From be85da3a69b306e5d8ca9dc0faad806d51433aad Mon Sep 17 00:00:00 2001
From: Danny Brain <me@danielbrain.com>
Date: Wed, 26 Jul 2017 11:30:02 +1000
Subject: [PATCH 001/421] Allow PlaybackControlView to be overridden in
 SimpleExoPlayerView

---
 .../android/exoplayer2/ui/SimpleExoPlayerView.java | 14 +++++++++++++-
 library/ui/src/main/res/values/ids.xml             |  1 +
 2 files changed, 14 insertions(+), 1 deletion(-)

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 a4083c940f5..1c39b558bbb 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
@@ -168,6 +168,15 @@
  *        <li>Type: {@link View}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code exo_controller}</b> - An already inflated instance of
+ *       {@link PlaybackControlView}. Allows you to use your own {@link PlaybackControlView} instead
+ *       of default. Note: attrs such as rewind_increment will not be passed through to this
+ *       instance and should be set at creation. {@code exo_controller_placeholder} will be ignored
+ *       if this is set.
+ *       <ul>
+ *        <li>Type: {@link View}</li>
+ *       </ul>
+ *   </li>
  *   <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>
@@ -315,8 +324,11 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
     }
 
     // Playback control view.
+    PlaybackControlView customController = (PlaybackControlView) findViewById(R.id.exo_controller);
     View controllerPlaceholder = findViewById(R.id.exo_controller_placeholder);
-    if (controllerPlaceholder != null) {
+    if (customController != null) {
+      this.controller = customController;
+    } else if (controllerPlaceholder != null) {
       // Note: rewindMs and fastForwardMs are passed via attrs, so we don't need to make explicit
       // calls to set them.
       this.controller = new PlaybackControlView(context, attrs);
diff --git a/library/ui/src/main/res/values/ids.xml b/library/ui/src/main/res/values/ids.xml
index 815487a54e0..b16b1729dac 100644
--- a/library/ui/src/main/res/values/ids.xml
+++ b/library/ui/src/main/res/values/ids.xml
@@ -20,6 +20,7 @@
   <item name="exo_subtitles" type="id"/>
   <item name="exo_artwork" type="id"/>
   <item name="exo_controller_placeholder" type="id"/>
+  <item name="exo_controller" type="id"/>
   <item name="exo_overlay" type="id"/>
   <item name="exo_play" type="id"/>
   <item name="exo_pause" type="id"/>

From 908362bdf352883497a58ff4c520f69497463070 Mon Sep 17 00:00:00 2001
From: Michael Goffioul <michael.goffioul@gmail.com>
Date: Thu, 27 Jul 2017 15:44:28 -0400
Subject: [PATCH 002/421] Fix H262 segmentation.

Prepend sequence headers to the next frame, instead of appending them to
the previous frame. Tested decoders like FFMPEG and Google's
Android/MPEG2 expects to read the sequence headers before the first
frame they apply to. When sequence headers are appended to the previous
frame, these are ignored and this leads to incorrect decoding.
---
 .../exoplayer2/extractor/ts/H262Reader.java   | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

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 7266f847c42..92c8e8d8004 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
@@ -51,7 +51,7 @@ public final class H262Reader implements ElementaryStreamReader {
   // State that should be reset on seek.
   private final boolean[] prefixFlags;
   private final CsdBuffer csdBuffer;
-  private boolean foundFirstFrameInGroup;
+  private boolean foundPicture;
   private long totalBytesWritten;
 
   // Per packet state that gets reset at the start of each packet.
@@ -60,8 +60,8 @@ public final class H262Reader implements ElementaryStreamReader {
 
   // Per sample state that gets reset at the start of each frame.
   private boolean isKeyframe;
-  private long framePosition;
-  private long frameTimeUs;
+  private long samplePosition;
+  private long sampleTimeUs;
 
   public H262Reader() {
     prefixFlags = new boolean[4];
@@ -73,7 +73,8 @@ public void seek() {
     NalUnitUtil.clearPrefixFlags(prefixFlags);
     csdBuffer.reset();
     pesPtsUsAvailable = false;
-    foundFirstFrameInGroup = false;
+    foundPicture = false;
+    samplePosition = C.POSITION_UNSET;
     totalBytesWritten = 0;
   }
 
@@ -136,25 +137,28 @@ public void consume(ParsableByteArray data) {
         }
       }
 
-      if (hasOutputFormat && (startCodeValue == START_GROUP || startCodeValue == START_PICTURE)) {
+      if (hasOutputFormat && (startCodeValue == START_PICTURE || startCodeValue == START_SEQUENCE_HEADER)) {
         int bytesWrittenPastStartCode = limit - startCodeOffset;
-        if (foundFirstFrameInGroup) {
+        boolean resetSample = (samplePosition == C.POSITION_UNSET);
+        if (foundPicture) {
           @C.BufferFlags int flags = isKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
-          int size = (int) (totalBytesWritten - framePosition) - bytesWrittenPastStartCode;
-          output.sampleMetadata(frameTimeUs, flags, size, bytesWrittenPastStartCode, null);
+          int size = (int) (totalBytesWritten - samplePosition) - bytesWrittenPastStartCode;
+          output.sampleMetadata(sampleTimeUs, flags, size, bytesWrittenPastStartCode, null);
           isKeyframe = false;
+          resetSample = true;
         }
-        if (startCodeValue == START_GROUP) {
-          foundFirstFrameInGroup = false;
-          isKeyframe = true;
-        } else /* startCodeValue == START_PICTURE */ {
-          frameTimeUs = pesPtsUsAvailable ? pesTimeUs : (frameTimeUs + frameDurationUs);
-          framePosition = totalBytesWritten - bytesWrittenPastStartCode;
+        foundPicture = (startCodeValue == START_PICTURE);
+        if (resetSample) {
+          samplePosition = totalBytesWritten - bytesWrittenPastStartCode;
+          sampleTimeUs = (pesPtsUsAvailable ? pesTimeUs : sampleTimeUs + frameDurationUs);
           pesPtsUsAvailable = false;
-          foundFirstFrameInGroup = true;
         }
       }
 
+      if (hasOutputFormat && startCodeValue == START_GROUP) {
+        isKeyframe = true;
+      }
+
       offset = startCodeOffset;
       searchOffset = offset + 3;
     }

From df562bc8d1d6d233e64dbf7e15df216df94aca7d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Sat, 22 Jul 2017 02:17:02 -0700
Subject: [PATCH 003/421] Fix PlaybackControlView's repeat mode button update
 when player is null

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=162824522
---
 .../google/android/exoplayer2/ui/PlaybackControlView.java    | 5 +++++
 1 file changed, 5 insertions(+)

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 7c4afa772a0..a99c2dfde2e 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
@@ -660,6 +660,11 @@ private void updateRepeatModeButton() {
       repeatToggleButton.setVisibility(View.GONE);
       return;
     }
+    if (player == null) {
+      setButtonEnabled(false, repeatToggleButton);
+      return;
+    }
+    setButtonEnabled(true, repeatToggleButton);
     switch (player.getRepeatMode()) {
       case Player.REPEAT_MODE_OFF:
         repeatToggleButton.setImageDrawable(repeatOffButtonDrawable);

From 1bc01c09eefe4898de70b69d158ce700e45a65a6 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 24 Jul 2017 03:46:14 -0700
Subject: [PATCH 004/421] Add fake adaptive media period.

This class extends the existing FakeMediaPeriod by using a ChunkSampleStream
with chunks from a FakeChunkSource instead of a FakeSampleStream.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=162916656
---
 .../testutil/FakeAdaptiveMediaPeriod.java     | 118 ++++++++++++++++++
 .../exoplayer2/testutil/FakeMediaPeriod.java  |  16 +--
 2 files changed, 126 insertions(+), 8 deletions(-)
 create mode 100644 testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java

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
new file mode 100644
index 00000000000..c8757e69cdf
--- /dev/null
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaPeriod.java
@@ -0,0 +1,118 @@
+/*
+ * 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.testutil;
+
+import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher;
+import com.google.android.exoplayer2.source.CompositeSequenceableLoader;
+import com.google.android.exoplayer2.source.MediaPeriod;
+import com.google.android.exoplayer2.source.SampleStream;
+import com.google.android.exoplayer2.source.SequenceableLoader;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.source.chunk.ChunkSampleStream;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.upstream.Allocator;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Fake {@link MediaPeriod} that provides tracks from the given {@link TrackGroupArray}. Selecting a
+ * track will give the player a {@link ChunkSampleStream<FakeChunkSource>}.
+ */
+public class FakeAdaptiveMediaPeriod extends FakeMediaPeriod
+    implements SequenceableLoader.Callback<ChunkSampleStream<FakeChunkSource>> {
+
+  private final EventDispatcher eventDispatcher;
+  private final Allocator allocator;
+  private final FakeChunkSource.Factory chunkSourceFactory;
+  private final long durationUs;
+
+  private Callback callback;
+  private ChunkSampleStream<FakeChunkSource>[] sampleStreams;
+  private SequenceableLoader sequenceableLoader;
+
+  public FakeAdaptiveMediaPeriod(TrackGroupArray trackGroupArray, EventDispatcher eventDispatcher,
+      Allocator allocator, FakeChunkSource.Factory chunkSourceFactory, long durationUs) {
+    super(trackGroupArray);
+    this.eventDispatcher = eventDispatcher;
+    this.allocator = allocator;
+    this.chunkSourceFactory = chunkSourceFactory;
+    this.durationUs = durationUs;
+  }
+
+  @Override
+  public void prepare(Callback callback, long positionUs) {
+    super.prepare(callback, positionUs);
+    this.callback = callback;
+  }
+
+  @Override
+  @SuppressWarnings("unchecked")
+  public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
+      SampleStream[] streams, boolean[] streamResetFlags, long positionUs) {
+    long returnPositionUs = super.selectTracks(selections, mayRetainStreamFlags, streams,
+        streamResetFlags, positionUs);
+    List<ChunkSampleStream<FakeChunkSource>> validStreams = new ArrayList<>();
+    for (SampleStream stream : streams) {
+      if (stream != null) {
+        validStreams.add((ChunkSampleStream<FakeChunkSource>) stream);
+      }
+    }
+    this.sampleStreams = validStreams.toArray(new ChunkSampleStream[validStreams.size()]);
+    this.sequenceableLoader = new CompositeSequenceableLoader(sampleStreams);
+    return returnPositionUs;
+  }
+
+  @Override
+  public long getBufferedPositionUs() {
+    super.getBufferedPositionUs();
+    return sequenceableLoader.getBufferedPositionUs();
+  }
+
+  @Override
+  public long seekToUs(long positionUs) {
+    for (ChunkSampleStream<FakeChunkSource> sampleStream : sampleStreams) {
+      sampleStream.seekToUs(positionUs);
+    }
+    return super.seekToUs(positionUs);
+  }
+
+  @Override
+  public long getNextLoadPositionUs() {
+    super.getNextLoadPositionUs();
+    return sequenceableLoader.getNextLoadPositionUs();
+  }
+
+  @Override
+  public boolean continueLoading(long positionUs) {
+    super.continueLoading(positionUs);
+    return sequenceableLoader.continueLoading(positionUs);
+  }
+
+  @Override
+  protected SampleStream createSampleStream(TrackSelection trackSelection) {
+    FakeChunkSource chunkSource = chunkSourceFactory.createChunkSource(trackSelection, durationUs);
+    return new ChunkSampleStream<>(
+        MimeTypes.getTrackType(trackSelection.getSelectedFormat().sampleMimeType), null,
+        chunkSource, this, allocator, 0, 3, eventDispatcher);
+  }
+
+  @Override
+  public void onContinueLoadingRequested(ChunkSampleStream<FakeChunkSource> source) {
+    callback.onContinueLoadingRequested(this);
+  }
+
+}
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 d8e501a2984..3863cf79876 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
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.testutil;
 
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.source.TrackGroup;
@@ -26,10 +25,10 @@
 import junit.framework.Assert;
 
 /**
- * Fake {@link MediaPeriod} that provides one track with a given {@link Format}. Selecting that
- * track will give the player a {@link FakeSampleStream}.
+ * Fake {@link MediaPeriod} that provides tracks from the given {@link TrackGroupArray}. Selecting
+ * tracks will give the player {@link FakeSampleStream}s.
  */
-public final class FakeMediaPeriod implements MediaPeriod {
+public class FakeMediaPeriod implements MediaPeriod {
 
   private final TrackGroupArray trackGroupArray;
 
@@ -46,7 +45,6 @@ public void release() {
   @Override
   public void prepare(Callback callback, long positionUs) {
     Assert.assertFalse(preparedPeriod);
-    Assert.assertEquals(0, positionUs);
     preparedPeriod = true;
     callback.onPrepared(this);
   }
@@ -71,8 +69,6 @@ public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamF
       if (streams[i] != null && (selections[i] == null || !mayRetainStreamFlags[i])) {
         streams[i] = null;
       }
-    }
-    for (int i = 0; i < rendererCount; i++) {
       if (streams[i] == null && selections[i] != null) {
         TrackSelection selection = selections[i];
         Assert.assertTrue(1 <= selection.length());
@@ -81,7 +77,7 @@ public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamF
         int indexInTrackGroup = selection.getIndexInTrackGroup(selection.getSelectedIndex());
         Assert.assertTrue(0 <= indexInTrackGroup);
         Assert.assertTrue(indexInTrackGroup < trackGroup.length);
-        streams[i] = new FakeSampleStream(selection.getSelectedFormat());
+        streams[i] = createSampleStream(selection);
         streamResetFlags[i] = true;
       }
     }
@@ -123,4 +119,8 @@ public boolean continueLoading(long positionUs) {
     return false;
   }
 
+  protected SampleStream createSampleStream(TrackSelection selection) {
+    return new FakeSampleStream(selection.getSelectedFormat());
+  }
+
 }

From 0411add91e383bead238403c584fbb01edebc25b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 24 Jul 2017 04:15:22 -0700
Subject: [PATCH 005/421] Add fake adaptive media source.

This class extends the existing FakeMediaSource by creating a
FakeAdaptiveMediaPeriod instead of a FakeMediaPeriod.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=162918487
---
 .../testutil/FakeAdaptiveMediaSource.java     | 52 +++++++++++++++++++
 .../exoplayer2/testutil/FakeMediaSource.java  |  9 +++-
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java

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
new file mode 100644
index 00000000000..59bcaf3e7c8
--- /dev/null
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveMediaSource.java
@@ -0,0 +1,52 @@
+/*
+ * 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.testutil;
+
+import android.os.Handler;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.Timeline.Period;
+import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener;
+import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.upstream.Allocator;
+
+/**
+ * Fake {@link MediaSource} that provides a given timeline. Creating the period returns a
+ * {@link FakeAdaptiveMediaPeriod} from the given {@link TrackGroupArray}.
+ */
+public class FakeAdaptiveMediaSource extends FakeMediaSource {
+
+  private final EventDispatcher eventDispatcher;
+  private final FakeChunkSource.Factory chunkSourceFactory;
+
+  public FakeAdaptiveMediaSource(Timeline timeline, Object manifest,
+      TrackGroupArray trackGroupArray, Handler eventHandler,
+      AdaptiveMediaSourceEventListener eventListener, FakeChunkSource.Factory chunkSourceFactory) {
+    super(timeline, manifest, trackGroupArray);
+    this.eventDispatcher = new EventDispatcher(eventHandler, eventListener);
+    this.chunkSourceFactory = chunkSourceFactory;
+  }
+
+  @Override
+  protected FakeMediaPeriod createFakeMediaPeriod(MediaPeriodId id, TrackGroupArray trackGroupArray,
+      Allocator allocator) {
+    Period period = timeline.getPeriod(id.periodIndex, new Period());
+    return new FakeAdaptiveMediaPeriod(trackGroupArray, eventDispatcher, allocator,
+        chunkSourceFactory, period.durationUs);
+  }
+
+}
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 a2c1e9879eb..9e7b498269b 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
@@ -34,7 +34,7 @@
  */
 public class FakeMediaSource implements MediaSource {
 
-  private final Timeline timeline;
+  protected final Timeline timeline;
   private final Object manifest;
   private final TrackGroupArray trackGroupArray;
   private final ArrayList<FakeMediaPeriod> activeMediaPeriods;
@@ -82,7 +82,7 @@ public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     Assertions.checkIndex(id.periodIndex, 0, timeline.getPeriodCount());
     Assert.assertTrue(preparedSource);
     Assert.assertFalse(releasedSource);
-    FakeMediaPeriod mediaPeriod = new FakeMediaPeriod(trackGroupArray);
+    FakeMediaPeriod mediaPeriod = createFakeMediaPeriod(id, trackGroupArray, allocator);
     activeMediaPeriods.add(mediaPeriod);
     return mediaPeriod;
   }
@@ -104,6 +104,11 @@ public void releaseSource() {
     releasedSource = true;
   }
 
+  protected FakeMediaPeriod createFakeMediaPeriod(MediaPeriodId id, TrackGroupArray trackGroupArray,
+      Allocator allocator) {
+    return new FakeMediaPeriod(trackGroupArray);
+  }
+
   private static TrackGroupArray buildTrackGroupArray(Format... formats) {
     TrackGroup[] trackGroups = new TrackGroup[formats.length];
     for (int i = 0; i < formats.length; i++) {

From 3991a6198bf9d51ea06e4189f4aad3dfae3a9de4 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 24 Jul 2017 04:16:47 -0700
Subject: [PATCH 006/421] Extend ActionSchedule with new actions.

The new actions are: prepare source, set repeat mode, wait for timeline
change, wait for position discontinuity, execute Runnable.

Moreover, this change removes the restriction of using a SimpleExoPlayer to
allow ActionSchedule to be used in other scenarios.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=162918554
---
 .../android/exoplayer2/testutil/Action.java   | 246 +++++++++++++++++-
 .../exoplayer2/testutil/ActionSchedule.java   |  73 +++++-
 2 files changed, 306 insertions(+), 13 deletions(-)

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 b1c6f081cf3..bbb694d6d61 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
@@ -15,11 +15,20 @@
  */
 package com.google.android.exoplayer2.testutil;
 
+import android.os.Handler;
 import android.util.Log;
 import android.view.Surface;
+import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.testutil.ActionSchedule.ActionNode;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 
 /**
  * Base class for actions to perform during playback tests.
@@ -39,21 +48,41 @@ public Action(String tag, String description) {
   }
 
   /**
-   * Executes the action.
+   * Executes the action and schedules the next.
    *
    * @param player The player to which the action should be applied.
    * @param trackSelector The track selector to which the action should be applied.
    * @param surface The surface to use when applying actions.
+   * @param handler The handler to use to pass to the next action.
+   * @param nextAction The next action to schedule immediately after this action finished.
    */
-  public final void doAction(SimpleExoPlayer player, MappingTrackSelector trackSelector,
-      Surface surface) {
+  public final void doActionAndScheduleNext(SimpleExoPlayer player,
+      MappingTrackSelector trackSelector, Surface surface, Handler handler, ActionNode nextAction) {
     Log.i(tag, description);
+    doActionAndScheduleNextImpl(player, trackSelector, surface, handler, nextAction);
+  }
+
+  /**
+   * Called by {@link #doActionAndScheduleNext(SimpleExoPlayer, MappingTrackSelector, Surface,
+   * Handler, ActionNode)} to perform the action and to schedule the next action node.
+   *
+   * @param player The player to which the action should be applied.
+   * @param trackSelector The track selector to which the action should be applied.
+   * @param surface The surface to use when applying actions.
+   * @param handler The handler to use to pass to the next action.
+   * @param nextAction The next action to schedule immediately after this action finished.
+   */
+  protected void doActionAndScheduleNextImpl(SimpleExoPlayer player,
+      MappingTrackSelector trackSelector, Surface surface, Handler handler, ActionNode nextAction) {
     doActionImpl(player, trackSelector, surface);
+    if (nextAction != null) {
+      nextAction.schedule(player, trackSelector, surface, handler);
+    }
   }
 
   /**
-   * Called by {@link #doAction(SimpleExoPlayer, MappingTrackSelector, Surface)} do perform the
-   * action.
+   * Called by {@link #doActionAndScheduleNextImpl(SimpleExoPlayer, MappingTrackSelector, Surface,
+   * Handler, ActionNode)} to perform the action.
    *
    * @param player The player to which the action should be applied.
    * @param trackSelector The track selector to which the action should be applied.
@@ -63,7 +92,7 @@ protected abstract void doActionImpl(SimpleExoPlayer player, MappingTrackSelecto
       Surface surface);
 
   /**
-   * Calls {@link ExoPlayer#seekTo(long)}.
+   * Calls {@link Player#seekTo(long)}.
    */
   public static final class Seek extends Action {
 
@@ -87,7 +116,7 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
   }
 
   /**
-   * Calls {@link ExoPlayer#stop()}.
+   * Calls {@link Player#stop()}.
    */
   public static final class Stop extends Action {
 
@@ -107,7 +136,7 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
   }
 
   /**
-   * Calls {@link ExoPlayer#setPlayWhenReady(boolean)}.
+   * Calls {@link Player#setPlayWhenReady(boolean)}.
    */
   public static final class SetPlayWhenReady extends Action {
 
@@ -197,5 +226,206 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
 
   }
 
+  /**
+   * Calls {@link ExoPlayer#prepare(MediaSource)}.
+   */
+  public static final class PrepareSource extends Action {
+
+    private final MediaSource mediaSource;
+    private final boolean resetPosition;
+    private final boolean resetState;
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public PrepareSource(String tag, MediaSource mediaSource) {
+      this(tag, mediaSource, true, true);
+    }
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public PrepareSource(String tag, MediaSource mediaSource, boolean resetPosition,
+        boolean resetState) {
+      super(tag, "PrepareSource");
+      this.mediaSource = mediaSource;
+      this.resetPosition = resetPosition;
+      this.resetState = resetState;
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      player.prepare(mediaSource, resetPosition, resetState);
+    }
+
+  }
+
+  /**
+   * Calls {@link Player#setRepeatMode(int)}.
+   */
+  public static final class SetRepeatMode extends Action {
+
+    private final @Player.RepeatMode int repeatMode;
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public SetRepeatMode(String tag, @Player.RepeatMode int repeatMode) {
+      super(tag, "SetRepeatMode:" + repeatMode);
+      this.repeatMode = repeatMode;
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      player.setRepeatMode(repeatMode);
+    }
+
+  }
+
+  /**
+   * Waits for {@link Player.EventListener#onTimelineChanged(Timeline, Object)}.
+   */
+  public static final class WaitForTimelineChanged extends Action {
+
+    private final Timeline expectedTimeline;
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public WaitForTimelineChanged(String tag, Timeline expectedTimeline) {
+      super(tag, "WaitForTimelineChanged");
+      this.expectedTimeline = expectedTimeline;
+    }
+
+    @Override
+    protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
+        final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
+        final ActionNode nextAction) {
+      PlayerListener listener = new PlayerListener() {
+        @Override
+        public void onTimelineChanged(Timeline timeline, Object manifest) {
+          if (timeline.equals(expectedTimeline)) {
+            player.removeListener(this);
+            nextAction.schedule(player, trackSelector, surface, handler);
+          }
+        }
+      };
+      player.addListener(listener);
+      if (player.getCurrentTimeline().equals(expectedTimeline)) {
+        player.removeListener(listener);
+        nextAction.schedule(player, trackSelector, surface, handler);
+      }
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      // Not triggered.
+    }
+
+  }
+
+  /**
+   * Waits for {@link Player.EventListener#onPositionDiscontinuity()}.
+   */
+  public static final class WaitForPositionDiscontinuity extends Action {
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public WaitForPositionDiscontinuity(String tag) {
+      super(tag, "WaitForPositionDiscontinuity");
+    }
+
+    @Override
+    protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
+        final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
+        final ActionNode nextAction) {
+      player.addListener(new PlayerListener() {
+        @Override
+        public void onPositionDiscontinuity() {
+          player.removeListener(this);
+          nextAction.schedule(player, trackSelector, surface, handler);
+        }
+      });
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      // Not triggered.
+    }
+
+  }
+
+  /**
+   * Calls {@link Runnable#run()}.
+   */
+  public static final class ExecuteRunnable extends Action {
+
+    private final Runnable runnable;
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public ExecuteRunnable(String tag, Runnable runnable) {
+      super(tag, "ExecuteRunnable");
+      this.runnable = runnable;
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      runnable.run();
+    }
+
+  }
+
+  /** Listener implementation used for overriding. Does nothing. */
+  private static class PlayerListener implements Player.EventListener {
+
+    @Override
+    public void onTimelineChanged(Timeline timeline, Object manifest) {
+
+    }
+
+    @Override
+    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+
+    }
+
+    @Override
+    public void onLoadingChanged(boolean isLoading) {
+
+    }
+
+    @Override
+    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+
+    }
+
+    @Override
+    public void onRepeatModeChanged(@ExoPlayer.RepeatMode int repeatMode) {
+
+    }
+
+    @Override
+    public void onPlayerError(ExoPlaybackException error) {
+
+    }
+
+    @Override
+    public void onPositionDiscontinuity() {
+
+    }
+
+    @Override
+    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+
+    }
+
+  }
 
 }
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 66f7ebca959..4392dd9d3f6 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
@@ -18,13 +18,22 @@
 import android.os.Handler;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.testutil.Action.ClearVideoSurface;
+import com.google.android.exoplayer2.testutil.Action.ExecuteRunnable;
+import com.google.android.exoplayer2.testutil.Action.PrepareSource;
 import com.google.android.exoplayer2.testutil.Action.Seek;
 import com.google.android.exoplayer2.testutil.Action.SetPlayWhenReady;
 import com.google.android.exoplayer2.testutil.Action.SetRendererDisabled;
+import com.google.android.exoplayer2.testutil.Action.SetRepeatMode;
 import com.google.android.exoplayer2.testutil.Action.SetVideoSurface;
 import com.google.android.exoplayer2.testutil.Action.Stop;
+import com.google.android.exoplayer2.testutil.Action.WaitForPositionDiscontinuity;
+import com.google.android.exoplayer2.testutil.Action.WaitForTimelineChanged;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 
 /**
@@ -179,6 +188,63 @@ public Builder setVideoSurface() {
       return apply(new SetVideoSurface(tag));
     }
 
+    /**
+     * Schedules a new source preparation action to be executed.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder prepareSource(MediaSource mediaSource) {
+      return apply(new PrepareSource(tag, mediaSource));
+    }
+
+    /**
+     * Schedules a new source preparation action to be executed.
+     * @see ExoPlayer#prepare(MediaSource, boolean, boolean).
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder prepareSource(MediaSource mediaSource, boolean resetPosition,
+        boolean resetState) {
+      return apply(new PrepareSource(tag, mediaSource, resetPosition, resetState));
+    }
+
+    /**
+     * Schedules a repeat mode setting action to be executed.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder setRepeatMode(@Player.RepeatMode int repeatMode) {
+      return apply(new SetRepeatMode(tag, repeatMode));
+    }
+
+    /**
+     * Schedules a delay until the timeline changed to a specified expected timeline.
+     *
+     * @param expectedTimeline The expected timeline to wait for.
+     * @return The builder, for convenience.
+     */
+    public Builder waitForTimelineChanged(Timeline expectedTimeline) {
+      return apply(new WaitForTimelineChanged(tag, expectedTimeline));
+    }
+
+    /**
+     * Schedules a delay until the next position discontinuity.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder waitForPositionDiscontinuity() {
+      return apply(new WaitForPositionDiscontinuity(tag));
+    }
+
+    /**
+     * Schedules a {@link Runnable} to be executed.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder executeRunnable(Runnable runnable) {
+      return apply(new ExecuteRunnable(tag, runnable));
+    }
+
     public ActionSchedule build() {
       return new ActionSchedule(rootNode);
     }
@@ -195,7 +261,7 @@ private Builder appendActionNode(ActionNode actionNode) {
   /**
    * Wraps an {@link Action}, allowing a delay and a next {@link Action} to be specified.
    */
-  private static final class ActionNode implements Runnable {
+  /* package */ static final class ActionNode implements Runnable {
 
     private final Action action;
     private final long delayMs;
@@ -257,10 +323,7 @@ public void schedule(SimpleExoPlayer player, MappingTrackSelector trackSelector,
 
     @Override
     public void run() {
-      action.doAction(player, trackSelector, surface);
-      if (next != null) {
-        next.schedule(player, trackSelector, surface, mainHandler);
-      }
+      action.doActionAndScheduleNext(player, trackSelector, surface, mainHandler, next);
       if (repeatIntervalMs != C.TIME_UNSET) {
         mainHandler.postDelayed(this, repeatIntervalMs);
       }

From 3f7b4dc75fca331e13880a9a9daf04b697e5afba Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 25 Jul 2017 03:41:23 -0700
Subject: [PATCH 007/421] Add HlsDownloader

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163052346
---
 library/hls/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index 77680569f0f..c870c3d1625 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -33,6 +33,7 @@ android {
 dependencies {
     compile project(modulePrefix + 'library-core')
     compile 'com.android.support:support-annotations:' + supportLibraryVersion
+    androidTestCompile project(':testutils')
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion

From 2dc1870dd43003733e218a9d9d25a751c987d722 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 25 Jul 2017 13:45:54 -0700
Subject: [PATCH 008/421] Simple Java style fix

Put space between ] and {.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163116816
---
 .../ogg/DefaultOggSeekerUtilMethodsTest.java     |  8 ++++----
 .../exoplayer2/util/ParsableByteArrayTest.java   |  8 ++++----
 .../exoplayer2/text/cea/Cea708Decoder.java       | 16 ++++++++--------
 .../exoplayer2/source/dash/DashUtilTest.java     |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
index d52deb108f5..1acc208c297 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
@@ -34,7 +34,7 @@ public void testSkipToNextPage() throws Exception {
     FakeExtractorInput extractorInput = TestData.createInput(
         TestUtil.joinByteArrays(
             TestUtil.buildTestData(4000, random),
-            new byte[]{'O', 'g', 'g', 'S'},
+            new byte[] {'O', 'g', 'g', 'S'},
             TestUtil.buildTestData(4000, random)
         ), false);
     skipToNextPage(extractorInput);
@@ -45,7 +45,7 @@ public void testSkipToNextPageOverlap() throws Exception {
     FakeExtractorInput extractorInput = TestData.createInput(
         TestUtil.joinByteArrays(
             TestUtil.buildTestData(2046, random),
-            new byte[]{'O', 'g', 'g', 'S'},
+            new byte[] {'O', 'g', 'g', 'S'},
             TestUtil.buildTestData(4000, random)
         ), false);
     skipToNextPage(extractorInput);
@@ -55,7 +55,7 @@ public void testSkipToNextPageOverlap() throws Exception {
   public void testSkipToNextPageInputShorterThanPeekLength() throws Exception {
     FakeExtractorInput extractorInput = TestData.createInput(
         TestUtil.joinByteArrays(
-            new byte[]{'x', 'O', 'g', 'g', 'S'}
+            new byte[] {'x', 'O', 'g', 'g', 'S'}
         ), false);
     skipToNextPage(extractorInput);
     assertEquals(1, extractorInput.getPosition());
@@ -63,7 +63,7 @@ public void testSkipToNextPageInputShorterThanPeekLength() throws Exception {
 
   public void testSkipToNextPageNoMatch() throws Exception {
     FakeExtractorInput extractorInput = TestData.createInput(
-        new byte[]{'g', 'g', 'S', 'O', 'g', 'g'}, false);
+        new byte[] {'g', 'g', 'S', 'O', 'g', 'g'}, false);
     try {
       skipToNextPage(extractorInput);
       fail();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
index 49719b95f79..324d668c7a1 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
@@ -279,7 +279,7 @@ public void testReadingBytesReturnsCopy() {
   }
 
   public void testReadLittleEndianLong() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[]{
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
         0x01, 0x00, 0x00, 0x00,
         0x00, 0x00, 0x00, (byte) 0xFF
     });
@@ -296,7 +296,7 @@ public void testReadLittleEndianUnsignedInt() {
   }
 
   public void testReadLittleEndianInt() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[]{
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
         0x01, 0x00, 0x00, (byte) 0xFF
     });
     assertEquals(0xFF000001, byteArray.readLittleEndianInt());
@@ -311,7 +311,7 @@ public void testReadLittleEndianUnsignedInt24() {
   }
 
   public void testReadLittleEndianUnsignedShort() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[]{
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
         0x01, (byte) 0xFF, 0x02, (byte) 0xFF
     });
     assertEquals(0xFF01, byteArray.readLittleEndianUnsignedShort());
@@ -321,7 +321,7 @@ public void testReadLittleEndianUnsignedShort() {
   }
 
   public void testReadLittleEndianShort() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[]{
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
         0x01, (byte) 0xFF, 0x02, (byte) 0xFF
     });
     assertEquals((short) 0xFF01, byteArray.readLittleEndianShort());
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 8fd70f7a67f..030f0cdbb0c 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
@@ -811,43 +811,43 @@ private static final class CueBuilder {
     private static final int PEN_OFFSET_NORMAL = 1;
 
     // The window style properties are specified in the CEA-708 specification.
-    private static final int[] WINDOW_STYLE_JUSTIFICATION = new int[]{
+    private static final int[] WINDOW_STYLE_JUSTIFICATION = new int[] {
         JUSTIFICATION_LEFT, JUSTIFICATION_LEFT, JUSTIFICATION_LEFT,
         JUSTIFICATION_LEFT, JUSTIFICATION_LEFT, JUSTIFICATION_CENTER,
         JUSTIFICATION_LEFT
     };
-    private static final int[] WINDOW_STYLE_PRINT_DIRECTION = new int[]{
+    private static final int[] WINDOW_STYLE_PRINT_DIRECTION = new int[] {
         DIRECTION_LEFT_TO_RIGHT, DIRECTION_LEFT_TO_RIGHT, DIRECTION_LEFT_TO_RIGHT,
         DIRECTION_LEFT_TO_RIGHT, DIRECTION_LEFT_TO_RIGHT, DIRECTION_LEFT_TO_RIGHT,
         DIRECTION_TOP_TO_BOTTOM
     };
-    private static final int[] WINDOW_STYLE_SCROLL_DIRECTION = new int[]{
+    private static final int[] WINDOW_STYLE_SCROLL_DIRECTION = new int[] {
         DIRECTION_BOTTOM_TO_TOP, DIRECTION_BOTTOM_TO_TOP, DIRECTION_BOTTOM_TO_TOP,
         DIRECTION_BOTTOM_TO_TOP, DIRECTION_BOTTOM_TO_TOP, DIRECTION_BOTTOM_TO_TOP,
         DIRECTION_RIGHT_TO_LEFT
     };
-    private static final boolean[] WINDOW_STYLE_WORD_WRAP = new boolean[]{
+    private static final boolean[] WINDOW_STYLE_WORD_WRAP = new boolean[] {
         false, false, false, true, true, true, false
     };
-    private static final int[] WINDOW_STYLE_FILL = new int[]{
+    private static final int[] WINDOW_STYLE_FILL = new int[] {
         COLOR_SOLID_BLACK, COLOR_TRANSPARENT, COLOR_SOLID_BLACK, COLOR_SOLID_BLACK,
         COLOR_TRANSPARENT, COLOR_SOLID_BLACK, COLOR_SOLID_BLACK
     };
 
     // The pen style properties are specified in the CEA-708 specification.
-    private static final int[] PEN_STYLE_FONT_STYLE = new int[]{
+    private static final int[] PEN_STYLE_FONT_STYLE = new int[] {
         PEN_FONT_STYLE_DEFAULT, PEN_FONT_STYLE_MONOSPACED_WITH_SERIFS,
         PEN_FONT_STYLE_PROPORTIONALLY_SPACED_WITH_SERIFS, PEN_FONT_STYLE_MONOSPACED_WITHOUT_SERIFS,
         PEN_FONT_STYLE_PROPORTIONALLY_SPACED_WITHOUT_SERIFS,
         PEN_FONT_STYLE_MONOSPACED_WITHOUT_SERIFS,
         PEN_FONT_STYLE_PROPORTIONALLY_SPACED_WITHOUT_SERIFS
     };
-    private static final int[] PEN_STYLE_EDGE_TYPE = new int[]{
+    private static final int[] PEN_STYLE_EDGE_TYPE = new int[] {
         BORDER_AND_EDGE_TYPE_NONE, BORDER_AND_EDGE_TYPE_NONE, BORDER_AND_EDGE_TYPE_NONE,
         BORDER_AND_EDGE_TYPE_NONE, BORDER_AND_EDGE_TYPE_NONE, BORDER_AND_EDGE_TYPE_UNIFORM,
         BORDER_AND_EDGE_TYPE_UNIFORM
     };
-    private static final int[] PEN_STYLE_BACKGROUND = new int[]{
+    private static final int[] PEN_STYLE_BACKGROUND = new int[] {
         COLOR_SOLID_BLACK, COLOR_SOLID_BLACK, COLOR_SOLID_BLACK, COLOR_SOLID_BLACK,
         COLOR_SOLID_BLACK, COLOR_TRANSPARENT, COLOR_TRANSPARENT};
 
diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
index bac1c272e8c..7a1c78b2e8a 100644
--- a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
+++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
@@ -76,7 +76,7 @@ private static Representation newRepresentations(DrmInitData drmInitData) {
 
   private static DrmInitData newDrmInitData() {
     return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, null, "mimeType",
-        new byte[]{1, 4, 7, 0, 3, 6}));
+        new byte[] {1, 4, 7, 0, 3, 6}));
   }
 
 }

From cdb71a80aae7cc1bb605b74cf83623b2786e4990 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 26 Jul 2017 03:03:48 -0700
Subject: [PATCH 009/421] Remove empty line after copyright text

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163186057
---
 .../exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java   | 1 -
 .../android/exoplayer2/ext/cronet/CronetDataSourceTest.java      | 1 -
 .../exoplayer2/ext/mediasession/RepeatModeActionProvider.java    | 1 -
 .../google/android/exoplayer2/drm/OfflineLicenseHelperTest.java  | 1 -
 .../java/com/google/android/exoplayer2/util/AtomicFileTest.java  | 1 -
 .../com/google/android/exoplayer2/drm/OfflineLicenseHelper.java  | 1 -
 .../main/java/com/google/android/exoplayer2/util/AtomicFile.java | 1 -
 7 files changed, 7 deletions(-)

diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
index 4282244a7aa..203fd5e21c7 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.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.cronet;
 
 import static org.junit.Assert.assertArrayEquals;
diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index 06a356487e0..c7050dbd0cf 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.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.cronet;
 
 import static org.junit.Assert.assertArrayEquals;
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 1f332450592..36d95914f7c 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
@@ -14,7 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.media.session.PlaybackStateCompat;
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 9f5b067b5ef..43c867f4353 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.android.exoplayer2.drm;
 
 import static org.mockito.Matchers.any;
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java
index 6c5d7c76f78..b4f1d502931 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.android.exoplayer2.util;
 
 import android.test.InstrumentationTestCase;
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 040ca50c76c..2eb3463b3dc 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
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.android.exoplayer2.drm;
 
 import android.media.MediaDrm;
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 f2e30d981b6..e85c07fba9e 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
@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.google.android.exoplayer2.util;
 
 import android.support.annotation.NonNull;

From b631755b634b14ca13b25742869fc9d9f13f1d9d Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 26 Jul 2017 03:08:52 -0700
Subject: [PATCH 010/421] Clean up test runner for ExoPlayer tests.

Currently the ExoPlayerWrapper is used to run tests using an ExoPlayer
implementation. Some properties of the test are set in the constructor, some
are set by overloading the class, others are hard-coded in the
ExoPlayerWrapper class, and a mechanism similar to the existing ActionSchedule
is missing.

This change does the following:
 1. Renames ExoPlayerWrapper to ExoPlayerTestRunner as it better reflects
    its purpose.
 2. Adds an internal Builder to easily set-up the test in a coherent way. This
    allows to only set necessary test components while using defaults for the rest.
 3. Integrate ActionSchedule.
 4. Apply the new structure to the existing tests currently using ExoPlayerWrapper.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163186578
---
 .../android/exoplayer2/ExoPlayerTest.java     | 204 ++++------
 .../testutil/ExoPlayerTestRunner.java         | 379 ++++++++++++++++++
 .../exoplayer2/testutil/ExoPlayerWrapper.java | 192 ---------
 3 files changed, 468 insertions(+), 307 deletions(-)
 create mode 100644 testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
 delete mode 100644 testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerWrapper.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
index bf4ea6e9728..bc72ebc0603 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -15,20 +15,18 @@
  */
 package com.google.android.exoplayer2;
 
-import android.util.Pair;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.testutil.ExoPlayerWrapper;
+import com.google.android.exoplayer2.testutil.ActionSchedule;
+import com.google.android.exoplayer2.testutil.ExoPlayerTestRunner;
+import com.google.android.exoplayer2.testutil.ExoPlayerTestRunner.Builder;
 import com.google.android.exoplayer2.testutil.FakeMediaClockRenderer;
 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.util.MimeTypes;
-import java.util.LinkedList;
 import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
 import junit.framework.TestCase;
 
 /**
@@ -43,67 +41,59 @@ public final class ExoPlayerTest extends TestCase {
    */
   private static final int TIMEOUT_MS = 10000;
 
-  private static final Format TEST_VIDEO_FORMAT = Format.createVideoSampleFormat(null,
-      MimeTypes.VIDEO_H264, null, Format.NO_VALUE, Format.NO_VALUE, 1280, 720, Format.NO_VALUE,
-      null, null);
-  private static final Format TEST_AUDIO_FORMAT =  Format.createAudioSampleFormat(null,
-      MimeTypes.AUDIO_AAC, null, Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, null);
-
   /**
    * Tests playback of a source that exposes an empty timeline. Playback is expected to end without
    * error.
    */
   public void testPlayEmptyTimeline() throws Exception {
-    ExoPlayerWrapper playerWrapper = new ExoPlayerWrapper();
     Timeline timeline = Timeline.EMPTY;
-    MediaSource mediaSource = new FakeMediaSource(timeline, null);
     FakeRenderer renderer = new FakeRenderer();
-    playerWrapper.setup(mediaSource, renderer);
-    playerWrapper.blockUntilEnded(TIMEOUT_MS);
-    assertEquals(0, playerWrapper.positionDiscontinuityCount);
+    ExoPlayerTestRunner testRunner = new ExoPlayerTestRunner.Builder()
+        .setTimeline(timeline).setRenderers(renderer)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    testRunner.assertPositionDiscontinuityCount(0);
+    testRunner.assertTimelinesEqual(timeline);
     assertEquals(0, renderer.formatReadCount);
     assertEquals(0, renderer.bufferReadCount);
     assertFalse(renderer.isEnded);
-    playerWrapper.assertSourceInfosEquals(Pair.create(timeline, null));
   }
 
   /**
    * Tests playback of a source that exposes a single period.
    */
   public void testPlaySinglePeriodTimeline() throws Exception {
-    ExoPlayerWrapper playerWrapper = new ExoPlayerWrapper();
     Timeline timeline = new FakeTimeline(new TimelineWindowDefinition(false, false, 0));
     Object manifest = new Object();
-    MediaSource mediaSource = new FakeMediaSource(timeline, manifest, TEST_VIDEO_FORMAT);
-    FakeRenderer renderer = new FakeRenderer(TEST_VIDEO_FORMAT);
-    playerWrapper.setup(mediaSource, renderer);
-    playerWrapper.blockUntilEnded(TIMEOUT_MS);
-    assertEquals(0, playerWrapper.positionDiscontinuityCount);
+    FakeRenderer renderer = new FakeRenderer(Builder.VIDEO_FORMAT);
+    ExoPlayerTestRunner testRunner = new ExoPlayerTestRunner.Builder()
+        .setTimeline(timeline).setManifest(manifest).setRenderers(renderer)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    testRunner.assertPositionDiscontinuityCount(0);
+    testRunner.assertTimelinesEqual(timeline);
+    testRunner.assertManifestsEqual(manifest);
+    testRunner.assertTrackGroupsEqual(new TrackGroupArray(new TrackGroup(Builder.VIDEO_FORMAT)));
     assertEquals(1, renderer.formatReadCount);
     assertEquals(1, renderer.bufferReadCount);
     assertTrue(renderer.isEnded);
-    assertEquals(new TrackGroupArray(new TrackGroup(TEST_VIDEO_FORMAT)), playerWrapper.trackGroups);
-    playerWrapper.assertSourceInfosEquals(Pair.create(timeline, manifest));
   }
 
   /**
    * Tests playback of a source that exposes three periods.
    */
   public void testPlayMultiPeriodTimeline() throws Exception {
-    ExoPlayerWrapper playerWrapper = new ExoPlayerWrapper();
     Timeline timeline = new FakeTimeline(
         new TimelineWindowDefinition(false, false, 0),
         new TimelineWindowDefinition(false, false, 0),
         new TimelineWindowDefinition(false, false, 0));
-    MediaSource mediaSource = new FakeMediaSource(timeline, null, TEST_VIDEO_FORMAT);
-    FakeRenderer renderer = new FakeRenderer(TEST_VIDEO_FORMAT);
-    playerWrapper.setup(mediaSource, renderer);
-    playerWrapper.blockUntilEnded(TIMEOUT_MS);
-    assertEquals(2, playerWrapper.positionDiscontinuityCount);
+    FakeRenderer renderer = new FakeRenderer(Builder.VIDEO_FORMAT);
+    ExoPlayerTestRunner testRunner = new ExoPlayerTestRunner.Builder()
+        .setTimeline(timeline).setRenderers(renderer)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    testRunner.assertPositionDiscontinuityCount(2);
+    testRunner.assertTimelinesEqual(timeline);
     assertEquals(3, renderer.formatReadCount);
     assertEquals(1, renderer.bufferReadCount);
     assertTrue(renderer.isEnded);
-    playerWrapper.assertSourceInfosEquals(Pair.create(timeline, null));
   }
 
   /**
@@ -111,16 +101,12 @@ public void testPlayMultiPeriodTimeline() throws Exception {
    * source.
    */
   public void testReadAheadToEndDoesNotResetRenderer() throws Exception {
-    final ExoPlayerWrapper playerWrapper = new ExoPlayerWrapper();
     Timeline timeline = new FakeTimeline(
         new TimelineWindowDefinition(false, false, 10),
         new TimelineWindowDefinition(false, false, 10),
         new TimelineWindowDefinition(false, false, 10));
-    MediaSource mediaSource = new FakeMediaSource(timeline, null, TEST_VIDEO_FORMAT,
-        TEST_AUDIO_FORMAT);
-
-    FakeRenderer videoRenderer = new FakeRenderer(TEST_VIDEO_FORMAT);
-    FakeMediaClockRenderer audioRenderer = new FakeMediaClockRenderer(TEST_AUDIO_FORMAT) {
+    final FakeRenderer videoRenderer = new FakeRenderer(Builder.VIDEO_FORMAT);
+    FakeMediaClockRenderer audioRenderer = new FakeMediaClockRenderer(Builder.AUDIO_FORMAT) {
 
       @Override
       public long getPositionUs() {
@@ -143,35 +129,30 @@ public PlaybackParameters getPlaybackParameters() {
 
       @Override
       public boolean isEnded() {
-        // Allow playback to end once the final period is playing.
-        return playerWrapper.positionDiscontinuityCount == 2;
+        return videoRenderer.isEnded();
       }
 
     };
-    playerWrapper.setup(mediaSource, videoRenderer, audioRenderer);
-    playerWrapper.blockUntilEnded(TIMEOUT_MS);
-    assertEquals(2, playerWrapper.positionDiscontinuityCount);
+    ExoPlayerTestRunner testRunner = new ExoPlayerTestRunner.Builder()
+        .setTimeline(timeline).setRenderers(videoRenderer, audioRenderer)
+        .setSupportedFormats(Builder.VIDEO_FORMAT, Builder.AUDIO_FORMAT)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    testRunner.assertPositionDiscontinuityCount(2);
+    testRunner.assertTimelinesEqual(timeline);
     assertEquals(1, audioRenderer.positionResetCount);
     assertTrue(videoRenderer.isEnded);
     assertTrue(audioRenderer.isEnded);
-    playerWrapper.assertSourceInfosEquals(Pair.create(timeline, null));
   }
 
   public void testRepreparationGivesFreshSourceInfo() throws Exception {
-    ExoPlayerWrapper playerWrapper = new ExoPlayerWrapper();
     Timeline timeline = new FakeTimeline(new TimelineWindowDefinition(false, false, 0));
-    FakeRenderer renderer = new FakeRenderer(TEST_VIDEO_FORMAT);
-
-    // Prepare the player with a source with the first manifest and a non-empty timeline
+    FakeRenderer renderer = new FakeRenderer(Builder.VIDEO_FORMAT);
     Object firstSourceManifest = new Object();
-    playerWrapper.setup(new FakeMediaSource(timeline, firstSourceManifest, TEST_VIDEO_FORMAT),
-        renderer);
-    playerWrapper.blockUntilSourceInfoRefreshed(TIMEOUT_MS);
-
-    // Prepare the player again with a source and a new manifest, which will never be exposed.
+    MediaSource firstSource = new FakeMediaSource(timeline, firstSourceManifest,
+        Builder.VIDEO_FORMAT);
     final CountDownLatch queuedSourceInfoCountDownLatch = new CountDownLatch(1);
     final CountDownLatch completePreparationCountDownLatch = new CountDownLatch(1);
-    playerWrapper.prepare(new FakeMediaSource(timeline, new Object(), TEST_VIDEO_FORMAT) {
+    MediaSource secondSource = new FakeMediaSource(timeline, new Object(), Builder.VIDEO_FORMAT) {
       @Override
       public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
         super.prepareSource(player, isTopLevelSource, listener);
@@ -185,29 +166,49 @@ public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener l
           throw new IllegalStateException(e);
         }
       }
-    });
-
-    // Prepare the player again with a third source.
-    queuedSourceInfoCountDownLatch.await();
+    };
     Object thirdSourceManifest = new Object();
-    playerWrapper.prepare(new FakeMediaSource(timeline, thirdSourceManifest, TEST_VIDEO_FORMAT));
-    completePreparationCountDownLatch.countDown();
-
-    // Wait for playback to complete.
-    playerWrapper.blockUntilEnded(TIMEOUT_MS);
-    assertEquals(0, playerWrapper.positionDiscontinuityCount);
-    assertEquals(1, renderer.formatReadCount);
-    assertEquals(1, renderer.bufferReadCount);
-    assertTrue(renderer.isEnded);
-    assertEquals(new TrackGroupArray(new TrackGroup(TEST_VIDEO_FORMAT)), playerWrapper.trackGroups);
-
+    MediaSource thirdSource = new FakeMediaSource(timeline, thirdSourceManifest,
+        Builder.VIDEO_FORMAT);
+
+    // Prepare the player with a source with the first manifest and a non-empty timeline. Prepare
+    // the player again with a source and a new manifest, which will never be exposed. Allow the
+    // test thread to prepare the player with a third source, and block the playback thread until
+    // the test thread's call to prepare() has returned.
+    ActionSchedule actionSchedule = new ActionSchedule.Builder("testRepreparation")
+        .waitForTimelineChanged(timeline)
+        .prepareSource(secondSource)
+        .executeRunnable(new Runnable() {
+          @Override
+          public void run() {
+            try {
+              queuedSourceInfoCountDownLatch.await();
+            } catch (InterruptedException e) {
+              // Ignore.
+            }
+          }
+        })
+        .prepareSource(thirdSource)
+        .executeRunnable(new Runnable() {
+          @Override
+          public void run() {
+            completePreparationCountDownLatch.countDown();
+          }
+        })
+        .build();
+    ExoPlayerTestRunner testRunner = new ExoPlayerTestRunner.Builder()
+        .setMediaSource(firstSource).setRenderers(renderer).setActionSchedule(actionSchedule)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    testRunner.assertPositionDiscontinuityCount(0);
     // The first source's preparation completed with a non-empty timeline. When the player was
     // re-prepared with the second source, it immediately exposed an empty timeline, but the source
     // info refresh from the second source was suppressed as we re-prepared with the third source.
-    playerWrapper.assertSourceInfosEquals(
-        Pair.create(timeline, firstSourceManifest),
-        Pair.create(Timeline.EMPTY, null),
-        Pair.create(timeline, thirdSourceManifest));
+    testRunner.assertTimelinesEqual(timeline, Timeline.EMPTY, timeline);
+    testRunner.assertManifestsEqual(firstSourceManifest, null, thirdSourceManifest);
+    testRunner.assertTrackGroupsEqual(new TrackGroupArray(new TrackGroup(Builder.VIDEO_FORMAT)));
+    assertEquals(1, renderer.formatReadCount);
+    assertEquals(1, renderer.bufferReadCount);
+    assertTrue(renderer.isEnded);
   }
 
   public void testRepeatModeChanges() throws Exception {
@@ -215,49 +216,22 @@ public void testRepeatModeChanges() throws Exception {
         new TimelineWindowDefinition(true, false, 100000),
         new TimelineWindowDefinition(true, false, 100000),
         new TimelineWindowDefinition(true, false, 100000));
-    final int[] actionSchedule = { // 0 -> 1
-        Player.REPEAT_MODE_ONE, // 1 -> 1
-        Player.REPEAT_MODE_OFF, // 1 -> 2
-        Player.REPEAT_MODE_ONE, // 2 -> 2
-        Player.REPEAT_MODE_ALL, // 2 -> 0
-        Player.REPEAT_MODE_ONE, // 0 -> 0
-        -1, // 0 -> 0
-        Player.REPEAT_MODE_OFF, // 0 -> 1
-        -1, // 1 -> 2
-        -1  // 2 -> ended
-    };
-    int[] expectedWindowIndices = {1, 1, 2, 2, 0, 0, 0, 1, 2};
-    final LinkedList<Integer> windowIndices = new LinkedList<>();
-    final CountDownLatch actionCounter = new CountDownLatch(actionSchedule.length);
-    ExoPlayerWrapper playerWrapper = new ExoPlayerWrapper() {
-      @Override
-      @SuppressWarnings("ResourceType")
-      public void onPositionDiscontinuity() {
-        super.onPositionDiscontinuity();
-        int actionIndex = actionSchedule.length - (int) actionCounter.getCount();
-        if (actionSchedule[actionIndex] != -1) {
-          player.setRepeatMode(actionSchedule[actionIndex]);
-        }
-        windowIndices.add(player.getCurrentWindowIndex());
-        actionCounter.countDown();
-      }
-    };
-    MediaSource mediaSource = new FakeMediaSource(timeline, null, TEST_VIDEO_FORMAT);
-    FakeRenderer renderer = new FakeRenderer(TEST_VIDEO_FORMAT);
-    playerWrapper.setup(mediaSource, renderer);
-    boolean finished = actionCounter.await(TIMEOUT_MS, TimeUnit.MILLISECONDS);
-    playerWrapper.release();
-    assertTrue("Test playback timed out waiting for action schedule to end.", finished);
-    if (playerWrapper.exception != null) {
-      throw playerWrapper.exception;
-    }
-    assertEquals(expectedWindowIndices.length, windowIndices.size());
-    for (int i = 0; i < expectedWindowIndices.length; i++) {
-      assertEquals(expectedWindowIndices[i], windowIndices.get(i).intValue());
-    }
-    assertEquals(9, playerWrapper.positionDiscontinuityCount);
+    FakeRenderer renderer = new FakeRenderer(Builder.VIDEO_FORMAT);
+    ActionSchedule actionSchedule = new ActionSchedule.Builder("testRepeatMode") // 0 -> 1
+        .waitForPositionDiscontinuity().setRepeatMode(Player.REPEAT_MODE_ONE) // 1 -> 1
+        .waitForPositionDiscontinuity().setRepeatMode(Player.REPEAT_MODE_OFF) // 1 -> 2
+        .waitForPositionDiscontinuity().setRepeatMode(Player.REPEAT_MODE_ONE) // 2 -> 2
+        .waitForPositionDiscontinuity().setRepeatMode(Player.REPEAT_MODE_ALL) // 2 -> 0
+        .waitForPositionDiscontinuity().setRepeatMode(Player.REPEAT_MODE_ONE) // 0 -> 0
+        .waitForPositionDiscontinuity()                                       // 0 -> 0
+        .waitForPositionDiscontinuity().setRepeatMode(Player.REPEAT_MODE_OFF) // 0 -> end
+        .build();
+    ExoPlayerTestRunner testRunner = new ExoPlayerTestRunner.Builder()
+        .setTimeline(timeline).setRenderers(renderer).setActionSchedule(actionSchedule)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    testRunner.assertPlayedPeriodIndices(0, 1, 1, 2, 2, 0, 0, 0, 1, 2);
+    testRunner.assertTimelinesEqual(timeline);
     assertTrue(renderer.isEnded);
-    playerWrapper.assertSourceInfosEquals(Pair.create(timeline, null));
   }
 
 }
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
new file mode 100644
index 00000000000..2bfef0b4ab1
--- /dev/null
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerTestRunner.java
@@ -0,0 +1,379 @@
+/*
+ * 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.testutil;
+
+import android.os.Handler;
+import android.os.HandlerThread;
+import com.google.android.exoplayer2.DefaultLoadControl;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.LoadControl;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.audio.AudioRendererEventListener;
+import com.google.android.exoplayer2.metadata.MetadataRenderer;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.testutil.ExoPlayerTestRunner.Builder.PlayerFactory;
+import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
+import com.google.android.exoplayer2.text.TextRenderer.Output;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.video.VideoRendererEventListener;
+import java.util.LinkedList;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+import junit.framework.Assert;
+
+/**
+ * Helper class to run an ExoPlayer test.
+ */
+public final class ExoPlayerTestRunner implements Player.EventListener {
+
+  /**
+   * Builder to set-up a {@link ExoPlayerTestRunner}. Default fake implementations will be used for
+   * unset test properties.
+   */
+  public static final class Builder {
+
+    /**
+     * Factory to create an {@link SimpleExoPlayer} instance. The player will be created on its own
+     * {@link HandlerThread}.
+     */
+    public interface PlayerFactory {
+
+      SimpleExoPlayer createExoPlayer(RenderersFactory renderersFactory,
+          MappingTrackSelector trackSelector, LoadControl loadControl);
+
+    }
+
+    public static final Format VIDEO_FORMAT = Format.createVideoSampleFormat(null,
+        MimeTypes.VIDEO_H264, null, Format.NO_VALUE, Format.NO_VALUE, 1280, 720, Format.NO_VALUE,
+        null, null);
+    public static final Format AUDIO_FORMAT = Format.createAudioSampleFormat(null,
+        MimeTypes.AUDIO_AAC, null, Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, null);
+
+    private PlayerFactory playerFactory;
+    private Timeline timeline;
+    private Object manifest;
+    private MediaSource mediaSource;
+    private MappingTrackSelector trackSelector;
+    private LoadControl loadControl;
+    private Format[] supportedFormats;
+    private Renderer[] renderers;
+    private RenderersFactory renderersFactory;
+    private ActionSchedule actionSchedule;
+    private Player.EventListener eventListener;
+
+    public Builder setTimeline(Timeline timeline) {
+      Assert.assertNull(mediaSource);
+      this.timeline = timeline;
+      return this;
+    }
+
+    public Builder setManifest(Object manifest) {
+      Assert.assertNull(mediaSource);
+      this.manifest = manifest;
+      return this;
+    }
+
+    /** Replaces {@link #setTimeline(Timeline)} and {@link #setManifest(Object)}. */
+    public Builder setMediaSource(MediaSource mediaSource) {
+      Assert.assertNull(timeline);
+      Assert.assertNull(manifest);
+      this.mediaSource = mediaSource;
+      return this;
+    }
+
+    public Builder setTrackSelector(MappingTrackSelector trackSelector) {
+      this.trackSelector = trackSelector;
+      return this;
+    }
+
+    public Builder setLoadControl(LoadControl loadControl) {
+      this.loadControl = loadControl;
+      return this;
+    }
+
+    public Builder setSupportedFormats(Format... supportedFormats) {
+      this.supportedFormats = supportedFormats;
+      return this;
+    }
+
+    public Builder setRenderers(Renderer... renderers) {
+      Assert.assertNull(renderersFactory);
+      this.renderers = renderers;
+      return this;
+    }
+
+    /** Replaces {@link #setRenderers(Renderer...)}. */
+    public Builder setRenderersFactory(RenderersFactory renderersFactory) {
+      Assert.assertNull(renderers);
+      this.renderersFactory = renderersFactory;
+      return this;
+    }
+
+    public Builder setExoPlayer(PlayerFactory playerFactory) {
+      this.playerFactory = playerFactory;
+      return this;
+    }
+
+    public Builder setActionSchedule(ActionSchedule actionSchedule) {
+      this.actionSchedule = actionSchedule;
+      return this;
+    }
+
+    public Builder setEventListener(Player.EventListener eventListener) {
+      this.eventListener = eventListener;
+      return this;
+    }
+
+    public ExoPlayerTestRunner build() {
+      if (supportedFormats == null) {
+        supportedFormats = new Format[] { VIDEO_FORMAT };
+      }
+      if (trackSelector == null) {
+        trackSelector = new DefaultTrackSelector();
+      }
+      if (renderersFactory == null) {
+        if (renderers == null) {
+          renderers = new Renderer[] { new FakeRenderer(supportedFormats) };
+        }
+        renderersFactory = new RenderersFactory() {
+          @Override
+          public Renderer[] createRenderers(Handler eventHandler,
+              VideoRendererEventListener videoRendererEventListener,
+              AudioRendererEventListener audioRendererEventListener, Output textRendererOutput,
+              MetadataRenderer.Output metadataRendererOutput) {
+            return renderers;
+          }
+        };
+      }
+      if (loadControl == null) {
+        loadControl = new DefaultLoadControl();
+      }
+      if (playerFactory == null) {
+        playerFactory = new PlayerFactory() {
+          @Override
+          public SimpleExoPlayer createExoPlayer(RenderersFactory renderersFactory,
+              MappingTrackSelector trackSelector, LoadControl loadControl) {
+            return ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector, loadControl);
+          }
+        };
+      }
+      if (mediaSource == null) {
+        if (timeline == null) {
+          timeline = new FakeTimeline(new TimelineWindowDefinition(false, false, 0));
+        }
+        mediaSource = new FakeMediaSource(timeline, manifest, supportedFormats);
+      }
+      return new ExoPlayerTestRunner(playerFactory, mediaSource, renderersFactory, trackSelector,
+          loadControl, actionSchedule, eventListener);
+    }
+  }
+
+  private final PlayerFactory playerFactory;
+  private final MediaSource mediaSource;
+  private final RenderersFactory renderersFactory;
+  private final MappingTrackSelector trackSelector;
+  private final LoadControl loadControl;
+  private final ActionSchedule actionSchedule;
+  private final Player.EventListener eventListener;
+
+  private final HandlerThread playerThread;
+  private final Handler handler;
+  private final CountDownLatch endedCountDownLatch;
+  private final LinkedList<Timeline> timelines;
+  private final LinkedList<Object> manifests;
+  private final LinkedList<Integer> periodIndices;
+
+  private SimpleExoPlayer player;
+  private Exception exception;
+  private TrackGroupArray trackGroups;
+  private int positionDiscontinuityCount;
+
+  private ExoPlayerTestRunner(PlayerFactory playerFactory, MediaSource mediaSource,
+      RenderersFactory renderersFactory, MappingTrackSelector trackSelector,
+      LoadControl loadControl, ActionSchedule actionSchedule, Player.EventListener eventListener) {
+    this.playerFactory = playerFactory;
+    this.mediaSource = mediaSource;
+    this.renderersFactory = renderersFactory;
+    this.trackSelector = trackSelector;
+    this.loadControl = loadControl;
+    this.actionSchedule = actionSchedule;
+    this.eventListener = eventListener;
+    this.timelines = new LinkedList<>();
+    this.manifests = new LinkedList<>();
+    this.periodIndices = new LinkedList<>();
+    this.endedCountDownLatch = new CountDownLatch(1);
+    this.playerThread = new HandlerThread("ExoPlayerTest thread");
+    playerThread.start();
+    this.handler = new Handler(playerThread.getLooper());
+  }
+
+  // Called on the test thread to run the test.
+
+  public ExoPlayerTestRunner start() {
+    handler.post(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          player = playerFactory.createExoPlayer(renderersFactory, trackSelector, loadControl);
+          player.addListener(ExoPlayerTestRunner.this);
+          if (eventListener != null) {
+            player.addListener(eventListener);
+          }
+          player.setPlayWhenReady(true);
+          if (actionSchedule != null) {
+            actionSchedule.start(player, trackSelector, null, handler);
+          }
+          player.prepare(mediaSource);
+        } catch (Exception e) {
+          handleException(e);
+        }
+      }
+    });
+    return this;
+  }
+
+  public ExoPlayerTestRunner blockUntilEnded(long timeoutMs) throws Exception {
+    if (!endedCountDownLatch.await(timeoutMs, TimeUnit.MILLISECONDS)) {
+      exception = new TimeoutException("Test playback timed out waiting for playback to end.");
+    }
+    release();
+    // Throw any pending exception (from playback, timing out or releasing).
+    if (exception != null) {
+      throw exception;
+    }
+    return this;
+  }
+
+  // Assertions called on the test thread after test finished.
+
+  public void assertTimelinesEqual(Timeline... timelines) {
+    Assert.assertEquals(timelines.length, this.timelines.size());
+    for (Timeline timeline : timelines) {
+      Assert.assertEquals(timeline, this.timelines.remove());
+    }
+  }
+
+  public void assertManifestsEqual(Object... manifests) {
+    Assert.assertEquals(manifests.length, this.manifests.size());
+    for (Object manifest : manifests) {
+      Assert.assertEquals(manifest, this.manifests.remove());
+    }
+  }
+
+  public void assertTrackGroupsEqual(TrackGroupArray trackGroupArray) {
+    Assert.assertEquals(trackGroupArray, this.trackGroups);
+  }
+
+  public void assertPositionDiscontinuityCount(int expectedCount) {
+    Assert.assertEquals(expectedCount, positionDiscontinuityCount);
+  }
+
+  public void assertPlayedPeriodIndices(int... periodIndices) {
+    Assert.assertEquals(periodIndices.length, this.periodIndices.size());
+    for (int periodIndex : periodIndices) {
+      Assert.assertEquals(periodIndex, (int) this.periodIndices.remove());
+    }
+  }
+
+  // Private implementation details.
+
+  private void release() throws InterruptedException {
+    handler.post(new Runnable() {
+      @Override
+      public void run() {
+        try {
+          if (player != null) {
+            player.release();
+          }
+        } catch (Exception e) {
+          handleException(e);
+        } finally {
+          playerThread.quit();
+        }
+      }
+    });
+    playerThread.join();
+  }
+
+  private void handleException(Exception exception) {
+    if (this.exception == null) {
+      this.exception = exception;
+    }
+    endedCountDownLatch.countDown();
+  }
+
+  // Player.EventListener
+
+  @Override
+  public void onTimelineChanged(Timeline timeline, Object manifest) {
+    timelines.add(timeline);
+    manifests.add(manifest);
+  }
+
+  @Override
+  public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+    this.trackGroups = trackGroups;
+  }
+
+  @Override
+  public void onLoadingChanged(boolean isLoading) {
+    // Do nothing.
+  }
+
+  @Override
+  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+    if (periodIndices.isEmpty() && playbackState == Player.STATE_READY) {
+      periodIndices.add(player.getCurrentPeriodIndex());
+    }
+    if (playbackState == Player.STATE_ENDED) {
+      endedCountDownLatch.countDown();
+    }
+  }
+
+  @Override
+  public void onRepeatModeChanged(@Player.RepeatMode int repeatMode) {
+    // Do nothing.
+  }
+
+  @Override
+  public void onPlayerError(ExoPlaybackException error) {
+    handleException(exception);
+  }
+
+  @Override
+  public void onPositionDiscontinuity() {
+    positionDiscontinuityCount++;
+    periodIndices.add(player.getCurrentPeriodIndex());
+  }
+
+  @Override
+  public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+    // Do nothing.
+  }
+
+}
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerWrapper.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerWrapper.java
deleted file mode 100644
index ab247283e67..00000000000
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/ExoPlayerWrapper.java
+++ /dev/null
@@ -1,192 +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.testutil;
-
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.util.Pair;
-import com.google.android.exoplayer2.ExoPlaybackException;
-import com.google.android.exoplayer2.ExoPlayer;
-import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Renderer;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
-import java.util.LinkedList;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-import junit.framework.Assert;
-
-/**
- * Wraps a player with its own handler thread.
- */
-public class ExoPlayerWrapper implements Player.EventListener {
-
-  private final CountDownLatch sourceInfoCountDownLatch;
-  private final CountDownLatch endedCountDownLatch;
-  private final HandlerThread playerThread;
-  private final Handler handler;
-  private final LinkedList<Pair<Timeline, Object>> sourceInfos;
-
-  public ExoPlayer player;
-  public TrackGroupArray trackGroups;
-  public Exception exception;
-
-  // Written only on the main thread.
-  public volatile int positionDiscontinuityCount;
-
-  public ExoPlayerWrapper() {
-    sourceInfoCountDownLatch = new CountDownLatch(1);
-    endedCountDownLatch = new CountDownLatch(1);
-    playerThread = new HandlerThread("ExoPlayerTest thread");
-    playerThread.start();
-    handler = new Handler(playerThread.getLooper());
-    sourceInfos = new LinkedList<>();
-  }
-
-  // Called on the test thread.
-
-  public void blockUntilEnded(long timeoutMs) throws Exception {
-    if (!endedCountDownLatch.await(timeoutMs, TimeUnit.MILLISECONDS)) {
-      exception = new TimeoutException("Test playback timed out waiting for playback to end.");
-    }
-    release();
-    // Throw any pending exception (from playback, timing out or releasing).
-    if (exception != null) {
-      throw exception;
-    }
-  }
-
-  public void blockUntilSourceInfoRefreshed(long timeoutMs) throws Exception {
-    if (!sourceInfoCountDownLatch.await(timeoutMs, TimeUnit.MILLISECONDS)) {
-      throw new TimeoutException("Test playback timed out waiting for source info.");
-    }
-  }
-
-  public void setup(final MediaSource mediaSource, final Renderer... renderers) {
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          player = ExoPlayerFactory.newInstance(renderers, new DefaultTrackSelector());
-          player.addListener(ExoPlayerWrapper.this);
-          player.setPlayWhenReady(true);
-          player.prepare(mediaSource);
-        } catch (Exception e) {
-          handleError(e);
-        }
-      }
-    });
-  }
-
-  public void prepare(final MediaSource mediaSource) {
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          player.prepare(mediaSource);
-        } catch (Exception e) {
-          handleError(e);
-        }
-      }
-    });
-  }
-
-  public void release() throws InterruptedException {
-    handler.post(new Runnable() {
-      @Override
-      public void run() {
-        try {
-          if (player != null) {
-            player.release();
-          }
-        } catch (Exception e) {
-          handleError(e);
-        } finally {
-          playerThread.quit();
-        }
-      }
-    });
-    playerThread.join();
-  }
-
-  private void handleError(Exception exception) {
-    if (this.exception == null) {
-      this.exception = exception;
-    }
-    endedCountDownLatch.countDown();
-  }
-
-  @SafeVarargs
-  public final void assertSourceInfosEquals(Pair<Timeline, Object>... sourceInfos) {
-    Assert.assertEquals(sourceInfos.length, this.sourceInfos.size());
-    for (Pair<Timeline, Object> sourceInfo : sourceInfos) {
-      Assert.assertEquals(sourceInfo, this.sourceInfos.remove());
-    }
-  }
-
-  // Player.EventListener implementation.
-
-  @Override
-  public void onLoadingChanged(boolean isLoading) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-    if (playbackState == Player.STATE_ENDED) {
-      endedCountDownLatch.countDown();
-    }
-  }
-
-  @Override
-  public void onRepeatModeChanged(int repeatMode) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onTimelineChanged(Timeline timeline, Object manifest) {
-    sourceInfos.add(Pair.create(timeline, manifest));
-    sourceInfoCountDownLatch.countDown();
-  }
-
-  @Override
-  public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-    this.trackGroups = trackGroups;
-  }
-
-  @Override
-  public void onPlayerError(ExoPlaybackException exception) {
-    handleError(exception);
-  }
-
-  @SuppressWarnings("NonAtomicVolatileUpdate")
-  @Override
-  public void onPositionDiscontinuity() {
-    positionDiscontinuityCount++;
-  }
-
-  @Override
-  public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-    // Do nothing.
-  }
-
-}

From 9936bc670293514811681cf9e1e3d89780f29ada Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 26 Jul 2017 04:47:56 -0700
Subject: [PATCH 011/421] Replace iterable foreach loops with indexed for loops

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163193118
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 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 6e2206d6ae2..bd3f6df826e 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
@@ -436,13 +436,13 @@ public void playAd() {
     }
     if (!imaPlayingAd) {
       imaPlayingAd = true;
-      for (VideoAdPlayerCallback callback : adCallbacks) {
-        callback.onPlay();
+      for (int i = 0; i < adCallbacks.size(); i++) {
+        adCallbacks.get(i).onPlay();
       }
     } else if (imaPausedInAd) {
       imaPausedInAd = false;
-      for (VideoAdPlayerCallback callback : adCallbacks) {
-        callback.onResume();
+      for (int i = 0; i < adCallbacks.size(); i++) {
+        adCallbacks.get(i).onResume();
       }
     }
   }
@@ -473,8 +473,8 @@ public void pauseAd() {
       return;
     }
     imaPausedInAd = true;
-    for (VideoAdPlayerCallback callback : adCallbacks) {
-      callback.onPause();
+    for (int i = 0; i < adCallbacks.size(); i++) {
+      adCallbacks.get(i).onPause();
     }
   }
 
@@ -519,8 +519,8 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     } else if (imaPlayingAd && playbackState == Player.STATE_ENDED) {
       // IMA is waiting for the ad playback to finish so invoke the callback now.
       // Either CONTENT_RESUME_REQUESTED will be passed next, or playAd will be called again.
-      for (VideoAdPlayerCallback callback : adCallbacks) {
-        callback.onEnded();
+      for (int i = 0; i < adCallbacks.size(); i++) {
+        adCallbacks.get(i).onEnded();
       }
     }
   }
@@ -533,8 +533,8 @@ public void onRepeatModeChanged(int repeatMode) {
   @Override
   public void onPlayerError(ExoPlaybackException error) {
     if (playingAd) {
-      for (VideoAdPlayerCallback callback : adCallbacks) {
-        callback.onError();
+      for (int i = 0; i < adCallbacks.size(); i++) {
+        adCallbacks.get(i).onError();
       }
     }
   }
@@ -584,8 +584,8 @@ private void updateImaStateForPlayerState() {
       if (adFinished) {
         // IMA is waiting for the ad playback to finish so invoke the callback now.
         // Either CONTENT_RESUME_REQUESTED will be passed next, or playAd will be called again.
-        for (VideoAdPlayerCallback callback : adCallbacks) {
-          callback.onEnded();
+        for (int i = 0; i < adCallbacks.size(); i++) {
+          adCallbacks.get(i).onEnded();
         }
       }
       if (!wasPlayingAd && playingAd) {

From bcc69c2da7afc8a8463b9ec11fab78af2305564a Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 26 Jul 2017 08:58:02 -0700
Subject: [PATCH 012/421] Add HlsMasterPlaylist.copy method

Creates a copy of this playlist which includes only the variants identified by the given variantUrls.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163212562
---
 .../hls/playlist/HlsMasterPlaylist.java       | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

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 b38763f7e8a..0b237e75e77 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
@@ -17,6 +17,7 @@
 
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -108,6 +109,20 @@ public HlsMasterPlaylist(String baseUri, List<String> tags, List<HlsUrl> variant
         ? Collections.unmodifiableList(muxedCaptionFormats) : null;
   }
 
+  /**
+   * Returns a copy of this playlist which includes only the renditions identified by the given
+   * urls.
+   *
+   * @param renditionUrls List of rendition urls.
+   * @return A copy of this playlist which includes only the renditions identified by the given
+   *     urls.
+   */
+  public HlsMasterPlaylist copy(List<String> renditionUrls) {
+    return new HlsMasterPlaylist(baseUri, tags, copyRenditionList(variants, renditionUrls),
+        copyRenditionList(audios, renditionUrls), copyRenditionList(subtitles, renditionUrls),
+        muxedAudioFormat, muxedCaptionFormats);
+  }
+
   /**
    * Creates a playlist with a single variant.
    *
@@ -121,4 +136,15 @@ public static HlsMasterPlaylist createSingleVariantMasterPlaylist(String variant
         emptyList, null, null);
   }
 
+  private static List<HlsUrl> copyRenditionList(List<HlsUrl> variants, List<String> variantUrls) {
+    List<HlsUrl> copyVariants = new ArrayList<>();
+    for (int i = 0; i < variants.size(); i++) {
+      HlsUrl variant = variants.get(i);
+      if (variantUrls.contains(variant.url)) {
+        copyVariants.add(variant);
+      }
+    }
+    return copyVariants;
+  }
+
 }

From 5278a63768e51222af9163331142978373c6d94d Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 27 Jul 2017 06:20:24 -0700
Subject: [PATCH 013/421] Change copyRenditionsList parameters names

Also instantiate the resulting list with a predicted size to minimize
list resizing.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163332285
---
 .../source/hls/playlist/HlsMasterPlaylist.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 0b237e75e77..04192def9d7 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
@@ -118,8 +118,8 @@ public HlsMasterPlaylist(String baseUri, List<String> tags, List<HlsUrl> variant
    *     urls.
    */
   public HlsMasterPlaylist copy(List<String> renditionUrls) {
-    return new HlsMasterPlaylist(baseUri, tags, copyRenditionList(variants, renditionUrls),
-        copyRenditionList(audios, renditionUrls), copyRenditionList(subtitles, renditionUrls),
+    return new HlsMasterPlaylist(baseUri, tags, copyRenditionsList(variants, renditionUrls),
+        copyRenditionsList(audios, renditionUrls), copyRenditionsList(subtitles, renditionUrls),
         muxedAudioFormat, muxedCaptionFormats);
   }
 
@@ -136,15 +136,15 @@ public static HlsMasterPlaylist createSingleVariantMasterPlaylist(String variant
         emptyList, null, null);
   }
 
-  private static List<HlsUrl> copyRenditionList(List<HlsUrl> variants, List<String> variantUrls) {
-    List<HlsUrl> copyVariants = new ArrayList<>();
-    for (int i = 0; i < variants.size(); i++) {
-      HlsUrl variant = variants.get(i);
-      if (variantUrls.contains(variant.url)) {
-        copyVariants.add(variant);
+  private static List<HlsUrl> copyRenditionsList(List<HlsUrl> renditions, List<String> urls) {
+    List<HlsUrl> copiedRenditions = new ArrayList<>(urls.size());
+    for (int i = 0; i < renditions.size(); i++) {
+      HlsUrl rendition = renditions.get(i);
+      if (urls.contains(rendition.url)) {
+        copiedRenditions.add(rendition);
       }
     }
-    return copyVariants;
+    return copiedRenditions;
   }
 
 }

From 84d19c464b04e0dc54a133ed5f56fdfb04ed8266 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 27 Jul 2017 07:20:41 -0700
Subject: [PATCH 014/421] Add support for AAC-LATM in transport streams

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163337073
---
 .../exoplayer2/util/ParsableBitArrayTest.java |  78 +++--
 .../ts/DefaultTsPayloadReaderFactory.java     |   5 +-
 .../exoplayer2/extractor/ts/LatmReader.java   | 306 ++++++++++++++++++
 .../exoplayer2/extractor/ts/TsExtractor.java  |   3 +-
 .../util/CodecSpecificDataUtil.java           |  75 ++++-
 .../exoplayer2/util/ParsableBitArray.java     |  37 +++
 6 files changed, 478 insertions(+), 26 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
index cfb9cd78be9..fc8318d8264 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.util;
 
 import android.test.MoreAsserts;
-
 import junit.framework.TestCase;
 
 /**
@@ -27,8 +26,14 @@ public final class ParsableBitArrayTest extends TestCase {
   private static final byte[] TEST_DATA = new byte[] {0x3C, (byte) 0xD2, (byte) 0x5F, (byte) 0x01,
       (byte) 0xFF, (byte) 0x14, (byte) 0x60, (byte) 0x99};
 
+  private ParsableBitArray testArray;
+
+  @Override
+  public void setUp() {
+    testArray = new ParsableBitArray(TEST_DATA);
+  }
+
   public void testReadAllBytes() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     byte[] bytesRead = new byte[TEST_DATA.length];
     testArray.readBytes(bytesRead, 0, TEST_DATA.length);
     MoreAsserts.assertEquals(TEST_DATA, bytesRead);
@@ -37,13 +42,12 @@ public void testReadAllBytes() {
   }
 
   public void testReadBit() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
-    assertReadBitsToEnd(0, testArray);
+    assertReadBitsToEnd(0);
   }
 
   public void testReadBits() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     assertEquals(getTestDataBits(0, 5), testArray.readBits(5));
+    assertEquals(getTestDataBits(5, 0), testArray.readBits(0));
     assertEquals(getTestDataBits(5, 3), testArray.readBits(3));
     assertEquals(getTestDataBits(8, 16), testArray.readBits(16));
     assertEquals(getTestDataBits(24, 3), testArray.readBits(3));
@@ -52,67 +56,97 @@ public void testReadBits() {
     assertEquals(getTestDataBits(50, 14), testArray.readBits(14));
   }
 
+  public void testReadBitsToByteArray() {
+    byte[] result = new byte[TEST_DATA.length];
+    // Test read within byte boundaries.
+    testArray.readBits(result, 0, 6);
+    assertEquals(TEST_DATA[0] & 0xFC, result[0]);
+    // Test read across byte boundaries.
+    testArray.readBits(result, 0, 8);
+    assertEquals(((TEST_DATA[0] & 0x03) << 6) | ((TEST_DATA[1] & 0xFC) >> 2), result[0]);
+    // Test reading across multiple bytes.
+    testArray.readBits(result, 1, 50);
+    for (int i = 1; i < 7; i++) {
+      assertEquals((byte) (((TEST_DATA[i] & 0x03) << 6) | ((TEST_DATA[i + 1] & 0xFC) >> 2)),
+          result[i]);
+    }
+    assertEquals((byte) (TEST_DATA[7] & 0x03) << 6, result[7]);
+    assertEquals(0, testArray.bitsLeft());
+    // Test read last buffer byte across input data bytes.
+    testArray.setPosition(31);
+    result[3] = 0;
+    testArray.readBits(result, 3, 3);
+    assertEquals((byte) 0xE0, result[3]);
+    // Test read bits in the middle of a input data byte.
+    result[0] = 0;
+    assertEquals(34, testArray.getPosition());
+    testArray.readBits(result, 0, 3);
+    assertEquals((byte) 0xE0, result[0]);
+    // Test read 0 bits.
+    testArray.setPosition(32);
+    result[1] = 0;
+    testArray.readBits(result, 1, 0);
+    assertEquals(0, result[1]);
+    // Test least significant bits are unmodified.
+    result[1] = (byte) 0xFF;
+    testArray.setPosition(16);
+    testArray.readBits(result, 0, 9);
+    assertEquals(0x5F, result[0]);
+    assertEquals(0x7F, result[1]);
+  }
+
   public void testRead32BitsByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     assertEquals(getTestDataBits(0, 32), testArray.readBits(32));
     assertEquals(getTestDataBits(32, 32), testArray.readBits(32));
   }
 
   public void testRead32BitsNonByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     assertEquals(getTestDataBits(0, 5), testArray.readBits(5));
     assertEquals(getTestDataBits(5, 32), testArray.readBits(32));
   }
 
   public void testSkipBytes() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     testArray.skipBytes(2);
-    assertReadBitsToEnd(16, testArray);
+    assertReadBitsToEnd(16);
   }
 
   public void testSkipBitsByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     testArray.skipBits(16);
-    assertReadBitsToEnd(16, testArray);
+    assertReadBitsToEnd(16);
   }
 
   public void testSkipBitsNonByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     testArray.skipBits(5);
-    assertReadBitsToEnd(5, testArray);
+    assertReadBitsToEnd(5);
   }
 
   public void testSetPositionByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     testArray.setPosition(16);
-    assertReadBitsToEnd(16, testArray);
+    assertReadBitsToEnd(16);
   }
 
   public void testSetPositionNonByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     testArray.setPosition(5);
-    assertReadBitsToEnd(5, testArray);
+    assertReadBitsToEnd(5);
   }
 
   public void testByteAlignFromNonByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     testArray.setPosition(11);
     testArray.byteAlign();
     assertEquals(2, testArray.getBytePosition());
     assertEquals(16, testArray.getPosition());
-    assertReadBitsToEnd(16, testArray);
+    assertReadBitsToEnd(16);
   }
 
   public void testByteAlignFromByteAligned() {
-    ParsableBitArray testArray = new ParsableBitArray(TEST_DATA);
     testArray.setPosition(16);
     testArray.byteAlign(); // Should be a no-op.
     assertEquals(2, testArray.getBytePosition());
     assertEquals(16, testArray.getPosition());
-    assertReadBitsToEnd(16, testArray);
+    assertReadBitsToEnd(16);
   }
 
-  private static void assertReadBitsToEnd(int expectedStartPosition, ParsableBitArray testArray) {
+  private void assertReadBitsToEnd(int expectedStartPosition) {
     int position = testArray.getPosition();
     assertEquals(expectedStartPosition, position);
     for (int i = position; i < TEST_DATA.length * 8; i++) {
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 40cfd7f8d92..bd013f96a31 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
@@ -94,9 +94,12 @@ public TsPayloadReader createPayloadReader(int streamType, EsInfo esInfo) {
       case TsExtractor.TS_STREAM_TYPE_MPA:
       case TsExtractor.TS_STREAM_TYPE_MPA_LSF:
         return new PesReader(new MpegAudioReader(esInfo.language));
-      case TsExtractor.TS_STREAM_TYPE_AAC:
+      case TsExtractor.TS_STREAM_TYPE_AAC_ADTS:
         return isSet(FLAG_IGNORE_AAC_STREAM)
             ? null : new PesReader(new AdtsReader(false, esInfo.language));
+      case TsExtractor.TS_STREAM_TYPE_AAC_LATM:
+        return isSet(FLAG_IGNORE_AAC_STREAM)
+            ? null : new PesReader(new LatmReader(esInfo.language));
       case TsExtractor.TS_STREAM_TYPE_AC3:
       case TsExtractor.TS_STREAM_TYPE_E_AC3:
         return new PesReader(new Ac3Reader(esInfo.language));
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
new file mode 100644
index 00000000000..425dc43ea7f
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ts/LatmReader.java
@@ -0,0 +1,306 @@
+/*
+ * 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.extractor.ts;
+
+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.extractor.ExtractorOutput;
+import com.google.android.exoplayer2.extractor.TrackOutput;
+import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
+import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.ParsableBitArray;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.util.Collections;
+
+/**
+ * Parses and extracts samples from an AAC/LATM elementary stream.
+ */
+public final class LatmReader implements ElementaryStreamReader {
+
+  private static final int STATE_FINDING_SYNC_1 = 0;
+  private static final int STATE_FINDING_SYNC_2 = 1;
+  private static final int STATE_READING_HEADER = 2;
+  private static final int STATE_READING_SAMPLE = 3;
+
+  private static final int INITIAL_BUFFER_SIZE = 1024;
+  private static final int SYNC_BYTE_FIRST = 0x56;
+  private static final int SYNC_BYTE_SECOND = 0xE0;
+
+  private final String language;
+  private final ParsableByteArray sampleDataBuffer;
+  private final ParsableBitArray sampleBitArray;
+
+  // Track output info.
+  private TrackOutput output;
+  private Format format;
+  private String formatId;
+
+  // Parser state info.
+  private int state;
+  private int bytesRead;
+  private int sampleSize;
+  private int secondHeaderByte;
+  private long timeUs;
+
+  // Container data.
+  private boolean streamMuxRead;
+  private int audioMuxVersion;
+  private int audioMuxVersionA;
+  private int numSubframes;
+  private int frameLengthType;
+  private boolean otherDataPresent;
+  private long otherDataLenBits;
+  private int sampleRateHz;
+  private long sampleDurationUs;
+  private int channelCount;
+
+  /**
+   * @param language Track language.
+   */
+  public LatmReader(@Nullable String language) {
+    this.language = language;
+    sampleDataBuffer = new ParsableByteArray(INITIAL_BUFFER_SIZE);
+    sampleBitArray = new ParsableBitArray(sampleDataBuffer.data);
+  }
+
+  @Override
+  public void seek() {
+    state = STATE_FINDING_SYNC_1;
+    streamMuxRead = false;
+  }
+
+  @Override
+  public void createTracks(ExtractorOutput extractorOutput, TrackIdGenerator idGenerator) {
+    idGenerator.generateNewId();
+    output = extractorOutput.track(idGenerator.getTrackId(), C.TRACK_TYPE_AUDIO);
+    formatId = idGenerator.getFormatId();
+  }
+
+  @Override
+  public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
+    timeUs = pesTimeUs;
+  }
+
+  @Override
+  public void consume(ParsableByteArray data) {
+    int bytesToRead;
+    while (data.bytesLeft() > 0) {
+      switch (state) {
+        case STATE_FINDING_SYNC_1:
+          if (data.readUnsignedByte() == SYNC_BYTE_FIRST) {
+            state = STATE_FINDING_SYNC_2;
+          }
+          break;
+        case STATE_FINDING_SYNC_2:
+          int secondByte = data.readUnsignedByte();
+          if ((secondByte & SYNC_BYTE_SECOND) == SYNC_BYTE_SECOND) {
+            secondHeaderByte = secondByte;
+            state = STATE_READING_HEADER;
+          } else if (secondByte != SYNC_BYTE_FIRST) {
+            state = STATE_FINDING_SYNC_1;
+          }
+          break;
+        case STATE_READING_HEADER:
+          sampleSize = ((secondHeaderByte & ~SYNC_BYTE_SECOND) << 8) | data.readUnsignedByte();
+          if (sampleSize > sampleDataBuffer.data.length) {
+            resetBufferForSize(sampleSize);
+          }
+          bytesRead = 0;
+          state = STATE_READING_SAMPLE;
+          break;
+        case STATE_READING_SAMPLE:
+          bytesToRead = Math.min(data.bytesLeft(), sampleSize - bytesRead);
+          data.readBytes(sampleBitArray.data, bytesRead, bytesToRead);
+          bytesRead += bytesToRead;
+          if (bytesRead == sampleSize) {
+            sampleBitArray.setPosition(0);
+            parseAudioMuxElement(sampleBitArray);
+            state = STATE_FINDING_SYNC_1;
+          }
+          break;
+      }
+    }
+  }
+
+  @Override
+  public void packetFinished() {
+    // Do nothing.
+  }
+
+  /**
+   * Parses an AudioMuxElement as defined in 14496-3:2009, Section 1.7.3.1, Table 1.41.
+   *
+   * @param data A {@link ParsableBitArray} containing the AudioMuxElement's bytes.
+   */
+  private void parseAudioMuxElement(ParsableBitArray data) {
+    boolean useSameStreamMux = data.readBit();
+    if (!useSameStreamMux) {
+      streamMuxRead = true;
+      parseStreamMuxConfig(data);
+    } else if (!streamMuxRead) {
+      return; // Parsing cannot continue without StreamMuxConfig information.
+    }
+
+    if (audioMuxVersionA == 0) {
+      if (numSubframes != 0) {
+        throw new UnsupportedOperationException();
+      }
+      int muxSlotLengthBytes = parsePayloadLengthInfo(data);
+      parsePayloadMux(data, muxSlotLengthBytes);
+      if (otherDataPresent) {
+        data.skipBits((int) otherDataLenBits);
+      }
+    } else {
+      throw new UnsupportedOperationException(); // Not defined by ISO/IEC 14496-3:2009.
+    }
+  }
+
+  /**
+   * Parses a StreamMuxConfig as defined in ISO/IEC 14496-3:2009 Section 1.7.3.1, Table 1.42.
+   */
+  private void parseStreamMuxConfig(ParsableBitArray data) {
+    audioMuxVersion = data.readBits(1);
+    audioMuxVersionA = audioMuxVersion == 1 ? data.readBits(1) : 0;
+    if (audioMuxVersionA == 0) {
+      if (audioMuxVersion == 1) {
+        latmGetValue(data); // Skip taraBufferFullness.
+      }
+      if (!data.readBit()) {
+        throw new UnsupportedOperationException();
+      }
+      numSubframes = data.readBits(6);
+      int numProgram = data.readBits(4);
+      int numLayer = data.readBits(3);
+      if (numProgram != 0 || numLayer != 0) {
+        throw new UnsupportedOperationException();
+      }
+      if (audioMuxVersion == 0) {
+        int startPosition = data.getPosition();
+        int readBits = parseAudioSpecificConfig(data);
+        data.setPosition(startPosition);
+        byte[] initData = new byte[(readBits + 7) / 8];
+        data.readBits(initData, 0, readBits);
+        Format format = Format.createAudioSampleFormat(formatId, MimeTypes.AUDIO_AAC, null,
+            Format.NO_VALUE, Format.NO_VALUE, channelCount, sampleRateHz,
+            Collections.singletonList(initData), null, 0, language);
+        if (!format.equals(this.format)) {
+          this.format = format;
+          sampleDurationUs = (C.MICROS_PER_SECOND * 1024) / format.sampleRate;
+          output.format(format);
+        }
+      } else {
+        int ascLen = (int) latmGetValue(data);
+        int bitsRead = parseAudioSpecificConfig(data);
+        data.skipBits(ascLen - bitsRead); // fillBits.
+      }
+      parseFrameLength(data);
+      otherDataPresent = data.readBit();
+      otherDataLenBits = 0;
+      if (otherDataPresent) {
+        if (audioMuxVersion == 1) {
+          otherDataLenBits = latmGetValue(data);
+        } else {
+          boolean otherDataLenEsc;
+          do {
+            otherDataLenEsc = data.readBit();
+            otherDataLenBits = (otherDataLenBits << 8) + data.readBits(8);
+          } while (otherDataLenEsc);
+        }
+      }
+      boolean crcCheckPresent = data.readBit();
+      if (crcCheckPresent) {
+        data.skipBits(8); // crcCheckSum.
+      }
+    } else {
+      throw new UnsupportedOperationException(); // This is not defined by ISO/IEC 14496-3:2009.
+    }
+  }
+
+  private void parseFrameLength(ParsableBitArray data) {
+    frameLengthType = data.readBits(3);
+    switch (frameLengthType) {
+      case 0:
+        data.skipBits(8); // latmBufferFullness.
+        break;
+      case 1:
+        data.skipBits(9); // frameLength.
+        break;
+      case 3:
+      case 4:
+      case 5:
+        data.skipBits(6); // CELPframeLengthTableIndex.
+        break;
+      case 6:
+      case 7:
+        data.skipBits(1); // HVXCframeLengthTableIndex.
+        break;
+    }
+  }
+
+  private int parseAudioSpecificConfig(ParsableBitArray data) {
+    int bitsLeft = data.bitsLeft();
+    Pair<Integer, Integer> config = CodecSpecificDataUtil.parseAacAudioSpecificConfig(data);
+    sampleRateHz = config.first;
+    channelCount = config.second;
+    return bitsLeft - data.bitsLeft();
+  }
+
+  private int parsePayloadLengthInfo(ParsableBitArray data) {
+    int muxSlotLengthBytes = 0;
+    // Assuming single program and single layer.
+    if (frameLengthType == 0) {
+      int tmp;
+      do {
+        tmp = data.readBits(8);
+        muxSlotLengthBytes += tmp;
+      } while (tmp == 255);
+      return muxSlotLengthBytes;
+    } else {
+      throw new UnsupportedOperationException();
+    }
+  }
+
+  private void parsePayloadMux(ParsableBitArray data, int muxLengthBytes) {
+    // The start of sample data in
+    int bitPosition = data.getPosition();
+    if ((bitPosition & 0x07) == 0) {
+      // Sample data is byte-aligned. We can output it directly.
+      sampleDataBuffer.setPosition(bitPosition >> 3);
+    } else {
+      // Sample data is not byte-aligned and we need align it ourselves before outputting.
+      // Byte alignment is needed because LATM framing is not supported by MediaCodec.
+      data.readBits(sampleDataBuffer.data, 0, muxLengthBytes * 8);
+      sampleDataBuffer.setPosition(0);
+    }
+    output.sampleData(sampleDataBuffer, muxLengthBytes);
+    output.sampleMetadata(timeUs, C.BUFFER_FLAG_KEY_FRAME, muxLengthBytes, 0, null);
+    timeUs += sampleDurationUs;
+  }
+
+  private void resetBufferForSize(int newSize) {
+    sampleDataBuffer.reset(newSize);
+    sampleBitArray.reset(sampleDataBuffer.data);
+  }
+
+  private static long latmGetValue(ParsableBitArray data) {
+    int bytesForValue = data.readBits(2);
+    return data.readBits((bytesForValue + 1) * 8);
+  }
+
+}
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 2929b8a0769..90506ab2f62 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
@@ -84,7 +84,8 @@ public Extractor[] createExtractors() {
 
   public static final int TS_STREAM_TYPE_MPA = 0x03;
   public static final int TS_STREAM_TYPE_MPA_LSF = 0x04;
-  public static final int TS_STREAM_TYPE_AAC = 0x0F;
+  public static final int TS_STREAM_TYPE_AAC_ADTS = 0x0F;
+  public static final int TS_STREAM_TYPE_AAC_LATM = 0x11;
   public static final int TS_STREAM_TYPE_AC3 = 0x81;
   public static final int TS_STREAM_TYPE_DTS = 0x8A;
   public static final int TS_STREAM_TYPE_HDMV_DTS = 0x82;
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 0093c3b826c..468e8dd666f 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
@@ -83,11 +83,21 @@ private CodecSpecificDataUtil() {}
   /**
    * Parses an AudioSpecificConfig, as defined in ISO 14496-3 1.6.2.1
    *
-   * @param audioSpecificConfig The AudioSpecificConfig to parse.
+   * @param audioSpecificConfig A byte array containing the AudioSpecificConfig to parse.
    * @return A pair consisting of the sample rate in Hz and the channel count.
    */
   public static Pair<Integer, Integer> parseAacAudioSpecificConfig(byte[] audioSpecificConfig) {
-    ParsableBitArray bitArray = new ParsableBitArray(audioSpecificConfig);
+    return parseAacAudioSpecificConfig(new ParsableBitArray(audioSpecificConfig));
+  }
+
+  /**
+   * Parses an AudioSpecificConfig, as defined in ISO 14496-3 1.6.2.1
+   *
+   * @param bitArray A {@link ParsableBitArray} containing the AudioSpecificConfig to parse. The
+   *     position is advanced to the end of the AudioSpecificConfig.
+   * @return A pair consisting of the sample rate in Hz and the channel count.
+   */
+  public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArray bitArray) {
     int audioObjectType = getAacAudioObjectType(bitArray);
     int sampleRate = getAacSamplingFrequency(bitArray);
     int channelConfiguration = bitArray.readBits(4);
@@ -104,6 +114,39 @@ public static Pair<Integer, Integer> parseAacAudioSpecificConfig(byte[] audioSpe
         channelConfiguration = bitArray.readBits(4);
       }
     }
+
+    switch (audioObjectType) {
+      case 1:
+      case 2:
+      case 3:
+      case 4:
+      case 6:
+      case 7:
+      case 17:
+      case 19:
+      case 20:
+      case 21:
+      case 22:
+      case 23:
+        parseGaSpecificConfig(bitArray, audioObjectType, channelConfiguration);
+        break;
+      default:
+        throw new UnsupportedOperationException();
+    }
+    switch (audioObjectType) {
+      case 17:
+      case 19:
+      case 20:
+      case 21:
+      case 22:
+      case 23:
+        int epConfig = bitArray.readBits(2);
+        if (epConfig == 2 || epConfig == 3) {
+          throw new UnsupportedOperationException();
+        }
+        break;
+    }
+    // For supported containers, bits_to_decode() is always 0.
     int channelCount = AUDIO_SPECIFIC_CONFIG_CHANNEL_COUNT_TABLE[channelConfiguration];
     Assertions.checkArgument(channelCount != AUDIO_SPECIFIC_CONFIG_CHANNEL_CONFIGURATION_INVALID);
     return Pair.create(sampleRate, channelCount);
@@ -269,4 +312,32 @@ private static int getAacSamplingFrequency(ParsableBitArray bitArray) {
     return samplingFrequency;
   }
 
+  private static void parseGaSpecificConfig(ParsableBitArray bitArray, int audioObjectType,
+      int channelConfiguration) {
+    bitArray.skipBits(1); // frameLengthFlag.
+    boolean dependsOnCoreDecoder = bitArray.readBit();
+    if (dependsOnCoreDecoder) {
+      bitArray.skipBits(14); // coreCoderDelay.
+    }
+    boolean extensionFlag = bitArray.readBit();
+    if (channelConfiguration == 0) {
+      throw new UnsupportedOperationException(); // TODO: Implement programConfigElement();
+    }
+    if (audioObjectType == 6 || audioObjectType == 20) {
+      bitArray.skipBits(3); // layerNr.
+    }
+    if (extensionFlag) {
+      if (audioObjectType == 22) {
+        bitArray.skipBits(16); // numOfSubFrame (5), layer_length(11).
+      }
+      if (audioObjectType == 17 || audioObjectType == 19 || audioObjectType == 20
+          || audioObjectType == 23) {
+        // aacSectionDataResilienceFlag, aacScalefactorDataResilienceFlag,
+        // aacSpectralDataResilienceFlag.
+        bitArray.skipBits(3);
+      }
+      bitArray.skipBits(1); // extensionFlag3.
+    }
+  }
+
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
index 0456bcb8799..e0238cb14d1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
@@ -155,6 +155,9 @@ public boolean readBit() {
    * @return An integer whose bottom n bits hold the read data.
    */
   public int readBits(int numBits) {
+    if (numBits == 0) {
+      return 0;
+    }
     int returnValue = 0;
     bitOffset += numBits;
     while (bitOffset > 8) {
@@ -171,6 +174,40 @@ public int readBits(int numBits) {
     return returnValue;
   }
 
+  /**
+   * Reads {@code numBits} bits into {@code buffer}.
+   *
+   * @param buffer The array into which the read data should be written. The trailing
+   *     {@code numBits % 8} bits are written into the most significant bits of the last modified
+   *     {@code buffer} byte. The remaining ones are unmodified.
+   * @param offset The offset in {@code buffer} at which the read data should be written.
+   * @param numBits The number of bits to read.
+   */
+  public void readBits(byte[] buffer, int offset, int numBits) {
+    // Whole bytes.
+    int to = offset + (numBits >> 3) /* numBits / 8 */;
+    for (int i = offset; i < to; i++) {
+      buffer[i] = (byte) (data[byteOffset++] << bitOffset);
+      buffer[i] |= (data[byteOffset] & 0xFF) >> (8 - bitOffset);
+    }
+    // Trailing bits.
+    int bitsLeft = numBits & 7 /* numBits % 8 */;
+    buffer[to] &= 0xFF >> bitsLeft; // Set to 0 the bits that are going to be overwritten.
+    if (bitOffset + bitsLeft > 8) {
+      // We read the rest of data[byteOffset] and increase byteOffset.
+      buffer[to] |= (byte) ((data[byteOffset++] & 0xFF) << bitOffset);
+      bitOffset -= 8;
+    }
+    bitOffset += bitsLeft;
+    int lastDataByteTrailingBits = (data[byteOffset] & 0xFF) >> (8 - bitOffset);
+    buffer[to] |= (byte) (lastDataByteTrailingBits << (8 - bitsLeft));
+    if (bitOffset == 8) {
+      bitOffset = 0;
+      byteOffset++;
+    }
+    assertValidOffset();
+  }
+
   /**
    * Aligns the position to the next byte boundary. Does nothing if the position is already aligned.
    */

From ad5ca0812d532645a60407881244df6ecad0e957 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 27 Jul 2017 08:15:15 -0700
Subject: [PATCH 015/421] Add unit test for FakeDataSource.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163341994
---
 .../com/google/android/exoplayer2/testutil/FakeDataSet.java   | 4 ++--
 .../google/android/exoplayer2/testutil/FakeDataSource.java    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

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 25802053614..fd85b02d789 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
@@ -162,8 +162,8 @@ public FakeData appendReadData(byte[] data) {
     }
 
     /**
-     * Appends data of the specified length. No actual data is available and this data should not
-     * be read.
+     * Appends a data segment of the specified length. No actual data is available and the
+     * {@link FakeDataSource} will perform no copy operations when this data is read.
      */
     public FakeData appendReadData(int length) {
       Assertions.checkState(length > 0);
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
index 6180a8aa77a..aacd265e45c 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
@@ -166,6 +166,7 @@ public final int read(byte[] buffer, int offset, int readLength) throws IOExcept
         // Do not allow crossing of the segment boundary.
         readLength = Math.min(readLength, current.length - current.bytesRead);
         // Perform the read and return.
+        Assertions.checkArgument(buffer.length - offset >= readLength);
         if (current.data != null) {
           System.arraycopy(current.data, current.bytesRead, buffer, offset, readLength);
         }

From c3d7ccc3cb00bde4f1c2ae40d2e5a12ef8e494a8 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 27 Jul 2017 08:30:25 -0700
Subject: [PATCH 016/421] Replace iterable foreach loops with indexed for loops

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163343347
---
 .../source/DynamicConcatenatingMediaSource.java           | 8 ++++----
 .../exoplayer2/upstream/cache/CachedContentIndex.java     | 8 ++++----
 .../android/exoplayer2/upstream/cache/SimpleCache.java    | 7 +++----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index ad2e154f6d0..79f7d8dd48f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -186,8 +186,8 @@ public synchronized void prepareSource(ExoPlayer player, boolean isTopLevelSourc
 
   @Override
   public void maybeThrowSourceInfoRefreshError() throws IOException {
-    for (MediaSourceHolder mediaSourceHolder : mediaSourceHolders) {
-      mediaSourceHolder.mediaSource.maybeThrowSourceInfoRefreshError();
+    for (int i = 0; i < mediaSourceHolders.size(); i++) {
+      mediaSourceHolders.get(i).mediaSource.maybeThrowSourceInfoRefreshError();
     }
   }
 
@@ -221,8 +221,8 @@ public void releasePeriod(MediaPeriod mediaPeriod) {
 
   @Override
   public void releaseSource() {
-    for (MediaSourceHolder mediaSourceHolder : mediaSourceHolders) {
-      mediaSourceHolder.mediaSource.releaseSource();
+    for (int i = 0; i < mediaSourceHolders.size(); i++) {
+      mediaSourceHolders.get(i).mediaSource.releaseSource();
     }
   }
 
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 58cc70d68db..10bc2985799 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
@@ -34,9 +34,9 @@
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.LinkedList;
 import java.util.Random;
 import java.util.Set;
 import javax.crypto.Cipher;
@@ -176,14 +176,14 @@ public void removeEmpty(String key) {
 
   /** Removes empty {@link CachedContent} instances from index. */
   public void removeEmpty() {
-    LinkedList<String> cachedContentToBeRemoved = new LinkedList<>();
+    ArrayList<String> cachedContentToBeRemoved = new ArrayList<>();
     for (CachedContent cachedContent : keyToContent.values()) {
       if (cachedContent.isEmpty()) {
         cachedContentToBeRemoved.add(cachedContent.key);
       }
     }
-    for (String key : cachedContentToBeRemoved) {
-      removeEmpty(key);
+    for (int i = 0; i < cachedContentToBeRemoved.size(); i++) {
+      removeEmpty(cachedContentToBeRemoved.get(i));
     }
   }
 
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 2da6ba759be..62bd2783b86 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,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.NavigableSet;
 import java.util.Set;
 import java.util.TreeSet;
@@ -308,7 +307,7 @@ public synchronized void removeSpan(CacheSpan span) throws CacheException {
    * no longer exist.
    */
   private void removeStaleSpansAndCachedContents() throws CacheException {
-    LinkedList<CacheSpan> spansToBeRemoved = new LinkedList<>();
+    ArrayList<CacheSpan> spansToBeRemoved = new ArrayList<>();
     for (CachedContent cachedContent : index.getAll()) {
       for (CacheSpan span : cachedContent.getSpans()) {
         if (!span.file.exists()) {
@@ -316,9 +315,9 @@ private void removeStaleSpansAndCachedContents() throws CacheException {
         }
       }
     }
-    for (CacheSpan span : spansToBeRemoved) {
+    for (int i = 0; i < spansToBeRemoved.size(); i++) {
       // Remove span but not CachedContent to prevent multiple index.store() calls.
-      removeSpan(span, false);
+      removeSpan(spansToBeRemoved.get(i), false);
     }
     index.removeEmpty();
     index.store();

From 5bd5af8c60b1996fd819d0250f7dce8e1d3f46e3 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 27 Jul 2017 08:34:46 -0700
Subject: [PATCH 017/421] Replace canStop with blockUntilEnded in
 HostedActiviy.

The canStop method gets called every second in a seperate thread until the
test can be stopped. Replacing it with blockUntilEnded forwards the
responsibility to stop to the test itself which has better control over the
stop condition.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163343824
---
 .../exoplayer2/testutil/ExoHostedTest.java    | 15 ++--
 .../exoplayer2/testutil/HostActivity.java     | 69 +++++--------------
 2 files changed, 28 insertions(+), 56 deletions(-)

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 b61b484e323..4aba23d691f 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
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.testutil;
 
+import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.SystemClock;
 import android.util.Log;
@@ -72,6 +73,7 @@ public abstract class ExoHostedTest implements HostedTest, Player.EventListener,
   private final long expectedPlayingTimeMs;
   private final DecoderCounters videoDecoderCounters;
   private final DecoderCounters audioDecoderCounters;
+  private final ConditionVariable playerFinished;
 
   private ActionSchedule pendingSchedule;
   private Handler actionHandler;
@@ -81,7 +83,7 @@ public abstract class ExoHostedTest implements HostedTest, Player.EventListener,
   private ExoPlaybackException playerError;
   private Player.EventListener playerEventListener;
   private boolean playerWasPrepared;
-  private boolean playerFinished;
+
   private boolean playing;
   private long totalPlayingTimeMs;
   private long lastPlayingStartTimeMs;
@@ -114,8 +116,9 @@ public ExoHostedTest(String tag, long expectedPlayingTimeMs, boolean failOnPlaye
     this.tag = tag;
     this.expectedPlayingTimeMs = expectedPlayingTimeMs;
     this.failOnPlayerError = failOnPlayerError;
-    videoDecoderCounters = new DecoderCounters();
-    audioDecoderCounters = new DecoderCounters();
+    this.playerFinished = new ConditionVariable();
+    this.videoDecoderCounters = new DecoderCounters();
+    this.audioDecoderCounters = new DecoderCounters();
   }
 
   /**
@@ -169,8 +172,8 @@ public final void onStart(HostActivity host, Surface surface) {
   }
 
   @Override
-  public final boolean canStop() {
-    return playerFinished;
+  public final boolean blockUntilEnded(long timeoutMs) {
+    return playerFinished.block(timeoutMs);
   }
 
   @Override
@@ -219,7 +222,7 @@ public final void onPlayerStateChanged(boolean playWhenReady, int playbackState)
     playerWasPrepared |= playbackState != Player.STATE_IDLE;
     if (playbackState == Player.STATE_ENDED
         || (playbackState == Player.STATE_IDLE && playerWasPrepared)) {
-      playerFinished = true;
+      playerFinished.open();
     }
     boolean playing = playWhenReady && playbackState == Player.STATE_READY;
     if (!this.playing && playing) {
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 831344aa8be..e1f7eae379d 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
@@ -24,7 +24,6 @@
 import android.net.wifi.WifiManager.WifiLock;
 import android.os.Bundle;
 import android.os.ConditionVariable;
-import android.os.Handler;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
@@ -57,17 +56,19 @@ public interface HostedTest {
     void onStart(HostActivity host, Surface surface);
 
     /**
-     * Called on the main thread to check whether the test is ready to be stopped.
+     * Called on the main thread to block until the test has stopped or {@link #onStop()} is called.
      *
-     * @return Whether the test is ready to be stopped.
+     * @param timeoutMs The maximum time to block in milliseconds.
+     * @return Whether the test has stopped successful.
      */
-    boolean canStop();
+    boolean blockUntilEnded(long timeoutMs);
 
     /**
      * Called on the main thread when the test is stopped.
      * <p>
-     * The test will be stopped if {@link #canStop()} returns true, if the {@link HostActivity} has
-     * been paused, or if the {@link HostActivity}'s {@link Surface} has been destroyed.
+     * The test will be stopped when {@link #blockUntilEnded(long)} returns, if the
+     * {@link HostActivity} has been paused, or if the {@link HostActivity}'s {@link Surface} has
+     * been destroyed.
      */
     void onStop();
 
@@ -85,13 +86,10 @@ public interface HostedTest {
   private WakeLock wakeLock;
   private WifiLock wifiLock;
   private SurfaceView surfaceView;
-  private Handler mainHandler;
-  private CheckCanStopRunnable checkCanStopRunnable;
 
   private HostedTest hostedTest;
-  private ConditionVariable hostedTestStoppedCondition;
   private boolean hostedTestStarted;
-  private boolean hostedTestFinished;
+  private boolean forcedFinished;
 
   /**
    * Executes a {@link HostedTest} inside the host.
@@ -100,7 +98,7 @@ public interface HostedTest {
    * @param timeoutMs The number of milliseconds to wait for the test to finish. If the timeout
    *     is exceeded then the test will fail.
    */
-  public void runTest(final HostedTest hostedTest, long timeoutMs) {
+  public void runTest(HostedTest hostedTest, long timeoutMs) {
     runTest(hostedTest, timeoutMs, true);
   }
 
@@ -111,27 +109,31 @@ public void runTest(final HostedTest hostedTest, long timeoutMs) {
    * @param timeoutMs The number of milliseconds to wait for the test to finish.
    * @param failOnTimeout Whether the test fails when the timeout is exceeded.
    */
-  public void runTest(final HostedTest hostedTest, long timeoutMs, boolean failOnTimeout) {
+  public void runTest(HostedTest hostedTest, long timeoutMs, boolean failOnTimeout) {
     Assertions.checkArgument(timeoutMs > 0);
     Assertions.checkState(Thread.currentThread() != getMainLooper().getThread());
 
     Assertions.checkState(this.hostedTest == null);
     this.hostedTest = Assertions.checkNotNull(hostedTest);
-    hostedTestStoppedCondition = new ConditionVariable();
     hostedTestStarted = false;
-    hostedTestFinished = false;
+    forcedFinished = false;
 
+    final ConditionVariable testStarted = new ConditionVariable();
     runOnUiThread(new Runnable() {
       @Override
       public void run() {
         maybeStartHostedTest();
+        testStarted.open();
       }
     });
+    testStarted.block();
 
-    if (hostedTestStoppedCondition.block(timeoutMs)) {
-      if (hostedTestFinished) {
+    if (hostedTest.blockUntilEnded(timeoutMs)) {
+      hostedTest.onStop();
+      if (!forcedFinished) {
         Log.d(TAG, "Test finished. Checking pass conditions.");
         hostedTest.onFinished();
+        this.hostedTest = null;
         Log.d(TAG, "Pass conditions checked.");
       } else {
         String message = "Test released before it finished. Activity may have been paused whilst "
@@ -146,7 +148,6 @@ public void run() {
         fail(message);
       }
       maybeStopHostedTest();
-      hostedTestStoppedCondition.block();
     }
   }
 
@@ -160,8 +161,6 @@ public void onCreate(Bundle savedInstanceState) {
     surfaceView = (SurfaceView) findViewById(
         getResources().getIdentifier("surface_view", "id", getPackageName()));
     surfaceView.getHolder().addCallback(this);
-    mainHandler = new Handler();
-    checkCanStopRunnable = new CheckCanStopRunnable();
   }
 
   @Override
@@ -225,24 +224,14 @@ private void maybeStartHostedTest() {
       hostedTestStarted = true;
       Log.d(TAG, "Starting test.");
       hostedTest.onStart(this, surface);
-      checkCanStopRunnable.startChecking();
     }
   }
 
   private void maybeStopHostedTest() {
     if (hostedTest != null && hostedTestStarted) {
+      forcedFinished = true;
       hostedTest.onStop();
       hostedTest = null;
-      mainHandler.removeCallbacks(checkCanStopRunnable);
-      // We post opening of the stopped condition so that any events posted to the main thread as a
-      // result of hostedTest.onStop() are guaranteed to be handled before hostedTest.onFinished()
-      // is called from runTest.
-      mainHandler.post(new Runnable() {
-        @Override
-        public void run() {
-          hostedTestStoppedCondition.open();
-        }
-      });
     }
   }
 
@@ -251,24 +240,4 @@ private static int getWifiLockMode() {
     return Util.SDK_INT < 12 ? WifiManager.WIFI_MODE_FULL : WifiManager.WIFI_MODE_FULL_HIGH_PERF;
   }
 
-  private final class CheckCanStopRunnable implements Runnable {
-
-    private static final long CHECK_INTERVAL_MS = 1000;
-
-    private void startChecking() {
-      mainHandler.post(this);
-    }
-
-    @Override
-    public void run() {
-      if (hostedTest.canStop()) {
-        hostedTestFinished = true;
-        maybeStopHostedTest();
-      } else {
-        mainHandler.postDelayed(this, CHECK_INTERVAL_MS);
-      }
-    }
-
-  }
-
 }

From bb044563245b3cf41772cf73ee5c75d84633f00b Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 28 Jul 2017 04:39:57 -0700
Subject: [PATCH 018/421] Fix IndexOutOfBounds when reading a multiple of 8
 number of bits

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163455269
---
 .../android/exoplayer2/util/ParsableBitArrayTest.java       | 6 +++++-
 .../google/android/exoplayer2/util/ParsableBitArray.java    | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
index fc8318d8264..d7b2b36740d 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
@@ -87,9 +87,13 @@ public void testReadBitsToByteArray() {
     result[1] = 0;
     testArray.readBits(result, 1, 0);
     assertEquals(0, result[1]);
+    // Test reading a number of bits divisible by 8.
+    testArray.setPosition(0);
+    testArray.readBits(result, 0, 16);
+    assertEquals(TEST_DATA[0], result[0]);
+    assertEquals(TEST_DATA[1], result[1]);
     // Test least significant bits are unmodified.
     result[1] = (byte) 0xFF;
-    testArray.setPosition(16);
     testArray.readBits(result, 0, 9);
     assertEquals(0x5F, result[0]);
     assertEquals(0x7F, result[1]);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
index e0238cb14d1..fdee7fb5e67 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
@@ -192,6 +192,9 @@ public void readBits(byte[] buffer, int offset, int numBits) {
     }
     // Trailing bits.
     int bitsLeft = numBits & 7 /* numBits % 8 */;
+    if (bitsLeft == 0) {
+      return;
+    }
     buffer[to] &= 0xFF >> bitsLeft; // Set to 0 the bits that are going to be overwritten.
     if (bitOffset + bitsLeft > 8) {
       // We read the rest of data[byteOffset] and increase byteOffset.

From 1f0c85bd73c3ba7bfe8ce913fe22f2a69bb9112a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 28 Jul 2017 04:45:52 -0700
Subject: [PATCH 019/421] Allow apps to handle ad clicked/tapped events

Issue: #3106

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163455563
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 22 ++++++++++-
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java | 38 +++++++++++++++++++
 2 files changed, 59 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 bd3f6df826e..d801ba182d2 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
@@ -61,7 +61,7 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
   /**
    * Listener for ad loader events. All methods are called on the main thread.
    */
-  public interface EventListener {
+  /* package */ interface EventListener {
 
     /**
      * Called when the ad playback state has been updated.
@@ -77,6 +77,16 @@ public interface EventListener {
      */
     void onLoadError(IOException 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();
+
   }
 
   static {
@@ -337,6 +347,16 @@ public void onAdEvent(AdEvent adEvent) {
         imaPausedContent = true;
         pauseContentInternal();
         break;
+      case TAPPED:
+        if (eventListener != null) {
+          eventListener.onAdTapped();
+        }
+        break;
+      case CLICKED:
+        if (eventListener != null) {
+          eventListener.onAdClicked();
+        }
+        break;
       case CONTENT_RESUME_REQUESTED:
         imaPausedContent = false;
         resumeContentInternal();
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 9c2eb4b4041..0bf5773d2ce 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
@@ -53,6 +53,16 @@ public interface AdsListener {
      */
     void onAdLoadError(IOException 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();
+
   }
 
   private static final String TAG = "ImaAdsMediaSource";
@@ -305,6 +315,34 @@ public void run() {
       });
     }
 
+    @Override
+    public void onAdClicked() {
+      if (eventHandler != null && eventListener != null) {
+        eventHandler.post(new Runnable() {
+          @Override
+          public void run() {
+            if (!released) {
+              eventListener.onAdClicked();
+            }
+          }
+        });
+      }
+    }
+
+    @Override
+    public void onAdTapped() {
+      if (eventHandler != null && eventListener != null) {
+        eventHandler.post(new Runnable() {
+          @Override
+          public void run() {
+            if (!released) {
+              eventListener.onAdTapped();
+            }
+          }
+        });
+      }
+    }
+
   }
 
 }

From cdeea279739e4a5e9e418bee76051493ce6b8f5b Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 31 Jul 2017 03:30:09 -0700
Subject: [PATCH 020/421] Handle release() while initializing the ads manager

Also don't detach any attached player in release() to prevent a possible
NullPointerException if ImaAdsLoader.release() runs first, then the MediaSource
is released and detaches the player. This is safe because if the loader was
attached it's guaranteed to be detached.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163673750
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 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 d801ba182d2..a1db09b3d81 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
@@ -187,6 +187,10 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
    * Whether {@link #getContentProgress()} has sent {@link #pendingContentPositionMs} to IMA.
    */
   private boolean sentPendingContentPositionMs;
+  /**
+   * Whether {@link #release()} has been called.
+   */
+  private boolean released;
 
   /**
    * Creates a new IMA ads loader.
@@ -252,7 +256,7 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
       if (imaPausedContent) {
         adsManager.resume();
       }
-    } else if (adTagUri != null) {
+    } else {
       requestAds();
     }
   }
@@ -278,12 +282,10 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
    * Releases the loader. Must be called when the instance is no longer needed.
    */
   public void release() {
+    released = true;
     if (adsManager != null) {
       adsManager.destroy();
       adsManager = null;
-      if (player != null) {
-        detachPlayer();
-      }
     }
   }
 
@@ -291,7 +293,12 @@ public void release() {
 
   @Override
   public void onAdsManagerLoaded(AdsManagerLoadedEvent adsManagerLoadedEvent) {
-    adsManager = adsManagerLoadedEvent.getAdsManager();
+    AdsManager adsManager = adsManagerLoadedEvent.getAdsManager();
+    if (released) {
+      adsManager.destroy();
+      return;
+    }
+    this.adsManager = adsManager;
     adsManager.addAdErrorListener(this);
     adsManager.addAdEventListener(this);
     if (ENABLE_PRELOADING) {

From c2d7e05429afeead1cac0d441f748b18c7319c0b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 31 Jul 2017 05:49:58 -0700
Subject: [PATCH 021/421] Propagate skipped input buffers through to
 CodecCounters

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163683081
---
 .../exoplayer2/source/SampleQueueTest.java    | 24 +++++++++----------
 .../android/exoplayer2/BaseRenderer.java      |  5 ++--
 .../exoplayer2/decoder/DecoderCounters.java   |  7 ++++++
 .../mediacodec/MediaCodecRenderer.java        |  2 +-
 .../source/ClippingMediaPeriod.java           |  4 ++--
 .../exoplayer2/source/EmptySampleStream.java  |  4 ++--
 .../source/ExtractorMediaPeriod.java          | 16 +++++++------
 .../source/SampleMetadataQueue.java           | 23 ++++++++++--------
 .../exoplayer2/source/SampleQueue.java        | 16 +++++++++----
 .../exoplayer2/source/SampleStream.java       |  3 ++-
 .../source/SingleSampleMediaPeriod.java       |  6 +++--
 .../source/chunk/ChunkSampleStream.java       | 22 +++++++++++------
 .../source/hls/HlsSampleStream.java           |  4 ++--
 .../source/hls/HlsSampleStreamWrapper.java    | 13 ++++++----
 .../exoplayer2/ui/DebugTextViewHelper.java    |  3 ++-
 .../exoplayer2/testutil/FakeSampleStream.java |  4 ++--
 16 files changed, 95 insertions(+), 61 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/SampleQueueTest.java
index 76ea0e34cf5..77e61e39a93 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/SampleQueueTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/SampleQueueTest.java
@@ -258,45 +258,45 @@ public void testAdvanceToEndRetainsUnassignedData() {
 
   public void testAdvanceToBeforeBuffer() {
     writeTestData();
-    boolean result = sampleQueue.advanceTo(TEST_SAMPLE_TIMESTAMPS[0] - 1, true, false);
+    int skipCount = sampleQueue.advanceTo(TEST_SAMPLE_TIMESTAMPS[0] - 1, true, false);
     // Should fail and have no effect.
-    assertFalse(result);
+    assertEquals(SampleQueue.ADVANCE_FAILED, skipCount);
     assertReadTestData();
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
   public void testAdvanceToStartOfBuffer() {
     writeTestData();
-    boolean result = sampleQueue.advanceTo(TEST_SAMPLE_TIMESTAMPS[0], true, false);
+    int skipCount = sampleQueue.advanceTo(TEST_SAMPLE_TIMESTAMPS[0], true, false);
     // Should succeed but have no effect (we're already at the first frame).
-    assertTrue(result);
+    assertEquals(0, skipCount);
     assertReadTestData();
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
   public void testAdvanceToEndOfBuffer() {
     writeTestData();
-    boolean result = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP, true, false);
-    // Should succeed and skip to 2nd keyframe.
-    assertTrue(result);
+    int skipCount = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP, true, false);
+    // Should succeed and skip to 2nd keyframe (the 4th frame).
+    assertEquals(4, skipCount);
     assertReadTestData(null, TEST_DATA_SECOND_KEYFRAME_INDEX);
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
   public void testAdvanceToAfterBuffer() {
     writeTestData();
-    boolean result = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP + 1, true, false);
+    int skipCount = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP + 1, true, false);
     // Should fail and have no effect.
-    assertFalse(result);
+    assertEquals(SampleQueue.ADVANCE_FAILED, skipCount);
     assertReadTestData();
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
   public void testAdvanceToAfterBufferAllowed() {
     writeTestData();
-    boolean result = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP + 1, true, true);
-    // Should succeed and skip to 2nd keyframe.
-    assertTrue(result);
+    int skipCount = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP + 1, true, true);
+    // Should succeed and skip to 2nd keyframe (the 4th frame).
+    assertEquals(4, skipCount);
     assertReadTestData(null, TEST_DATA_SECOND_KEYFRAME_INDEX);
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
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 a88a1dd6152..7f148379655 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
@@ -296,9 +296,10 @@ protected final int readSource(FormatHolder formatHolder, DecoderInputBuffer buf
    * {@code positionUs} is beyond it.
    *
    * @param positionUs The position in microseconds.
+   * @return The number of samples that were skipped.
    */
-  protected void skipSource(long positionUs) {
-    stream.skipData(positionUs - streamOffsetUs);
+  protected int skipSource(long positionUs) {
+    return stream.skipData(positionUs - streamOffsetUs);
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
index 3c2d6d96e9f..7a532110d39 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
@@ -36,6 +36,12 @@ public final class DecoderCounters {
    * The number of queued input buffers.
    */
   public int inputBufferCount;
+  /**
+   * The number of skipped input buffers.
+   * <p>
+   * A skipped input buffer is an input buffer that was deliberately not sent to the decoder.
+   */
+  public int skippedInputBufferCount;
   /**
    * The number of rendered output buffers.
    */
@@ -79,6 +85,7 @@ public void merge(DecoderCounters other) {
     decoderInitCount += other.decoderInitCount;
     decoderReleaseCount += other.decoderReleaseCount;
     inputBufferCount += other.inputBufferCount;
+    skippedInputBufferCount += other.skippedInputBufferCount;
     renderedOutputBufferCount += other.renderedOutputBufferCount;
     skippedOutputBufferCount += other.skippedOutputBufferCount;
     droppedOutputBufferCount += other.droppedOutputBufferCount;
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 01229c11044..7c0549de25a 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
@@ -530,7 +530,7 @@ public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackEx
       while (feedInputBuffer()) {}
       TraceUtil.endSection();
     } else {
-      skipSource(positionUs);
+      decoderCounters.skippedInputBufferCount += skipSource(positionUs);
       // We need to read any format changes despite not having a codec so that drmSession can be
       // 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
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
index 12f58d9a21c..a8c33b4625e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
@@ -286,8 +286,8 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
     }
 
     @Override
-    public void skipData(long positionUs) {
-      stream.skipData(startUs + positionUs);
+    public int skipData(long positionUs) {
+      return stream.skipData(startUs + positionUs);
     }
 
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java b/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java
index 7aab22d8a08..299b816cc8c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/EmptySampleStream.java
@@ -43,8 +43,8 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
   }
 
   @Override
-  public void skipData(long positionUs) {
-    // Do nothing.
+  public int skipData(long positionUs) {
+    return 0;
   }
 
 }
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 e7273f834b2..511f7f4a8a7 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
@@ -238,7 +238,7 @@ public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamF
           // sample queue, or if we haven't read anything from the queue since the previous seek
           // (this case is common for sparse tracks such as metadata tracks). In all other cases a
           // seek is required.
-          seekRequired = !sampleQueue.advanceTo(positionUs, true, true)
+          seekRequired = sampleQueue.advanceTo(positionUs, true, true) == SampleQueue.ADVANCE_FAILED
               && sampleQueue.getReadIndex() != 0;
         }
       }
@@ -371,12 +371,13 @@ public long seekToUs(long positionUs) {
         lastSeekPositionUs);
   }
 
-  /* package */ void skipData(int track, long positionUs) {
+  /* package */ int skipData(int track, long positionUs) {
     SampleQueue sampleQueue = sampleQueues[track];
     if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
-      sampleQueue.advanceToEnd();
+      return sampleQueue.advanceToEnd();
     } else {
-      sampleQueue.advanceTo(positionUs, true, true);
+      int skipCount = sampleQueue.advanceTo(positionUs, true, true);
+      return skipCount == SampleQueue.ADVANCE_FAILED ? 0 : skipCount;
     }
   }
 
@@ -558,7 +559,8 @@ private boolean seekInsideBufferUs(long positionUs) {
     for (int i = 0; i < trackCount; i++) {
       SampleQueue sampleQueue = sampleQueues[i];
       sampleQueue.rewind();
-      boolean seekInsideQueue = sampleQueue.advanceTo(positionUs, true, false);
+      boolean seekInsideQueue = sampleQueue.advanceTo(positionUs, true, false)
+          != SampleQueue.ADVANCE_FAILED;
       // If we have AV tracks then an in-buffer seek is successful if the seek into every AV queue
       // is successful. We ignore whether seeks within non-AV queues are successful in this case, as
       // they may be sparse or poorly interleaved. If we only have non-AV tracks then a seek is
@@ -632,8 +634,8 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
     }
 
     @Override
-    public void skipData(long positionUs) {
-      ExtractorMediaPeriod.this.skipData(track, positionUs);
+    public int skipData(long positionUs) {
+      return ExtractorMediaPeriod.this.skipData(track, positionUs);
     }
 
   }
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 03b2e3b715e..d70c59b1958 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
@@ -253,32 +253,35 @@ public synchronized int read(FormatHolder formatHolder, DecoderInputBuffer buffe
    * @param allowTimeBeyondBuffer Whether the operation can succeed if {@code timeUs} is beyond the
    *     end of the queue, by advancing the read position to the last sample (or keyframe) in the
    *     queue.
-   * @return Whether the operation was a success. A successful advance is one in which the read
-   *     position was unchanged or advanced, and is now at a sample meeting the specified criteria.
+   * @return The number of samples that were skipped if the operation was successful, which may be
+   *     equal to 0, or {@link SampleQueue#ADVANCE_FAILED} if the operation was not successful. A
+   *     successful advance is one in which the read position was unchanged or advanced, and is now
+   *     at a sample meeting the specified criteria.
    */
-  public synchronized boolean advanceTo(long timeUs, boolean toKeyframe,
+  public synchronized int advanceTo(long timeUs, boolean toKeyframe,
       boolean allowTimeBeyondBuffer) {
     int relativeReadIndex = getRelativeIndex(readPosition);
     if (!hasNextSample() || timeUs < timesUs[relativeReadIndex]
         || (timeUs > largestQueuedTimestampUs && !allowTimeBeyondBuffer)) {
-      return false;
+      return SampleQueue.ADVANCE_FAILED;
     }
     int offset = findSampleBefore(relativeReadIndex, length - readPosition, timeUs, toKeyframe);
     if (offset == -1) {
-      return false;
+      return SampleQueue.ADVANCE_FAILED;
     }
     readPosition += offset;
-    return true;
+    return offset;
   }
 
   /**
    * Advances the read position to the end of the queue.
+   *
+   * @return The number of samples that were skipped.
    */
-  public synchronized void advanceToEnd() {
-    if (!hasNextSample()) {
-      return;
-    }
+  public synchronized int advanceToEnd() {
+    int skipCount = length - readPosition;
     readPosition = length;
+    return skipCount;
   }
 
   /**
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 c7bae8f8b4d..b83cf7df5b7 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
@@ -49,6 +49,8 @@ public interface UpstreamFormatChangedListener {
 
   }
 
+  public static final int ADVANCE_FAILED = -1;
+
   private static final int INITIAL_SCRATCH_SIZE = 32;
 
   private final Allocator allocator;
@@ -255,9 +257,11 @@ public void discardToEnd() {
 
   /**
    * Advances the read position to the end of the queue.
+   *
+   * @return The number of samples that were skipped.
    */
-  public void advanceToEnd() {
-    metadataQueue.advanceToEnd();
+  public int advanceToEnd() {
+    return metadataQueue.advanceToEnd();
   }
 
   /**
@@ -268,10 +272,12 @@ public void advanceToEnd() {
    *     time, rather than to any sample before or at that time.
    * @param allowTimeBeyondBuffer Whether the operation can succeed if {@code timeUs} is beyond the
    *     end of the queue, by advancing the read position to the last sample (or keyframe).
-   * @return Whether the operation was a success. A successful advance is one in which the read
-   *     position was unchanged or advanced, and is now at a sample meeting the specified criteria.
+   * @return The number of samples that were skipped if the operation was successful, which may be
+   *     equal to 0, or {@link #ADVANCE_FAILED} if the operation was not successful. A successful
+   *     advance is one in which the read position was unchanged or advanced, and is now at a sample
+   *     meeting the specified criteria.
    */
-  public boolean advanceTo(long timeUs, boolean toKeyframe, boolean allowTimeBeyondBuffer) {
+  public int advanceTo(long timeUs, boolean toKeyframe, boolean allowTimeBeyondBuffer) {
     return metadataQueue.advanceTo(timeUs, toKeyframe, allowTimeBeyondBuffer);
   }
 
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 dc58c29c227..06efc980e2c 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
@@ -70,7 +70,8 @@ public interface SampleStream {
    * {@code positionUs} is beyond it.
    *
    * @param positionUs The specified time.
+   * @return The number of samples that were skipped.
    */
-  void skipData(long positionUs);
+  int skipData(long positionUs);
 
 }
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 3435c01eeb3..b19f398d86e 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
@@ -235,10 +235,12 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
     }
 
     @Override
-    public void skipData(long positionUs) {
-      if (positionUs > 0) {
+    public int skipData(long positionUs) {
+      if (positionUs > 0 && streamState != STREAM_STATE_END_OF_STREAM) {
         streamState = STREAM_STATE_END_OF_STREAM;
+        return 1;
       }
+      return 0;
     }
 
   }
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 0fc3d5881e4..f2609a0ffdd 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
@@ -160,6 +160,7 @@ public T getChunkSource() {
    * @return An estimate of the absolute position in microseconds up to which data is buffered, or
    *     {@link C#TIME_END_OF_SOURCE} if the track is fully buffered.
    */
+  @Override
   public long getBufferedPositionUs() {
     if (loadingFinished) {
       return C.TIME_END_OF_SOURCE;
@@ -185,8 +186,8 @@ public long getBufferedPositionUs() {
   public void seekToUs(long positionUs) {
     lastSeekPositionUs = positionUs;
     // If we're not pending a reset, see if we can seek within the primary sample queue.
-    boolean seekInsideBuffer = !isPendingReset() && primarySampleQueue.advanceTo(positionUs, true,
-        positionUs < getNextLoadPositionUs());
+    boolean seekInsideBuffer = !isPendingReset() && (primarySampleQueue.advanceTo(positionUs, true,
+        positionUs < getNextLoadPositionUs()) != SampleQueue.ADVANCE_FAILED);
     if (seekInsideBuffer) {
       // We succeeded. Discard samples and corresponding chunks prior to the seek position.
       discardDownstreamMediaChunks(primarySampleQueue.getReadIndex());
@@ -266,13 +267,19 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
   }
 
   @Override
-  public void skipData(long positionUs) {
+  public int skipData(long positionUs) {
+    int skipCount;
     if (loadingFinished && positionUs > primarySampleQueue.getLargestQueuedTimestampUs()) {
       primarySampleQueue.advanceToEnd();
+      skipCount = primarySampleQueue.advanceToEnd();
     } else {
-      primarySampleQueue.advanceTo(positionUs, true, true);
+      skipCount = primarySampleQueue.advanceTo(positionUs, true, true);
+      if (skipCount == SampleQueue.ADVANCE_FAILED) {
+        skipCount = 0;
+      }
     }
     primarySampleQueue.discardToRead();
+    return skipCount;
   }
 
   // Loader.Callback implementation.
@@ -470,11 +477,12 @@ public boolean isReady() {
     }
 
     @Override
-    public void skipData(long positionUs) {
+    public int skipData(long positionUs) {
       if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
-        sampleQueue.advanceToEnd();
+        return sampleQueue.advanceToEnd();
       } else {
-        sampleQueue.advanceTo(positionUs, true, true);
+        int skipCount = sampleQueue.advanceTo(positionUs, true, true);
+        return skipCount == SampleQueue.ADVANCE_FAILED ? 0 : skipCount;
       }
     }
 
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 450644f60f9..e423a682f3d 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
@@ -50,8 +50,8 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer, boolea
   }
 
   @Override
-  public void skipData(long positionUs) {
-    sampleStreamWrapper.skipData(group, positionUs);
+  public int skipData(long positionUs) {
+    return sampleStreamWrapper.skipData(group, positionUs);
   }
 
 }
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 0b6d1863bd0..00a3cd4a85c 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
@@ -229,7 +229,7 @@ public boolean selectTracks(TrackSelection[] selections, boolean[] mayRetainStre
           // sample queue, or if we haven't read anything from the queue since the previous seek
           // (this case is common for sparse tracks such as metadata tracks). In all other cases a
           // seek is required.
-          seekRequired = !sampleQueue.advanceTo(positionUs, true, true)
+          seekRequired = sampleQueue.advanceTo(positionUs, true, true) == SampleQueue.ADVANCE_FAILED
               && sampleQueue.getReadIndex() != 0;
         }
       }
@@ -320,6 +320,7 @@ public boolean seekToUs(long positionUs, boolean forceReset) {
     return true;
   }
 
+  @Override
   public long getBufferedPositionUs() {
     if (loadingFinished) {
       return C.TIME_END_OF_SOURCE;
@@ -402,12 +403,13 @@ public void onPlaylistBlacklisted(HlsUrl url, long blacklistMs) {
         lastSeekPositionUs);
   }
 
-  /* package */ void skipData(int trackGroupIndex, long positionUs) {
+  /* package */ int skipData(int trackGroupIndex, long positionUs) {
     SampleQueue sampleQueue = sampleQueues[trackGroupIndex];
     if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
-      sampleQueue.advanceToEnd();
+      return sampleQueue.advanceToEnd();
     } else {
-      sampleQueue.advanceTo(positionUs, true, true);
+      int skipCount = sampleQueue.advanceTo(positionUs, true, true);
+      return skipCount == SampleQueue.ADVANCE_FAILED ? 0 : skipCount;
     }
   }
 
@@ -760,7 +762,8 @@ private boolean seekInsideBufferUs(long positionUs) {
     for (int i = 0; i < trackCount; i++) {
       SampleQueue sampleQueue = sampleQueues[i];
       sampleQueue.rewind();
-      boolean seekInsideQueue = sampleQueue.advanceTo(positionUs, true, false);
+      boolean seekInsideQueue = sampleQueue.advanceTo(positionUs, true, false)
+          != SampleQueue.ADVANCE_FAILED;
       // If we have AV tracks then an in-queue seek is successful if the seek into every AV queue
       // is successful. We ignore whether seeks within non-AV queues are successful in this case, as
       // they may be sparse or poorly interleaved. If we only have non-AV tracks then a seek is
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 2b8705bb743..8c4bad18628 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
@@ -183,8 +183,9 @@ private static String getDecoderCountersBufferCountString(DecoderCounters counte
       return "";
     }
     counters.ensureUpdated();
-    return " rb:" + counters.renderedOutputBufferCount
+    return " sib:" + counters.skippedInputBufferCount
         + " sb:" + counters.skippedOutputBufferCount
+        + " rb:" + counters.renderedOutputBufferCount
         + " db:" + counters.droppedOutputBufferCount
         + " mcdb:" + counters.maxConsecutiveDroppedOutputBufferCount;
   }
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 4e1e32980fe..699b850f73f 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
@@ -60,8 +60,8 @@ public void maybeThrowError() throws IOException {
   }
 
   @Override
-  public void skipData(long positionUs) {
-    // Do nothing.
+  public int skipData(long positionUs) {
+    return 0;
   }
 
 }

From 3ec0ccabbc96ecd2164a6cd646493b92e72f7825 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 31 Jul 2017 07:00:10 -0700
Subject: [PATCH 022/421] Check for null entries in ConcatenatingMediaSource

We do this in the dynamic case, and I think we've seen
a few GitHub issues where developers do this and don't
understand what they've done wrong (because the failure
comes later).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163688557
---
 .../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 de42df9a142..2c998e8a06a 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
@@ -57,6 +57,9 @@ public ConcatenatingMediaSource(MediaSource... mediaSources) {
    *     {@link MediaSource} instance to be present more than once in the array.
    */
   public ConcatenatingMediaSource(boolean isRepeatOneAtomic, MediaSource... mediaSources) {
+    for (MediaSource mediaSource : mediaSources) {
+      Assertions.checkNotNull(mediaSource);
+    }
     this.mediaSources = mediaSources;
     this.isRepeatOneAtomic = isRepeatOneAtomic;
     timelines = new Timeline[mediaSources.length];

From ecd9cff0588f739a815f79b0f7f7433282547166 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 31 Jul 2017 07:53:08 -0700
Subject: [PATCH 023/421] Robustness fix for malformed ID3 metadata

Issue: #3116

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163693235
---
 .../exoplayer2/metadata/id3/Id3Decoder.java   | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

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 df3353fb185..0e4256be5ca 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
@@ -483,13 +483,8 @@ private static PrivFrame decodePrivFrame(ParsableByteArray id3Data, int frameSiz
     int ownerEndIndex = indexOfZeroByte(data, 0);
     String owner = new String(data, 0, ownerEndIndex, "ISO-8859-1");
 
-    byte[] privateData;
     int privateDataStartIndex = ownerEndIndex + 1;
-    if (privateDataStartIndex < data.length) {
-      privateData = Arrays.copyOfRange(data, privateDataStartIndex, data.length);
-    } else {
-      privateData = new byte[0];
-    }
+    byte[] privateData = copyOfRangeIfValid(data, privateDataStartIndex, data.length);
 
     return new PrivFrame(owner, privateData);
   }
@@ -516,7 +511,7 @@ private static GeobFrame decodeGeobFrame(ParsableByteArray id3Data, int frameSiz
         descriptionEndIndex - descriptionStartIndex, charset);
 
     int objectDataStartIndex = descriptionEndIndex + delimiterLength(encoding);
-    byte[] objectData = Arrays.copyOfRange(data, objectDataStartIndex, data.length);
+    byte[] objectData = copyOfRangeIfValid(data, objectDataStartIndex, data.length);
 
     return new GeobFrame(mimeType, filename, description, objectData);
   }
@@ -553,7 +548,7 @@ private static ApicFrame decodeApicFrame(ParsableByteArray id3Data, int frameSiz
         descriptionEndIndex - descriptionStartIndex, charset);
 
     int pictureDataStartIndex = descriptionEndIndex + delimiterLength(encoding);
-    byte[] pictureData = Arrays.copyOfRange(data, pictureDataStartIndex, data.length);
+    byte[] pictureData = copyOfRangeIfValid(data, pictureDataStartIndex, data.length);
 
     return new ApicFrame(mimeType, description, pictureType, pictureData);
   }
@@ -749,6 +744,22 @@ private static int delimiterLength(int encodingByte) {
         ? 1 : 2;
   }
 
+  /**
+   * Copies the specified range of an array, or returns a zero length array if the range is invalid.
+   *
+   * @param data The array from which to copy.
+   * @param from The start of the range to copy (inclusive).
+   * @param to The end of the range to copy (exclusive).
+   * @return The copied data, or a zero length array if the range is invalid.
+   */
+  private static byte[] copyOfRangeIfValid(byte[] data, int from, int to) {
+    if (to <= from) {
+      // Invalid or zero length range.
+      return new byte[0];
+    }
+    return Arrays.copyOfRange(data, from, data.length);
+  }
+
   private static final class Id3Header {
 
     private final int majorVersion;

From 516762946d52e09ece780046715716cafdb40c8a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 31 Jul 2017 08:08:29 -0700
Subject: [PATCH 024/421] Fix typo in Id3Decoder

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

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 0e4256be5ca..6b2e5c36753 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
@@ -757,7 +757,7 @@ private static byte[] copyOfRangeIfValid(byte[] data, int from, int to) {
       // Invalid or zero length range.
       return new byte[0];
     }
-    return Arrays.copyOfRange(data, from, data.length);
+    return Arrays.copyOfRange(data, from, to);
   }
 
   private static final class Id3Header {

From 957158b7ffe1a07d267bf31cb6a2cb52d672e8bb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 31 Jul 2017 09:50:08 -0700
Subject: [PATCH 025/421] Fix 2.5.0 lint errors

- Publish IMA extension
- Force IMA to use the correct version of the support library
- Add missing sr translations for repeat mode strings

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163705883
---
 extensions/ima/build.gradle                     | 17 +++++++++++++++++
 .../exoplayer2/mediacodec/MediaCodecInfo.java   |  2 +-
 library/ui/src/main/res/values-sr/strings.xml   |  3 +++
 3 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 77327512960..fc7dc088e84 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -14,6 +14,12 @@ android {
 
 dependencies {
     compile project(modulePrefix + 'library-core')
+    // This dependency is necessary to force the supportLibraryVersion of
+    // com.android.support:support-v4 to be used. Else an older version (25.2.0) is included via:
+    // com.google.android.gms:play-services-ads:11.0.2
+    // |-- com.google.android.gms:play-services-ads-lite:[11.0.2] -> 11.0.2
+    //   |-- com.google.android.gms:play-services-basement:[11.0.2] -> 11.0.2
+    //     |-- com.android.support:support-v4:25.2.0
     compile 'com.android.support:support-annotations:' + supportLibraryVersion
     compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
     compile 'com.google.android.gms:play-services-ads:11.0.2'
@@ -23,3 +29,14 @@ dependencies {
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion
     androidTestCompile 'com.android.support.test:runner:' + testSupportLibraryVersion
 }
+
+ext {
+    javadocTitle = 'IMA extension'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+    releaseArtifact = 'extension-ima'
+    releaseDescription = 'Interactive Media Ads extension for ExoPlayer.'
+}
+apply from: '../../publish.gradle'
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 17ef2c4456e..2e5b04f4a94 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
@@ -64,7 +64,7 @@ public final class MediaCodecInfo {
   /**
    * Whether the decoder is secure.
    *
-   * @see CodecCapabilities#isFeatureRequired(String)
+   * @see CodecCapabilities#isFeatureSupported(String)
    * @see CodecCapabilities#FEATURE_SecurePlayback
    */
   public final boolean secure;
diff --git a/library/ui/src/main/res/values-sr/strings.xml b/library/ui/src/main/res/values-sr/strings.xml
index 175ad4fe7f2..0d54de5f6a4 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -22,4 +22,7 @@
   <string name="exo_controls_stop_description">"Заустави"</string>
   <string name="exo_controls_rewind_description">"Премотај уназад"</string>
   <string name="exo_controls_fastforward_description">"Премотај унапред"</string>
+  <string name="exo_controls_repeat_all_description">"Понови све"</string>
+  <string name="exo_controls_repeat_off_description">"Понављање је искључено"</string>
+  <string name="exo_controls_repeat_one_description">"Понови једну"</string>
 </resources>

From 1151104e2f9c5e10da869dfb59860ca4a890e371 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 1 Aug 2017 02:18:48 -0700
Subject: [PATCH 026/421] Use TrackGroup instead of TrackSelection in
 FakeAdaptiveDataSet.

This was a bug as the data set should contain sample data for all available
tracks. Also added a unit test.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163806579
---
 .../testutil/FakeAdaptiveDataSet.java         | 21 +++++++++----------
 .../exoplayer2/testutil/FakeChunkSource.java  |  3 ++-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
index f4476ddf934..add0c5d22f4 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
@@ -17,11 +17,11 @@
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.source.TrackGroup;
 
 /**
  * Fake data set emulating the data of an adaptive media source.
- * It provides chunk data for all {@link Format}s in the given {@link TrackSelection}.
+ * It provides chunk data for all {@link Format}s in the given {@link TrackGroup}.
  */
 public final class FakeAdaptiveDataSet extends FakeDataSet {
 
@@ -36,8 +36,8 @@ public Factory(long chunkDurationUs) {
       this.chunkDurationUs = chunkDurationUs;
     }
 
-    public FakeAdaptiveDataSet createDataSet(TrackSelection trackSelection, long mediaDurationUs) {
-      return new FakeAdaptiveDataSet(trackSelection, mediaDurationUs, chunkDurationUs);
+    public FakeAdaptiveDataSet createDataSet(TrackGroup trackGroup, long mediaDurationUs) {
+      return new FakeAdaptiveDataSet(trackGroup, mediaDurationUs, chunkDurationUs);
     }
 
   }
@@ -46,15 +46,14 @@ public FakeAdaptiveDataSet createDataSet(TrackSelection trackSelection, long med
   private final long chunkDurationUs;
   private final long lastChunkDurationUs;
 
-  public FakeAdaptiveDataSet(TrackSelection trackSelection, long mediaDurationUs,
-      long chunkDurationUs) {
+  public FakeAdaptiveDataSet(TrackGroup trackGroup, long mediaDurationUs, long chunkDurationUs) {
     this.chunkDurationUs = chunkDurationUs;
-    int selectionCount = trackSelection.length();
+    int trackCount = trackGroup.length;
     long lastChunkDurationUs = mediaDurationUs % chunkDurationUs;
     int fullChunks = (int) (mediaDurationUs / chunkDurationUs);
-    for (int i = 0; i < selectionCount; i++) {
+    for (int i = 0; i < trackCount; i++) {
       String uri = getUri(i);
-      Format format = trackSelection.getFormat(i);
+      Format format = trackGroup.getFormat(i);
       int chunkLength = (int) (format.bitrate * chunkDurationUs / (8 * C.MICROS_PER_SECOND));
       FakeData newData = this.newData(uri);
       for (int j = 0; j < fullChunks; j++) {
@@ -74,8 +73,8 @@ public long getChunkCount() {
     return chunkCount;
   }
 
-  public String getUri(int trackSelectionIndex) {
-    return "fake://adaptive.media/" + Integer.toString(trackSelectionIndex);
+  public String getUri(int trackIndex) {
+    return "fake://adaptive.media/" + trackIndex;
   }
 
   public long getChunkDuration(int chunkIndex) {
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 0c970caa15e..b8f25bfbce5 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
@@ -50,7 +50,8 @@ public Factory(FakeAdaptiveDataSet.Factory dataSetFactory,
     }
 
     public FakeChunkSource createChunkSource(TrackSelection trackSelection, long durationUs) {
-      FakeAdaptiveDataSet dataSet = dataSetFactory.createDataSet(trackSelection, durationUs);
+      FakeAdaptiveDataSet dataSet =
+          dataSetFactory.createDataSet(trackSelection.getTrackGroup(), durationUs);
       dataSourceFactory.setFakeDataSet(dataSet);
       DataSource dataSource = dataSourceFactory.createDataSource();
       return new FakeChunkSource(trackSelection, dataSource, dataSet);

From 55620348d4974ba8dfd0834e7ea968c41d6bab44 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 1 Aug 2017 04:44:02 -0700
Subject: [PATCH 027/421] Fix sequence extension position calculation

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

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 92c8e8d8004..add8079105a 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
@@ -257,7 +257,7 @@ public void reset() {
     public boolean onStartCode(int startCodeValue, int bytesAlreadyPassed) {
       if (isFilling) {
         if (sequenceExtensionPosition == 0 && startCodeValue == START_EXTENSION) {
-          sequenceExtensionPosition = length;
+          sequenceExtensionPosition = length - bytesAlreadyPassed;
         } else {
           length -= bytesAlreadyPassed;
           isFilling = false;

From 13513b9c3eb881bc87028245ea569c409b9fae26 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 1 Aug 2017 07:50:12 -0700
Subject: [PATCH 028/421] Clean up MediaSessionExt documentation

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163828712
---
 .../DefaultPlaybackController.java            |  42 +++---
 .../mediasession/MediaSessionConnector.java   | 126 ++++++++----------
 .../RepeatModeActionProvider.java             |  19 +--
 .../mediasession/TimelineQueueNavigator.java  |  25 ++--
 .../exoplayer2/ui/PlaybackControlView.java    |  16 ++-
 5 files changed, 112 insertions(+), 116 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 231c1f1ea50..c3586b29e63 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
@@ -21,40 +21,50 @@
 import com.google.android.exoplayer2.Player;
 
 /**
- * A default implementation of the {@link MediaSessionConnector.PlaybackController}. You can safely
- * override any method for instance to intercept calls for a given action.
+ * 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;
 
-  protected final long fastForwardIncrementMs;
   protected final long rewindIncrementMs;
+  protected final long fastForwardIncrementMs;
 
   /**
-   * Creates a new {@link DefaultPlaybackController}. This is equivalent to calling
-   * {@code DefaultPlaybackController(15000L, 5000L)}.
+   * Creates a new instance.
+   * <p>
+   * Equivalent to {@code DefaultPlaybackController(
+   *     DefaultPlaybackController.DEFAULT_REWIND_MS,
+   *     DefaultPlaybackController.DEFAULT_FAST_FORWARD_MS)}.
    */
   public DefaultPlaybackController() {
-    this(15000L, 5000L);
+    this(DEFAULT_REWIND_MS, DEFAULT_FAST_FORWARD_MS);
   }
 
   /**
-   * Creates a new {@link DefaultPlaybackController} and sets the fast forward and rewind increments
-   * in milliseconds.
+   * Creates a new instance with the given fast forward and rewind increments.
    *
-   * @param fastForwardIncrementMs A positive value will cause the
-   *     {@link PlaybackStateCompat#ACTION_FAST_FORWARD} playback action to be added. A zero or a
-   *     negative value will cause it to be removed.
-   * @param rewindIncrementMs A positive value will cause the
-   *     {@link PlaybackStateCompat#ACTION_REWIND} playback action to be added. A zero or a
-   *     negative value will cause it to be removed.
+   * @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
+   *     value will cause the fast forward action to be removed.
    */
-  public DefaultPlaybackController(long fastForwardIncrementMs, long rewindIncrementMs) {
-    this.fastForwardIncrementMs = fastForwardIncrementMs;
+  public DefaultPlaybackController(long rewindIncrementMs, long fastForwardIncrementMs) {
     this.rewindIncrementMs = rewindIncrementMs;
+    this.fastForwardIncrementMs = fastForwardIncrementMs;
   }
 
   @Override
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 a300acfffa2..0e839b80831 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
@@ -44,30 +44,27 @@
 import java.util.Map;
 
 /**
- * Mediates between a {@link MediaSessionCompat} and an {@link Player} instance set with
- * {@link #setPlayer(Player, PlaybackPreparer, CustomActionProvider...)}.
+ * Connects a {@link MediaSessionCompat} to a {@link Player}.
  * <p>
- * The {@code MediaSessionConnector} listens for media actions sent by a media controller and
- * realizes these actions by calling appropriate ExoPlayer methods. Further, the state of ExoPlayer
- * will be synced automatically with the {@link PlaybackStateCompat} of the media session to
- * broadcast state transitions to clients. You can optionally extend this behaviour by providing
- * various collaborators.
- * <p>
- * Media actions to initiate media playback ({@code PlaybackStateCompat#ACTION_PREPARE_*} and
- * {@code PlaybackStateCompat#ACTION_PLAY_*} need to be handled by a {@link PlaybackPreparer} which
- * build a {@link com.google.android.exoplayer2.source.MediaSource} to prepare ExoPlayer. Deploy
- * your preparer by calling {@link #setPlaybackPreparer(PlaybackPreparer)}.
- * <p>
- * To support a media session queue and navigation within this queue, you can set a
- * {@link QueueNavigator} to maintain the queue yourself and implement queue navigation commands
- * (like 'skip to next') sent by controllers. It's recommended to use the
- * {@link TimelineQueueNavigator} to allow users navigating the windows of the ExoPlayer timeline.
- * <p>
- * If you want to allow media controllers to manipulate the queue, implement a {@link QueueEditor}
- * and deploy it with {@link #setQueueEditor(QueueEditor)}.
- * <p>
- * Set an {@link ErrorMessageProvider} to provide an error code and a human readable error message
- * to be broadcast to controllers.
+ * The connector listens for actions sent by the media session's controller and implements these
+ * actions by calling appropriate ExoPlayer methods. The playback state of the media session is
+ * automatically synced with the player. The connector can also be optionally extended by providing
+ * various collaborators:
+ * <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.
+ *   </li>
+ *   <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.</li>
+ *   <li>To enable editing of the media queue, you can set a {@link QueueEditor} by calling
+ *   {@link #setQueueEditor(QueueEditor)}.</li>
+ *   <li>An {@link ErrorMessageProvider} for providing human readable error messages and
+ *   corresponding error codes can be set by calling
+ *   {@link #setErrorMessageProvider(ErrorMessageProvider)}.</li>
+ * </ul>
  */
 public final class MediaSessionConnector {
 
@@ -78,12 +75,7 @@ public final class MediaSessionConnector {
   public static final String EXTRAS_PITCH = "EXO_PITCH";
 
   /**
-   * Interface to which media controller commands regarding preparing playback for a given media
-   * clip are delegated to.
-   * <p>
-   * Normally preparing playback includes preparing the player with a
-   * {@link com.google.android.exoplayer2.source.MediaSource} and setting up the media session queue
-   * with a corresponding list of queue items.
+   * Interface to which playback preparation actions are delegated.
    */
   public interface PlaybackPreparer {
 
@@ -131,7 +123,7 @@ public interface PlaybackPreparer {
   }
 
   /**
-   * Controller to handle playback actions.
+   * Interface to which playback actions are delegated.
    */
   public interface PlaybackController {
 
@@ -178,8 +170,8 @@ public interface PlaybackController {
   }
 
   /**
-   * Navigator to handle queue navigation actions and maintain the media session queue with
-   * {#link MediaSessionCompat#setQueue(List)} to provide the active queue item to the connector.
+   * Handles queue navigation actions, and updates the media session queue by calling
+   * {@code MediaSessionCompat.setQueue()}.
    */
   public interface QueueNavigator {
 
@@ -211,7 +203,7 @@ public interface QueueNavigator {
      */
     void onCurrentWindowIndexChanged(Player player);
     /**
-     * Gets the id of the currently active queue item or
+     * Gets the id of the currently active queue item, or
      * {@link MediaSessionCompat.QueueItem#UNKNOWN_ID} if the active item is unknown.
      * <p>
      * To let the connector publish metadata for the active queue item, the queue item with the
@@ -241,7 +233,7 @@ public interface QueueNavigator {
   }
 
   /**
-   * Editor to manipulate the queue.
+   * Handles media session queue edits.
    */
   public interface QueueEditor {
 
@@ -302,12 +294,12 @@ public interface CustomActionProvider {
   }
 
   /**
-   * Provides an user readable error code and a message for {@link ExoPlaybackException}s.
+   * Converts an exception into an error code and a user readable error message.
    */
   public interface ErrorMessageProvider {
     /**
-     * Returns a pair of an error code and a user readable error message for a given
-     * {@link ExoPlaybackException}.
+     * Returns a pair consisting of an error code and a user readable error message for a given
+     * exception.
      */
     Pair<Integer, String> getErrorMessage(ExoPlaybackException playbackException);
   }
@@ -316,6 +308,7 @@ public interface ErrorMessageProvider {
    * The wrapped {@link MediaSessionCompat}.
    */
   public final MediaSessionCompat mediaSession;
+
   private final MediaControllerCompat mediaController;
   private final Handler handler;
   private final boolean doMaintainMetadata;
@@ -334,11 +327,10 @@ public interface ErrorMessageProvider {
   private ExoPlaybackException playbackException;
 
   /**
-   * Creates a {@code MediaSessionConnector}. This is equivalent to calling
-   * {@code #MediaSessionConnector(mediaSession, new DefaultPlaybackController)}.
+   * Creates an instance. Must be called on the same thread that is used to construct the player
+   * instances passed to {@link #setPlayer(Player, PlaybackPreparer, CustomActionProvider...)}.
    * <p>
-   * Constructing the {@link MediaSessionConnector} needs to be done on the same thread as
-   * constructing the player instance.
+   * Equivalent to {@code MediaSessionConnector(mediaSession, new DefaultPlaybackController())}.
    *
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
    */
@@ -347,14 +339,13 @@ public MediaSessionConnector(MediaSessionCompat mediaSession) {
   }
 
   /**
-   * Creates a {@code MediaSessionConnector}. This is equivalent to calling
-   * {@code #MediaSessionConnector(mediaSession, playbackController, true)}.
+   * Creates an instance. Must be called on the same thread that is used to construct the player
+   * instances passed to {@link #setPlayer(Player, PlaybackPreparer, CustomActionProvider...)}.
    * <p>
-   * Constructing the {@link MediaSessionConnector} needs to be done on the same thread as
-   * constructing the player instance.
+   * Equivalent to {@code MediaSessionConnector(mediaSession, playbackController, true)}.
    *
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   * @param playbackController The {@link PlaybackController}.
+   * @param playbackController A {@link PlaybackController} for handling playback actions.
    */
   public MediaSessionConnector(MediaSessionCompat mediaSession,
       PlaybackController playbackController) {
@@ -362,19 +353,14 @@ public MediaSessionConnector(MediaSessionCompat mediaSession,
   }
 
   /**
-   * Creates a {@code MediaSessionConnector} with {@link CustomActionProvider}s.
-   * <p>
-   * If you choose to pass {@code false} for {@code doMaintainMetadata} you need to maintain the
-   * metadata of the media session yourself (provide at least the duration to allow clients to show
-   * a progress bar).
-   * <p>
-   * Constructing the {@link MediaSessionConnector} needs to be done on the same thread as
-   * constructing the player instance.
+   * Creates an instance. Must be called on the same thread that is used to construct the player
+   * instances passed to {@link #setPlayer(Player, PlaybackPreparer, CustomActionProvider...)}.
    *
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   * @param playbackController The {@link PlaybackController}.
-   * @param doMaintainMetadata Sets whether the connector should maintain the metadata of the
-   *     session.
+   * @param playbackController A {@link PlaybackController} for handling playback actions.
+   * @param doMaintainMetadata Whether the connector should maintain the metadata of the session. If
+   *     {@code false}, you need to maintain the metadata of the media session yourself (provide at
+   *     least the duration to allow clients to show a progress bar).
    */
   public MediaSessionConnector(MediaSessionCompat mediaSession,
       PlaybackController playbackController, boolean doMaintainMetadata) {
@@ -392,17 +378,14 @@ public MediaSessionConnector(MediaSessionCompat mediaSession,
   }
 
   /**
-   * Sets the player to which media commands sent by a media controller are delegated.
-   * <p>
-   * The media session callback is set if the {@code player} is not {@code null} and the callback is
-   * removed if the {@code player} is {@code null}.
+   * Sets the player to be connected to the media session.
    * <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}.
-   * @param playbackPreparer The playback preparer for the player.
-   * @param customActionProviders Optional {@link CustomActionProvider}s to publish and handle
+   * @param playbackPreparer An optional {@link PlaybackPreparer} for preparing the player.
+   * @param customActionProviders An optional {@link CustomActionProvider}s to publish and handle
    *     custom actions.
    */
   public void setPlayer(Player player, PlaybackPreparer playbackPreparer,
@@ -411,7 +394,7 @@ public void setPlayer(Player player, PlaybackPreparer playbackPreparer,
       this.player.removeListener(exoPlayerEventListener);
       mediaSession.setCallback(null);
     }
-    setPlaybackPreparer(playbackPreparer);
+    this.playbackPreparer = playbackPreparer;
     this.player = player;
     this.customActionProviders = (player != null && customActionProviders != null)
         ? customActionProviders : new CustomActionProvider[0];
@@ -424,9 +407,9 @@ public void setPlayer(Player player, PlaybackPreparer playbackPreparer,
   }
 
   /**
-   * Sets the optional {@link ErrorMessageProvider}.
+   * Sets the {@link ErrorMessageProvider}.
    *
-   * @param errorMessageProvider The {@link ErrorMessageProvider}.
+   * @param errorMessageProvider The error message provider.
    */
   public void setErrorMessageProvider(ErrorMessageProvider errorMessageProvider) {
     this.errorMessageProvider = errorMessageProvider;
@@ -437,25 +420,21 @@ public void setErrorMessageProvider(ErrorMessageProvider errorMessageProvider) {
    * {@code ACTION_SKIP_TO_PREVIOUS}, {@code ACTION_SKIP_TO_QUEUE_ITEM} and
    * {@code ACTION_SET_SHUFFLE_MODE_ENABLED}.
    *
-   * @param queueNavigator The navigator to handle queue navigation.
+   * @param queueNavigator The queue navigator.
    */
   public void setQueueNavigator(QueueNavigator queueNavigator) {
     this.queueNavigator = queueNavigator;
   }
 
   /**
-   * Sets the queue editor to handle commands to manipulate the queue sent by a media controller.
+   * Sets the {@link QueueEditor} to handle queue edits sent by the media controller.
    *
-   * @param queueEditor The editor to handle queue manipulation actions.
+   * @param queueEditor The queue editor.
    */
   public void setQueueEditor(QueueEditor queueEditor) {
     this.queueEditor = queueEditor;
   }
 
-  private void setPlaybackPreparer(PlaybackPreparer playbackPreparer) {
-    this.playbackPreparer = playbackPreparer;
-  }
-
   private void updateMediaSessionPlaybackState() {
     PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder();
     if (player == null) {
@@ -603,6 +582,7 @@ private boolean canDispatchToQueueEditor(long action) {
   }
 
   private class ExoPlayerEventListener implements Player.EventListener {
+
     @Override
     public void onTimelineChanged(Timeline timeline, Object manifest) {
       if (queueNavigator != null) {
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 36d95914f7c..db0190de0f3 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
@@ -25,10 +25,13 @@
  */
 public final class RepeatModeActionProvider implements MediaSessionConnector.CustomActionProvider {
 
+  /**
+   * The default repeat toggle modes.
+   */
+  public static final @RepeatModeUtil.RepeatToggleModes 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";
-  @RepeatModeUtil.RepeatToggleModes
-  private static final int DEFAULT_REPEAT_MODES = RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE
-      | RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL;
 
   private final Player player;
   @RepeatModeUtil.RepeatToggleModes
@@ -38,20 +41,20 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
   private final CharSequence repeatOffDescription;
 
   /**
-   * Creates a new {@link RepeatModeActionProvider}.
+   * Creates a new instance.
    * <p>
-   * This is equivalent to calling the two argument constructor with
-   * {@code RepeatModeUtil#REPEAT_TOGGLE_MODE_ONE | RepeatModeUtil#REPEAT_TOGGLE_MODE_ALL}.
+   * Equivalent to {@code RepeatModeActionProvider(context, player,
+   *     RepeatModeActionProvider.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_MODES);
+    this(context, player, DEFAULT_REPEAT_TOGGLE_MODES);
   }
 
   /**
-   * Creates a new {@link RepeatModeActionProvider} for the given 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.
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 60aa5a5ba03..521b4cd6e37 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
@@ -29,9 +29,8 @@
 import java.util.List;
 
 /**
- * An abstract implementation of the {@link MediaSessionConnector.QueueNavigator} that's based on an
- * {@link Player}'s current {@link Timeline} and maps the timeline of the player to the media
- * session queue.
+ * An abstract implementation of the {@link MediaSessionConnector.QueueNavigator} that maps the
+ * windows of a {@link Player}'s {@link Timeline} to the media session queue.
  */
 public abstract class TimelineQueueNavigator implements MediaSessionConnector.QueueNavigator {
 
@@ -44,10 +43,9 @@ public abstract class TimelineQueueNavigator implements MediaSessionConnector.Qu
   private long activeQueueItemId;
 
   /**
-   * Creates a new timeline queue navigator for a given {@link MediaSessionCompat}.
+   * Creates an instance for a given {@link MediaSessionCompat}.
    * <p>
-   * This is equivalent to calling
-   * {@code #TimelineQueueNavigator(mediaSession, DEFAULT_MAX_QUEUE_SIZE)}.
+   * Equivalent to {@code TimelineQueueNavigator(mediaSession, DEFAULT_MAX_QUEUE_SIZE)}.
    *
    * @param mediaSession The {@link MediaSessionCompat}.
    */
@@ -56,12 +54,11 @@ public TimelineQueueNavigator(MediaSessionCompat mediaSession) {
   }
 
   /**
-   * Creates a new timeline queue navigator for a given {@link MediaSessionCompat} and a maximum
-   * queue size of {@code maxQueueSize}.
+   * Creates an instance for a given {@link MediaSessionCompat} and maximum queue size.
    * <p>
-   * If the actual queue size is larger than {@code maxQueueSize} a floating window of
-   * {@code maxQueueSize} is applied and moved back and forth when the user is navigating within the
-   * queue.
+   * If the number of windows in the {@link Player}'s {@link Timeline} exceeds {@code maxQueueSize},
+   * the media session queue will correspond to {@code maxQueueSize} windows centered on the one
+   * currently being played.
    *
    * @param mediaSession The {@link MediaSessionCompat}.
    * @param maxQueueSize The maximum queue size.
@@ -80,12 +77,6 @@ public TimelineQueueNavigator(MediaSessionCompat mediaSession, int maxQueueSize)
    */
   public abstract MediaDescriptionCompat getMediaDescription(int windowIndex);
 
-  /**
-   * Supports the following media actions: {@code PlaybackStateCompat.ACTION_SKIP_TO_NEXT |
-   * PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS | PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM}.
-   *
-   * @return The bit mask of the supported media actions.
-   */
   @Override
   public long getSupportedQueueNavigatorActions(Player player) {
     if (player == null || player.getCurrentTimeline().getWindowCount() < 2) {
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 a99c2dfde2e..6ddbfed973b 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
@@ -249,11 +249,23 @@ public boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode)
 
   };
 
+  /**
+   * 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;
+  /**
+   * The default show timeout, in milliseconds.
+   */
   public static final int DEFAULT_SHOW_TIMEOUT_MS = 5000;
-  public static final @RepeatModeUtil.RepeatToggleModes int DEFAULT_REPEAT_TOGGLE_MODES
-      = RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE;
+  /**
+   * The default repeat toggle modes.
+   */
+  public static final @RepeatModeUtil.RepeatToggleModes int DEFAULT_REPEAT_TOGGLE_MODES =
+      RepeatModeUtil.REPEAT_TOGGLE_MODE_NONE;
 
   /**
    * The maximum number of windows that can be shown in a multi-window time bar.

From c01c8cd2a6acee76532d9b32465a4b4743281c9b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 1 Aug 2017 08:08:58 -0700
Subject: [PATCH 029/421] Bump version to 2.5.0-beta2

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163830353
---
 RELEASENOTES.md                                           | 8 +++++---
 constants.gradle                                          | 2 +-
 .../google/android/exoplayer2/ExoPlayerLibraryInfo.java   | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 24da37808b8..379b84b4e7d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,11 +1,11 @@
 # Release notes #
 
-### r2.5.0-beta1 ###
+### r2.5.0 (beta) ###
 
 * IMA extension: Wraps the Google Interactive Media Ads (IMA) SDK to provide an
   easy and seamless way of incorporating display ads into ExoPlayer playbacks.
-  You can read more about the IMA extension *A link to a blog post about this
-  extension will be added here prior to the stable 2.5.0 release.*
+  You can read more about the IMA extension
+  [here](https://medium.com/google-exoplayer/playing-ads-with-exoplayer-and-ima-868dfd767ea).
 * MediaSession extension: Provides an easy to to connect ExoPlayer with
   MediaSessionCompat in the Android Support Library. *A link to a blog post
   about this extension will be added here prior to the stable 2.5.0 release.*
@@ -48,6 +48,8 @@
   ([#889](https://github.com/google/ExoPlayer/issues/889)).
 * AndroidTV: Fixed issue where tunneled video playback would not start on some
   devices ([#2985](https://github.com/google/ExoPlayer/issues/2985)).
+* MPEG-TS: Fixed segmentation issue when parsing H262
+  ([#2891](https://github.com/google/ExoPlayer/issues/2891)).
 * Cronet extension: Support for a user-defined fallback if Cronet library is not
   present.
 * Misc bugfixes.
diff --git a/constants.gradle b/constants.gradle
index 73b80f6a83a..0db74945c4d 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -24,7 +24,7 @@ project.ext {
     supportLibraryVersion = '25.4.0'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
-    releaseVersion = 'r2.5.0-beta1'
+    releaseVersion = 'r2.5.0-beta2'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
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 2abdfe5aee2..c04a777e142 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
@@ -31,13 +31,13 @@ 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.5.0-beta1";
+  public static final String VERSION = "2.5.0-beta2";
 
   /**
    * 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.5.0-beta1";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.0-beta2";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.

From 1a95a35434ec335d0c25d16cb80200673fb5a69d Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 1 Aug 2017 18:20:54 +0100
Subject: [PATCH 030/421] Minor cleanup

---
 .../src/androidTest/assets/ts/sample.ps.0.dump   |  2 +-
 .../src/androidTest/assets/ts/sample.ts.0.dump   |  4 ++--
 .../exoplayer2/extractor/ts/H262Reader.java      |  7 ++++---
 .../exoplayer2/ui/SimpleExoPlayerView.java       | 16 ++++++++--------
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/library/core/src/androidTest/assets/ts/sample.ps.0.dump b/library/core/src/androidTest/assets/ts/sample.ps.0.dump
index 3b44fb6fb90..98f3c6a85a3 100644
--- a/library/core/src/androidTest/assets/ts/sample.ps.0.dump
+++ b/library/core/src/androidTest/assets/ts/sample.ps.0.dump
@@ -69,7 +69,7 @@ track 224:
   sample 0:
     time = 40000
     flags = 1
-    data = length 20616, hash CA38A5B5
+    data = length 20646, hash 576390B
   sample 1:
     time = 80000
     flags = 0
diff --git a/library/core/src/androidTest/assets/ts/sample.ts.0.dump b/library/core/src/androidTest/assets/ts/sample.ts.0.dump
index 26c6665aaaa..83f1337816a 100644
--- a/library/core/src/androidTest/assets/ts/sample.ts.0.dump
+++ b/library/core/src/androidTest/assets/ts/sample.ts.0.dump
@@ -28,9 +28,9 @@ track 256:
       data = length 22, hash CE183139
   sample count = 2
   sample 0:
-    time = 33366
+    time = 0
     flags = 1
-    data = length 20669, hash 26DABA0F
+    data = length 20711, hash 34341E8
   sample 1:
     time = 66733
     flags = 0
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 add8079105a..a00bace56c0 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
@@ -137,9 +137,10 @@ public void consume(ParsableByteArray data) {
         }
       }
 
-      if (hasOutputFormat && (startCodeValue == START_PICTURE || startCodeValue == START_SEQUENCE_HEADER)) {
+      if (hasOutputFormat
+          && (startCodeValue == START_PICTURE || startCodeValue == START_SEQUENCE_HEADER)) {
         int bytesWrittenPastStartCode = limit - startCodeOffset;
-        boolean resetSample = (samplePosition == C.POSITION_UNSET);
+        boolean resetSample = samplePosition == C.POSITION_UNSET;
         if (foundPicture) {
           @C.BufferFlags int flags = isKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
           int size = (int) (totalBytesWritten - samplePosition) - bytesWrittenPastStartCode;
@@ -147,7 +148,7 @@ public void consume(ParsableByteArray data) {
           isKeyframe = false;
           resetSample = true;
         }
-        foundPicture = (startCodeValue == START_PICTURE);
+        foundPicture = startCodeValue == START_PICTURE;
         if (resetSample) {
           samplePosition = totalBytesWritten - bytesWrittenPastStartCode;
           sampleTimeUs = (pesPtsUsAvailable ? pesTimeUs : sampleTimeUs + frameDurationUs);
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 1c39b558bbb..2bba9071fd2 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
@@ -126,7 +126,8 @@
  *         <li>Default: {@code R.id.exo_playback_control_view}</li>
  *       </ul>
  *   <li>All attributes that can be set on a {@link PlaybackControlView} can also be set on a
- *       SimpleExoPlayerView, and will be propagated to the inflated {@link PlaybackControlView}.
+ *       SimpleExoPlayerView, and will be propagated to the inflated {@link PlaybackControlView}
+ *       unless the layout is overridden to specify a custom {@code exo_controller} (see below).
  *   </li>
  * </ul>
  *
@@ -163,18 +164,17 @@
  *       </ul>
  *   </li>
  *   <li><b>{@code exo_controller_placeholder}</b> - A placeholder that's replaced with the inflated
- *       {@link PlaybackControlView}.
+ *       {@link PlaybackControlView}. Ignored if an {@code exo_controller} view exists.
  *       <ul>
  *        <li>Type: {@link View}</li>
  *       </ul>
  *   </li>
- *   <li><b>{@code exo_controller}</b> - An already inflated instance of
- *       {@link PlaybackControlView}. Allows you to use your own {@link PlaybackControlView} instead
- *       of default. Note: attrs such as rewind_increment will not be passed through to this
- *       instance and should be set at creation. {@code exo_controller_placeholder} will be ignored
- *       if this is set.
+ *   <li><b>{@code exo_controller}</b> - An already inflated {@link PlaybackControlView}. Allows use
+ *       of a custom extension of {@link PlaybackControlView}. Note that attributes such as
+ *       {@code rewind_increment} will not be automatically propagated through to this instance. If
+ *       a view exists with this id, any {@code exo_controller_placeholder} view will be ignored.
  *       <ul>
- *        <li>Type: {@link View}</li>
+ *        <li>Type: {@link PlaybackControlView}</li>
  *       </ul>
  *   </li>
  *   <li><b>{@code exo_overlay}</b> - A {@link FrameLayout} positioned on top of the player which

From 962a71314a670fb7e489a12444430f19623dce10 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 2 Aug 2017 01:25:41 -0700
Subject: [PATCH 031/421] Fix handling of H.262 CSD

The start code for H.262 codec-specific data may be across a packet boundary.
Before this change the offset passed to CsdBuffer.onData may have been before
the start point of the data in the newData buffer.

After this change, start codes are added directly to the CSD buffer when it's
filling and any start code bytes added by onData (at the end of a packet) are
discarded.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163943584
---
 .../exoplayer2/extractor/ts/H262Reader.java   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

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 a00bace56c0..160a9c5a717 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
@@ -103,9 +103,8 @@ public void consume(ParsableByteArray data) {
     totalBytesWritten += data.bytesLeft();
     output.sampleData(data, data.bytesLeft());
 
-    int searchOffset = offset;
     while (true) {
-      int startCodeOffset = NalUnitUtil.findNalUnit(dataArray, searchOffset, limit, prefixFlags);
+      int startCodeOffset = NalUnitUtil.findNalUnit(dataArray, offset, limit, prefixFlags);
 
       if (startCodeOffset == limit) {
         // We've scanned to the end of the data without finding another start code.
@@ -126,7 +125,7 @@ public void consume(ParsableByteArray data) {
           csdBuffer.onData(dataArray, offset, startCodeOffset);
         }
         // This is the number of bytes belonging to the next start code that have already been
-        // passed to csdDataTargetBuffer.
+        // passed to csdBuffer.
         int bytesAlreadyPassed = lengthToStartCode < 0 ? -lengthToStartCode : 0;
         if (csdBuffer.onStartCode(startCodeValue, bytesAlreadyPassed)) {
           // The csd data is complete, so we can decode and output the media format.
@@ -160,8 +159,7 @@ public void consume(ParsableByteArray data) {
         isKeyframe = true;
       }
 
-      offset = startCodeOffset;
-      searchOffset = offset + 3;
+      offset = startCodeOffset + 3;
     }
   }
 
@@ -226,6 +224,8 @@ private static Pair<Format, Long> parseCsdBuffer(CsdBuffer csdBuffer, String for
 
   private static final class CsdBuffer {
 
+    private static final byte[] START_CODE = new byte[] {0, 0, 1};
+
     private boolean isFilling;
 
     public int length;
@@ -249,24 +249,25 @@ public void reset() {
      * Called when a start code is encountered in the stream.
      *
      * @param startCodeValue The start code value.
-     * @param bytesAlreadyPassed The number of bytes of the start code that have already been
-     *     passed to {@link #onData(byte[], int, int)}, or 0.
+     * @param bytesAlreadyPassed The number of bytes of the start code that have been passed to
+     *     {@link #onData(byte[], int, int)}, or 0.
      * @return Whether the csd data is now complete. If true is returned, neither
-     *     this method or {@link #onData(byte[], int, int)} should be called again without an
+     *     this method nor {@link #onData(byte[], int, int)} should be called again without an
      *     interleaving call to {@link #reset()}.
      */
     public boolean onStartCode(int startCodeValue, int bytesAlreadyPassed) {
       if (isFilling) {
+        length -= bytesAlreadyPassed;
         if (sequenceExtensionPosition == 0 && startCodeValue == START_EXTENSION) {
-          sequenceExtensionPosition = length - bytesAlreadyPassed;
+          sequenceExtensionPosition = length;
         } else {
-          length -= bytesAlreadyPassed;
           isFilling = false;
           return true;
         }
       } else if (startCodeValue == START_SEQUENCE_HEADER) {
         isFilling = true;
       }
+      onData(START_CODE, 0, START_CODE.length);
       return false;
     }
 

From 8e08d982aba3edf87c74f6462a99cadc793fa487 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Aug 2017 03:07:56 -0700
Subject: [PATCH 032/421] Further fix H262 segmentation

Issue: #2891

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163951910
---
 .../androidTest/assets/ts/sample.ts.0.dump    |  2 +-
 .../exoplayer2/extractor/ts/H262Reader.java   | 46 ++++++++-----------
 2 files changed, 21 insertions(+), 27 deletions(-)

diff --git a/library/core/src/androidTest/assets/ts/sample.ts.0.dump b/library/core/src/androidTest/assets/ts/sample.ts.0.dump
index 83f1337816a..91e48b17220 100644
--- a/library/core/src/androidTest/assets/ts/sample.ts.0.dump
+++ b/library/core/src/androidTest/assets/ts/sample.ts.0.dump
@@ -28,7 +28,7 @@ track 256:
       data = length 22, hash CE183139
   sample count = 2
   sample 0:
-    time = 0
+    time = 33366
     flags = 1
     data = length 20711, hash 34341E8
   sample 1:
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 160a9c5a717..a3502a3242d 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
@@ -51,17 +51,17 @@ public final class H262Reader implements ElementaryStreamReader {
   // State that should be reset on seek.
   private final boolean[] prefixFlags;
   private final CsdBuffer csdBuffer;
-  private boolean foundPicture;
   private long totalBytesWritten;
+  private boolean startedFirstSample;
 
   // Per packet state that gets reset at the start of each packet.
   private long pesTimeUs;
-  private boolean pesPtsUsAvailable;
 
-  // Per sample state that gets reset at the start of each frame.
-  private boolean isKeyframe;
+  // Per sample state that gets reset at the start of each sample.
   private long samplePosition;
   private long sampleTimeUs;
+  private boolean sampleIsKeyframe;
+  private boolean sampleHasPicture;
 
   public H262Reader() {
     prefixFlags = new boolean[4];
@@ -72,10 +72,8 @@ public H262Reader() {
   public void seek() {
     NalUnitUtil.clearPrefixFlags(prefixFlags);
     csdBuffer.reset();
-    pesPtsUsAvailable = false;
-    foundPicture = false;
-    samplePosition = C.POSITION_UNSET;
     totalBytesWritten = 0;
+    startedFirstSample = false;
   }
 
   @Override
@@ -87,10 +85,7 @@ public void createTracks(ExtractorOutput extractorOutput, TrackIdGenerator idGen
 
   @Override
   public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
-    pesPtsUsAvailable = pesTimeUs != C.TIME_UNSET;
-    if (pesPtsUsAvailable) {
-      this.pesTimeUs = pesTimeUs;
-    }
+    this.pesTimeUs = pesTimeUs;
   }
 
   @Override
@@ -136,27 +131,26 @@ public void consume(ParsableByteArray data) {
         }
       }
 
-      if (hasOutputFormat
-          && (startCodeValue == START_PICTURE || startCodeValue == START_SEQUENCE_HEADER)) {
+      if (startCodeValue == START_PICTURE || startCodeValue == START_SEQUENCE_HEADER) {
         int bytesWrittenPastStartCode = limit - startCodeOffset;
-        boolean resetSample = samplePosition == C.POSITION_UNSET;
-        if (foundPicture) {
-          @C.BufferFlags int flags = isKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
+        if (startedFirstSample && sampleHasPicture && hasOutputFormat) {
+          // Output the sample.
+          @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
           int size = (int) (totalBytesWritten - samplePosition) - bytesWrittenPastStartCode;
           output.sampleMetadata(sampleTimeUs, flags, size, bytesWrittenPastStartCode, null);
-          isKeyframe = false;
-          resetSample = true;
         }
-        foundPicture = startCodeValue == START_PICTURE;
-        if (resetSample) {
+        if (!startedFirstSample || sampleHasPicture) {
+          // Start the next sample.
           samplePosition = totalBytesWritten - bytesWrittenPastStartCode;
-          sampleTimeUs = (pesPtsUsAvailable ? pesTimeUs : sampleTimeUs + frameDurationUs);
-          pesPtsUsAvailable = false;
+          sampleTimeUs = pesTimeUs != C.TIME_UNSET ? pesTimeUs
+              : (startedFirstSample ? (sampleTimeUs + frameDurationUs) : 0);
+          sampleIsKeyframe = false;
+          pesTimeUs = C.TIME_UNSET;
+          startedFirstSample = true;
         }
-      }
-
-      if (hasOutputFormat && startCodeValue == START_GROUP) {
-        isKeyframe = true;
+        sampleHasPicture = startCodeValue == START_PICTURE;
+      } else if (startCodeValue == START_GROUP) {
+        sampleIsKeyframe = true;
       }
 
       offset = startCodeOffset + 3;

From 55fe5d21a21ca257f631f8613e3ea6b26105333a Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 2 Aug 2017 05:57:38 -0700
Subject: [PATCH 033/421] Create the demos dir

Now the demo app is under demos/main.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163967883
---
 {demo => demos/main}/README.md                      |   0
 {demo => demos/main}/build.gradle                   |   0
 {demo => demos/main}/src/main/AndroidManifest.xml   |   0
 .../main}/src/main/assets/media.exolist.json        |   0
 .../android/exoplayer2/demo/DemoApplication.java    |   0
 .../google/android/exoplayer2/demo/DemoUtil.java    |   0
 .../google/android/exoplayer2/demo/EventLogger.java |   0
 .../android/exoplayer2/demo/PlayerActivity.java     |   0
 .../exoplayer2/demo/SampleChooserActivity.java      |   0
 .../exoplayer2/demo/TrackSelectionHelper.java       |   0
 .../main}/src/main/res/drawable-xhdpi/ic_banner.png | Bin
 .../main}/src/main/res/layout/list_divider.xml      |   0
 .../main}/src/main/res/layout/player_activity.xml   |   0
 .../src/main/res/layout/sample_chooser_activity.xml |   0
 .../src/main/res/layout/track_selection_dialog.xml  |   0
 .../main}/src/main/res/mipmap-hdpi/ic_launcher.png  | Bin
 .../main}/src/main/res/mipmap-mdpi/ic_launcher.png  | Bin
 .../main}/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin
 .../src/main/res/mipmap-xxhdpi/ic_launcher.png      | Bin
 .../src/main/res/mipmap-xxxhdpi/ic_launcher.png     | Bin
 .../main}/src/main/res/values/strings.xml           |   0
 {demo => demos/main}/src/main/res/values/styles.xml |   0
 settings.gradle                                     |   2 +-
 23 files changed, 1 insertion(+), 1 deletion(-)
 rename {demo => demos/main}/README.md (100%)
 rename {demo => demos/main}/build.gradle (100%)
 rename {demo => demos/main}/src/main/AndroidManifest.xml (100%)
 rename {demo => demos/main}/src/main/assets/media.exolist.json (100%)
 rename {demo => demos/main}/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java (100%)
 rename {demo => demos/main}/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java (100%)
 rename {demo => demos/main}/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java (100%)
 rename {demo => demos/main}/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java (100%)
 rename {demo => demos/main}/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java (100%)
 rename {demo => demos/main}/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java (100%)
 rename {demo => demos/main}/src/main/res/drawable-xhdpi/ic_banner.png (100%)
 rename {demo => demos/main}/src/main/res/layout/list_divider.xml (100%)
 rename {demo => demos/main}/src/main/res/layout/player_activity.xml (100%)
 rename {demo => demos/main}/src/main/res/layout/sample_chooser_activity.xml (100%)
 rename {demo => demos/main}/src/main/res/layout/track_selection_dialog.xml (100%)
 rename {demo => demos/main}/src/main/res/mipmap-hdpi/ic_launcher.png (100%)
 rename {demo => demos/main}/src/main/res/mipmap-mdpi/ic_launcher.png (100%)
 rename {demo => demos/main}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%)
 rename {demo => demos/main}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%)
 rename {demo => demos/main}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%)
 rename {demo => demos/main}/src/main/res/values/strings.xml (100%)
 rename {demo => demos/main}/src/main/res/values/styles.xml (100%)

diff --git a/demo/README.md b/demos/main/README.md
similarity index 100%
rename from demo/README.md
rename to demos/main/README.md
diff --git a/demo/build.gradle b/demos/main/build.gradle
similarity index 100%
rename from demo/build.gradle
rename to demos/main/build.gradle
diff --git a/demo/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
similarity index 100%
rename from demo/src/main/AndroidManifest.xml
rename to demos/main/src/main/AndroidManifest.xml
diff --git a/demo/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
similarity index 100%
rename from demo/src/main/assets/media.exolist.json
rename to demos/main/src/main/assets/media.exolist.json
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoApplication.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/DemoUtil.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/PlayerActivity.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/SampleChooserActivity.java
diff --git a/demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
similarity index 100%
rename from demo/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
rename to demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
diff --git a/demo/src/main/res/drawable-xhdpi/ic_banner.png b/demos/main/src/main/res/drawable-xhdpi/ic_banner.png
similarity index 100%
rename from demo/src/main/res/drawable-xhdpi/ic_banner.png
rename to demos/main/src/main/res/drawable-xhdpi/ic_banner.png
diff --git a/demo/src/main/res/layout/list_divider.xml b/demos/main/src/main/res/layout/list_divider.xml
similarity index 100%
rename from demo/src/main/res/layout/list_divider.xml
rename to demos/main/src/main/res/layout/list_divider.xml
diff --git a/demo/src/main/res/layout/player_activity.xml b/demos/main/src/main/res/layout/player_activity.xml
similarity index 100%
rename from demo/src/main/res/layout/player_activity.xml
rename to demos/main/src/main/res/layout/player_activity.xml
diff --git a/demo/src/main/res/layout/sample_chooser_activity.xml b/demos/main/src/main/res/layout/sample_chooser_activity.xml
similarity index 100%
rename from demo/src/main/res/layout/sample_chooser_activity.xml
rename to demos/main/src/main/res/layout/sample_chooser_activity.xml
diff --git a/demo/src/main/res/layout/track_selection_dialog.xml b/demos/main/src/main/res/layout/track_selection_dialog.xml
similarity index 100%
rename from demo/src/main/res/layout/track_selection_dialog.xml
rename to demos/main/src/main/res/layout/track_selection_dialog.xml
diff --git a/demo/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-hdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-mdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-xhdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-xxhdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/demo/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
similarity index 100%
rename from demo/src/main/res/mipmap-xxxhdpi/ic_launcher.png
rename to demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/demo/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
similarity index 100%
rename from demo/src/main/res/values/strings.xml
rename to demos/main/src/main/res/values/strings.xml
diff --git a/demo/src/main/res/values/styles.xml b/demos/main/src/main/res/values/styles.xml
similarity index 100%
rename from demo/src/main/res/values/styles.xml
rename to demos/main/src/main/res/values/styles.xml
diff --git a/settings.gradle b/settings.gradle
index fb31055f5ef..766d46bbaef 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,7 +20,7 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 
 include modulePrefix + 'demo'
 include modulePrefix + 'playbacktests'
-project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demo')
+project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
 project(modulePrefix + 'playbacktests').projectDir = new File(rootDir, 'playbacktests')
 
 apply from: 'core_settings.gradle'

From 22ea9ed6875384800bcd86772709ee68c2ebdf67 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 2 Aug 2017 05:58:45 -0700
Subject: [PATCH 034/421] Clean-up ExoHostedTest/HostActivity.

This change clearly seperates the hosting of a test (HostActivity) from
the internals of hosting an ExoPlayer lifecycle (ExoHostedTest).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163967960
---
 .../exoplayer2/testutil/ExoHostedTest.java    | 36 ++++++++----
 .../exoplayer2/testutil/HostActivity.java     | 56 ++++++++-----------
 2 files changed, 49 insertions(+), 43 deletions(-)

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 4aba23d691f..77e197515b5 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
@@ -73,7 +73,7 @@ public abstract class ExoHostedTest implements HostedTest, Player.EventListener,
   private final long expectedPlayingTimeMs;
   private final DecoderCounters videoDecoderCounters;
   private final DecoderCounters audioDecoderCounters;
-  private final ConditionVariable playerFinished;
+  private final ConditionVariable testFinished;
 
   private ActionSchedule pendingSchedule;
   private Handler actionHandler;
@@ -116,7 +116,7 @@ public ExoHostedTest(String tag, long expectedPlayingTimeMs, boolean failOnPlaye
     this.tag = tag;
     this.expectedPlayingTimeMs = expectedPlayingTimeMs;
     this.failOnPlayerError = failOnPlayerError;
-    this.playerFinished = new ConditionVariable();
+    this.testFinished = new ConditionVariable();
     this.videoDecoderCounters = new DecoderCounters();
     this.audioDecoderCounters = new DecoderCounters();
   }
@@ -172,16 +172,13 @@ public final void onStart(HostActivity host, Surface surface) {
   }
 
   @Override
-  public final boolean blockUntilEnded(long timeoutMs) {
-    return playerFinished.block(timeoutMs);
+  public final boolean blockUntilStopped(long timeoutMs) {
+    return testFinished.block(timeoutMs);
   }
 
   @Override
-  public final void onStop() {
-    actionHandler.removeCallbacksAndMessages(null);
-    sourceDurationMs = player.getDuration();
-    player.release();
-    player = null;
+  public final boolean forceStop() {
+    return stopTest();
   }
 
   @Override
@@ -222,7 +219,7 @@ public final void onPlayerStateChanged(boolean playWhenReady, int playbackState)
     playerWasPrepared |= playbackState != Player.STATE_IDLE;
     if (playbackState == Player.STATE_ENDED
         || (playbackState == Player.STATE_IDLE && playerWasPrepared)) {
-      playerFinished.open();
+      stopTest();
     }
     boolean playing = playWhenReady && playbackState == Player.STATE_READY;
     if (!this.playing && playing) {
@@ -337,6 +334,25 @@ public void onRenderedFirstFrame(Surface surface) {
 
   // Internal logic
 
+  private boolean stopTest() {
+    if (player == null) {
+      return false;
+    }
+    actionHandler.removeCallbacksAndMessages(null);
+    sourceDurationMs = player.getDuration();
+    player.release();
+    player = null;
+    // We post opening of the finished condition so that any events posted to the main thread as a
+    // result of player.release() are guaranteed to be handled before the test returns.
+    actionHandler.post(new Runnable() {
+      @Override
+      public void run() {
+        testFinished.open();
+      }
+    });
+    return true;
+  }
+
   protected DrmSessionManager<FrameworkMediaCrypto> buildDrmSessionManager(String userAgent) {
     // Do nothing. Interested subclasses may override.
     return null;
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 e1f7eae379d..8e4b9001ddd 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
@@ -56,21 +56,20 @@ public interface HostedTest {
     void onStart(HostActivity host, Surface surface);
 
     /**
-     * Called on the main thread to block until the test has stopped or {@link #onStop()} is called.
+     * Called on the main thread to block until the test has stopped or {@link #forceStop()} is
+     * called.
      *
      * @param timeoutMs The maximum time to block in milliseconds.
      * @return Whether the test has stopped successful.
      */
-    boolean blockUntilEnded(long timeoutMs);
+    boolean blockUntilStopped(long timeoutMs);
 
     /**
-     * Called on the main thread when the test is stopped.
-     * <p>
-     * The test will be stopped when {@link #blockUntilEnded(long)} returns, if the
-     * {@link HostActivity} has been paused, or if the {@link HostActivity}'s {@link Surface} has
-     * been destroyed.
+     * Called on the main thread to force stop the test (if it is not stopped already).
+     *
+     * @return Whether the test was forced stopped.
      */
-    void onStop();
+    boolean forceStop();
 
     /**
      * Called on the test thread after the test has finished and been stopped.
@@ -89,7 +88,8 @@ public interface HostedTest {
 
   private HostedTest hostedTest;
   private boolean hostedTestStarted;
-  private boolean forcedFinished;
+  private ConditionVariable hostedTestStartedCondition;
+  private boolean forcedStopped;
 
   /**
    * Executes a {@link HostedTest} inside the host.
@@ -109,34 +109,31 @@ public void runTest(HostedTest hostedTest, long timeoutMs) {
    * @param timeoutMs The number of milliseconds to wait for the test to finish.
    * @param failOnTimeout Whether the test fails when the timeout is exceeded.
    */
-  public void runTest(HostedTest hostedTest, long timeoutMs, boolean failOnTimeout) {
+  public void runTest(final HostedTest hostedTest, long timeoutMs, boolean failOnTimeout) {
     Assertions.checkArgument(timeoutMs > 0);
     Assertions.checkState(Thread.currentThread() != getMainLooper().getThread());
-
     Assertions.checkState(this.hostedTest == null);
-    this.hostedTest = Assertions.checkNotNull(hostedTest);
+    Assertions.checkNotNull(hostedTest);
+    hostedTestStartedCondition = new ConditionVariable();
+    forcedStopped = false;
     hostedTestStarted = false;
-    forcedFinished = false;
 
-    final ConditionVariable testStarted = new ConditionVariable();
     runOnUiThread(new Runnable() {
       @Override
       public void run() {
+        HostActivity.this.hostedTest = hostedTest;
         maybeStartHostedTest();
-        testStarted.open();
       }
     });
-    testStarted.block();
+    hostedTestStartedCondition.block();
 
-    if (hostedTest.blockUntilEnded(timeoutMs)) {
-      hostedTest.onStop();
-      if (!forcedFinished) {
-        Log.d(TAG, "Test finished. Checking pass conditions.");
+    if (hostedTest.blockUntilStopped(timeoutMs)) {
+      if (!forcedStopped) {
+        Log.d(TAG, "Checking test pass conditions.");
         hostedTest.onFinished();
-        this.hostedTest = null;
         Log.d(TAG, "Pass conditions checked.");
       } else {
-        String message = "Test released before it finished. Activity may have been paused whilst "
+        String message = "Test force stopped. Activity may have been paused whilst "
             + "test was in progress.";
         Log.e(TAG, message);
         fail(message);
@@ -147,8 +144,8 @@ public void run() {
       if (failOnTimeout) {
         fail(message);
       }
-      maybeStopHostedTest();
     }
+    this.hostedTest = null;
   }
 
   // Activity lifecycle
@@ -175,12 +172,6 @@ public void onStart() {
     super.onStart();
   }
 
-  @Override
-  public void onResume() {
-    super.onResume();
-    maybeStartHostedTest();
-  }
-
   @Override
   public void onPause() {
     super.onPause();
@@ -224,14 +215,13 @@ private void maybeStartHostedTest() {
       hostedTestStarted = true;
       Log.d(TAG, "Starting test.");
       hostedTest.onStart(this, surface);
+      hostedTestStartedCondition.open();
     }
   }
 
   private void maybeStopHostedTest() {
-    if (hostedTest != null && hostedTestStarted) {
-      forcedFinished = true;
-      hostedTest.onStop();
-      hostedTest = null;
+    if (hostedTest != null && hostedTestStarted && !forcedStopped) {
+      forcedStopped = hostedTest.forceStop();
     }
   }
 

From 49b83c01ca2d005f54530adef360b5e9ae9bd235 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Aug 2017 07:07:38 -0700
Subject: [PATCH 035/421] Throw ParserException if parsing unsupported media

This is for consistency with what we do elsewhere;
specifically in FragmentedMp4Extractor.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163974960
---
 .../extractor/ts/AdtsReaderTest.java          |  7 +++---
 .../extractor/flv/AudioTagPayloadReader.java  |  3 ++-
 .../exoplayer2/extractor/mp4/AtomParsers.java |  2 +-
 .../exoplayer2/extractor/ts/AdtsReader.java   |  5 ++--
 .../extractor/ts/ElementaryStreamReader.java  |  4 +++-
 .../exoplayer2/extractor/ts/LatmReader.java   | 23 ++++++++++---------
 .../exoplayer2/extractor/ts/PesReader.java    |  4 +++-
 .../exoplayer2/extractor/ts/PsExtractor.java  |  6 +++--
 .../extractor/ts/TsPayloadReader.java         |  4 +++-
 .../util/CodecSpecificDataUtil.java           | 13 +++++++----
 10 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
index bcfa90a565d..6a31250e152 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsReaderTest.java
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.extractor.ts;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ts.TsPayloadReader.TrackIdGenerator;
 import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
 import com.google.android.exoplayer2.testutil.FakeTrackOutput;
@@ -154,20 +155,20 @@ public void testMultiPacketConsumed() throws Exception {
     }
   }
 
-  public void testAdtsDataOnly() throws Exception {
+  public void testAdtsDataOnly() throws ParserException {
     data.setPosition(ID3_DATA_1.length + ID3_DATA_2.length);
     feed();
     assertSampleCounts(0, 1);
     adtsOutput.assertSample(0, ADTS_CONTENT, 0, C.BUFFER_FLAG_KEY_FRAME, null);
   }
 
-  private void feedLimited(int limit) {
+  private void feedLimited(int limit) throws ParserException {
     maybeStartPacket();
     data.setLimit(limit);
     feed();
   }
 
-  private void feed() {
+  private void feed() throws ParserException {
     maybeStartPacket();
     adtsReader.consume(data);
   }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
index 2f218980075..ec5ad88aebb 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/AudioTagPayloadReader.java
@@ -18,6 +18,7 @@
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.util.CodecSpecificDataUtil;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -85,7 +86,7 @@ protected boolean parseHeader(ParsableByteArray data) throws UnsupportedFormatEx
   }
 
   @Override
-  protected void parsePayload(ParsableByteArray data, long timeUs) {
+  protected void parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
     if (audioFormat == AUDIO_FORMAT_MP3) {
       int sampleSize = data.bytesLeft();
       output.sampleData(data, sampleSize);
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 f7e3e846e90..0a5e0e8a6db 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
@@ -816,7 +816,7 @@ private static float parsePaspFromParent(ParsableByteArray parent, int position)
 
   private static void parseAudioSampleEntry(ParsableByteArray parent, int atomType, int position,
       int size, int trackId, String language, boolean isQuickTime, DrmInitData drmInitData,
-      StsdData out, int entryIndex) {
+      StsdData out, int entryIndex) throws ParserException {
     parent.setPosition(position + Atom.HEADER_SIZE + StsdData.STSD_HEADER_SIZE);
 
     int quickTimeSoundDescriptionVersion = 0;
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 7277df5bb89..96b964a4c4b 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
@@ -19,6 +19,7 @@
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.DummyTrackOutput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
@@ -128,7 +129,7 @@ public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
   }
 
   @Override
-  public void consume(ParsableByteArray data) {
+  public void consume(ParsableByteArray data) throws ParserException {
     while (data.bytesLeft() > 0) {
       switch (state) {
         case STATE_FINDING_SAMPLE:
@@ -276,7 +277,7 @@ private void parseId3Header() {
   /**
    * Parses the sample header.
    */
-  private void parseAdtsHeader() {
+  private void parseAdtsHeader() throws ParserException {
     adtsScratch.setPosition(0);
 
     if (!hasOutputFormat) {
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 57bcf31fc58..fa7f78c8c07 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
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+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;
@@ -50,8 +51,9 @@ public interface ElementaryStreamReader {
    * Consumes (possibly partial) data from the current packet.
    *
    * @param data The data to consume.
+   * @throws ParserException If the data could not be parsed.
    */
-  void consume(ParsableByteArray data);
+  void consume(ParsableByteArray data) throws ParserException;
 
   /**
    * Called when a packet ends.
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 425dc43ea7f..d21943eae87 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
@@ -19,6 +19,7 @@
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+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.extractor.ts.TsPayloadReader.TrackIdGenerator;
@@ -98,7 +99,7 @@ public void packetStarted(long pesTimeUs, boolean dataAlignmentIndicator) {
   }
 
   @Override
-  public void consume(ParsableByteArray data) {
+  public void consume(ParsableByteArray data) throws ParserException {
     int bytesToRead;
     while (data.bytesLeft() > 0) {
       switch (state) {
@@ -148,7 +149,7 @@ public void packetFinished() {
    *
    * @param data A {@link ParsableBitArray} containing the AudioMuxElement's bytes.
    */
-  private void parseAudioMuxElement(ParsableBitArray data) {
+  private void parseAudioMuxElement(ParsableBitArray data) throws ParserException {
     boolean useSameStreamMux = data.readBit();
     if (!useSameStreamMux) {
       streamMuxRead = true;
@@ -159,7 +160,7 @@ private void parseAudioMuxElement(ParsableBitArray data) {
 
     if (audioMuxVersionA == 0) {
       if (numSubframes != 0) {
-        throw new UnsupportedOperationException();
+        throw new ParserException();
       }
       int muxSlotLengthBytes = parsePayloadLengthInfo(data);
       parsePayloadMux(data, muxSlotLengthBytes);
@@ -167,14 +168,14 @@ private void parseAudioMuxElement(ParsableBitArray data) {
         data.skipBits((int) otherDataLenBits);
       }
     } else {
-      throw new UnsupportedOperationException(); // Not defined by ISO/IEC 14496-3:2009.
+      throw new ParserException(); // Not defined by ISO/IEC 14496-3:2009.
     }
   }
 
   /**
    * Parses a StreamMuxConfig as defined in ISO/IEC 14496-3:2009 Section 1.7.3.1, Table 1.42.
    */
-  private void parseStreamMuxConfig(ParsableBitArray data) {
+  private void parseStreamMuxConfig(ParsableBitArray data) throws ParserException {
     audioMuxVersion = data.readBits(1);
     audioMuxVersionA = audioMuxVersion == 1 ? data.readBits(1) : 0;
     if (audioMuxVersionA == 0) {
@@ -182,13 +183,13 @@ private void parseStreamMuxConfig(ParsableBitArray data) {
         latmGetValue(data); // Skip taraBufferFullness.
       }
       if (!data.readBit()) {
-        throw new UnsupportedOperationException();
+        throw new ParserException();
       }
       numSubframes = data.readBits(6);
       int numProgram = data.readBits(4);
       int numLayer = data.readBits(3);
       if (numProgram != 0 || numLayer != 0) {
-        throw new UnsupportedOperationException();
+        throw new ParserException();
       }
       if (audioMuxVersion == 0) {
         int startPosition = data.getPosition();
@@ -228,7 +229,7 @@ private void parseStreamMuxConfig(ParsableBitArray data) {
         data.skipBits(8); // crcCheckSum.
       }
     } else {
-      throw new UnsupportedOperationException(); // This is not defined by ISO/IEC 14496-3:2009.
+      throw new ParserException(); // This is not defined by ISO/IEC 14496-3:2009.
     }
   }
 
@@ -253,7 +254,7 @@ private void parseFrameLength(ParsableBitArray data) {
     }
   }
 
-  private int parseAudioSpecificConfig(ParsableBitArray data) {
+  private int parseAudioSpecificConfig(ParsableBitArray data) throws ParserException {
     int bitsLeft = data.bitsLeft();
     Pair<Integer, Integer> config = CodecSpecificDataUtil.parseAacAudioSpecificConfig(data);
     sampleRateHz = config.first;
@@ -261,7 +262,7 @@ private int parseAudioSpecificConfig(ParsableBitArray data) {
     return bitsLeft - data.bitsLeft();
   }
 
-  private int parsePayloadLengthInfo(ParsableBitArray data) {
+  private int parsePayloadLengthInfo(ParsableBitArray data) throws ParserException {
     int muxSlotLengthBytes = 0;
     // Assuming single program and single layer.
     if (frameLengthType == 0) {
@@ -272,7 +273,7 @@ private int parsePayloadLengthInfo(ParsableBitArray data) {
       } while (tmp == 255);
       return muxSlotLengthBytes;
     } else {
-      throw new UnsupportedOperationException();
+      throw new ParserException();
     }
   }
 
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 59696b9deae..4863df42eb2 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
@@ -17,6 +17,7 @@
 
 import android.util.Log;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.util.ParsableBitArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
@@ -77,7 +78,8 @@ public final void seek() {
   }
 
   @Override
-  public final void consume(ParsableByteArray data, boolean payloadUnitStartIndicator) {
+  public final void consume(ParsableByteArray data, boolean payloadUnitStartIndicator)
+      throws ParserException {
     if (payloadUnitStartIndicator) {
       switch (state) {
         case STATE_FINDING_HEADER:
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 883fb8f880e..69c5745eaa2 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
@@ -17,6 +17,7 @@
 
 import android.util.SparseArray;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
@@ -30,7 +31,7 @@
 import java.io.IOException;
 
 /**
- * Facilitates the extraction of data from the MPEG-2 TS container format.
+ * Facilitates the extraction of data from the MPEG-2 PS container format.
  */
 public final class PsExtractor implements Extractor {
 
@@ -275,8 +276,9 @@ public void seek() {
      * Consumes the payload of a PS packet.
      *
      * @param data The PES packet. The position will be set to the start of the payload.
+     * @throws ParserException If the payload could not be parsed.
      */
-    public void consume(ParsableByteArray data) {
+    public void consume(ParsableByteArray data) throws ParserException {
       data.readBytes(pesScratch.data, 0, 3);
       pesScratch.setPosition(0);
       parseHeader();
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 e7996c66c36..efa764b5720 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
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.extractor.ts;
 
 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;
@@ -196,7 +197,8 @@ void init(TimestampAdjuster timestampAdjuster, ExtractorOutput extractorOutput,
    *
    * @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.
+   * @throws ParserException If the payload could not be parsed.
    */
-  void consume(ParsableByteArray data, boolean payloadUnitStartIndicator);
+  void consume(ParsableByteArray data, boolean payloadUnitStartIndicator) throws ParserException;
 
 }
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 468e8dd666f..c9884abe78c 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
@@ -17,6 +17,7 @@
 
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -85,8 +86,10 @@ private CodecSpecificDataUtil() {}
    *
    * @param audioSpecificConfig A byte array containing the AudioSpecificConfig to parse.
    * @return A pair consisting of the sample rate in Hz and the channel count.
+   * @throws ParserException If the AudioSpecificConfig cannot be parsed as it's not supported.
    */
-  public static Pair<Integer, Integer> parseAacAudioSpecificConfig(byte[] audioSpecificConfig) {
+  public static Pair<Integer, Integer> parseAacAudioSpecificConfig(byte[] audioSpecificConfig)
+      throws ParserException {
     return parseAacAudioSpecificConfig(new ParsableBitArray(audioSpecificConfig));
   }
 
@@ -96,8 +99,10 @@ public static Pair<Integer, Integer> parseAacAudioSpecificConfig(byte[] audioSpe
    * @param bitArray A {@link ParsableBitArray} containing the AudioSpecificConfig to parse. The
    *     position is advanced to the end of the AudioSpecificConfig.
    * @return A pair consisting of the sample rate in Hz and the channel count.
+   * @throws ParserException If the AudioSpecificConfig cannot be parsed as it's not supported.
    */
-  public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArray bitArray) {
+  public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArray bitArray)
+      throws ParserException {
     int audioObjectType = getAacAudioObjectType(bitArray);
     int sampleRate = getAacSamplingFrequency(bitArray);
     int channelConfiguration = bitArray.readBits(4);
@@ -131,7 +136,7 @@ public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArra
         parseGaSpecificConfig(bitArray, audioObjectType, channelConfiguration);
         break;
       default:
-        throw new UnsupportedOperationException();
+        throw new ParserException("Unsupported audio object type: " + audioObjectType);
     }
     switch (audioObjectType) {
       case 17:
@@ -142,7 +147,7 @@ public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArra
       case 23:
         int epConfig = bitArray.readBits(2);
         if (epConfig == 2 || epConfig == 3) {
-          throw new UnsupportedOperationException();
+          throw new ParserException("Unsupported epConfig: " + epConfig);
         }
         break;
     }

From 412138b2eaf475edc4d7c997aad569ae87573aca Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Aug 2017 09:26:04 -0700
Subject: [PATCH 036/421] Some extractor fixes

- Fix Ogg extractor to work without sniffing.
- Fix extractors to handle seek() before init().
- Add tests for both issues.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163992343
---
 .../ext/flac/FlacExtractorTest.java           |  2 +-
 .../exoplayer2/ext/flac/FlacExtractor.java    | 10 ++-
 .../extractor/flv/FlvExtractorTest.java       |  2 +-
 .../extractor/mkv/MatroskaExtractorTest.java  |  6 +-
 .../extractor/mp3/Mp3ExtractorTest.java       |  4 +-
 .../mp4/FragmentedMp4ExtractorTest.java       |  6 +-
 .../extractor/mp4/Mp4ExtractorTest.java       |  2 +-
 .../extractor/ogg/OggExtractorTest.java       |  9 +-
 .../extractor/rawcc/RawCcExtractorTest.java   |  2 +-
 .../extractor/ts/Ac3ExtractorTest.java        |  2 +-
 .../extractor/ts/AdtsExtractorTest.java       |  2 +-
 .../extractor/ts/PsExtractorTest.java         |  2 +-
 .../extractor/ts/TsExtractorTest.java         |  2 +-
 .../extractor/wav/WavExtractorTest.java       |  2 +-
 .../exoplayer2/extractor/Extractor.java       |  3 +-
 .../extractor/ogg/OggExtractor.java           | 66 ++++++++------
 .../extractor/ogg/StreamReader.java           |  9 +-
 .../exoplayer2/extractor/ts/Ac3Extractor.java |  4 +-
 .../extractor/ts/AdtsExtractor.java           |  5 +-
 .../exoplayer2/testutil/ExtractorAsserts.java | 87 +++++++++++--------
 20 files changed, 132 insertions(+), 95 deletions(-)

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 59549851004..7b193997c35 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
@@ -26,7 +26,7 @@
 public class FlacExtractorTest extends InstrumentationTestCase {
 
   public void testSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new FlacExtractor();
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 d13194793eb..7b71b5c7431 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
@@ -159,13 +159,17 @@ public void seek(long position, long timeUs) {
     if (position == 0) {
       metadataParsed = false;
     }
-    decoderJni.reset(position);
+    if (decoderJni != null) {
+      decoderJni.reset(position);
+    }
   }
 
   @Override
   public void release() {
-    decoderJni.release();
-    decoderJni = null;
+    if (decoderJni != null) {
+      decoderJni.release();
+      decoderJni = null;
+    }
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
index 4587c98317d..fc8d181eac6 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/flv/FlvExtractorTest.java
@@ -26,7 +26,7 @@
 public final class FlvExtractorTest extends InstrumentationTestCase {
 
   public void testSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new FlvExtractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
index 57beec3ac67..624a5ccb7e9 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/MatroskaExtractorTest.java
@@ -26,7 +26,7 @@
 public final class MatroskaExtractorTest extends InstrumentationTestCase {
 
   public void testMkvSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new MatroskaExtractor();
@@ -35,7 +35,7 @@ public Extractor create() {
   }
 
   public void testWebmSubsampleEncryption() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new MatroskaExtractor();
@@ -44,7 +44,7 @@ public Extractor create() {
   }
 
   public void testWebmSubsampleEncryptionWithAltrefFrames() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new MatroskaExtractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
index 3ad6a74bc98..0f98624d69b 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/Mp3ExtractorTest.java
@@ -26,7 +26,7 @@
 public final class Mp3ExtractorTest extends InstrumentationTestCase {
 
   public void testMp3Sample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new Mp3Extractor();
@@ -35,7 +35,7 @@ public Extractor create() {
   }
 
   public void testTrimmedMp3Sample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new Mp3Extractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
index d8da8760e4e..76c13495c17 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
@@ -27,13 +27,13 @@
 public final class FragmentedMp4ExtractorTest extends InstrumentationTestCase {
 
   public void testSample() throws Exception {
-    ExtractorAsserts
-        .assertOutput(getExtractorFactory(), "mp4/sample_fragmented.mp4", getInstrumentation());
+    ExtractorAsserts.assertBehavior(getExtractorFactory(), "mp4/sample_fragmented.mp4",
+        getInstrumentation());
   }
 
   public void testSampleWithSeiPayloadParsing() throws Exception {
     // Enabling the CEA-608 track enables SEI payload parsing.
-    ExtractorAsserts.assertOutput(
+    ExtractorAsserts.assertBehavior(
         getExtractorFactory(FragmentedMp4Extractor.FLAG_ENABLE_CEA608_TRACK),
         "mp4/sample_fragmented_sei.mp4", getInstrumentation());
   }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
index a534d6dd245..5e327e55023 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/Mp4ExtractorTest.java
@@ -28,7 +28,7 @@
 public final class Mp4ExtractorTest extends InstrumentationTestCase {
 
   public void testMp4Sample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new Mp4Extractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
index 26b79918692..3be23422ccf 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
@@ -36,20 +36,21 @@ public Extractor create() {
   };
 
   public void testOpus() throws Exception {
-    ExtractorAsserts.assertOutput(OGG_EXTRACTOR_FACTORY, "ogg/bear.opus", getInstrumentation());
+    ExtractorAsserts.assertBehavior(OGG_EXTRACTOR_FACTORY, "ogg/bear.opus", getInstrumentation());
   }
 
   public void testFlac() throws Exception {
-    ExtractorAsserts.assertOutput(OGG_EXTRACTOR_FACTORY, "ogg/bear_flac.ogg", getInstrumentation());
+    ExtractorAsserts.assertBehavior(OGG_EXTRACTOR_FACTORY, "ogg/bear_flac.ogg",
+        getInstrumentation());
   }
 
   public void testFlacNoSeektable() throws Exception {
-    ExtractorAsserts.assertOutput(OGG_EXTRACTOR_FACTORY, "ogg/bear_flac_noseektable.ogg",
+    ExtractorAsserts.assertBehavior(OGG_EXTRACTOR_FACTORY, "ogg/bear_flac_noseektable.ogg",
         getInstrumentation());
   }
 
   public void testVorbis() throws Exception {
-    ExtractorAsserts.assertOutput(OGG_EXTRACTOR_FACTORY, "ogg/bear_vorbis.ogg",
+    ExtractorAsserts.assertBehavior(OGG_EXTRACTOR_FACTORY, "ogg/bear_vorbis.ogg",
         getInstrumentation());
   }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
index 5a9d60512cd..18050f48a31 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/rawcc/RawCcExtractorTest.java
@@ -30,7 +30,7 @@
 public final class RawCcExtractorTest extends InstrumentationTestCase {
 
   public void testRawCcSample() throws Exception {
-    ExtractorAsserts.assertOutput(
+    ExtractorAsserts.assertBehavior(
         new ExtractorFactory() {
           @Override
           public Extractor create() {
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
index 1c18e443739..31633361db7 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/Ac3ExtractorTest.java
@@ -26,7 +26,7 @@
 public final class Ac3ExtractorTest extends InstrumentationTestCase {
 
   public void testSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new Ac3Extractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
index bc05be6fa8a..9eb65d2091a 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/AdtsExtractorTest.java
@@ -26,7 +26,7 @@
 public final class AdtsExtractorTest extends InstrumentationTestCase {
 
   public void testSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new AdtsExtractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
index e6937ccbc81..78ef05a769d 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/PsExtractorTest.java
@@ -26,7 +26,7 @@
 public final class PsExtractorTest extends InstrumentationTestCase {
 
   public void testSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new PsExtractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
index 09c9facab0a..b6eddb5112a 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/TsExtractorTest.java
@@ -45,7 +45,7 @@ public final class TsExtractorTest extends InstrumentationTestCase {
   private static final int TS_SYNC_BYTE = 0x47; // First byte of each TS packet.
 
   public void testSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new TsExtractor();
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
index 7c969fd386c..36c05aa72e4 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/wav/WavExtractorTest.java
@@ -26,7 +26,7 @@
 public final class WavExtractorTest extends InstrumentationTestCase {
 
   public void testSample() throws Exception {
-    ExtractorAsserts.assertOutput(new ExtractorFactory() {
+    ExtractorAsserts.assertBehavior(new ExtractorFactory() {
       @Override
       public Extractor create() {
         return new WavExtractor();
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 de3dfd52666..7a2bc15da9b 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
@@ -63,7 +63,8 @@ public interface Extractor {
   void init(ExtractorOutput output);
 
   /**
-   * Extracts data read from a provided {@link ExtractorInput}.
+   * Extracts data read from a provided {@link ExtractorInput}. Must not be called before
+   * {@link #init(ExtractorOutput)}.
    * <p>
    * A single call to this method will block until some progress has been made, but will not block
    * for longer than this. Hence each call will consume only a small amount of input data.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java
index cc3c5de3112..54e168c6656 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/OggExtractor.java
@@ -45,30 +45,14 @@ public Extractor[] createExtractors() {
 
   private static final int MAX_VERIFICATION_BYTES = 8;
 
+  private ExtractorOutput output;
   private StreamReader streamReader;
+  private boolean streamReaderInitialized;
 
   @Override
   public boolean sniff(ExtractorInput input) throws IOException, InterruptedException {
     try {
-      OggPageHeader header = new OggPageHeader();
-      if (!header.populate(input, true) || (header.type & 0x02) != 0x02) {
-        return false;
-      }
-
-      int length = Math.min(header.bodySize, MAX_VERIFICATION_BYTES);
-      ParsableByteArray scratch = new ParsableByteArray(length);
-      input.peekFully(scratch.data, 0, length);
-
-      if (FlacReader.verifyBitstreamType(resetPosition(scratch))) {
-        streamReader = new FlacReader();
-      } else if (VorbisReader.verifyBitstreamType(resetPosition(scratch))) {
-        streamReader = new VorbisReader();
-      } else if (OpusReader.verifyBitstreamType(resetPosition(scratch))) {
-        streamReader = new OpusReader();
-      } else {
-        return false;
-      }
-      return true;
+      return sniffInternal(input);
     } catch (ParserException e) {
       return false;
     }
@@ -76,15 +60,14 @@ public boolean sniff(ExtractorInput input) throws IOException, InterruptedExcept
 
   @Override
   public void init(ExtractorOutput output) {
-    TrackOutput trackOutput = output.track(0, C.TRACK_TYPE_AUDIO);
-    output.endTracks();
-    // TODO: fix the case if sniff() isn't called
-    streamReader.init(output, trackOutput);
+    this.output = output;
   }
 
   @Override
   public void seek(long position, long timeUs) {
-    streamReader.seek(position, timeUs);
+    if (streamReader != null) {
+      streamReader.seek(position, timeUs);
+    }
   }
 
   @Override
@@ -95,12 +78,41 @@ public void release() {
   @Override
   public int read(ExtractorInput input, PositionHolder seekPosition)
       throws IOException, InterruptedException {
+    if (streamReader == null) {
+      if (!sniffInternal(input)) {
+        throw new ParserException("Failed to determine bitstream type");
+      }
+      input.resetPeekPosition();
+    }
+    if (!streamReaderInitialized) {
+      TrackOutput trackOutput = output.track(0, C.TRACK_TYPE_AUDIO);
+      output.endTracks();
+      streamReader.init(output, trackOutput);
+      streamReaderInitialized = true;
+    }
     return streamReader.read(input, seekPosition);
   }
 
-  //@VisibleForTesting
-  /* package */ StreamReader getStreamReader() {
-    return streamReader;
+  private boolean sniffInternal(ExtractorInput input) throws IOException, InterruptedException {
+    OggPageHeader header = new OggPageHeader();
+    if (!header.populate(input, true) || (header.type & 0x02) != 0x02) {
+      return false;
+    }
+
+    int length = Math.min(header.bodySize, MAX_VERIFICATION_BYTES);
+    ParsableByteArray scratch = new ParsableByteArray(length);
+    input.peekFully(scratch.data, 0, length);
+
+    if (FlacReader.verifyBitstreamType(resetPosition(scratch))) {
+      streamReader = new FlacReader();
+    } else if (VorbisReader.verifyBitstreamType(resetPosition(scratch))) {
+      streamReader = new VorbisReader();
+    } else if (OpusReader.verifyBitstreamType(resetPosition(scratch))) {
+      streamReader = new OpusReader();
+    } else {
+      return false;
+    }
+    return true;
   }
 
   private static ParsableByteArray resetPosition(ParsableByteArray scratch) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
index c203b0c6bdf..d136468faa2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/ogg/StreamReader.java
@@ -41,7 +41,8 @@ static class SetupData {
     OggSeeker oggSeeker;
   }
 
-  private OggPacket oggPacket;
+  private final OggPacket oggPacket;
+
   private TrackOutput trackOutput;
   private ExtractorOutput extractorOutput;
   private OggSeeker oggSeeker;
@@ -55,11 +56,13 @@ static class SetupData {
   private boolean seekMapSet;
   private boolean formatSet;
 
+  public StreamReader() {
+    oggPacket = new OggPacket();
+  }
+
   void init(ExtractorOutput output, TrackOutput trackOutput) {
     this.extractorOutput = output;
     this.trackOutput = trackOutput;
-    this.oggPacket = new OggPacket();
-
     reset(true);
   }
 
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 9c9536beece..8bab6b7ed1a 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
@@ -56,9 +56,9 @@ public Extractor[] createExtractors() {
   private static final int ID3_TAG = Util.getIntegerCodeForString("ID3");
 
   private final long firstSampleTimestampUs;
+  private final Ac3Reader reader;
   private final ParsableByteArray sampleData;
 
-  private Ac3Reader reader;
   private boolean startedPacket;
 
   public Ac3Extractor() {
@@ -67,6 +67,7 @@ public Ac3Extractor() {
 
   public Ac3Extractor(long firstSampleTimestampUs) {
     this.firstSampleTimestampUs = firstSampleTimestampUs;
+    reader = new Ac3Reader();
     sampleData = new ParsableByteArray(MAX_SYNC_FRAME_SIZE);
   }
 
@@ -117,7 +118,6 @@ public boolean sniff(ExtractorInput input) throws IOException, InterruptedExcept
 
   @Override
   public void init(ExtractorOutput output) {
-    reader = new Ac3Reader(); // TODO: Add support for embedded ID3.
     reader.createTracks(output, new TrackIdGenerator(0, 1));
     output.endTracks();
     output.seekMap(new SeekMap.Unseekable(C.TIME_UNSET));
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 f7dadd51b26..a1851aa0eab 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
@@ -55,10 +55,9 @@ public Extractor[] createExtractors() {
   private static final int MAX_SNIFF_BYTES = 8 * 1024;
 
   private final long firstSampleTimestampUs;
+  private final AdtsReader reader;
   private final ParsableByteArray packetBuffer;
 
-  // Accessed only by the loading thread.
-  private AdtsReader reader;
   private boolean startedPacket;
 
   public AdtsExtractor() {
@@ -67,6 +66,7 @@ public AdtsExtractor() {
 
   public AdtsExtractor(long firstSampleTimestampUs) {
     this.firstSampleTimestampUs = firstSampleTimestampUs;
+    reader = new AdtsReader(true);
     packetBuffer = new ParsableByteArray(MAX_PACKET_SIZE);
   }
 
@@ -127,7 +127,6 @@ public boolean sniff(ExtractorInput input) throws IOException, InterruptedExcept
 
   @Override
   public void init(ExtractorOutput output) {
-    reader = new AdtsReader(true);
     reader.createTracks(output, new TrackIdGenerator(0, 1));
     output.endTracks();
     output.seekMap(new SeekMap.Unseekable(C.TIME_UNSET));
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 fb78b3a6345..db63662c45d 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,8 @@
 import android.app.Instrumentation;
 import com.google.android.exoplayer2.C;
 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.PositionHolder;
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
@@ -42,46 +44,57 @@ public interface ExtractorFactory {
   private static final String UNKNOWN_LENGTH_EXTENSION = ".unklen" + DUMP_EXTENSION;
 
   /**
-   * Calls {@link #assertOutput(Extractor, String, byte[], Instrumentation, boolean, boolean,
-   * boolean)} with all possible combinations of "simulate" parameters.
+   * Asserts that an extractor behaves correctly given valid input data:
+   * <ul>
+   *   <li>Calls {@link Extractor#seek(long, long)} and {@link Extractor#release()} without calling
+   *   {@link Extractor#init(ExtractorOutput)} to check these calls do not fail.</li>
+   *   <li>Calls {@link #assertOutput(Extractor, String, byte[], Instrumentation, boolean, boolean,
+   *   boolean, boolean)} with all possible combinations of "simulate" parameters.</li>
+   * </ul>
    *
    * @param factory An {@link ExtractorFactory} which creates instances of the {@link Extractor}
    *     class which is to be tested.
-   * @param sampleFile The path to the input sample.
+   * @param file The path to the input sample.
    * @param instrumentation To be used to load the sample file.
    * @throws IOException If reading from the input fails.
    * @throws InterruptedException If interrupted while reading from the input.
-   * @see #assertOutput(Extractor, String, byte[], Instrumentation, boolean, boolean, boolean)
    */
-  public static void assertOutput(ExtractorFactory factory, String sampleFile,
+  public static void assertBehavior(ExtractorFactory factory, String file,
       Instrumentation instrumentation) throws IOException, InterruptedException {
-    byte[] fileData = TestUtil.getByteArray(instrumentation, sampleFile);
-    assertOutput(factory, sampleFile, fileData, instrumentation);
+    // Check behavior prior to initialization.
+    Extractor extractor = factory.create();
+    extractor.seek(0, 0);
+    extractor.release();
+    // Assert output.
+    byte[] fileData = TestUtil.getByteArray(instrumentation, file);
+    assertOutput(factory, file, fileData, instrumentation);
   }
 
   /**
    * Calls {@link #assertOutput(Extractor, String, byte[], Instrumentation, boolean, boolean,
-   * boolean)} with all possible combinations of "simulate" parameters.
+   * boolean, boolean)} with all possible combinations of "simulate" parameters with
+   * {@code sniffFirst} set to true, and makes one additional call with the "simulate" and
+   * {@code sniffFirst} parameters all set to false.
    *
    * @param factory An {@link ExtractorFactory} which creates instances of the {@link Extractor}
    *     class which is to be tested.
-   * @param sampleFile The path to the input sample.
-   * @param fileData Content of the input file.
+   * @param file The path to the input sample.
+   * @param data Content of the input file.
    * @param instrumentation To be used to load the sample file.
    * @throws IOException If reading from the input fails.
    * @throws InterruptedException If interrupted while reading from the input.
-   * @see #assertOutput(Extractor, String, byte[], Instrumentation, boolean, boolean, boolean)
    */
-  public static void assertOutput(ExtractorFactory factory, String sampleFile, byte[] fileData,
+  public static void assertOutput(ExtractorFactory factory, String file, byte[] data,
       Instrumentation instrumentation) throws IOException, InterruptedException {
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation, false, false, false);
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation,  true, false, false);
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation, false,  true, false);
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation,  true,  true, false);
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation, false, false,  true);
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation,  true, false,  true);
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation, false,  true,  true);
-    assertOutput(factory.create(), sampleFile, fileData, instrumentation,  true,  true,  true);
+    assertOutput(factory.create(), file, data, instrumentation,  true, false, false, false);
+    assertOutput(factory.create(), file, data, instrumentation,  true, false, false,  true);
+    assertOutput(factory.create(), file, data, instrumentation,  true, false,  true, false);
+    assertOutput(factory.create(), file, data, instrumentation,  true, false,  true,  true);
+    assertOutput(factory.create(), file, data, instrumentation,  true,  true, false, false);
+    assertOutput(factory.create(), file, data, instrumentation,  true,  true, false,  true);
+    assertOutput(factory.create(), file, data, instrumentation,  true,  true,  true, false);
+    assertOutput(factory.create(), file, data, instrumentation,  true,  true,  true,  true);
+    assertOutput(factory.create(), file, data, instrumentation, false, false, false, false);
   }
 
   /**
@@ -91,34 +104,38 @@ public static void assertOutput(ExtractorFactory factory, String sampleFile, byt
    * #UNKNOWN_LENGTH_EXTENSION}" exists, it's preferred.
    *
    * @param extractor The {@link Extractor} to be tested.
-   * @param sampleFile The path to the input sample.
-   * @param fileData Content of the input file.
+   * @param file The path to the input sample.
+   * @param data Content of the input file.
    * @param instrumentation To be used to load the sample file.
-   * @param simulateIOErrors If true simulates IOErrors.
-   * @param simulateUnknownLength If true simulates unknown input length.
-   * @param simulatePartialReads If true simulates partial reads.
+   * @param sniffFirst Whether to sniff the data by calling {@link Extractor#sniff(ExtractorInput)}
+   *     prior to consuming it.
+   * @param simulateIOErrors Whether to simulate IO errors.
+   * @param simulateUnknownLength Whether to simulate unknown input length.
+   * @param simulatePartialReads Whether to simulate partial reads.
    * @return The {@link FakeExtractorOutput} used in the test.
    * @throws IOException If reading from the input fails.
    * @throws InterruptedException If interrupted while reading from the input.
    */
-  public static FakeExtractorOutput assertOutput(Extractor extractor, String sampleFile,
-      byte[] fileData, Instrumentation instrumentation, boolean simulateIOErrors,
+  public static FakeExtractorOutput assertOutput(Extractor extractor, String file, byte[] data,
+      Instrumentation instrumentation, boolean sniffFirst, boolean simulateIOErrors,
       boolean simulateUnknownLength, boolean simulatePartialReads) throws IOException,
       InterruptedException {
-    FakeExtractorInput input = new FakeExtractorInput.Builder().setData(fileData)
+    FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data)
         .setSimulateIOErrors(simulateIOErrors)
         .setSimulateUnknownLength(simulateUnknownLength)
         .setSimulatePartialReads(simulatePartialReads).build();
 
-    Assert.assertTrue(TestUtil.sniffTestData(extractor, input));
-    input.resetPeekPosition();
-    FakeExtractorOutput extractorOutput = consumeTestData(extractor, input, 0, true);
+    if (sniffFirst) {
+      Assert.assertTrue(TestUtil.sniffTestData(extractor, input));
+      input.resetPeekPosition();
+    }
 
+    FakeExtractorOutput extractorOutput = consumeTestData(extractor, input, 0, true);
     if (simulateUnknownLength
-        && assetExists(instrumentation, sampleFile + UNKNOWN_LENGTH_EXTENSION)) {
-      extractorOutput.assertOutput(instrumentation, sampleFile + UNKNOWN_LENGTH_EXTENSION);
+        && assetExists(instrumentation, file + UNKNOWN_LENGTH_EXTENSION)) {
+      extractorOutput.assertOutput(instrumentation, file + UNKNOWN_LENGTH_EXTENSION);
     } else {
-      extractorOutput.assertOutput(instrumentation, sampleFile + ".0" + DUMP_EXTENSION);
+      extractorOutput.assertOutput(instrumentation, file + ".0" + DUMP_EXTENSION);
     }
 
     SeekMap seekMap = extractorOutput.seekMap;
@@ -133,7 +150,7 @@ && assetExists(instrumentation, sampleFile + UNKNOWN_LENGTH_EXTENSION)) {
         }
 
         consumeTestData(extractor, input, timeUs, extractorOutput, false);
-        extractorOutput.assertOutput(instrumentation, sampleFile + '.' + j + DUMP_EXTENSION);
+        extractorOutput.assertOutput(instrumentation, file + '.' + j + DUMP_EXTENSION);
       }
     }
 

From 5ca84ebfd8bc933c676c3b1c5e8194ab21a95002 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 2 Aug 2017 09:26:58 -0700
Subject: [PATCH 037/421] Remove child data holder helper from
 AbstractConcatenatedTimeline.

This helper class required a scratch instance to write on. Such a scratch
instance may violate the immuatability of the timelines if used by multiple
threads simultaneously.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=163992458
---
 .../source/AbstractConcatenatedTimeline.java  | 141 ++++++++----------
 .../source/ConcatenatingMediaSource.java      |  43 +++---
 .../DynamicConcatenatingMediaSource.java      |  45 +++---
 .../exoplayer2/source/LoopingMediaSource.java |  40 +++--
 4 files changed, 139 insertions(+), 130 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
index 3bee3cc73f9..42ac9386777 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
@@ -25,68 +25,25 @@
  */
 /* package */ abstract class AbstractConcatenatedTimeline extends Timeline {
 
-  /**
-   * Meta data of a child timeline.
-   */
-  protected static final class ChildDataHolder {
-
-    /**
-     * Child timeline.
-     */
-    public Timeline timeline;
-
-    /**
-     * First period index belonging to the child timeline.
-     */
-    public int firstPeriodIndexInChild;
-
-    /**
-     * First window index belonging to the child timeline.
-     */
-    public int firstWindowIndexInChild;
-
-    /**
-     * UID of child timeline.
-     */
-    public Object uid;
-
-    /**
-     * Set child holder data.
-     *
-     * @param timeline Child timeline.
-     * @param firstPeriodIndexInChild First period index belonging to the child timeline.
-     * @param firstWindowIndexInChild First window index belonging to the child timeline.
-     * @param uid UID of child timeline.
-     */
-    public void setData(Timeline timeline, int firstPeriodIndexInChild, int firstWindowIndexInChild,
-        Object uid) {
-      this.timeline = timeline;
-      this.firstPeriodIndexInChild = firstPeriodIndexInChild;
-      this.firstWindowIndexInChild = firstWindowIndexInChild;
-      this.uid = uid;
-    }
-
-  }
-
-  private final ChildDataHolder childDataHolder;
+  private final int childCount;
 
-  public AbstractConcatenatedTimeline() {
-    childDataHolder = new ChildDataHolder();
+  public AbstractConcatenatedTimeline(int childCount) {
+    this.childCount = childCount;
   }
 
   @Override
   public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-    getChildDataByWindowIndex(windowIndex, childDataHolder);
-    int firstWindowIndexInChild = childDataHolder.firstWindowIndexInChild;
-    int nextWindowIndexInChild = childDataHolder.timeline.getNextWindowIndex(
+    int childIndex = getChildIndexByWindowIndex(windowIndex);
+    int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
+    int nextWindowIndexInChild = getTimelineByChildIndex(childIndex).getNextWindowIndex(
         windowIndex - firstWindowIndexInChild,
         repeatMode == Player.REPEAT_MODE_ALL ? Player.REPEAT_MODE_OFF : repeatMode);
     if (nextWindowIndexInChild != C.INDEX_UNSET) {
       return firstWindowIndexInChild + nextWindowIndexInChild;
     } else {
-      firstWindowIndexInChild += childDataHolder.timeline.getWindowCount();
-      if (firstWindowIndexInChild < getWindowCount()) {
-        return firstWindowIndexInChild;
+      int nextChildIndex = childIndex + 1;
+      if (nextChildIndex < childCount) {
+        return getFirstWindowIndexByChildIndex(nextChildIndex);
       } else if (repeatMode == Player.REPEAT_MODE_ALL) {
         return 0;
       } else {
@@ -97,9 +54,9 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
 
   @Override
   public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-    getChildDataByWindowIndex(windowIndex, childDataHolder);
-    int firstWindowIndexInChild = childDataHolder.firstWindowIndexInChild;
-    int previousWindowIndexInChild = childDataHolder.timeline.getPreviousWindowIndex(
+    int childIndex = getChildIndexByWindowIndex(windowIndex);
+    int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
+    int previousWindowIndexInChild = getTimelineByChildIndex(childIndex).getPreviousWindowIndex(
         windowIndex - firstWindowIndexInChild,
         repeatMode == Player.REPEAT_MODE_ALL ? Player.REPEAT_MODE_OFF : repeatMode);
     if (previousWindowIndexInChild != C.INDEX_UNSET) {
@@ -118,11 +75,11 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
   @Override
   public final Window getWindow(int windowIndex, Window window, boolean setIds,
       long defaultPositionProjectionUs) {
-    getChildDataByWindowIndex(windowIndex, childDataHolder);
-    int firstWindowIndexInChild = childDataHolder.firstWindowIndexInChild;
-    int firstPeriodIndexInChild = childDataHolder.firstPeriodIndexInChild;
-    childDataHolder.timeline.getWindow(windowIndex - firstWindowIndexInChild, window, setIds,
-        defaultPositionProjectionUs);
+    int childIndex = getChildIndexByWindowIndex(windowIndex);
+    int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
+    int firstPeriodIndexInChild = getFirstPeriodIndexByChildIndex(childIndex);
+    getTimelineByChildIndex(childIndex).getWindow(windowIndex - firstWindowIndexInChild, window,
+        setIds, defaultPositionProjectionUs);
     window.firstPeriodIndex += firstPeriodIndexInChild;
     window.lastPeriodIndex += firstPeriodIndexInChild;
     return window;
@@ -130,13 +87,14 @@ public final Window getWindow(int windowIndex, Window window, boolean setIds,
 
   @Override
   public final Period getPeriod(int periodIndex, Period period, boolean setIds) {
-    getChildDataByPeriodIndex(periodIndex, childDataHolder);
-    int firstWindowIndexInChild = childDataHolder.firstWindowIndexInChild;
-    int firstPeriodIndexInChild = childDataHolder.firstPeriodIndexInChild;
-    childDataHolder.timeline.getPeriod(periodIndex - firstPeriodIndexInChild, period, setIds);
+    int childIndex = getChildIndexByPeriodIndex(periodIndex);
+    int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
+    int firstPeriodIndexInChild = getFirstPeriodIndexByChildIndex(childIndex);
+    getTimelineByChildIndex(childIndex).getPeriod(periodIndex - firstPeriodIndexInChild, period,
+        setIds);
     period.windowIndex += firstWindowIndexInChild;
     if (setIds) {
-      period.uid = Pair.create(childDataHolder.uid, period.uid);
+      period.uid = Pair.create(getChildUidByChildIndex(childIndex), period.uid);
     }
     return period;
   }
@@ -149,37 +107,64 @@ public final int getIndexOfPeriod(Object uid) {
     Pair<?, ?> childUidAndPeriodUid = (Pair<?, ?>) uid;
     Object childUid = childUidAndPeriodUid.first;
     Object periodUid = childUidAndPeriodUid.second;
-    if (!getChildDataByChildUid(childUid, childDataHolder)) {
+    int childIndex = getChildIndexByChildUid(childUid);
+    if (childIndex == C.INDEX_UNSET) {
       return C.INDEX_UNSET;
     }
-    int periodIndexInChild = childDataHolder.timeline.getIndexOfPeriod(periodUid);
+    int periodIndexInChild = getTimelineByChildIndex(childIndex).getIndexOfPeriod(periodUid);
     return periodIndexInChild == C.INDEX_UNSET ? C.INDEX_UNSET
-        : childDataHolder.firstPeriodIndexInChild + periodIndexInChild;
+        : getFirstPeriodIndexByChildIndex(childIndex) + periodIndexInChild;
   }
 
   /**
-   * Populates {@link ChildDataHolder} for the child timeline containing the given period index.
+   * Returns the index of the child timeline containing the given period index.
    *
    * @param periodIndex A valid period index within the bounds of the timeline.
-   * @param childData A data holder to be populated.
    */
-  protected abstract void getChildDataByPeriodIndex(int periodIndex, ChildDataHolder childData);
+  protected abstract int getChildIndexByPeriodIndex(int periodIndex);
 
   /**
-   * Populates {@link ChildDataHolder} for the child timeline containing the given window index.
+   * Returns the index of the child timeline containing the given window index.
    *
    * @param windowIndex A valid window index within the bounds of the timeline.
-   * @param childData A data holder to be populated.
    */
-  protected abstract void getChildDataByWindowIndex(int windowIndex, ChildDataHolder childData);
+  protected abstract int getChildIndexByWindowIndex(int windowIndex);
 
   /**
-   * Populates {@link ChildDataHolder} for the child timeline with the given UID.
+   * Returns the index of the child timeline with the given UID or {@link C#INDEX_UNSET} if not
+   * found.
    *
    * @param childUid A child UID.
-   * @param childData A data holder to be populated.
-   * @return Whether a child with the given UID was found.
+   * @return Index of child timeline or {@link C#INDEX_UNSET} if UID was not found.
+   */
+  protected abstract int getChildIndexByChildUid(Object childUid);
+
+  /**
+   * Returns the child timeline for the child with the given index.
+   *
+   * @param childIndex A valid child index within the bounds of the timeline.
+   */
+  protected abstract Timeline getTimelineByChildIndex(int childIndex);
+
+  /**
+   * Returns the first period index belonging to the child timeline with the given index.
+   *
+   * @param childIndex A valid child index within the bounds of the timeline.
+   */
+  protected abstract int getFirstPeriodIndexByChildIndex(int childIndex);
+
+  /**
+   * Returns the first window index belonging to the child timeline with the given index.
+   *
+   * @param childIndex A valid child index within the bounds of the timeline.
+   */
+  protected abstract int getFirstWindowIndexByChildIndex(int childIndex);
+
+  /**
+   * Returns the UID of the child timeline with the given index.
+   *
+   * @param childIndex A valid child index within the bounds of the timeline.
    */
-  protected abstract boolean getChildDataByChildUid(Object childUid, ChildDataHolder childData);
+  protected abstract Object getChildUidByChildIndex(int childIndex);
 
 }
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 2c998e8a06a..5d2bbcc33ea 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
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
@@ -97,7 +98,7 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     int sourceIndex = timeline.getChildIndexByPeriodIndex(id.periodIndex);
     MediaPeriodId periodIdInSource =
-        new MediaPeriodId(id.periodIndex - timeline.getFirstPeriodIndexInChild(sourceIndex));
+        new MediaPeriodId(id.periodIndex - timeline.getFirstPeriodIndexByChildIndex(sourceIndex));
     MediaPeriod mediaPeriod = mediaSources[sourceIndex].createPeriod(periodIdInSource, allocator);
     sourceIndexByMediaPeriod.put(mediaPeriod, sourceIndex);
     return mediaPeriod;
@@ -166,6 +167,7 @@ private static final class ConcatenatedTimeline extends AbstractConcatenatedTime
     private final boolean isRepeatOneAtomic;
 
     public ConcatenatedTimeline(Timeline[] timelines, boolean isRepeatOneAtomic) {
+      super(timelines.length);
       int[] sourcePeriodOffsets = new int[timelines.length];
       int[] sourceWindowOffsets = new int[timelines.length];
       long periodCount = 0;
@@ -212,44 +214,43 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
     }
 
     @Override
-    protected void getChildDataByPeriodIndex(int periodIndex, ChildDataHolder childData) {
-      int childIndex = getChildIndexByPeriodIndex(periodIndex);
-      getChildDataByChildIndex(childIndex, childData);
+    protected int getChildIndexByPeriodIndex(int periodIndex) {
+      return Util.binarySearchFloor(sourcePeriodOffsets, periodIndex, true, false) + 1;
     }
 
     @Override
-    protected void getChildDataByWindowIndex(int windowIndex, ChildDataHolder childData) {
-      int childIndex = Util.binarySearchFloor(sourceWindowOffsets, windowIndex, true, false) + 1;
-      getChildDataByChildIndex(childIndex, childData);
+    protected int getChildIndexByWindowIndex(int windowIndex) {
+      return Util.binarySearchFloor(sourceWindowOffsets, windowIndex, true, false) + 1;
     }
 
     @Override
-    protected boolean getChildDataByChildUid(Object childUid, ChildDataHolder childData) {
+    protected int getChildIndexByChildUid(Object childUid) {
       if (!(childUid instanceof Integer)) {
-        return false;
+        return C.INDEX_UNSET;
       }
-      int childIndex = (Integer) childUid;
-      getChildDataByChildIndex(childIndex, childData);
-      return true;
-    }
-
-    private void getChildDataByChildIndex(int childIndex, ChildDataHolder childData) {
-      childData.setData(timelines[childIndex], getFirstPeriodIndexInChild(childIndex),
-          getFirstWindowIndexInChild(childIndex), childIndex);
+      return (Integer) childUid;
     }
 
-    private int getChildIndexByPeriodIndex(int periodIndex) {
-      return Util.binarySearchFloor(sourcePeriodOffsets, periodIndex, true, false) + 1;
+    @Override
+    protected Timeline getTimelineByChildIndex(int childIndex) {
+      return timelines[childIndex];
     }
 
-    private int getFirstPeriodIndexInChild(int childIndex) {
+    @Override
+    protected int getFirstPeriodIndexByChildIndex(int childIndex) {
       return childIndex == 0 ? 0 : sourcePeriodOffsets[childIndex - 1];
     }
 
-    private int getFirstWindowIndexInChild(int childIndex) {
+    @Override
+    protected int getFirstWindowIndexByChildIndex(int childIndex) {
       return childIndex == 0 ? 0 : sourceWindowOffsets[childIndex - 1];
     }
 
+    @Override
+    protected Object getChildUidByChildIndex(int childIndex) {
+      return childIndex;
+    }
+
   }
 
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 79f7d8dd48f..c2d2e5f11e4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -397,6 +397,7 @@ private static final class ConcatenatedTimeline extends AbstractConcatenatedTime
 
     public ConcatenatedTimeline(Collection<MediaSourceHolder> mediaSourceHolders, int windowCount,
         int periodCount) {
+      super(mediaSourceHolders.size());
       this.windowCount = windowCount;
       this.periodCount = periodCount;
       int childCount = mediaSourceHolders.size();
@@ -416,28 +417,42 @@ public ConcatenatedTimeline(Collection<MediaSourceHolder> mediaSourceHolders, in
     }
 
     @Override
-    protected void getChildDataByPeriodIndex(int periodIndex, ChildDataHolder childDataHolder) {
-      int index = Util.binarySearchFloor(firstPeriodInChildIndices, periodIndex, true, false);
-      setChildData(index, childDataHolder);
+    protected int getChildIndexByPeriodIndex(int periodIndex) {
+      return Util.binarySearchFloor(firstPeriodInChildIndices, periodIndex, true, false);
     }
 
     @Override
-    protected void getChildDataByWindowIndex(int windowIndex, ChildDataHolder childDataHolder) {
-      int index = Util.binarySearchFloor(firstWindowInChildIndices, windowIndex, true, false);
-      setChildData(index, childDataHolder);
+    protected int getChildIndexByWindowIndex(int windowIndex) {
+      return Util.binarySearchFloor(firstWindowInChildIndices, windowIndex, true, false);
     }
 
     @Override
-    protected boolean getChildDataByChildUid(Object childUid, ChildDataHolder childDataHolder) {
+    protected int getChildIndexByChildUid(Object childUid) {
       if (!(childUid instanceof Integer)) {
-        return false;
+        return C.INDEX_UNSET;
       }
       int index = childIndexByUid.get((int) childUid, -1);
-      if (index == -1) {
-        return false;
-      }
-      setChildData(index, childDataHolder);
-      return true;
+      return index == -1 ? C.INDEX_UNSET : index;
+    }
+
+    @Override
+    protected Timeline getTimelineByChildIndex(int childIndex) {
+      return timelines[childIndex];
+    }
+
+    @Override
+    protected int getFirstPeriodIndexByChildIndex(int childIndex) {
+      return firstPeriodInChildIndices[childIndex];
+    }
+
+    @Override
+    protected int getFirstWindowIndexByChildIndex(int childIndex) {
+      return firstWindowInChildIndices[childIndex];
+    }
+
+    @Override
+    protected Object getChildUidByChildIndex(int childIndex) {
+      return uids[childIndex];
     }
 
     @Override
@@ -450,10 +465,6 @@ public int getPeriodCount() {
       return periodCount;
     }
 
-    private void setChildData(int srcIndex, ChildDataHolder dest) {
-      dest.setData(timelines[srcIndex], firstPeriodInChildIndices[srcIndex],
-          firstWindowInChildIndices[srcIndex], uids[srcIndex]);
-    }
   }
 
   private static final class DeferredTimeline extends Timeline {
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 f0032e0ee03..a6e93a92b93 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
@@ -101,6 +101,7 @@ private static final class LoopingTimeline extends AbstractConcatenatedTimeline
     private final int loopCount;
 
     public LoopingTimeline(Timeline childTimeline, int loopCount) {
+      super(loopCount);
       this.childTimeline = childTimeline;
       childPeriodCount = childTimeline.getPeriodCount();
       childWindowCount = childTimeline.getWindowCount();
@@ -120,30 +121,41 @@ public int getPeriodCount() {
     }
 
     @Override
-    protected void getChildDataByPeriodIndex(int periodIndex, ChildDataHolder childData) {
-      int childIndex = periodIndex / childPeriodCount;
-      getChildDataByChildIndex(childIndex, childData);
+    protected int getChildIndexByPeriodIndex(int periodIndex) {
+      return periodIndex / childPeriodCount;
     }
 
     @Override
-    protected void getChildDataByWindowIndex(int windowIndex, ChildDataHolder childData) {
-      int childIndex = windowIndex / childWindowCount;
-      getChildDataByChildIndex(childIndex, childData);
+    protected int getChildIndexByWindowIndex(int windowIndex) {
+      return windowIndex / childWindowCount;
     }
 
     @Override
-    protected boolean getChildDataByChildUid(Object childUid, ChildDataHolder childData) {
+    protected int getChildIndexByChildUid(Object childUid) {
       if (!(childUid instanceof Integer)) {
-        return false;
+        return C.INDEX_UNSET;
       }
-      int childIndex = (Integer) childUid;
-      getChildDataByChildIndex(childIndex, childData);
-      return true;
+      return (Integer) childUid;
     }
 
-    private void getChildDataByChildIndex(int childIndex, ChildDataHolder childData) {
-      childData.setData(childTimeline, childIndex * childPeriodCount, childIndex * childWindowCount,
-          childIndex);
+    @Override
+    protected Timeline getTimelineByChildIndex(int childIndex) {
+      return childTimeline;
+    }
+
+    @Override
+    protected int getFirstPeriodIndexByChildIndex(int childIndex) {
+      return childIndex * childPeriodCount;
+    }
+
+    @Override
+    protected int getFirstWindowIndexByChildIndex(int childIndex) {
+      return childIndex * childWindowCount;
+    }
+
+    @Override
+    protected Object getChildUidByChildIndex(int childIndex) {
+      return childIndex;
     }
 
   }

From 1f019ca80854885d2d42e1fa08acfed9527bb41c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 2 Aug 2017 10:44:38 -0700
Subject: [PATCH 038/421] Fix build.gradle to use modulePrefix

Issue: #3131

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

diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index c870c3d1625..14a26b0e12c 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -33,7 +33,7 @@ android {
 dependencies {
     compile project(modulePrefix + 'library-core')
     compile 'com.android.support:support-annotations:' + supportLibraryVersion
-    androidTestCompile project(':testutils')
+    androidTestCompile project(modulePrefix + 'testutils')
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion

From a5f9f40bf0650adafac8ba69b98f8bbb3124d803 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 3 Aug 2017 00:50:47 -0700
Subject: [PATCH 039/421] Replace README reference to source with reference to
 javadoc

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

diff --git a/extensions/ima/README.md b/extensions/ima/README.md
index b5afcec94a4..f328bb44cb1 100644
--- a/extensions/ima/README.md
+++ b/extensions/ima/README.md
@@ -7,7 +7,7 @@ The IMA extension is a [MediaSource][] implementation wrapping the
 alongside content.
 
 [IMA]: https://developers.google.com/interactive-media-ads/docs/sdks/android/
-[MediaSource]: https://github.com/google/ExoPlayer/blob/release-v2/library/core/src/main/java/com/google/android/exoplayer2/source/MediaSource.java
+[MediaSource]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/source/MediaSource.html
 
 ## Getting the extension ##
 

From 81cbd7348fab7a2ed2468beba7eb11cafacf0f38 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 3 Aug 2017 01:51:50 -0700
Subject: [PATCH 040/421] Fix path to constants.gradle

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

diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 7eea25478ff..029a44326eb 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -11,7 +11,7 @@
 // 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 from: '../../constants.gradle'
 apply plugin: 'com.android.application'
 
 android {

From 147d5bb3b21432d364820582d7f1b167ded65240 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Aug 2017 03:33:22 -0700
Subject: [PATCH 041/421] Fix targetSdkVersion to be consistent with gradle
 builds

The manifest value is always overridden in gradle builds,
so this is for internal builds only. The value should be
the same (i.e. 25!).

Also fix IMA build to force the right support library
version, attempt 2!

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

diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index a39023353ae..0e04d9a4357 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-feature android:name="android.software.leanback" android:required="false"/>
   <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25"/>
 
   <application
       android:label="@string/application_name"
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index fc7dc088e84..a4ead9e01fb 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -20,7 +20,7 @@ dependencies {
     // |-- com.google.android.gms:play-services-ads-lite:[11.0.2] -> 11.0.2
     //   |-- com.google.android.gms:play-services-basement:[11.0.2] -> 11.0.2
     //     |-- com.android.support:support-v4:25.2.0
-    compile 'com.android.support:support-annotations:' + supportLibraryVersion
+    compile 'com.android.support:support-v4:' + supportLibraryVersion
     compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
     compile 'com.google.android.gms:play-services-ads:11.0.2'
     androidTestCompile project(modulePrefix + 'library')

From 78cdd08684ae7ad1f8cfe2793f5f9af52687f862 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Aug 2017 04:10:10 -0700
Subject: [PATCH 042/421] Add some missing @param Javadoc to extensions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164105607
---
 .../android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java       | 4 ++++
 .../google/android/exoplayer2/ext/flac/FlacLibrary.java    | 2 ++
 .../android/exoplayer2/ext/gvr/GvrAudioProcessor.java      | 5 +++++
 .../android/exoplayer2/ext/ima/ImaAdsMediaSource.java      | 2 ++
 .../android/exoplayer2/ext/opus/LibopusAudioRenderer.java  | 7 +++++++
 .../google/android/exoplayer2/ext/opus/OpusLibrary.java    | 2 ++
 .../com/google/android/exoplayer2/ext/vp9/VpxLibrary.java  | 2 ++
 .../exoplayer2/ext/vp9/VpxOutputBufferRenderer.java        | 2 ++
 8 files changed, 26 insertions(+)

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 0c065549ca9..9b3bbbb6ab5 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
@@ -37,6 +37,8 @@ private FfmpegLibrary() {}
    * Override the names of the FFmpeg native libraries. If an application wishes to call this
    * method, it must do so before calling any other method defined by this class, and before
    * instantiating a {@link FfmpegAudioRenderer} instance.
+   *
+   * @param libraries The names of the FFmpeg native libraries.
    */
   public static void setLibraries(String... libraries) {
     LOADER.setLibraries(libraries);
@@ -58,6 +60,8 @@ public static String getVersion() {
 
   /**
    * Returns whether the underlying library supports the specified MIME type.
+   *
+   * @param mimeType The MIME type to check.
    */
   public static boolean supportsFormat(String mimeType) {
     if (!isAvailable()) {
diff --git a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java
index 4130c27c59a..d8b9b808a6e 100644
--- a/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java
+++ b/extensions/flac/src/main/java/com/google/android/exoplayer2/ext/flac/FlacLibrary.java
@@ -35,6 +35,8 @@ private FlacLibrary() {}
    * Override the names of the Flac native libraries. If an application wishes to call this method,
    * it must do so before calling any other method defined by this class, and before instantiating
    * any {@link LibflacAudioRenderer} and {@link FlacExtractor} instances.
+   *
+   * @param libraries The names of the Flac native libraries.
    */
   public static void setLibraries(String... libraries) {
     LOADER.setLibraries(libraries);
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 c6e09cf4cc0..5750f5f04d5 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
@@ -61,6 +61,11 @@ public GvrAudioProcessor() {
   /**
    * Updates the listener head orientation. May be called on any thread. See
    * {@code GvrAudioSurround.updateNativeOrientation}.
+   *
+   * @param w The w component of the quaternion.
+   * @param x The x component of the quaternion.
+   * @param y The y component of the quaternion.
+   * @param z The z component of the quaternion.
    */
   public synchronized void updateOrientation(float w, float x, float y, float z) {
     this.w = w;
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 0bf5773d2ce..d56a3ad41fa 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
@@ -50,6 +50,8 @@ public interface AdsListener {
      * Called if there was an error loading ads. The media source will load the content without ads
      * if ads can't be loaded, so listen for this event if you need to implement additional handling
      * (for example, stopping the player).
+     *
+     * @param error The error.
      */
     void onAdLoadError(IOException error);
 
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 93fe033a314..730473ddadc 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
@@ -54,6 +54,13 @@ public LibopusAudioRenderer(Handler eventHandler, AudioRendererEventListener eve
    * @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 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 audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
    */
   public LibopusAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
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 fb8fb738fff..22985ea4976 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
@@ -35,6 +35,8 @@ private OpusLibrary() {}
    * Override the names of the Opus native libraries. If an application wishes to call this method,
    * it must do so before calling any other method defined by this class, and before instantiating a
    * {@link LibopusAudioRenderer} instance.
+   *
+   * @param libraries The names of the Opus native libraries.
    */
   public static void setLibraries(String... libraries) {
     LOADER.setLibraries(libraries);
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 09f242f1eaf..854576b4b21 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
@@ -35,6 +35,8 @@ private VpxLibrary() {}
    * Override the names of the Vpx native libraries. If an application wishes to call this method,
    * it must do so before calling any other method defined by this class, and before instantiating a
    * {@link LibvpxVideoRenderer} instance.
+   *
+   * @param libraries The names of the Vpx native libraries.
    */
   public static void setLibraries(String... libraries) {
     LOADER.setLibraries(libraries);
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java
index 8f43a0207b0..d07e24d9204 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxOutputBufferRenderer.java
@@ -22,6 +22,8 @@ public interface VpxOutputBufferRenderer {
 
   /**
    * Sets the output buffer to be rendered. The renderer is responsible for releasing the buffer.
+   *
+   * @param outputBuffer The output buffer to be rendered.
    */
   void setOutputBuffer(VpxOutputBuffer outputBuffer);
 

From db991873819d3bf6ab8b6cbe2514b89d03c1ef0e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Aug 2017 04:11:08 -0700
Subject: [PATCH 043/421] Fix some lint warnings

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164105662
---
 .../main/java/com/google/android/exoplayer2/Timeline.java    | 2 +-
 .../com/google/android/exoplayer2/text/ssa/SsaDecoder.java   | 3 ++-
 .../com/google/android/exoplayer2/text/ttml/TtmlDecoder.java | 2 +-
 .../main/java/com/google/android/exoplayer2/util/Util.java   | 2 +-
 .../google/android/exoplayer2/source/hls/HlsChunkSource.java | 3 +--
 .../google/android/exoplayer2/ui/DebugTextViewHelper.java    | 5 ++++-
 6 files changed, 10 insertions(+), 7 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 7ce23e67ece..414c0804ad2 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
@@ -95,7 +95,7 @@
  * of the on-demand stream ends, playback of the live stream will start from its default position
  * near the live edge.
  *
- * <h3 id="single-file">On-demand stream with mid-roll ads</h3>
+ * <h3 id="single-file-midrolls">On-demand stream with mid-roll ads</h3>
  * <p align="center">
  *   <img src="doc-files/timeline-single-file-midrolls.svg" alt="Example timeline for an on-demand
  *       stream with mid-roll ad groups">
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
index 11489e7b35a..d2f5a67c279 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
@@ -23,6 +23,7 @@
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.LongArray;
 import com.google.android.exoplayer2.util.ParsableByteArray;
+import com.google.android.exoplayer2.util.Util;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Matcher;
@@ -132,7 +133,7 @@ private void parseFormatLine(String formatLine) {
     formatEndIndex = C.INDEX_UNSET;
     formatTextIndex = C.INDEX_UNSET;
     for (int i = 0; i < formatKeyCount; i++) {
-      String key = values[i].trim().toLowerCase();
+      String key = Util.toLowerInvariant(values[i].trim());
       switch (key) {
         case "start":
           formatStartIndex = i;
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 e438aa18378..a215bf3cc9a 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
@@ -290,7 +290,7 @@ private TtmlRegion parseRegionAttributes(XmlPullParser xmlParser) {
     String displayAlign = XmlPullParserUtil.getAttributeValue(xmlParser,
         TtmlNode.ATTR_TTS_DISPLAY_ALIGN);
     if (displayAlign != null) {
-      switch (displayAlign.toLowerCase()) {
+      switch (Util.toLowerInvariant(displayAlign)) {
         case "center":
           lineAnchor = Cue.ANCHOR_TYPE_MIDDLE;
           line += height / 2;
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 c00d7fa36c0..b958a54244c 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
@@ -895,7 +895,7 @@ public static int inferContentType(Uri uri) {
    */
   @C.ContentType
   public static int inferContentType(String fileName) {
-    fileName = fileName.toLowerCase();
+    fileName = Util.toLowerInvariant(fileName);
     if (fileName.endsWith(".mpd")) {
       return C.TYPE_DASH;
     } else if (fileName.endsWith(".m3u8")) {
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 38c3da81947..bca62ed2303 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
@@ -39,7 +39,6 @@
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.List;
-import java.util.Locale;
 
 /**
  * Source of Hls (possibly adaptive) chunks.
@@ -366,7 +365,7 @@ private EncryptionKeyChunk newEncryptionKeyChunk(Uri keyUri, String iv, int vari
 
   private void setEncryptionData(Uri keyUri, String iv, byte[] secretKey) {
     String trimmedIv;
-    if (iv.toLowerCase(Locale.getDefault()).startsWith("0x")) {
+    if (Util.toLowerInvariant(iv).startsWith("0x")) {
       trimmedIv = iv.substring(2);
     } else {
       trimmedIv = iv;
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 8c4bad18628..060780eda2f 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
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ui;
 
+import android.annotation.SuppressLint;
 import android.widget.TextView;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
@@ -25,6 +26,7 @@
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import java.util.Locale;
 
 /**
  * A helper class for periodically updating a {@link TextView} with debug information obtained from
@@ -125,6 +127,7 @@ public void run() {
 
   // Private methods.
 
+  @SuppressLint("SetTextI18n")
   private void updateAndPost() {
     textView.setText(getPlayerStateString() + getPlayerWindowIndexString() + getVideoString()
         + getAudioString());
@@ -192,7 +195,7 @@ private static String getDecoderCountersBufferCountString(DecoderCounters counte
 
   private static String getPixelAspectRatioString(float pixelAspectRatio) {
     return pixelAspectRatio == Format.NO_VALUE || pixelAspectRatio == 1f ? ""
-        : (" par:" + String.format("%.02f", pixelAspectRatio));
+        : (" par:" + String.format(Locale.US, "%.02f", pixelAspectRatio));
   }
 
 }

From cb00b0209f551eefe7968633715ed3067b55aa08 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 3 Aug 2017 05:19:02 -0700
Subject: [PATCH 044/421] Take into account init data size for input buffer
 size

Issue: #2900

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164110904
---
 .../video/MediaCodecVideoRenderer.java        | 23 +++++++++++++------
 1 file changed, 16 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 07c45dcd25e..9a2927cc3f4 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
@@ -477,7 +477,7 @@ protected boolean canReconfigureCodec(MediaCodec codec, boolean codecIsAdaptive,
       Format oldFormat, Format newFormat) {
     return areAdaptationCompatible(codecIsAdaptive, oldFormat, newFormat)
         && newFormat.width <= codecMaxValues.width && newFormat.height <= codecMaxValues.height
-        && newFormat.maxInputSize <= codecMaxValues.inputSize;
+        && getMaxInputSize(newFormat) <= codecMaxValues.inputSize;
   }
 
   @Override
@@ -854,18 +854,27 @@ private static Point getCodecMaxSize(MediaCodecInfo codecInfo, Format format)
   }
 
   /**
-   * Returns a maximum input size for a given format.
+   * Returns a maximum input buffer size for a given format.
    *
    * @param format The format.
-   * @return A maximum input size in bytes, or {@link Format#NO_VALUE} if a maximum could not be
-   *     determined.
+   * @return A maximum input buffer size in bytes, or {@link Format#NO_VALUE} if a maximum could not
+   *     be determined.
    */
   private static int getMaxInputSize(Format format) {
     if (format.maxInputSize != Format.NO_VALUE) {
-      // The format defines an explicit maximum input size.
-      return format.maxInputSize;
+      // The format defines an explicit maximum input size. Add the total size of initialization
+      // data buffers, as they may need to be queued in the same input buffer as the largest sample.
+      int totalInitializationDataSize = 0;
+      int initializationDataCount = format.initializationData.size();
+      for (int i = 0; i < initializationDataCount; i++) {
+        totalInitializationDataSize += format.initializationData.get(i).length;
+      }
+      return format.maxInputSize + totalInitializationDataSize;
+    } else {
+      // Calculated maximum input sizes are overestimates, so it's not necessary to add the size of
+      // initialization data.
+      return getMaxInputSize(format.sampleMimeType, format.width, format.height);
     }
-    return getMaxInputSize(format.sampleMimeType, format.width, format.height);
   }
 
   /**

From 3c6ad40481c3b4f2b1a757b7e182c1343a545d03 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 3 Aug 2017 06:32:22 -0700
Subject: [PATCH 045/421] Add shuffle order interface and default
 implementation.

These classes maintain a shuffled order of indices allowing to query the
next, previous, first, and last indices. And also support inserting and
removing elements without changing the shuffled order of the rest.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164116287
---
 .../exoplayer2/source/ShuffleOrderTest.java   | 134 +++++++++
 .../exoplayer2/source/ShuffleOrder.java       | 256 ++++++++++++++++++
 2 files changed, 390 insertions(+)
 create mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
new file mode 100644
index 00000000000..5de6bdf3e11
--- /dev/null
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
@@ -0,0 +1,134 @@
+/*
+ * 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;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
+import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
+import junit.framework.TestCase;
+
+/**
+ * Unit test for {@link ShuffleOrder}.
+ */
+public final class ShuffleOrderTest extends TestCase {
+
+  public static final long RANDOM_SEED = 1234567890L;
+
+  public void testDefaultShuffleOrder() {
+    assertShuffleOrderCorrectness(new DefaultShuffleOrder(0, RANDOM_SEED), 0);
+    assertShuffleOrderCorrectness(new DefaultShuffleOrder(1, RANDOM_SEED), 1);
+    assertShuffleOrderCorrectness(new DefaultShuffleOrder(5, RANDOM_SEED), 5);
+    for (int initialLength = 0; initialLength < 4; initialLength++) {
+      for (int insertionPoint = 0; insertionPoint <= initialLength; insertionPoint += 2) {
+        testCloneAndInsert(new DefaultShuffleOrder(initialLength, RANDOM_SEED), insertionPoint, 0);
+        testCloneAndInsert(new DefaultShuffleOrder(initialLength, RANDOM_SEED), insertionPoint, 1);
+        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);
+  }
+
+  public void testUnshuffledShuffleOrder() {
+    assertShuffleOrderCorrectness(new UnshuffledShuffleOrder(0), 0);
+    assertShuffleOrderCorrectness(new UnshuffledShuffleOrder(1), 1);
+    assertShuffleOrderCorrectness(new UnshuffledShuffleOrder(5), 5);
+    for (int initialLength = 0; initialLength < 4; initialLength++) {
+      for (int insertionPoint = 0; insertionPoint <= initialLength; insertionPoint += 2) {
+        testCloneAndInsert(new UnshuffledShuffleOrder(initialLength), insertionPoint, 0);
+        testCloneAndInsert(new UnshuffledShuffleOrder(initialLength), insertionPoint, 1);
+        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);
+  }
+
+  public void testUnshuffledShuffleOrderIsUnshuffled() {
+    ShuffleOrder shuffleOrder = new UnshuffledShuffleOrder(5);
+    assertEquals(0, shuffleOrder.getFirstIndex());
+    assertEquals(4, shuffleOrder.getLastIndex());
+    for (int i = 0; i < 4; i++) {
+      assertEquals(i + 1, shuffleOrder.getNextIndex(i));
+    }
+  }
+
+  private static void assertShuffleOrderCorrectness(ShuffleOrder shuffleOrder, int length) {
+    assertEquals(length, shuffleOrder.getLength());
+    if (length == 0) {
+      assertEquals(C.INDEX_UNSET, shuffleOrder.getFirstIndex());
+      assertEquals(C.INDEX_UNSET, shuffleOrder.getLastIndex());
+    } else {
+      int[] indices = new int[length];
+      indices[0] = shuffleOrder.getFirstIndex();
+      assertEquals(C.INDEX_UNSET, shuffleOrder.getPreviousIndex(indices[0]));
+      for (int i = 1; i < length; i++) {
+        indices[i] = shuffleOrder.getNextIndex(indices[i - 1]);
+        assertEquals(indices[i - 1], shuffleOrder.getPreviousIndex(indices[i]));
+        for (int j = 0; j < i; j++) {
+          assertTrue(indices[i] != indices[j]);
+        }
+      }
+      assertEquals(indices[length - 1], shuffleOrder.getLastIndex());
+      assertEquals(C.INDEX_UNSET, shuffleOrder.getNextIndex(indices[length - 1]));
+      for (int i = 0; i < length; i++) {
+        assertTrue(indices[i] >= 0 && indices[i] < length);
+      }
+    }
+  }
+
+  private static void testCloneAndInsert(ShuffleOrder shuffleOrder, int position, int count) {
+    ShuffleOrder newOrder = shuffleOrder.cloneAndInsert(position, count);
+    assertShuffleOrderCorrectness(newOrder, shuffleOrder.getLength() + count);
+    // Assert all elements still have the relative same order
+    for (int i = 0; i < shuffleOrder.getLength(); i++) {
+      int expectedNextIndex = shuffleOrder.getNextIndex(i);
+      if (expectedNextIndex != C.INDEX_UNSET && expectedNextIndex >= position) {
+        expectedNextIndex += count;
+      }
+      int newNextIndex = newOrder.getNextIndex(i < position ? i : i + count);
+      while (newNextIndex >= position && newNextIndex < position + count) {
+        newNextIndex = newOrder.getNextIndex(newNextIndex);
+      }
+      assertEquals(expectedNextIndex, newNextIndex);
+    }
+  }
+
+  private static void testCloneAndRemove(ShuffleOrder shuffleOrder, int position) {
+    ShuffleOrder newOrder = shuffleOrder.cloneAndRemove(position);
+    assertShuffleOrderCorrectness(newOrder, shuffleOrder.getLength() - 1);
+    // Assert all elements still have the relative same order
+    for (int i = 0; i < shuffleOrder.getLength(); i++) {
+      if (i == position) {
+        continue;
+      }
+      int expectedNextIndex = shuffleOrder.getNextIndex(i);
+      if (expectedNextIndex == position) {
+        expectedNextIndex = shuffleOrder.getNextIndex(expectedNextIndex);
+      }
+      if (expectedNextIndex != C.INDEX_UNSET && expectedNextIndex >= position) {
+        expectedNextIndex--;
+      }
+      int newNextIndex = newOrder.getNextIndex(i < position ? i : i - 1);
+      assertEquals(expectedNextIndex, newNextIndex);
+    }
+  }
+
+}
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
new file mode 100644
index 00000000000..4307fd2c19e
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ShuffleOrder.java
@@ -0,0 +1,256 @@
+/*
+ * 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;
+
+import com.google.android.exoplayer2.C;
+import java.util.Arrays;
+import java.util.Random;
+
+/**
+ * Shuffled order of indices.
+ */
+public interface ShuffleOrder {
+
+  /**
+   * The default {@link ShuffleOrder} implementation for random shuffle order.
+   */
+  class DefaultShuffleOrder implements ShuffleOrder {
+
+    private final Random random;
+    private final int[] shuffled;
+    private final int[] indexInShuffled;
+
+    /**
+     * Creates an instance with a specified length.
+     *
+     * @param length The length of the shuffle order.
+     */
+    public DefaultShuffleOrder(int length) {
+      this(length, new Random());
+    }
+
+    /**
+     * Creates an instance with a specified length and the specified random seed. Shuffle orders of
+     * the same length initialized with the same random seed are guaranteed to be equal.
+     *
+     * @param length The length of the shuffle order.
+     * @param randomSeed A random seed.
+     */
+    public DefaultShuffleOrder(int length, long randomSeed) {
+      this(length, new Random(randomSeed));
+    }
+
+    private DefaultShuffleOrder(int length, Random random) {
+      this(createShuffledList(length, random), random);
+    }
+
+    private DefaultShuffleOrder(int[] shuffled, Random random) {
+      this.shuffled = shuffled;
+      this.random = random;
+      this.indexInShuffled = new int[shuffled.length];
+      for (int i = 0; i < shuffled.length; i++) {
+        indexInShuffled[shuffled[i]] = i;
+      }
+    }
+
+    @Override
+    public int getLength() {
+      return shuffled.length;
+    }
+
+    @Override
+    public int getNextIndex(int index) {
+      int shuffledIndex = indexInShuffled[index];
+      return ++shuffledIndex < shuffled.length ? shuffled[shuffledIndex] : C.INDEX_UNSET;
+    }
+
+    @Override
+    public int getPreviousIndex(int index) {
+      int shuffledIndex = indexInShuffled[index];
+      return --shuffledIndex >= 0 ? shuffled[shuffledIndex] : C.INDEX_UNSET;
+    }
+
+    @Override
+    public int getLastIndex() {
+      return shuffled.length > 0 ? shuffled[shuffled.length - 1] : C.INDEX_UNSET;
+    }
+
+    @Override
+    public int getFirstIndex() {
+      return shuffled.length > 0 ? shuffled[0] : C.INDEX_UNSET;
+    }
+
+    @Override
+    public ShuffleOrder cloneAndInsert(int insertionIndex, int insertionCount) {
+      int[] insertionPoints = new int[insertionCount];
+      int[] insertionValues = new int[insertionCount];
+      for (int i = 0; i < insertionCount; i++) {
+        insertionPoints[i] = random.nextInt(shuffled.length + 1);
+        int swapIndex = random.nextInt(i + 1);
+        insertionValues[i] = insertionValues[swapIndex];
+        insertionValues[swapIndex] = i + insertionIndex;
+      }
+      Arrays.sort(insertionPoints);
+      int[] newShuffled = new int[shuffled.length + insertionCount];
+      int indexInOldShuffled = 0;
+      int indexInInsertionList = 0;
+      for (int i = 0; i < shuffled.length + insertionCount; i++) {
+        if (indexInInsertionList < insertionCount
+            && indexInOldShuffled == insertionPoints[indexInInsertionList]) {
+          newShuffled[i] = insertionValues[indexInInsertionList++];
+        } else {
+          newShuffled[i] = shuffled[indexInOldShuffled++];
+          if (newShuffled[i] >= insertionIndex) {
+            newShuffled[i] += insertionCount;
+          }
+        }
+      }
+      return new DefaultShuffleOrder(newShuffled, new Random(random.nextLong()));
+    }
+
+    @Override
+    public ShuffleOrder cloneAndRemove(int removalIndex) {
+      int[] newShuffled = new int[shuffled.length - 1];
+      boolean foundRemovedElement = false;
+      for (int i = 0; i < shuffled.length; i++) {
+        if (shuffled[i] == removalIndex) {
+          foundRemovedElement = true;
+        } else {
+          newShuffled[foundRemovedElement ? i - 1 : i] = shuffled[i] > removalIndex
+              ? shuffled[i] - 1 : shuffled[i];
+        }
+      }
+      return new DefaultShuffleOrder(newShuffled, new Random(random.nextLong()));
+    }
+
+    private static int[] createShuffledList(int length, Random random) {
+      int[] shuffled = new int[length];
+      for (int i = 0; i < length; i++) {
+        int swapIndex = random.nextInt(i + 1);
+        shuffled[i] = shuffled[swapIndex];
+        shuffled[swapIndex] = i;
+      }
+      return shuffled;
+    }
+
+  }
+
+  /**
+   * A {@link ShuffleOrder} implementation which does not shuffle.
+   */
+  final class UnshuffledShuffleOrder implements ShuffleOrder {
+
+    private final int length;
+
+    /**
+     * Creates an instance with a specified length.
+     *
+     * @param length The length of the shuffle order.
+     */
+    public UnshuffledShuffleOrder(int length) {
+      this.length = length;
+    }
+
+    @Override
+    public int getLength() {
+      return length;
+    }
+
+    @Override
+    public int getNextIndex(int index) {
+      return ++index < length ? index : C.INDEX_UNSET;
+    }
+
+    @Override
+    public int getPreviousIndex(int index) {
+      return --index >= 0 ? index : C.INDEX_UNSET;
+    }
+
+    @Override
+    public int getLastIndex() {
+      return length > 0 ? length - 1 : C.INDEX_UNSET;
+    }
+
+    @Override
+    public int getFirstIndex() {
+      return length > 0 ? 0 : C.INDEX_UNSET;
+    }
+
+    @Override
+    public ShuffleOrder cloneAndInsert(int insertionIndex, int insertionCount) {
+      return new UnshuffledShuffleOrder(length + insertionCount);
+    }
+
+    @Override
+    public ShuffleOrder cloneAndRemove(int removalIndex) {
+      return new UnshuffledShuffleOrder(length - 1);
+    }
+
+  }
+
+  /**
+   * Returns length of shuffle order.
+   */
+  int getLength();
+
+  /**
+   * Returns the next index in the shuffle order.
+   *
+   * @param index An index.
+   * @return The index after {@code index}, or {@link C#INDEX_UNSET} if {@code index} is the last
+   *     element.
+   */
+  int getNextIndex(int index);
+
+  /**
+   * Returns the previous index in the shuffle order.
+   *
+   * @param index An index.
+   * @return The index before {@code index}, or {@link C#INDEX_UNSET} if {@code index} is the first
+   *     element.
+   */
+  int getPreviousIndex(int index);
+
+  /**
+   * Returns the last index in the shuffle order, or {@link C#INDEX_UNSET} if the shuffle order is
+   * empty.
+   */
+  int getLastIndex();
+
+  /**
+   * Returns the first index in the shuffle order, or {@link C#INDEX_UNSET} if the shuffle order is
+   * empty.
+   */
+  int getFirstIndex();
+
+  /**
+   * Return a copy of the shuffle order with newly inserted elements.
+   *
+   * @param insertionIndex The index in the unshuffled order at which elements are inserted.
+   * @param insertionCount The number of elements inserted at {@code insertionIndex}.
+   * @return A copy of this {@link ShuffleOrder} with newly inserted elements.
+   */
+  ShuffleOrder cloneAndInsert(int insertionIndex, int insertionCount);
+
+  /**
+   * Return a copy of the shuffle order with one element 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.
+   */
+  ShuffleOrder cloneAndRemove(int removalIndex);
+
+}

From 768a73b377d842aeefdd466cf7a5904f858cc8a4 Mon Sep 17 00:00:00 2001
From: "J. Oliva" <jesus@epiclabs.io>
Date: Fri, 4 Aug 2017 09:47:54 +0200
Subject: [PATCH 046/421] Add possibility of forcing a specific license URL in
 HttpMediaDrmCallback

- Renamed some license URL related variables to keep consistency across the code.
- Added a new parameter to HttpMediaDrmCallback that enables forcing defaultLicenseURL as the license acquisition URL.
---
 .../exoplayer2/drm/HttpMediaDrmCallback.java  | 28 ++++++-------
 .../exoplayer2/drm/OfflineLicenseHelper.java  | 39 +++++++++++++++----
 2 files changed, 45 insertions(+), 22 deletions(-)

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 f9d5efffb15..5a564976800 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
@@ -47,29 +47,29 @@ public final class HttpMediaDrmCallback implements MediaDrmCallback {
   }
 
   private final HttpDataSource.Factory dataSourceFactory;
-  private final String defaultUrl;
+  private final String defaultLicenseUrl;
+  private final boolean forceDefaultLicenseUrl;
   private final Map<String, String> keyRequestProperties;
 
   /**
-   * @param defaultUrl The default license URL.
+   * @param defaultLicenseUrl The default license URL.
    * @param dataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
    */
-  public HttpMediaDrmCallback(String defaultUrl, HttpDataSource.Factory dataSourceFactory) {
-    this(defaultUrl, dataSourceFactory, null);
+  public HttpMediaDrmCallback(String defaultLicenseUrl, HttpDataSource.Factory dataSourceFactory) {
+    this(defaultLicenseUrl, false, dataSourceFactory, null);
   }
 
   /**
-   * @deprecated Use {@link HttpMediaDrmCallback#HttpMediaDrmCallback(String, Factory)}. Request
-   *     properties can be set by calling {@link #setKeyRequestProperty(String, String)}.
-   * @param defaultUrl The default license URL.
+   * @param defaultLicenseUrl The default license URL.
+   * @param forceDefaultLicenseUrl Whether to force use of {@code defaultLicenseUrl} even for key
+   *     requests that include their own license URL.
    * @param dataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
-   * @param keyRequestProperties Request properties to set when making key requests, or null.
    */
-  @Deprecated
-  public HttpMediaDrmCallback(String defaultUrl, HttpDataSource.Factory dataSourceFactory,
-      Map<String, String> keyRequestProperties) {
+  public HttpMediaDrmCallback(String defaultLicenseUrl, boolean forceDefaultLicenseUrl,
+      HttpDataSource.Factory dataSourceFactory, Map<String, String> keyRequestProperties) {
     this.dataSourceFactory = dataSourceFactory;
-    this.defaultUrl = defaultUrl;
+    this.defaultLicenseUrl = defaultLicenseUrl;
+    this.forceDefaultLicenseUrl = forceDefaultLicenseUrl;
     this.keyRequestProperties = new HashMap<>();
     if (keyRequestProperties != null) {
       this.keyRequestProperties.putAll(keyRequestProperties);
@@ -120,8 +120,8 @@ public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throw
   @Override
   public byte[] executeKeyRequest(UUID uuid, KeyRequest request) throws Exception {
     String url = request.getDefaultUrl();
-    if (TextUtils.isEmpty(url)) {
-      url = defaultUrl;
+    if (forceDefaultLicenseUrl || TextUtils.isEmpty(url)) {
+      url = defaultLicenseUrl;
     }
     Map<String, String> requestProperties = new HashMap<>();
     requestProperties.put("Content-Type", "application/octet-stream");
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 2eb3463b3dc..5ae06b76919 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
@@ -43,23 +43,44 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
    * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
    * is no longer required.
    *
-   * @param licenseUrl The default license URL.
+   * @param defaultLicenseUrl The default license URL.
    * @param httpDataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
    * @return A new instance which uses Widevine CDM.
    * @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
    *     instantiated.
    */
   public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
-      String licenseUrl, Factory httpDataSourceFactory) throws UnsupportedDrmException {
-    return newWidevineInstance(
-        new HttpMediaDrmCallback(licenseUrl, httpDataSourceFactory), null);
+      String defaultLicenseUrl, Factory httpDataSourceFactory)
+      throws UnsupportedDrmException {
+    return newWidevineInstance(defaultLicenseUrl, false, httpDataSourceFactory, null);
   }
 
   /**
    * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
    * is no longer required.
    *
-   * @param callback Performs key and provisioning requests.
+   * @param defaultLicenseUrl The default license URL.
+   * @param forceDefaultLicenseUrl Whether to force use of {@code defaultLicenseUrl} even for key
+   *     requests that include their own license URL.
+   * @param httpDataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
+   * @return A new instance which uses Widevine CDM.
+   * @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
+   *     instantiated.
+   */
+  public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
+      String defaultLicenseUrl, boolean forceDefaultLicenseUrl, Factory httpDataSourceFactory)
+      throws UnsupportedDrmException {
+    return newWidevineInstance(defaultLicenseUrl, forceDefaultLicenseUrl, httpDataSourceFactory,
+        null);
+  }
+
+  /**
+   * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
+   * is no longer required.
+   *
+   * @param defaultLicenseUrl The default license URL.
+   * @param forceDefaultLicenseUrl Whether to force use of {@code defaultLicenseUrl} even for key
+   *     requests that include their own license URL.
    * @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.
    * @return A new instance which uses Widevine CDM.
@@ -69,10 +90,12 @@ public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
    *     MediaDrmCallback, HashMap, Handler, EventListener)
    */
   public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
-      MediaDrmCallback callback, HashMap<String, String> optionalKeyRequestParameters)
+      String defaultLicenseUrl, boolean forceDefaultLicenseUrl, Factory httpDataSourceFactory,
+      HashMap<String, String> optionalKeyRequestParameters)
       throws UnsupportedDrmException {
-    return new OfflineLicenseHelper<>(FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID), callback,
-        optionalKeyRequestParameters);
+    return new OfflineLicenseHelper<>(FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID),
+        new HttpMediaDrmCallback(defaultLicenseUrl, forceDefaultLicenseUrl, httpDataSourceFactory,
+        null), optionalKeyRequestParameters);
   }
 
   /**

From 6f7dc974c963169130a8d59d4890f771883d66d7 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 3 Aug 2017 06:45:18 -0700
Subject: [PATCH 047/421] Add forwarding timeline to prevent repetition of
 boiler-plate code.

Multiple timelines work as a wrapper around another timeline and forward
most of the method calls to the wrapped timeline. Added a base class meant to
be overridden which handles all the boiler-plate forwarding.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164117264
---
 .../ext/ima/SinglePeriodAdTimeline.java       | 29 ++------
 .../source/ClippingMediaSource.java           | 31 +--------
 .../exoplayer2/source/ForwardingTimeline.java | 68 +++++++++++++++++++
 .../exoplayer2/source/LoopingMediaSource.java | 38 ++---------
 4 files changed, 79 insertions(+), 87 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java

diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
index c93f1e8f28f..e3eef6a2b7b 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
@@ -17,14 +17,14 @@
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.ForwardingTimeline;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
  * A {@link Timeline} for sources that have ads.
  */
-public final class SinglePeriodAdTimeline extends Timeline {
+public final class SinglePeriodAdTimeline extends ForwardingTimeline {
 
-  private final Timeline contentTimeline;
   private final long[] adGroupTimesUs;
   private final int[] adCounts;
   private final int[] adsLoadedCounts;
@@ -52,9 +52,9 @@ public final class SinglePeriodAdTimeline extends Timeline {
   public SinglePeriodAdTimeline(Timeline contentTimeline, long[] adGroupTimesUs, int[] adCounts,
       int[] adsLoadedCounts, int[] adsPlayedCounts, long[][] adDurationsUs,
       long adResumePositionUs) {
+    super(contentTimeline);
     Assertions.checkState(contentTimeline.getPeriodCount() == 1);
     Assertions.checkState(contentTimeline.getWindowCount() == 1);
-    this.contentTimeline = contentTimeline;
     this.adGroupTimesUs = adGroupTimesUs;
     this.adCounts = adCounts;
     this.adsLoadedCounts = adsLoadedCounts;
@@ -63,34 +63,13 @@ public SinglePeriodAdTimeline(Timeline contentTimeline, long[] adGroupTimesUs, i
     this.adResumePositionUs = adResumePositionUs;
   }
 
-  @Override
-  public int getWindowCount() {
-    return 1;
-  }
-
-  @Override
-  public Window getWindow(int windowIndex, Window window, boolean setIds,
-      long defaultPositionProjectionUs) {
-    return contentTimeline.getWindow(windowIndex, window, setIds, defaultPositionProjectionUs);
-  }
-
-  @Override
-  public int getPeriodCount() {
-    return 1;
-  }
-
   @Override
   public Period getPeriod(int periodIndex, Period period, boolean setIds) {
-    contentTimeline.getPeriod(periodIndex, period, setIds);
+    timeline.getPeriod(periodIndex, period, setIds);
     period.set(period.id, period.uid, period.windowIndex, period.durationUs,
         period.getPositionInWindowUs(), adGroupTimesUs, adCounts, adsLoadedCounts, adsPlayedCounts,
         adDurationsUs, adResumePositionUs);
     return period;
   }
 
-  @Override
-  public int getIndexOfPeriod(Object uid) {
-    return contentTimeline.getIndexOfPeriod(uid);
-  }
-
 }
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 32c4eb6c730..4caafa31101 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
@@ -17,7 +17,6 @@
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
-import com.google.android.exoplayer2.Player.RepeatMode;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
@@ -128,9 +127,8 @@ public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
   /**
    * Provides a clipped view of a specified timeline.
    */
-  private static final class ClippingTimeline extends Timeline {
+  private static final class ClippingTimeline extends ForwardingTimeline {
 
-    private final Timeline timeline;
     private final long startUs;
     private final long endUs;
 
@@ -143,6 +141,7 @@ private static final class ClippingTimeline extends Timeline {
      *     of {@code timeline}, or {@link C#TIME_END_OF_SOURCE} to clip no samples from the end.
      */
     public ClippingTimeline(Timeline timeline, long startUs, long endUs) {
+      super(timeline);
       Assertions.checkArgument(timeline.getWindowCount() == 1);
       Assertions.checkArgument(timeline.getPeriodCount() == 1);
       Window window = timeline.getWindow(0, new Window(), false);
@@ -155,26 +154,10 @@ public ClippingTimeline(Timeline timeline, long startUs, long endUs) {
       }
       Period period = timeline.getPeriod(0, new Period());
       Assertions.checkArgument(period.getPositionInWindowUs() == 0);
-      this.timeline = timeline;
       this.startUs = startUs;
       this.endUs = resolvedEndUs;
     }
 
-    @Override
-    public int getWindowCount() {
-      return 1;
-    }
-
-    @Override
-    public int getNextWindowIndex(int windowIndex, @RepeatMode int repeatMode) {
-      return timeline.getNextWindowIndex(windowIndex, repeatMode);
-    }
-
-    @Override
-    public int getPreviousWindowIndex(int windowIndex, @RepeatMode int repeatMode) {
-      return timeline.getPreviousWindowIndex(windowIndex, repeatMode);
-    }
-
     @Override
     public Window getWindow(int windowIndex, Window window, boolean setIds,
         long defaultPositionProjectionUs) {
@@ -196,11 +179,6 @@ public Window getWindow(int windowIndex, Window window, boolean setIds,
       return window;
     }
 
-    @Override
-    public int getPeriodCount() {
-      return 1;
-    }
-
     @Override
     public Period getPeriod(int periodIndex, Period period, boolean setIds) {
       period = timeline.getPeriod(0, period, setIds);
@@ -208,11 +186,6 @@ public Period getPeriod(int periodIndex, Period period, boolean setIds) {
       return period;
     }
 
-    @Override
-    public int getIndexOfPeriod(Object uid) {
-      return timeline.getIndexOfPeriod(uid);
-    }
-
   }
 
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
new file mode 100644
index 00000000000..4203abbf397
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
@@ -0,0 +1,68 @@
+/*
+ * 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;
+
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Timeline;
+
+/**
+ * An overridable {@link Timeline} implementation forwarding all methods to another timeline.
+ */
+public abstract class ForwardingTimeline extends Timeline {
+
+  protected final Timeline timeline;
+
+  public ForwardingTimeline(Timeline timeline) {
+    this.timeline = timeline;
+  }
+
+  @Override
+  public int getWindowCount() {
+    return timeline.getWindowCount();
+  }
+
+  @Override
+  public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+    return timeline.getNextWindowIndex(windowIndex, repeatMode);
+  }
+
+  @Override
+  public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+    return timeline.getPreviousWindowIndex(windowIndex, repeatMode);
+  }
+
+  @Override
+  public Window getWindow(int windowIndex, Window window, boolean setIds,
+      long defaultPositionProjectionUs) {
+    return timeline.getWindow(windowIndex, window, setIds, defaultPositionProjectionUs);
+  }
+
+  @Override
+  public int getPeriodCount() {
+    return timeline.getPeriodCount();
+  }
+
+  @Override
+  public Period getPeriod(int periodIndex, Period period, boolean setIds) {
+    return timeline.getPeriod(periodIndex, period, setIds);
+  }
+
+  @Override
+  public int getIndexOfPeriod(Object uid) {
+    return timeline.getIndexOfPeriod(uid);
+  }
+
+}
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 a6e93a92b93..1795fe8045a 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
@@ -160,53 +160,25 @@ protected Object getChildUidByChildIndex(int childIndex) {
 
   }
 
-  private static final class InfinitelyLoopingTimeline extends Timeline {
+  private static final class InfinitelyLoopingTimeline extends ForwardingTimeline {
 
-    private final Timeline childTimeline;
-
-    public InfinitelyLoopingTimeline(Timeline childTimeline) {
-      this.childTimeline = childTimeline;
-    }
-
-    @Override
-    public int getWindowCount() {
-      return childTimeline.getWindowCount();
+    public InfinitelyLoopingTimeline(Timeline timeline) {
+      super(timeline);
     }
 
     @Override
     public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-      int childNextWindowIndex = childTimeline.getNextWindowIndex(windowIndex, repeatMode);
+      int childNextWindowIndex = timeline.getNextWindowIndex(windowIndex, repeatMode);
       return childNextWindowIndex == C.INDEX_UNSET ? 0 : childNextWindowIndex;
     }
 
     @Override
     public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-      int childPreviousWindowIndex = childTimeline.getPreviousWindowIndex(windowIndex, repeatMode);
+      int childPreviousWindowIndex = timeline.getPreviousWindowIndex(windowIndex, repeatMode);
       return childPreviousWindowIndex == C.INDEX_UNSET ? getWindowCount() - 1
           : childPreviousWindowIndex;
     }
 
-    @Override
-    public Window getWindow(int windowIndex, Window window, boolean setIds,
-        long defaultPositionProjectionUs) {
-      return childTimeline.getWindow(windowIndex, window, setIds, defaultPositionProjectionUs);
-    }
-
-    @Override
-    public int getPeriodCount() {
-      return childTimeline.getPeriodCount();
-    }
-
-    @Override
-    public Period getPeriod(int periodIndex, Period period, boolean setIds) {
-      return childTimeline.getPeriod(periodIndex, period, setIds);
-    }
-
-    @Override
-    public int getIndexOfPeriod(Object uid) {
-      return childTimeline.getIndexOfPeriod(uid);
-    }
-
   }
 
 }

From ccd05cbd04ca62659e4c1992dfeda912e2dbf7b9 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 3 Aug 2017 07:22:15 -0700
Subject: [PATCH 048/421] Add fake simple exo player.

This implementation runs as fast as possible by triggering a simplified
playback loop continuously without waiting. The class only supports a basic
use case with a single-period timeline, no timeline update, no seeks or other
user-initiated actions.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164120420
---
 .../android/exoplayer2/SimpleExoPlayer.java   |  15 +-
 .../testutil/FakeSimpleExoPlayer.java         | 521 ++++++++++++++++++
 2 files changed, 535 insertions(+), 1 deletion(-)
 create mode 100644 testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java

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 ebfe380b6b3..9dea83cff29 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
@@ -141,7 +141,7 @@ protected SimpleExoPlayer(RenderersFactory renderersFactory, TrackSelector track
     videoScalingMode = C.VIDEO_SCALING_MODE_DEFAULT;
 
     // Build the player and associated objects.
-    player = new ExoPlayerImpl(renderers, trackSelector, loadControl);
+    player = createExoPlayerImpl(renderers, trackSelector, loadControl);
   }
 
   /**
@@ -722,6 +722,19 @@ public long getContentPosition() {
 
   // Internal methods.
 
+  /**
+   * Creates the ExoPlayer implementation used by this {@link SimpleExoPlayer}.
+   *
+   * @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.
+   * @return A new {@link ExoPlayer} instance.
+   */
+  protected ExoPlayer createExoPlayerImpl(Renderer[] renderers, TrackSelector trackSelector,
+      LoadControl loadControl) {
+    return new ExoPlayerImpl(renderers, trackSelector, loadControl);
+  }
+
   private void removeSurfaceCallbacks() {
     if (textureView != null) {
       if (textureView.getSurfaceTextureListener() != componentListener) {
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
new file mode 100644
index 00000000000..cf88d10bc85
--- /dev/null
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -0,0 +1,521 @@
+/*
+ * 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.testutil;
+
+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.ExoPlaybackException;
+import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.LoadControl;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Renderer;
+import com.google.android.exoplayer2.RendererCapabilities;
+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.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;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.trackselection.TrackSelector;
+import com.google.android.exoplayer2.trackselection.TrackSelector.InvalidationListener;
+import com.google.android.exoplayer2.trackselection.TrackSelectorResult;
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.Arrays;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+/**
+ * Fake {@link SimpleExoPlayer} which runs a simplified copy of the playback loop as fast as
+ * possible without waiting. It does only support single period timelines and does not support
+ * updates during playback (like seek, timeline changes, repeat mode changes).
+ */
+public class FakeSimpleExoPlayer extends SimpleExoPlayer {
+
+  private FakeExoPlayer player;
+
+  public FakeSimpleExoPlayer(RenderersFactory renderersFactory, TrackSelector trackSelector,
+      LoadControl loadControl, FakeClock clock) {
+    super (renderersFactory, trackSelector, loadControl);
+    player.setFakeClock(clock);
+  }
+
+  @Override
+  protected ExoPlayer createExoPlayerImpl(Renderer[] renderers, TrackSelector trackSelector,
+      LoadControl loadControl) {
+    this.player = new FakeExoPlayer(renderers, trackSelector, loadControl);
+    return player;
+  }
+
+  private class FakeExoPlayer implements ExoPlayer, MediaSource.Listener, MediaPeriod.Callback,
+      Runnable {
+
+    private final Renderer[] renderers;
+    private final TrackSelector trackSelector;
+    private final LoadControl loadControl;
+    private final CopyOnWriteArraySet<Player.EventListener> eventListeners;
+    private final HandlerThread playbackThread;
+    private final Handler playbackHandler;
+    private final Handler eventListenerHandler;
+
+    private FakeClock clock;
+    private MediaSource mediaSource;
+    private Timeline timeline;
+    private Object manifest;
+    private MediaPeriod mediaPeriod;
+    private TrackSelectorResult selectorResult;
+
+    private boolean isStartingUp;
+    private boolean isLoading;
+    private int playbackState;
+    private long rendererPositionUs;
+    private long durationUs;
+    private volatile long currentPositionMs;
+    private volatile long bufferedPositionMs;
+
+    public FakeExoPlayer(Renderer[] renderers, TrackSelector trackSelector,
+        LoadControl loadControl) {
+      this.renderers = renderers;
+      this.trackSelector = trackSelector;
+      this.loadControl = loadControl;
+      this.eventListeners = new CopyOnWriteArraySet<>();
+      Looper eventListenerLooper = Looper.myLooper();
+      this.eventListenerHandler = new Handler(eventListenerLooper != null ? eventListenerLooper
+          : Looper.getMainLooper());
+      this.playbackThread = new HandlerThread("FakeExoPlayer Thread");
+      playbackThread.start();
+      this.playbackHandler = new Handler(playbackThread.getLooper());
+      this.isStartingUp = true;
+      this.isLoading = false;
+      this.playbackState = Player.STATE_IDLE;
+      this.durationUs = C.TIME_UNSET;
+    }
+
+    public void setFakeClock(FakeClock clock) {
+      this.clock = clock;
+    }
+
+    @Override
+    public void addListener(Player.EventListener listener) {
+      eventListeners.add(listener);
+    }
+
+    @Override
+    public void removeListener(Player.EventListener listener) {
+      eventListeners.remove(listener);
+    }
+
+    @Override
+    public int getPlaybackState() {
+      return playbackState;
+    }
+
+    @Override
+    public void setPlayWhenReady(boolean playWhenReady) {
+      if (playWhenReady != true) {
+        throw new UnsupportedOperationException();
+      }
+    }
+
+    @Override
+    public boolean getPlayWhenReady() {
+      return true;
+    }
+
+    @Override
+    public void setRepeatMode(@RepeatMode int repeatMode) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int getRepeatMode() {
+      return Player.REPEAT_MODE_OFF;
+    }
+
+    @Override
+    public boolean isLoading() {
+      return isLoading;
+    }
+
+    @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 void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public PlaybackParameters getPlaybackParameters() {
+      return PlaybackParameters.DEFAULT;
+    }
+
+    @Override
+    public void stop() {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void release() {
+      playbackThread.quit();
+    }
+
+    @Override
+    public int getRendererCount() {
+      return renderers.length;
+    }
+
+    @Override
+    public int getRendererType(int index) {
+      return renderers[index].getTrackType();
+    }
+
+    @Override
+    public TrackGroupArray getCurrentTrackGroups() {
+      return selectorResult != null ? selectorResult.groups : null;
+    }
+
+    @Override
+    public TrackSelectionArray getCurrentTrackSelections() {
+      return selectorResult != null ? selectorResult.selections : null;
+    }
+
+    @Nullable
+    @Override
+    public Object getCurrentManifest() {
+      return manifest;
+    }
+
+    @Override
+    public Timeline getCurrentTimeline() {
+      return timeline;
+    }
+
+    @Override
+    public int getCurrentPeriodIndex() {
+      return 0;
+    }
+
+    @Override
+    public int getCurrentWindowIndex() {
+      return 0;
+    }
+
+    @Override
+    public long getDuration() {
+      return C.usToMs(durationUs);
+    }
+
+    @Override
+    public long getCurrentPosition() {
+      return currentPositionMs;
+    }
+
+    @Override
+    public long getBufferedPosition() {
+      return bufferedPositionMs == C.TIME_END_OF_SOURCE ? getDuration() : bufferedPositionMs;
+    }
+
+    @Override
+    public int getBufferedPercentage() {
+      long duration = getDuration();
+      return duration == C.TIME_UNSET ? 0 : (int) (getBufferedPosition() * 100 / duration);
+    }
+
+    @Override
+    public boolean isCurrentWindowDynamic() {
+      return false;
+    }
+
+    @Override
+    public boolean isCurrentWindowSeekable() {
+      return false;
+    }
+
+    @Override
+    public boolean isPlayingAd() {
+      return false;
+    }
+
+    @Override
+    public int getCurrentAdGroupIndex() {
+      return 0;
+    }
+
+    @Override
+    public int getCurrentAdIndexInAdGroup() {
+      return 0;
+    }
+
+    @Override
+    public long getContentPosition() {
+      return getCurrentPosition();
+    }
+
+    @Override
+    public Looper getPlaybackLooper() {
+      return playbackThread.getLooper();
+    }
+
+    @Override
+    public void prepare(MediaSource mediaSource) {
+      prepare(mediaSource, true, true);
+    }
+
+    @Override
+    public void prepare(final MediaSource mediaSource, boolean resetPosition, boolean resetState) {
+      if (resetPosition != true || resetState != true) {
+        throw new UnsupportedOperationException();
+      }
+      this.mediaSource = mediaSource;
+      playbackHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          mediaSource.prepareSource(FakeExoPlayer.this, true, FakeExoPlayer.this);
+        }
+      });
+    }
+
+    @Override
+    public void sendMessages(ExoPlayerMessage... messages) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public void blockingSendMessages(ExoPlayerMessage... messages) {
+      throw new UnsupportedOperationException();
+    }
+
+    // MediaSource.Listener
+
+    @Override
+    public void onSourceInfoRefreshed(final Timeline timeline, final @Nullable Object manifest) {
+      if (this.timeline != null) {
+        throw new UnsupportedOperationException();
+      }
+      Assertions.checkArgument(timeline.getPeriodCount() == 1);
+      Assertions.checkArgument(timeline.getWindowCount() == 1);
+      final ConditionVariable waitForNotification = new ConditionVariable();
+      eventListenerHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          for (Player.EventListener eventListener : eventListeners) {
+            FakeExoPlayer.this.durationUs = timeline.getPeriod(0, new Period()).durationUs;
+            FakeExoPlayer.this.timeline = timeline;
+            FakeExoPlayer.this.manifest = manifest;
+            eventListener.onTimelineChanged(timeline, manifest);
+            waitForNotification.open();
+          }
+        }
+      });
+      waitForNotification.block();
+      this.mediaPeriod = mediaSource.createPeriod(new MediaPeriodId(0), loadControl.getAllocator());
+      mediaPeriod.prepare(this, 0);
+    }
+
+    // MediaPeriod.Callback
+
+    @Override
+    public void onContinueLoadingRequested(MediaPeriod source) {
+      maybeContinueLoading();
+    }
+
+    @Override
+    public void onPrepared(MediaPeriod mediaPeriod) {
+      try {
+        initializePlaybackLoop();
+      } catch (ExoPlaybackException e) {
+        handlePlayerError(e);
+      }
+    }
+
+    // Runnable (Playback loop).
+
+    @Override
+    public void run() {
+      try {
+        maybeContinueLoading();
+        boolean allRenderersEnded = true;
+        boolean allRenderersReadyOrEnded = true;
+        if (playbackState == Player.STATE_READY) {
+          for (Renderer renderer : renderers) {
+            renderer.render(rendererPositionUs, C.msToUs(clock.elapsedRealtime()));
+            if (!renderer.isEnded()) {
+              allRenderersEnded = false;
+            }
+            if (!(renderer.isReady() || renderer.isEnded())) {
+              allRenderersReadyOrEnded = false;
+            }
+          }
+        }
+        if (rendererPositionUs >= durationUs && allRenderersEnded) {
+          changePlaybackState(Player.STATE_ENDED);
+          return;
+        }
+        long bufferedPositionUs = mediaPeriod.getBufferedPositionUs();
+        if (playbackState == Player.STATE_BUFFERING && allRenderersReadyOrEnded
+            && haveSufficientBuffer(!isStartingUp, rendererPositionUs, bufferedPositionUs)) {
+          changePlaybackState(Player.STATE_READY);
+          isStartingUp = false;
+        } else if (playbackState == Player.STATE_READY && !allRenderersReadyOrEnded) {
+          changePlaybackState(Player.STATE_BUFFERING);
+        }
+        // Advance simulated time by 10ms.
+        clock.advanceTime(10);
+        if (playbackState == Player.STATE_READY) {
+          rendererPositionUs += 10000;
+        }
+        this.currentPositionMs = C.usToMs(rendererPositionUs);
+        this.bufferedPositionMs = C.usToMs(bufferedPositionUs);
+        playbackHandler.post(this);
+      } catch (ExoPlaybackException e) {
+        handlePlayerError(e);
+      }
+    }
+
+    // Internal logic
+
+    private void initializePlaybackLoop() throws ExoPlaybackException {
+      Assertions.checkNotNull(clock);
+      trackSelector.init(new InvalidationListener() {
+        @Override
+        public void onTrackSelectionsInvalidated() {
+          throw new IllegalStateException();
+        }
+      });
+      RendererCapabilities[] rendererCapabilities = new RendererCapabilities[renderers.length];
+      for (int i = 0; i < renderers.length; i++) {
+        rendererCapabilities[i] = renderers[i].getCapabilities();
+      }
+      selectorResult = trackSelector.selectTracks(rendererCapabilities,
+          mediaPeriod.getTrackGroups());
+      SampleStream[] sampleStreams = new SampleStream[renderers.length];
+      boolean[] mayRetainStreamFlags = new boolean[renderers.length];
+      Arrays.fill(mayRetainStreamFlags, true);
+      mediaPeriod.selectTracks(selectorResult.selections.getAll(), mayRetainStreamFlags,
+          sampleStreams, new boolean[renderers.length], 0);
+      eventListenerHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          for (Player.EventListener eventListener : eventListeners) {
+            eventListener.onTracksChanged(selectorResult.groups, selectorResult.selections);
+          }
+        }
+      });
+
+      loadControl.onPrepared();
+      loadControl.onTracksSelected(renderers, selectorResult.groups, selectorResult.selections);
+
+      for (int i = 0; i < renderers.length; i++) {
+        TrackSelection selection = selectorResult.selections.get(i);
+        Format[] formats = new Format[selection.length()];
+        for (int j = 0; j < formats.length; j++) {
+          formats[j] = selection.getFormat(j);
+        }
+        renderers[i].enable(selectorResult.rendererConfigurations[i], formats, sampleStreams[i], 0,
+            false, 0);
+        renderers[i].setCurrentStreamFinal();
+      }
+
+      rendererPositionUs = 0;
+      changePlaybackState(Player.STATE_BUFFERING);
+      playbackHandler.post(this);
+    }
+
+    private void maybeContinueLoading() {
+      boolean newIsLoading = false;
+      long nextLoadPositionUs = mediaPeriod.getNextLoadPositionUs();
+      if (nextLoadPositionUs != C.TIME_END_OF_SOURCE) {
+        long bufferedDurationUs = nextLoadPositionUs - rendererPositionUs;
+        if (loadControl.shouldContinueLoading(bufferedDurationUs)) {
+          newIsLoading = true;
+          mediaPeriod.continueLoading(rendererPositionUs);
+        }
+      }
+      if (newIsLoading != isLoading) {
+        isLoading = newIsLoading;
+        eventListenerHandler.post(new Runnable() {
+          @Override
+          public void run() {
+            for (Player.EventListener eventListener : eventListeners) {
+              eventListener.onLoadingChanged(isLoading);
+            }
+          }
+        });
+      }
+    }
+
+    private boolean haveSufficientBuffer(boolean rebuffering, long rendererPositionUs,
+        long bufferedPositionUs) {
+      if (bufferedPositionUs == C.TIME_END_OF_SOURCE) {
+        return true;
+      }
+      return loadControl.shouldStartPlayback(bufferedPositionUs - rendererPositionUs, rebuffering);
+    }
+
+    private void handlePlayerError(final ExoPlaybackException e) {
+      eventListenerHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          for (Player.EventListener listener : eventListeners) {
+            listener.onPlayerError(e);
+          }
+        }
+      });
+      changePlaybackState(Player.STATE_ENDED);
+    }
+
+    private void changePlaybackState(final int playbackState) {
+      this.playbackState = playbackState;
+      eventListenerHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          for (Player.EventListener listener : eventListeners) {
+            listener.onPlayerStateChanged(true, playbackState);
+          }
+        }
+      });
+    }
+
+  }
+
+}

From 72daef7a4c3ae5a9375f7d064d88bbc9f6f96da6 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 3 Aug 2017 08:17:26 -0700
Subject: [PATCH 049/421] Don't read GaSpecificConfig unless required

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164125579
---
 .../exoplayer2/extractor/ts/LatmReader.java   |  2 +-
 .../util/CodecSpecificDataUtil.java           | 70 ++++++++++---------
 2 files changed, 38 insertions(+), 34 deletions(-)

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 d21943eae87..d06c6f0cb44 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
@@ -256,7 +256,7 @@ private void parseFrameLength(ParsableBitArray data) {
 
   private int parseAudioSpecificConfig(ParsableBitArray data) throws ParserException {
     int bitsLeft = data.bitsLeft();
-    Pair<Integer, Integer> config = CodecSpecificDataUtil.parseAacAudioSpecificConfig(data);
+    Pair<Integer, Integer> config = CodecSpecificDataUtil.parseAacAudioSpecificConfig(data, true);
     sampleRateHz = config.first;
     channelCount = config.second;
     return bitsLeft - data.bitsLeft();
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 c9884abe78c..0514d9dbdc1 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
@@ -90,7 +90,7 @@ private CodecSpecificDataUtil() {}
    */
   public static Pair<Integer, Integer> parseAacAudioSpecificConfig(byte[] audioSpecificConfig)
       throws ParserException {
-    return parseAacAudioSpecificConfig(new ParsableBitArray(audioSpecificConfig));
+    return parseAacAudioSpecificConfig(new ParsableBitArray(audioSpecificConfig), false);
   }
 
   /**
@@ -98,11 +98,13 @@ public static Pair<Integer, Integer> parseAacAudioSpecificConfig(byte[] audioSpe
    *
    * @param bitArray A {@link ParsableBitArray} containing the AudioSpecificConfig to parse. The
    *     position is advanced to the end of the AudioSpecificConfig.
+   * @param forceReadToEnd Whether the entire AudioSpecificConfig should be read. Required for
+   *     knowing the length of the configuration payload.
    * @return A pair consisting of the sample rate in Hz and the channel count.
    * @throws ParserException If the AudioSpecificConfig cannot be parsed as it's not supported.
    */
-  public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArray bitArray)
-      throws ParserException {
+  public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArray bitArray,
+      boolean forceReadToEnd) throws ParserException {
     int audioObjectType = getAacAudioObjectType(bitArray);
     int sampleRate = getAacSamplingFrequency(bitArray);
     int channelConfiguration = bitArray.readBits(4);
@@ -120,36 +122,38 @@ public static Pair<Integer, Integer> parseAacAudioSpecificConfig(ParsableBitArra
       }
     }
 
-    switch (audioObjectType) {
-      case 1:
-      case 2:
-      case 3:
-      case 4:
-      case 6:
-      case 7:
-      case 17:
-      case 19:
-      case 20:
-      case 21:
-      case 22:
-      case 23:
-        parseGaSpecificConfig(bitArray, audioObjectType, channelConfiguration);
-        break;
-      default:
-        throw new ParserException("Unsupported audio object type: " + audioObjectType);
-    }
-    switch (audioObjectType) {
-      case 17:
-      case 19:
-      case 20:
-      case 21:
-      case 22:
-      case 23:
-        int epConfig = bitArray.readBits(2);
-        if (epConfig == 2 || epConfig == 3) {
-          throw new ParserException("Unsupported epConfig: " + epConfig);
-        }
-        break;
+    if (forceReadToEnd) {
+      switch (audioObjectType) {
+        case 1:
+        case 2:
+        case 3:
+        case 4:
+        case 6:
+        case 7:
+        case 17:
+        case 19:
+        case 20:
+        case 21:
+        case 22:
+        case 23:
+          parseGaSpecificConfig(bitArray, audioObjectType, channelConfiguration);
+          break;
+        default:
+          throw new ParserException("Unsupported audio object type: " + audioObjectType);
+      }
+      switch (audioObjectType) {
+        case 17:
+        case 19:
+        case 20:
+        case 21:
+        case 22:
+        case 23:
+          int epConfig = bitArray.readBits(2);
+          if (epConfig == 2 || epConfig == 3) {
+            throw new ParserException("Unsupported epConfig: " + epConfig);
+          }
+          break;
+      }
     }
     // For supported containers, bits_to_decode() is always 0.
     int channelCount = AUDIO_SPECIFIC_CONFIG_CHANNEL_COUNT_TABLE[channelConfiguration];

From 53bc59b9d214a13b44a08fc088cb69971c40f2d8 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 3 Aug 2017 08:22:45 -0700
Subject: [PATCH 050/421] Add UI resources for shuffle mode.

Including strings, icon, and button.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164126101
---
 .../exo_controls_shuffle.xml                  |  26 ++++++++++++++++++
 .../drawable-hdpi/exo_controls_shuffle.png    | Bin 0 -> 268 bytes
 .../drawable-ldpi/exo_controls_shuffle.png    | Bin 0 -> 187 bytes
 .../drawable-mdpi/exo_controls_shuffle.png    | Bin 0 -> 230 bytes
 .../drawable-xhdpi/exo_controls_shuffle.png   | Bin 0 -> 342 bytes
 .../drawable-xxhdpi/exo_controls_shuffle.png  | Bin 0 -> 436 bytes
 .../res/layout/exo_playback_control_view.xml  |   3 ++
 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 +
 .../ui/src/main/res/values-az-rAZ/strings.xml |   1 +
 .../src/main/res/values-b+sr+Latn/strings.xml |   1 +
 .../ui/src/main/res/values-be-rBY/strings.xml |   1 +
 library/ui/src/main/res/values-bg/strings.xml |   1 +
 .../ui/src/main/res/values-bn-rBD/strings.xml |   1 +
 .../ui/src/main/res/values-bs-rBA/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 +
 .../ui/src/main/res/values-en-rAU/strings.xml |   1 +
 .../ui/src/main/res/values-en-rGB/strings.xml |   1 +
 .../ui/src/main/res/values-en-rIN/strings.xml |   1 +
 .../ui/src/main/res/values-es-rUS/strings.xml |   1 +
 library/ui/src/main/res/values-es/strings.xml |   1 +
 .../ui/src/main/res/values-et-rEE/strings.xml |   1 +
 .../ui/src/main/res/values-eu-rES/strings.xml |   1 +
 library/ui/src/main/res/values-fa/strings.xml |   1 +
 library/ui/src/main/res/values-fi/strings.xml |   1 +
 .../ui/src/main/res/values-fr-rCA/strings.xml |   1 +
 library/ui/src/main/res/values-fr/strings.xml |   1 +
 .../ui/src/main/res/values-gl-rES/strings.xml |   1 +
 .../ui/src/main/res/values-gu-rIN/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 +
 .../ui/src/main/res/values-hy-rAM/strings.xml |   1 +
 library/ui/src/main/res/values-in/strings.xml |   1 +
 .../ui/src/main/res/values-is-rIS/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 +
 .../ui/src/main/res/values-ka-rGE/strings.xml |   1 +
 .../ui/src/main/res/values-kk-rKZ/strings.xml |   1 +
 .../ui/src/main/res/values-km-rKH/strings.xml |   1 +
 .../ui/src/main/res/values-kn-rIN/strings.xml |   1 +
 library/ui/src/main/res/values-ko/strings.xml |   1 +
 .../ui/src/main/res/values-ky-rKG/strings.xml |   1 +
 .../ui/src/main/res/values-lo-rLA/strings.xml |   1 +
 library/ui/src/main/res/values-lt/strings.xml |   1 +
 library/ui/src/main/res/values-lv/strings.xml |   1 +
 .../ui/src/main/res/values-mk-rMK/strings.xml |   1 +
 .../ui/src/main/res/values-ml-rIN/strings.xml |   1 +
 .../ui/src/main/res/values-mn-rMN/strings.xml |   1 +
 .../ui/src/main/res/values-mr-rIN/strings.xml |   1 +
 .../ui/src/main/res/values-ms-rMY/strings.xml |   1 +
 .../ui/src/main/res/values-my-rMM/strings.xml |   1 +
 library/ui/src/main/res/values-nb/strings.xml |   1 +
 .../ui/src/main/res/values-ne-rNP/strings.xml |   1 +
 library/ui/src/main/res/values-nl/strings.xml |   1 +
 .../ui/src/main/res/values-pa-rIN/strings.xml |   1 +
 library/ui/src/main/res/values-pl/strings.xml |   1 +
 .../ui/src/main/res/values-pt-rBR/strings.xml |   1 +
 .../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 +
 .../ui/src/main/res/values-si-rLK/strings.xml |   1 +
 library/ui/src/main/res/values-sk/strings.xml |   1 +
 library/ui/src/main/res/values-sl/strings.xml |   1 +
 .../ui/src/main/res/values-sq-rAL/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 +
 .../ui/src/main/res/values-ta-rIN/strings.xml |   1 +
 .../ui/src/main/res/values-te-rIN/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 +
 .../ui/src/main/res/values-ur-rPK/strings.xml |   1 +
 .../ui/src/main/res/values-uz-rUZ/strings.xml |   1 +
 library/ui/src/main/res/values-vi/strings.xml |   1 +
 .../ui/src/main/res/values-zh-rCN/strings.xml |   1 +
 .../ui/src/main/res/values-zh-rHK/strings.xml |   1 +
 .../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/ids.xml        |   1 +
 library/ui/src/main/res/values/strings.xml    |   1 +
 library/ui/src/main/res/values/styles.xml     |   5 ++++
 91 files changed, 117 insertions(+)
 create mode 100644 library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
 create mode 100644 library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle.png
 create mode 100644 library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle.png
 create mode 100644 library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle.png
 create mode 100644 library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle.png
 create mode 100644 library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle.png

diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
new file mode 100644
index 00000000000..28ac6a57861
--- /dev/null
+++ b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
@@ -0,0 +1,26 @@
+<!-- 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.
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20
+17.96 7.46 20 9.5V4h-5.5zm.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04
+2.04-3.13-3.13z" />
+</vector>
diff --git a/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-hdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000000000000000000000000000000000..52a805aac1b49335b507086aea99d9fb813ef0ba
GIT binary patch
literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002fNkl<ZcmeIy
zfdzzc7>4mffJ0+6L|cR#qfu^z8=xV=jnM!Na5#kbz~|tV9=-_Q3o3bjQ2(1-tyWW`
zm-++mJ!N(zKS}xk0s@mH0RjV~#0UsbLIVI05%~=OfN*&OaKh&|Jv2Fh6Fxu0=ZyeQ
z_<a09e}EH<n!S7waZQO;-A*3O5HQcDmgo5@f5E((bMu`R^=IZ+e@5lxTdneE)R>U>
z$6!27$vYyR<m3$zcL{k*eB&Y^?}=Dq-V->V56m=AfxF%$&wwCimfr_zwb~E-7#5fO
S8wt(;0000<MNUMnLSTYDxN2em

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-ldpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000000000000000000000000000000000..80ec43a119428e6ed3b30438c15d179dcce93275
GIT binary patch
literal 187
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iCQlc~kP61TlNi|=97J5K9oS!R
z$SSgwH1ORrWNKmP=DWbi)G}Qt+PZAN!W)KT)dtH>XkOu&a%t_Iz(lrVI~F;eUBxBp
z#}dj^lPK&c(r>L5WwvzhrpvY;SLX+1e`U;j>OZIN6ZgH%zmNL-vHWy%_7CsEgvZaO
ls~x-?zbLiqaX`uxX0MyCcfUOJfFI}@22WQ%mvv4FO#oRXM=1aR

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-mdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000000000000000000000000000000000..0924b2cb69b3d5c8acd3efbfc833d36e1896a9d8
GIT binary patch
literal 230
zcmV<C02%*@P)<h;3K|Lk000e1NJLTq001BW001Be1ONa4*>kdg00023Nkl<ZcmeIx
z5fFqx9EI`V;2@uK$~l+AoDRap+##oR_gTpKoX+{+J2-eV&A#S8P1N+Vw(loZbM4^q
z;Au{JGP+(afAeK9#Eh2fk4yjoLV$V15F`&6!sH&Xg!07f0ZS<VpKk*q$~xCe^{t47
zww?#aJ)Ya0D5s?`?9Xp3tM8%<=ei?;L=NVf2ojLPd4<3LHjn?#j3y5Q9iQ#o10qIq
g(o=LXHAn8+55<#tAVj$YGXMYp07*qoM6N<$g3A75i~s-t

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-xhdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000000000000000000000000000000000..ede80c93417756aa396efeb759fd415ec524b160
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq002M$002M;1ONa40ARUQ0003UNkl<ZcmeI$
z0S3Zw7>4l>LI}_?I>7M1LkH*xJIan3AcQcy;RUEq4{rwFJAlpeGt#zQuh;AKs_6{R
zKWY@miRNcLHNk5ZeczyYNm0V!`6vMZbdi@O@H>zpa6o{dD+i<q&aVJK2p|sthyd~c
zfCwPJ>Z*kTIHAb<7eN7>P~=UZ08S|KCK!+-+;#XpZ$b&+{|_YZ=?G#af#-A6%=6*t
z%=77WzVn?g@;YprpLEx>W&TMYU-S9ud13$0{7Dbh&kM6gHea7%g6F(A0OU)8^BjQk
z1;Kd^Ao+seyaBO1xZ)*Y0LbTG%|M<LMmEn0Bb*0s5&RQPK2Pt!lFl1|2-&;=kPyrp
oK&K1-RC_Cqj~{+}y<V^P29OqnBNYbK4FCWD07*qoM6N<$f=Ne_TL1t6

literal 0
HcmV?d00001

diff --git a/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle.png b/library/ui/src/main/res/drawable-xxhdpi/exo_controls_shuffle.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c5e141a3f99bcd11e36c185710e67165bde7989
GIT binary patch
literal 436
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD0wg^q?%&M7z*z0+;uuoF`1Yn?4ojkl>%-P0
z+t->RuQji1eYfM?ywc;PdLpk^UQS9}xS=4b*2MSRl5(@1)6?V59si$~8GF4Hg6<SQ
zDqI@v{%_CMPxl)?{};Y?M%^*O(B3&h*WTp=!###17XAlQvl|o`7@L@$aM~1KW$+jH
zDgJ@M|HDtY2b^~InQaa}t!_~7sNw&>GO_+)>tvRSrW5t|-tKt3gkhe-r+RY^rUVY9
zdI1&(L6?6D5e*7E{x}*iINs>~<0!!3XmRR~<BgxX!ZrKmt3UZ{t2lo>hnBtlJePmd
zw*CF{%zXdPv-x$OXP^JK?Q{Q}$~{kO4hVkwIcviC>n$~Qr&;)-Pu0(e*B7>Mu&e*s
z?>OV9z$x*TiTpEbfXoRe#am_~GaGA4Uv^u5`uQ_GZ1Q`~hc*5j&#MomeLns*pIhK(
zos0v+wz>P+9w^V;&z5jLUF|+Io8pA`jLiZkzBf2>JgGjQP_t%cJ|jHT>^BNrb3E|o
Sniw!P7(8A5T-G@yGywp@636lY

literal 0
HcmV?d00001

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 407329890dd..159844c2346 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
@@ -34,6 +34,9 @@
     <ImageButton android:id="@id/exo_rew"
       style="@style/ExoMediaButton.Rewind"/>
 
+    <ImageButton android:id="@id/exo_shuffle"
+      style="@style/ExoMediaButton.Shuffle"/>
+
     <ImageButton android:id="@id/exo_repeat_toggle"
       style="@style/ExoMediaButton"/>
 
diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml
index 103877f1e66..2510552c0c9 100644
--- a/library/ui/src/main/res/values-af/strings.xml
+++ b/library/ui/src/main/res/values-af/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Herhaal alles"</string>
   <string name="exo_controls_repeat_off_description">"Herhaal niks"</string>
   <string name="exo_controls_repeat_one_description">"Herhaal een"</string>
+  <string name="exo_controls_shuffle_description">"Skommel"</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 356566cb871..165b5eee62c 100644
--- a/library/ui/src/main/res/values-am/strings.xml
+++ b/library/ui/src/main/res/values-am/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ሁሉንም ድገም"</string>
   <string name="exo_controls_repeat_off_description">"ምንም አትድገም"</string>
   <string name="exo_controls_repeat_one_description">"አንዱን ድገም"</string>
+  <string name="exo_controls_shuffle_description">"በው"</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 4bdbda061ca..239f01be6be 100644
--- a/library/ui/src/main/res/values-ar/strings.xml
+++ b/library/ui/src/main/res/values-ar/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"تكرار الكل"</string>
   <string name="exo_controls_repeat_off_description">"عدم التكرار"</string>
   <string name="exo_controls_repeat_one_description">"تكرار مقطع واحد"</string>
+  <string name="exo_controls_shuffle_description">"ترتيب عشوائي"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-az-rAZ/strings.xml b/library/ui/src/main/res/values-az-rAZ/strings.xml
index 771335952fc..1071cd55425 100644
--- a/library/ui/src/main/res/values-az-rAZ/strings.xml
+++ b/library/ui/src/main/res/values-az-rAZ/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Bütün təkrarlayın"</string>
   <string name="exo_controls_repeat_one_description">"Təkrar bir"</string>
   <string name="exo_controls_repeat_off_description">"Heç bir təkrar"</string>
+  <string name="exo_controls_shuffle_description">"Qarışdır"</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 7c373b5b554..a9d35e5cb6b 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
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovi sve"</string>
   <string name="exo_controls_repeat_off_description">"Ne ponavljaj nijednu"</string>
   <string name="exo_controls_repeat_one_description">"Ponovi jednu"</string>
+  <string name="exo_controls_shuffle_description">"Pusti nasumično"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-be-rBY/strings.xml b/library/ui/src/main/res/values-be-rBY/strings.xml
index 7790a7887fd..69b24ad5e98 100644
--- a/library/ui/src/main/res/values-be-rBY/strings.xml
+++ b/library/ui/src/main/res/values-be-rBY/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Паўтарыць усё"</string>
   <string name="exo_controls_repeat_off_description">"Паўтараць ні"</string>
   <string name="exo_controls_repeat_one_description">"Паўтарыць адзін"</string>
+  <string name="exo_controls_shuffle_description">"Перамяшаць"</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 ce9e3d69430..e3504797888 100644
--- a/library/ui/src/main/res/values-bg/strings.xml
+++ b/library/ui/src/main/res/values-bg/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повтаряне на всички"</string>
   <string name="exo_controls_repeat_off_description">"Без повтаряне"</string>
   <string name="exo_controls_repeat_one_description">"Повтаряне на един елемент"</string>
+  <string name="exo_controls_shuffle_description">"Разбъркване"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bn-rBD/strings.xml b/library/ui/src/main/res/values-bn-rBD/strings.xml
index 5f8ebfa98e3..446ef982a39 100644
--- a/library/ui/src/main/res/values-bn-rBD/strings.xml
+++ b/library/ui/src/main/res/values-bn-rBD/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"সবগুলির পুনরাবৃত্তি করুন"</string>
   <string name="exo_controls_repeat_off_description">"একটিরও পুনরাবৃত্তি করবেন না"</string>
   <string name="exo_controls_repeat_one_description">"একটির পুনরাবৃত্তি করুন"</string>
+  <string name="exo_controls_shuffle_description">"অদলবদল"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-bs-rBA/strings.xml b/library/ui/src/main/res/values-bs-rBA/strings.xml
index ef470997609..186b1058d91 100644
--- a/library/ui/src/main/res/values-bs-rBA/strings.xml
+++ b/library/ui/src/main/res/values-bs-rBA/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovite sve"</string>
   <string name="exo_controls_repeat_off_description">"Ne ponavljaju"</string>
   <string name="exo_controls_repeat_one_description">"Ponovite jedan"</string>
+  <string name="exo_controls_shuffle_description">"Izmiješaj"</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 a42fe3b9cb1..fd76a8e08e8 100644
--- a/library/ui/src/main/res/values-ca/strings.xml
+++ b/library/ui/src/main/res/values-ca/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeteix-ho tot"</string>
   <string name="exo_controls_repeat_off_description">"No en repeteixis cap"</string>
   <string name="exo_controls_repeat_one_description">"Repeteix-ne un"</string>
+  <string name="exo_controls_shuffle_description">"Reprodueix aleatòriament"</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 9c1e50ce273..087ab79c25c 100644
--- a/library/ui/src/main/res/values-cs/strings.xml
+++ b/library/ui/src/main/res/values-cs/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Opakovat vše"</string>
   <string name="exo_controls_repeat_off_description">"Neopakovat"</string>
   <string name="exo_controls_repeat_one_description">"Opakovat jednu položku"</string>
+  <string name="exo_controls_shuffle_description">"Náhodně"</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 3ec132ebb7f..0ae23ee288d 100644
--- a/library/ui/src/main/res/values-da/strings.xml
+++ b/library/ui/src/main/res/values-da/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Gentag alle"</string>
   <string name="exo_controls_repeat_off_description">"Gentag ingen"</string>
   <string name="exo_controls_repeat_one_description">"Gentag en"</string>
+  <string name="exo_controls_shuffle_description">"Bland"</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 a1dc749864a..37ca6c44ac3 100644
--- a/library/ui/src/main/res/values-de/strings.xml
+++ b/library/ui/src/main/res/values-de/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Alle wiederholen"</string>
   <string name="exo_controls_repeat_off_description">"Keinen Titel wiederholen"</string>
   <string name="exo_controls_repeat_one_description">"Einen Titel wiederholen"</string>
+  <string name="exo_controls_shuffle_description">"Zufallsmix"</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 845011fe557..534192e185e 100644
--- a/library/ui/src/main/res/values-el/strings.xml
+++ b/library/ui/src/main/res/values-el/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Επανάληψη όλων"</string>
   <string name="exo_controls_repeat_off_description">"Καμία επανάληψη"</string>
   <string name="exo_controls_repeat_one_description">"Επανάληψη ενός στοιχείου"</string>
+  <string name="exo_controls_shuffle_description">"Τυχαία αναπαραγωγή"</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 8a1742c8caa..0b4c4658538 100644
--- a/library/ui/src/main/res/values-en-rAU/strings.xml
+++ b/library/ui/src/main/res/values-en-rAU/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeat all"</string>
   <string name="exo_controls_repeat_off_description">"Repeat none"</string>
   <string name="exo_controls_repeat_one_description">"Repeat one"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</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 8a1742c8caa..0b4c4658538 100644
--- a/library/ui/src/main/res/values-en-rGB/strings.xml
+++ b/library/ui/src/main/res/values-en-rGB/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeat all"</string>
   <string name="exo_controls_repeat_off_description">"Repeat none"</string>
   <string name="exo_controls_repeat_one_description">"Repeat one"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</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 8a1742c8caa..0b4c4658538 100644
--- a/library/ui/src/main/res/values-en-rIN/strings.xml
+++ b/library/ui/src/main/res/values-en-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repeat all"</string>
   <string name="exo_controls_repeat_off_description">"Repeat none"</string>
   <string name="exo_controls_repeat_one_description">"Repeat one"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</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 f2ec848fb67..e6cf3fc6f21 100644
--- a/library/ui/src/main/res/values-es-rUS/strings.xml
+++ b/library/ui/src/main/res/values-es-rUS/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir todo"</string>
   <string name="exo_controls_repeat_off_description">"No repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir uno"</string>
+  <string name="exo_controls_shuffle_description">"Reproducir aleatoriamente"</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 116f064223f..04e1ea038ce 100644
--- a/library/ui/src/main/res/values-es/strings.xml
+++ b/library/ui/src/main/res/values-es/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir todo"</string>
   <string name="exo_controls_repeat_off_description">"No repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir uno"</string>
+  <string name="exo_controls_shuffle_description">"Reproducción aleatoria"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-et-rEE/strings.xml b/library/ui/src/main/res/values-et-rEE/strings.xml
index 153611ece42..004ec7e6c38 100644
--- a/library/ui/src/main/res/values-et-rEE/strings.xml
+++ b/library/ui/src/main/res/values-et-rEE/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Korda kõike"</string>
   <string name="exo_controls_repeat_off_description">"Ära korda midagi"</string>
   <string name="exo_controls_repeat_one_description">"Korda ühte"</string>
+  <string name="exo_controls_shuffle_description">"Esita juhuslikus järjekorras"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-eu-rES/strings.xml b/library/ui/src/main/res/values-eu-rES/strings.xml
index 1128572d9ab..6a3345303a8 100644
--- a/library/ui/src/main/res/values-eu-rES/strings.xml
+++ b/library/ui/src/main/res/values-eu-rES/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Errepikatu guztiak"</string>
   <string name="exo_controls_repeat_off_description">"Ez errepikatu"</string>
   <string name="exo_controls_repeat_one_description">"Errepikatu bat"</string>
+  <string name="exo_controls_shuffle_description">"Erreproduzitu ausaz"</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 d6be77323b4..101fcdbfb54 100644
--- a/library/ui/src/main/res/values-fa/strings.xml
+++ b/library/ui/src/main/res/values-fa/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"تکرار همه"</string>
   <string name="exo_controls_repeat_off_description">"تکرار هیچ‌کدام"</string>
   <string name="exo_controls_repeat_one_description">"یک‌بار تکرار"</string>
+  <string name="exo_controls_shuffle_description">"پخش درهم"</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 10e4b0bbe34..92feb866830 100644
--- a/library/ui/src/main/res/values-fi/strings.xml
+++ b/library/ui/src/main/res/values-fi/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Toista kaikki"</string>
   <string name="exo_controls_repeat_off_description">"Toista ei mitään"</string>
   <string name="exo_controls_repeat_one_description">"Toista yksi"</string>
+  <string name="exo_controls_shuffle_description">"Toista satunnaisesti"</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 d8852b5d3fc..45fc0a86f94 100644
--- a/library/ui/src/main/res/values-fr-rCA/strings.xml
+++ b/library/ui/src/main/res/values-fr-rCA/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Tout lire en boucle"</string>
   <string name="exo_controls_repeat_off_description">"Aucune répétition"</string>
   <string name="exo_controls_repeat_one_description">"Répéter un élément"</string>
+  <string name="exo_controls_shuffle_description">"Lecture aléatoire"</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 acf3670fa45..82b5a406269 100644
--- a/library/ui/src/main/res/values-fr/strings.xml
+++ b/library/ui/src/main/res/values-fr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Tout lire en boucle"</string>
   <string name="exo_controls_repeat_off_description">"Ne rien lire en boucle"</string>
   <string name="exo_controls_repeat_one_description">"Lire en boucle un élément"</string>
+  <string name="exo_controls_shuffle_description">"Lire en mode aléatoire"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-gl-rES/strings.xml b/library/ui/src/main/res/values-gl-rES/strings.xml
index 81b854cafe4..7062d8d023c 100644
--- a/library/ui/src/main/res/values-gl-rES/strings.xml
+++ b/library/ui/src/main/res/values-gl-rES/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir todo"</string>
   <string name="exo_controls_repeat_off_description">"Non repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir un"</string>
+  <string name="exo_controls_shuffle_description">"Reprodución aleatoria"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-gu-rIN/strings.xml b/library/ui/src/main/res/values-gu-rIN/strings.xml
index 6d51c29f973..ed78b1ee302 100644
--- a/library/ui/src/main/res/values-gu-rIN/strings.xml
+++ b/library/ui/src/main/res/values-gu-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"બધા પુનરાવર્તન કરો"</string>
   <string name="exo_controls_repeat_off_description">"કંઈ પુનરાવર્તન કરો"</string>
   <string name="exo_controls_repeat_one_description">"એક પુનરાવર્તન કરો"</string>
+  <string name="exo_controls_shuffle_description">"શફલ કરો"</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 eadb0519df6..ec624b1f35b 100644
--- a/library/ui/src/main/res/values-hi/strings.xml
+++ b/library/ui/src/main/res/values-hi/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"सभी को दोहराएं"</string>
   <string name="exo_controls_repeat_off_description">"कुछ भी न दोहराएं"</string>
   <string name="exo_controls_repeat_one_description">"एक दोहराएं"</string>
+  <string name="exo_controls_shuffle_description">"शफ़ल करें"</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 cb49965640f..7cb23e11dd8 100644
--- a/library/ui/src/main/res/values-hr/strings.xml
+++ b/library/ui/src/main/res/values-hr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovi sve"</string>
   <string name="exo_controls_repeat_off_description">"Bez ponavljanja"</string>
   <string name="exo_controls_repeat_one_description">"Ponovi jedno"</string>
+  <string name="exo_controls_shuffle_description">"Reproduciraj nasumično"</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 43ac8f51ffd..cf3d34c88f5 100644
--- a/library/ui/src/main/res/values-hu/strings.xml
+++ b/library/ui/src/main/res/values-hu/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Összes ismétlése"</string>
   <string name="exo_controls_repeat_off_description">"Nincs ismétlés"</string>
   <string name="exo_controls_repeat_one_description">"Egy ismétlése"</string>
+  <string name="exo_controls_shuffle_description">"Véletlenszerű lejátszás"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-hy-rAM/strings.xml b/library/ui/src/main/res/values-hy-rAM/strings.xml
index 3b09f9a5075..13a489baf5d 100644
--- a/library/ui/src/main/res/values-hy-rAM/strings.xml
+++ b/library/ui/src/main/res/values-hy-rAM/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"կրկնել այն ամենը"</string>
   <string name="exo_controls_repeat_off_description">"Չկրկնել"</string>
   <string name="exo_controls_repeat_one_description">"Կրկնել մեկը"</string>
+  <string name="exo_controls_shuffle_description">"Խառնել"</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 928be5945ae..09b05815e65 100644
--- a/library/ui/src/main/res/values-in/strings.xml
+++ b/library/ui/src/main/res/values-in/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ulangi Semua"</string>
   <string name="exo_controls_repeat_off_description">"Jangan Ulangi"</string>
   <string name="exo_controls_repeat_one_description">"Ulangi Satu"</string>
+  <string name="exo_controls_shuffle_description">"Acak"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-is-rIS/strings.xml b/library/ui/src/main/res/values-is-rIS/strings.xml
index 75be2aeb17d..12c4632cdf9 100644
--- a/library/ui/src/main/res/values-is-rIS/strings.xml
+++ b/library/ui/src/main/res/values-is-rIS/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Endurtaka allt"</string>
   <string name="exo_controls_repeat_off_description">"Endurtaka ekkert"</string>
   <string name="exo_controls_repeat_one_description">"Endurtaka eitt"</string>
+  <string name="exo_controls_shuffle_description">"Stokka"</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 59117a6b750..aea20db82e5 100644
--- a/library/ui/src/main/res/values-it/strings.xml
+++ b/library/ui/src/main/res/values-it/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ripeti tutti"</string>
   <string name="exo_controls_repeat_off_description">"Non ripetere nessuno"</string>
   <string name="exo_controls_repeat_one_description">"Ripeti uno"</string>
+  <string name="exo_controls_shuffle_description">"Riproduci casualmente"</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 347b137cf2f..dd973af50bf 100644
--- a/library/ui/src/main/res/values-iw/strings.xml
+++ b/library/ui/src/main/res/values-iw/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"חזור על הכל"</string>
   <string name="exo_controls_repeat_off_description">"אל תחזור על כלום"</string>
   <string name="exo_controls_repeat_one_description">"חזור על פריט אחד"</string>
+  <string name="exo_controls_shuffle_description">"ערבב"</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 cf2cc49b671..d6ce751d5c3 100644
--- a/library/ui/src/main/res/values-ja/strings.xml
+++ b/library/ui/src/main/res/values-ja/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"全曲を繰り返し"</string>
   <string name="exo_controls_repeat_off_description">"繰り返しなし"</string>
   <string name="exo_controls_repeat_one_description">"1曲を繰り返し"</string>
+  <string name="exo_controls_shuffle_description">"シャッフル"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ka-rGE/strings.xml b/library/ui/src/main/res/values-ka-rGE/strings.xml
index 75da8dde18c..252e52f1519 100644
--- a/library/ui/src/main/res/values-ka-rGE/strings.xml
+++ b/library/ui/src/main/res/values-ka-rGE/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"გამეორება ყველა"</string>
   <string name="exo_controls_repeat_off_description">"გაიმეორეთ არცერთი"</string>
   <string name="exo_controls_repeat_one_description">"გაიმეორეთ ერთი"</string>
+  <string name="exo_controls_shuffle_description">"არეულად დაკვრა"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-kk-rKZ/strings.xml b/library/ui/src/main/res/values-kk-rKZ/strings.xml
index b1ab22ecf65..43eb3dd0309 100644
--- a/library/ui/src/main/res/values-kk-rKZ/strings.xml
+++ b/library/ui/src/main/res/values-kk-rKZ/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Барлығын қайталау"</string>
   <string name="exo_controls_repeat_off_description">"Ешқайсысын қайталамау"</string>
   <string name="exo_controls_repeat_one_description">"Біреуін қайталау"</string>
+  <string name="exo_controls_shuffle_description">"Кездейсоқ ретпен ойнату"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-km-rKH/strings.xml b/library/ui/src/main/res/values-km-rKH/strings.xml
index dfd9f7d8636..653c9f051d8 100644
--- a/library/ui/src/main/res/values-km-rKH/strings.xml
+++ b/library/ui/src/main/res/values-km-rKH/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ធ្វើ​ម្ដង​ទៀត​ទាំងអស់"</string>
   <string name="exo_controls_repeat_off_description">"មិន​ធ្វើ​ឡើង​វិញ"</string>
   <string name="exo_controls_repeat_one_description">"ធ្វើ​​ឡើងវិញ​ម្ដង"</string>
+  <string name="exo_controls_shuffle_description">"ច្របល់"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-kn-rIN/strings.xml b/library/ui/src/main/res/values-kn-rIN/strings.xml
index 868af17a650..7368fc8ad3b 100644
--- a/library/ui/src/main/res/values-kn-rIN/strings.xml
+++ b/library/ui/src/main/res/values-kn-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ಎಲ್ಲವನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
   <string name="exo_controls_repeat_off_description">"ಯಾವುದನ್ನೂ ಪುನರಾವರ್ತಿಸಬೇಡಿ"</string>
   <string name="exo_controls_repeat_one_description">"ಒಂದನ್ನು ಪುನರಾವರ್ತಿಸಿ"</string>
+  <string name="exo_controls_shuffle_description">"ಬೆರೆಸು"</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 89636ac8a08..99d4a2f9a48 100644
--- a/library/ui/src/main/res/values-ko/strings.xml
+++ b/library/ui/src/main/res/values-ko/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"전체 반복"</string>
   <string name="exo_controls_repeat_off_description">"반복 안함"</string>
   <string name="exo_controls_repeat_one_description">"한 항목 반복"</string>
+  <string name="exo_controls_shuffle_description">"셔플"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ky-rKG/strings.xml b/library/ui/src/main/res/values-ky-rKG/strings.xml
index 15fd50468a1..9b903a124ef 100644
--- a/library/ui/src/main/res/values-ky-rKG/strings.xml
+++ b/library/ui/src/main/res/values-ky-rKG/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Баарын кайталоо"</string>
   <string name="exo_controls_repeat_off_description">"Эч бирин кайталабоо"</string>
   <string name="exo_controls_repeat_one_description">"Бирөөнү кайталоо"</string>
+  <string name="exo_controls_shuffle_description">"Аралаштыруу"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-lo-rLA/strings.xml b/library/ui/src/main/res/values-lo-rLA/strings.xml
index 405d0c64feb..702cd54396d 100644
--- a/library/ui/src/main/res/values-lo-rLA/strings.xml
+++ b/library/ui/src/main/res/values-lo-rLA/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ຫຼິ້ນ​ຊ້ຳ​ທັງ​ໝົດ"</string>
   <string name="exo_controls_repeat_off_description">"​ບໍ່ຫຼິ້ນ​ຊ້ຳ"</string>
   <string name="exo_controls_repeat_one_description">"ຫຼິ້ນ​ຊ້ຳ"</string>
+  <string name="exo_controls_shuffle_description">"ຫຼີ້ນແບບສຸ່ມ"</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 bd7d4142fce..d6073f42e33 100644
--- a/library/ui/src/main/res/values-lt/strings.xml
+++ b/library/ui/src/main/res/values-lt/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Kartoti viską"</string>
   <string name="exo_controls_repeat_off_description">"Nekartoti nieko"</string>
   <string name="exo_controls_repeat_one_description">"Kartoti vieną"</string>
+  <string name="exo_controls_shuffle_description">"Maišyti"</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 c2ebc70cbd1..64393d679af 100644
--- a/library/ui/src/main/res/values-lv/strings.xml
+++ b/library/ui/src/main/res/values-lv/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Atkārtot visu"</string>
   <string name="exo_controls_repeat_off_description">"Neatkārtot nevienu"</string>
   <string name="exo_controls_repeat_one_description">"Atkārtot vienu"</string>
+  <string name="exo_controls_shuffle_description">"Atskaņot jauktā secībā"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mk-rMK/strings.xml b/library/ui/src/main/res/values-mk-rMK/strings.xml
index 14ce7111a43..60858df8b1b 100644
--- a/library/ui/src/main/res/values-mk-rMK/strings.xml
+++ b/library/ui/src/main/res/values-mk-rMK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повтори ги сите"</string>
   <string name="exo_controls_repeat_off_description">"Не повторувај ниту една"</string>
   <string name="exo_controls_repeat_one_description">"Повтори една"</string>
+  <string name="exo_controls_shuffle_description">"По случаен избор"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ml-rIN/strings.xml b/library/ui/src/main/res/values-ml-rIN/strings.xml
index 17fe7a16554..4e5eddb93e8 100644
--- a/library/ui/src/main/res/values-ml-rIN/strings.xml
+++ b/library/ui/src/main/res/values-ml-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"എല്ലാം ആവർത്തിക്കുക"</string>
   <string name="exo_controls_repeat_off_description">"ഒന്നും ആവർത്തിക്കരുത്"</string>
   <string name="exo_controls_repeat_one_description">"ഒന്ന് ആവർത്തിക്കുക"</string>
+  <string name="exo_controls_shuffle_description">"ഷഫിൾ ചെയ്യുക"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mn-rMN/strings.xml b/library/ui/src/main/res/values-mn-rMN/strings.xml
index bf9a7e03bff..4ab26a7f629 100644
--- a/library/ui/src/main/res/values-mn-rMN/strings.xml
+++ b/library/ui/src/main/res/values-mn-rMN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Бүгдийг давтах"</string>
   <string name="exo_controls_repeat_off_description">"Алийг нь ч давтахгүй"</string>
   <string name="exo_controls_repeat_one_description">"Нэгийг давтах"</string>
+  <string name="exo_controls_shuffle_description">"Холих"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-mr-rIN/strings.xml b/library/ui/src/main/res/values-mr-rIN/strings.xml
index df4ac9de6b8..7869355b59a 100644
--- a/library/ui/src/main/res/values-mr-rIN/strings.xml
+++ b/library/ui/src/main/res/values-mr-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"सर्व पुनरावृत्ती करा"</string>
   <string name="exo_controls_repeat_off_description">"काहीही पुनरावृत्ती करू नका"</string>
   <string name="exo_controls_repeat_one_description">"एक पुनरावृत्ती करा"</string>
+  <string name="exo_controls_shuffle_description">"शफल करा"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ms-rMY/strings.xml b/library/ui/src/main/res/values-ms-rMY/strings.xml
index 33dfcb40f0a..fdde3de0790 100644
--- a/library/ui/src/main/res/values-ms-rMY/strings.xml
+++ b/library/ui/src/main/res/values-ms-rMY/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ulang semua"</string>
   <string name="exo_controls_repeat_off_description">"Tiada ulangan"</string>
   <string name="exo_controls_repeat_one_description">"Ulangan"</string>
+  <string name="exo_controls_shuffle_description">"Rombak"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-my-rMM/strings.xml b/library/ui/src/main/res/values-my-rMM/strings.xml
index b4ea5b11554..3d7918d953d 100644
--- a/library/ui/src/main/res/values-my-rMM/strings.xml
+++ b/library/ui/src/main/res/values-my-rMM/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"အားလုံး ထပ်တလဲလဲဖွင့်ရန်"</string>
   <string name="exo_controls_repeat_off_description">"ထပ်တလဲလဲမဖွင့်ရန်"</string>
   <string name="exo_controls_repeat_one_description">"တစ်ခုအား ထပ်တလဲလဲဖွင့်ရန်"</string>
+  <string name="exo_controls_shuffle_description">"မွှေနှောက်ဖွင့်ရန်"</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 679bf1134c0..370c759b84d 100644
--- a/library/ui/src/main/res/values-nb/strings.xml
+++ b/library/ui/src/main/res/values-nb/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Gjenta alle"</string>
   <string name="exo_controls_repeat_off_description">"Ikke gjenta noen"</string>
   <string name="exo_controls_repeat_one_description">"Gjenta én"</string>
+  <string name="exo_controls_shuffle_description">"Spill av i tilfeldig rekkefølge"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ne-rNP/strings.xml b/library/ui/src/main/res/values-ne-rNP/strings.xml
index 43730c1880f..19f43d0392f 100644
--- a/library/ui/src/main/res/values-ne-rNP/strings.xml
+++ b/library/ui/src/main/res/values-ne-rNP/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"सबै दोहोर्याउनुहोस्"</string>
   <string name="exo_controls_repeat_off_description">"कुनै पनि नदोहोर्याउनुहोस्"</string>
   <string name="exo_controls_repeat_one_description">"एउटा दोहोर्याउनुहोस्"</string>
+  <string name="exo_controls_shuffle_description">"मिसाउनुहोस्"</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 6383c977fca..a67ab2968c9 100644
--- a/library/ui/src/main/res/values-nl/strings.xml
+++ b/library/ui/src/main/res/values-nl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Alles herhalen"</string>
   <string name="exo_controls_repeat_off_description">"Niet herhalen"</string>
   <string name="exo_controls_repeat_one_description">"Eén herhalen"</string>
+  <string name="exo_controls_shuffle_description">"Shuffle"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pa-rIN/strings.xml b/library/ui/src/main/res/values-pa-rIN/strings.xml
index ddf60b03944..6250b905140 100644
--- a/library/ui/src/main/res/values-pa-rIN/strings.xml
+++ b/library/ui/src/main/res/values-pa-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"ਸਭ ਨੂੰ ਦੁਹਰਾਓ"</string>
   <string name="exo_controls_repeat_off_description">"ਕੋਈ ਵੀ ਨਹੀਂ ਦੁਹਰਾਓ"</string>
   <string name="exo_controls_repeat_one_description">"ਇੱਕ ਦੁਹਰਾਓ"</string>
+  <string name="exo_controls_shuffle_description">"ਸ਼ੱਫਲ"</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 113c568f85f..ff1d77fdd5f 100644
--- a/library/ui/src/main/res/values-pl/strings.xml
+++ b/library/ui/src/main/res/values-pl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Powtórz wszystkie"</string>
   <string name="exo_controls_repeat_off_description">"Nie powtarzaj"</string>
   <string name="exo_controls_repeat_one_description">"Powtórz jeden"</string>
+  <string name="exo_controls_shuffle_description">"Odtwarzaj losowo"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-pt-rBR/strings.xml b/library/ui/src/main/res/values-pt-rBR/strings.xml
index 87c54358ba6..86a91b06775 100644
--- a/library/ui/src/main/res/values-pt-rBR/strings.xml
+++ b/library/ui/src/main/res/values-pt-rBR/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir tudo"</string>
   <string name="exo_controls_repeat_off_description">"Não repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir um"</string>
+  <string name="exo_controls_shuffle_description">"Reproduzir aleatoriamente"</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 ca34afec3c9..5a7144e36b2 100644
--- a/library/ui/src/main/res/values-pt-rPT/strings.xml
+++ b/library/ui/src/main/res/values-pt-rPT/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir tudo"</string>
   <string name="exo_controls_repeat_off_description">"Não repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir um"</string>
+  <string name="exo_controls_shuffle_description">"Reproduzir aleatoriamente"</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 2fc31917384..8441e4e1cc9 100644
--- a/library/ui/src/main/res/values-pt/strings.xml
+++ b/library/ui/src/main/res/values-pt/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetir tudo"</string>
   <string name="exo_controls_repeat_off_description">"Não repetir"</string>
   <string name="exo_controls_repeat_one_description">"Repetir uma"</string>
+  <string name="exo_controls_shuffle_description">"Reproduzir aleatoriamente"</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 0b2ce540f7f..6b8644e30a5 100644
--- a/library/ui/src/main/res/values-ro/strings.xml
+++ b/library/ui/src/main/res/values-ro/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Repetați toate"</string>
   <string name="exo_controls_repeat_off_description">"Repetați niciuna"</string>
   <string name="exo_controls_repeat_one_description">"Repetați unul"</string>
+  <string name="exo_controls_shuffle_description">"Redați aleatoriu"</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 1d179e028c9..51d11d6371e 100644
--- a/library/ui/src/main/res/values-ru/strings.xml
+++ b/library/ui/src/main/res/values-ru/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повторять все"</string>
   <string name="exo_controls_repeat_off_description">"Не повторять"</string>
   <string name="exo_controls_repeat_one_description">"Повторять один элемент"</string>
+  <string name="exo_controls_shuffle_description">"Перемешать"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-si-rLK/strings.xml b/library/ui/src/main/res/values-si-rLK/strings.xml
index bc37d98eed1..eb8453b1563 100644
--- a/library/ui/src/main/res/values-si-rLK/strings.xml
+++ b/library/ui/src/main/res/values-si-rLK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"සියලු නැවත"</string>
   <string name="exo_controls_repeat_off_description">"කිසිවක් නැවත"</string>
   <string name="exo_controls_repeat_one_description">"නැවත නැවත එක්"</string>
+  <string name="exo_controls_shuffle_description">"කලවම් කරන්න"</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 a6ea26bdf06..2428dbdccee 100644
--- a/library/ui/src/main/res/values-sk/strings.xml
+++ b/library/ui/src/main/res/values-sk/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Opakovať všetko"</string>
   <string name="exo_controls_repeat_off_description">"Neopakovať"</string>
   <string name="exo_controls_repeat_one_description">"Opakovať jednu položku"</string>
+  <string name="exo_controls_shuffle_description">"Náhodne prehrávať"</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 39813fa3857..8ed731b0d33 100644
--- a/library/ui/src/main/res/values-sl/strings.xml
+++ b/library/ui/src/main/res/values-sl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ponovi vse"</string>
   <string name="exo_controls_repeat_off_description">"Ne ponovi"</string>
   <string name="exo_controls_repeat_one_description">"Ponovi eno"</string>
+  <string name="exo_controls_shuffle_description">"Naključno predvajaj"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-sq-rAL/strings.xml b/library/ui/src/main/res/values-sq-rAL/strings.xml
index 0bdc2e5f84f..e2d209e10b9 100644
--- a/library/ui/src/main/res/values-sq-rAL/strings.xml
+++ b/library/ui/src/main/res/values-sq-rAL/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Përsërit të gjithë"</string>
   <string name="exo_controls_repeat_off_description">"Përsëritni asnjë"</string>
   <string name="exo_controls_repeat_one_description">"Përsëritni një"</string>
+  <string name="exo_controls_shuffle_description">"Përziej"</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 0d54de5f6a4..8e43a03079e 100644
--- a/library/ui/src/main/res/values-sr/strings.xml
+++ b/library/ui/src/main/res/values-sr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Понови све"</string>
   <string name="exo_controls_repeat_off_description">"Понављање је искључено"</string>
   <string name="exo_controls_repeat_one_description">"Понови једну"</string>
+  <string name="exo_controls_shuffle_description">"Пусти насумично"</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 0f7f16f91d4..5ff11006328 100644
--- a/library/ui/src/main/res/values-sv/strings.xml
+++ b/library/ui/src/main/res/values-sv/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Upprepa alla"</string>
   <string name="exo_controls_repeat_off_description">"Upprepa inga"</string>
   <string name="exo_controls_repeat_one_description">"Upprepa en"</string>
+  <string name="exo_controls_shuffle_description">"Blanda"</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 b48af886592..d1d5978f9ce 100644
--- a/library/ui/src/main/res/values-sw/strings.xml
+++ b/library/ui/src/main/res/values-sw/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Rudia zote"</string>
   <string name="exo_controls_repeat_off_description">"Usirudie Yoyote"</string>
   <string name="exo_controls_repeat_one_description">"Rudia Moja"</string>
+  <string name="exo_controls_shuffle_description">"Changanya"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ta-rIN/strings.xml b/library/ui/src/main/res/values-ta-rIN/strings.xml
index 3dd64f52f71..43a925aa2eb 100644
--- a/library/ui/src/main/res/values-ta-rIN/strings.xml
+++ b/library/ui/src/main/res/values-ta-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"அனைத்தையும் மீண்டும் இயக்கு"</string>
   <string name="exo_controls_repeat_off_description">"எதையும் மீண்டும் இயக்காதே"</string>
   <string name="exo_controls_repeat_one_description">"ஒன்றை மட்டும் மீண்டும் இயக்கு"</string>
+  <string name="exo_controls_shuffle_description">"குலை"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-te-rIN/strings.xml b/library/ui/src/main/res/values-te-rIN/strings.xml
index daf337a931d..8541a44553e 100644
--- a/library/ui/src/main/res/values-te-rIN/strings.xml
+++ b/library/ui/src/main/res/values-te-rIN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"అన్నీ పునరావృతం చేయి"</string>
   <string name="exo_controls_repeat_off_description">"ఏదీ పునరావృతం చేయవద్దు"</string>
   <string name="exo_controls_repeat_one_description">"ఒకదాన్ని పునరావృతం చేయి"</string>
+  <string name="exo_controls_shuffle_description">"షఫుల్ చేయి"</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 ff89b8d5f53..cd97712b671 100644
--- a/library/ui/src/main/res/values-th/strings.xml
+++ b/library/ui/src/main/res/values-th/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"เล่นซ้ำทั้งหมด"</string>
   <string name="exo_controls_repeat_off_description">"ไม่เล่นซ้ำ"</string>
   <string name="exo_controls_repeat_one_description">"เล่นซ้ำรายการเดียว"</string>
+  <string name="exo_controls_shuffle_description">"สุ่มเพลง"</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 89cf2ef400d..e8cb87acddd 100644
--- a/library/ui/src/main/res/values-tl/strings.xml
+++ b/library/ui/src/main/res/values-tl/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Ulitin Lahat"</string>
   <string name="exo_controls_repeat_off_description">"Walang Uulitin"</string>
   <string name="exo_controls_repeat_one_description">"Ulitin ang Isa"</string>
+  <string name="exo_controls_shuffle_description">"I-shuffle"</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 87dba7204c4..cd1bfc5444c 100644
--- a/library/ui/src/main/res/values-tr/strings.xml
+++ b/library/ui/src/main/res/values-tr/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Tümünü Tekrarla"</string>
   <string name="exo_controls_repeat_off_description">"Hiçbirini Tekrarlama"</string>
   <string name="exo_controls_repeat_one_description">"Birini Tekrarla"</string>
+  <string name="exo_controls_shuffle_description">"Karıştır"</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 1fdfe2bce5b..1b0278ae940 100644
--- a/library/ui/src/main/res/values-uk/strings.xml
+++ b/library/ui/src/main/res/values-uk/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Повторити все"</string>
   <string name="exo_controls_repeat_off_description">"Не повторювати"</string>
   <string name="exo_controls_repeat_one_description">"Повторити один елемент"</string>
+  <string name="exo_controls_shuffle_description">"Перемішати"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-ur-rPK/strings.xml b/library/ui/src/main/res/values-ur-rPK/strings.xml
index 956374b26a6..f253e56c000 100644
--- a/library/ui/src/main/res/values-ur-rPK/strings.xml
+++ b/library/ui/src/main/res/values-ur-rPK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"سبھی کو دہرائیں"</string>
   <string name="exo_controls_repeat_off_description">"کسی کو نہ دہرائیں"</string>
   <string name="exo_controls_repeat_one_description">"ایک کو دہرائیں"</string>
+  <string name="exo_controls_shuffle_description">"شفل کریں"</string>
 </resources>
diff --git a/library/ui/src/main/res/values-uz-rUZ/strings.xml b/library/ui/src/main/res/values-uz-rUZ/strings.xml
index 286d4d01abf..a322690b2de 100644
--- a/library/ui/src/main/res/values-uz-rUZ/strings.xml
+++ b/library/ui/src/main/res/values-uz-rUZ/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Barchasini takrorlash"</string>
   <string name="exo_controls_repeat_off_description">"Takrorlamaslik"</string>
   <string name="exo_controls_repeat_one_description">"Bir marta takrorlash"</string>
+  <string name="exo_controls_shuffle_description">"Tasodifiy tartibda"</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 4dea58d494c..cff19eca7e6 100644
--- a/library/ui/src/main/res/values-vi/strings.xml
+++ b/library/ui/src/main/res/values-vi/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Lặp lại tất cả"</string>
   <string name="exo_controls_repeat_off_description">"Không lặp lại"</string>
   <string name="exo_controls_repeat_one_description">"Lặp lại một mục"</string>
+  <string name="exo_controls_shuffle_description">"Trộn bài"</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 e15d84e777a..cf3fe5e88bd 100644
--- a/library/ui/src/main/res/values-zh-rCN/strings.xml
+++ b/library/ui/src/main/res/values-zh-rCN/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"重复播放全部"</string>
   <string name="exo_controls_repeat_off_description">"不重复播放"</string>
   <string name="exo_controls_repeat_one_description">"重复播放单个视频"</string>
+  <string name="exo_controls_shuffle_description">"随机播放"</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 ba793e98a85..78fe4ad9952 100644
--- a/library/ui/src/main/res/values-zh-rHK/strings.xml
+++ b/library/ui/src/main/res/values-zh-rHK/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"重複播放所有媒體項目"</string>
   <string name="exo_controls_repeat_off_description">"不重複播放任何媒體項目"</string>
   <string name="exo_controls_repeat_one_description">"重複播放一個媒體項目"</string>
+  <string name="exo_controls_shuffle_description">"隨機播放"</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 bf3364d5cfe..36327429046 100644
--- a/library/ui/src/main/res/values-zh-rTW/strings.xml
+++ b/library/ui/src/main/res/values-zh-rTW/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"重複播放所有媒體項目"</string>
   <string name="exo_controls_repeat_off_description">"不重複播放"</string>
   <string name="exo_controls_repeat_one_description">"重複播放單一媒體項目"</string>
+  <string name="exo_controls_shuffle_description">"隨機播放"</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 d7bebaaa2ac..42dd59c97f1 100644
--- a/library/ui/src/main/res/values-zu/strings.xml
+++ b/library/ui/src/main/res/values-zu/strings.xml
@@ -25,4 +25,5 @@
   <string name="exo_controls_repeat_all_description">"Phinda konke"</string>
   <string name="exo_controls_repeat_off_description">"Ungaphindi lutho"</string>
   <string name="exo_controls_repeat_one_description">"Phida okukodwa"</string>
+  <string name="exo_controls_shuffle_description">"Shova"</string>
 </resources>
diff --git a/library/ui/src/main/res/values/ids.xml b/library/ui/src/main/res/values/ids.xml
index b16b1729dac..b90d2329b34 100644
--- a/library/ui/src/main/res/values/ids.xml
+++ b/library/ui/src/main/res/values/ids.xml
@@ -28,6 +28,7 @@
   <item name="exo_ffwd" type="id"/>
   <item name="exo_prev" type="id"/>
   <item name="exo_next" type="id"/>
+  <item name="exo_shuffle" type="id"/>
   <item name="exo_repeat_toggle" type="id"/>
   <item name="exo_duration" type="id"/>
   <item name="exo_position" type="id"/>
diff --git a/library/ui/src/main/res/values/strings.xml b/library/ui/src/main/res/values/strings.xml
index c5d11eeadb0..ee8cd78be76 100644
--- a/library/ui/src/main/res/values/strings.xml
+++ b/library/ui/src/main/res/values/strings.xml
@@ -24,4 +24,5 @@
   <string name="exo_controls_repeat_off_description">Repeat none</string>
   <string name="exo_controls_repeat_one_description">Repeat one</string>
   <string name="exo_controls_repeat_all_description">Repeat all</string>
+  <string name="exo_controls_shuffle_description">Shuffle</string>
 </resources>
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index a67cffe4200..4ef8971ccdd 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -51,4 +51,9 @@
     <item name="android:contentDescription">@string/exo_controls_pause_description</item>
   </style>
 
+  <style name="ExoMediaButton.Shuffle">
+    <item name="android:src">@drawable/exo_controls_shuffle</item>
+    <item name="android:contentDescription">@string/exo_controls_shuffle_description</item>
+  </style>
+
 </resources>

From 1109bf50dd9cb9ed5108cf325559e139364e9872 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Aug 2017 08:26:44 -0700
Subject: [PATCH 051/421] Bump version

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164126494
---
 RELEASENOTES.md                                               | 2 ++
 constants.gradle                                              | 2 +-
 .../com/google/android/exoplayer2/ExoPlayerLibraryInfo.java   | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 379b84b4e7d..e96cd9ddabd 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -52,6 +52,8 @@
   ([#2891](https://github.com/google/ExoPlayer/issues/2891)).
 * Cronet extension: Support for a user-defined fallback if Cronet library is not
   present.
+* Fix buffer too small IllegalStateException issue affecting some composite
+  media playbacks ([#2900](https://github.com/google/ExoPlayer/issues/2900)).
 * Misc bugfixes.
 
 ### r2.4.4 ###
diff --git a/constants.gradle b/constants.gradle
index 0db74945c4d..93284fd897d 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -24,7 +24,7 @@ project.ext {
     supportLibraryVersion = '25.4.0'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
-    releaseVersion = 'r2.5.0-beta2'
+    releaseVersion = 'r2.5.0-beta3'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
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 c04a777e142..153c6cda9cf 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
@@ -31,13 +31,13 @@ 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.5.0-beta2";
+  public static final String VERSION = "2.5.0-beta3";
 
   /**
    * 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.5.0-beta2";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.0-beta3";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.

From 95dd590016d064a47f142159afa70286ba63ec4c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Aug 2017 10:06:28 -0700
Subject: [PATCH 052/421] Remove dead sample link

Issue: #3135

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164138761
---
 demos/main/src/main/assets/media.exolist.json | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
index e0110df80b7..59d8259d37b 100644
--- a/demos/main/src/main/assets/media.exolist.json
+++ b/demos/main/src/main/assets/media.exolist.json
@@ -325,18 +325,6 @@
       }
     ]
   },
-  {
-    "name": "ClearKey DASH",
-    "samples": [
-      {
-        "name": "Big Buck Bunny (CENC ClearKey)",
-        "uri": "http://html5.cablelabs.com:8100/cenc/ck/dash.mpd",
-        "extension": "mpd",
-        "drm_scheme": "cenc",
-        "drm_license_url": "https://wasabeef.jp/demos/cenc-ck-dash.json"
-      }
-    ]
-  },
   {
     "name": "SmoothStreaming",
     "samples": [

From b664e92bb4084af281d8ab116bcd4cb3a7671030 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 3 Aug 2017 10:18:54 -0700
Subject: [PATCH 053/421] Remove shuffle button since it doesn't work yet

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164141326
---
 library/ui/src/main/res/layout/exo_playback_control_view.xml | 3 ---
 1 file changed, 3 deletions(-)

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 159844c2346..407329890dd 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
@@ -34,9 +34,6 @@
     <ImageButton android:id="@id/exo_rew"
       style="@style/ExoMediaButton.Rewind"/>
 
-    <ImageButton android:id="@id/exo_shuffle"
-      style="@style/ExoMediaButton.Shuffle"/>
-
     <ImageButton android:id="@id/exo_repeat_toggle"
       style="@style/ExoMediaButton"/>
 

From 40f3f1cb784343657057bee8c212ba9e508e270b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 4 Aug 2017 00:57:05 -0700
Subject: [PATCH 054/421] Decrease number of Vpx input buffers

I think they're excessively sized also, but changing that
is a little more risky. And we should look at investigating
the input buffer size for all our decoder extensions,
rather than just this one.

Issue: #3120

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164234087
---
 .../ext/ffmpeg/FfmpegAudioRenderer.java        |  7 +++++++
 .../ext/vp9/LibvpxVideoRenderer.java           | 18 +++++++++++++-----
 2 files changed, 20 insertions(+), 5 deletions(-)

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 8d75ca3dbb5..453a18476ee 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
@@ -30,7 +30,14 @@
  */
 public final class FfmpegAudioRenderer extends SimpleDecoderAudioRenderer {
 
+  /**
+   * The number of input and output buffers.
+   */
   private static final int NUM_BUFFERS = 16;
+  /**
+   * The initial input buffer size. Input buffers are reallocated dynamically if this value is
+   * insufficient.
+   */
   private static final int INITIAL_INPUT_BUFFER_SIZE = 960 * 6;
 
   private FfmpegDecoder decoder;
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 9b0355a9e78..a947378de5d 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
@@ -77,11 +77,18 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
   public static final int MSG_SET_OUTPUT_BUFFER_RENDERER = C.MSG_CUSTOM_BASE;
 
   /**
-   * The number of input buffers and 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.
+   * The number of input buffers.
+   */
+  private static final int NUM_INPUT_BUFFERS = 8;
+  /**
+   * 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 = 16;
+  /**
+   * The initial input buffer size. Input buffers are reallocated dynamically if this value is
+   * insufficient.
    */
-  private static final int NUM_BUFFERS = 16;
   private static final int INITIAL_INPUT_BUFFER_SIZE = 768 * 1024; // Value based on cs/SoftVpx.cpp.
 
   private final boolean scaleToFit;
@@ -564,7 +571,8 @@ private void maybeInitDecoder() throws ExoPlaybackException {
     try {
       long codecInitializingTimestamp = SystemClock.elapsedRealtime();
       TraceUtil.beginSection("createVpxDecoder");
-      decoder = new VpxDecoder(NUM_BUFFERS, NUM_BUFFERS, INITIAL_INPUT_BUFFER_SIZE, mediaCrypto);
+      decoder = new VpxDecoder(NUM_INPUT_BUFFERS, NUM_OUTPUT_BUFFERS, INITIAL_INPUT_BUFFER_SIZE,
+          mediaCrypto);
       decoder.setOutputMode(outputMode);
       TraceUtil.endSection();
       long codecInitializedTimestamp = SystemClock.elapsedRealtime();

From 08e58af6e7ac8707e59fd2c80c48c5d4569ba48e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Aug 2017 06:20:38 -0700
Subject: [PATCH 055/421] Separate handling of oldTimeline == null case

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164254522
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 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 633250a7844..f77b32082b6 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
@@ -986,26 +986,29 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
           // 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(manifest, processedInitialSeekCount);
-          return;
+        } else {
+          int periodIndex = periodPosition.first;
+          long positionUs = periodPosition.second;
+          MediaPeriodId periodId =
+              mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex, positionUs);
+          playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : positionUs, positionUs);
+          notifySourceInfoRefresh(manifest, processedInitialSeekCount);
         }
-        int periodIndex = periodPosition.first;
-        long positionUs = periodPosition.second;
-        MediaPeriodId periodId =
-            mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex, positionUs);
-        playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : positionUs, positionUs);
       } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
         if (timeline.isEmpty()) {
           handleSourceInfoRefreshEndedPlayback(manifest, processedInitialSeekCount);
-          return;
+        } else {
+          Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET);
+          int periodIndex = defaultPosition.first;
+          long startPositionUs = defaultPosition.second;
+          MediaPeriodId periodId = mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex,
+              startPositionUs);
+          playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : startPositionUs,
+              startPositionUs);
+          notifySourceInfoRefresh(manifest, processedInitialSeekCount);
         }
-        Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET);
-        int periodIndex = defaultPosition.first;
-        long startPositionUs = defaultPosition.second;
-        MediaPeriodId periodId = mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex,
-            startPositionUs);
-        playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : startPositionUs,
-            startPositionUs);
       }
+      return;
     }
 
     MediaPeriodHolder periodHolder = playingPeriodHolder != null ? playingPeriodHolder

From 576f362912924cff21e24ed9f7c52389c50a982c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Aug 2017 06:51:38 -0700
Subject: [PATCH 056/421] Update playbackInfo even if there's no period holder

This is required to correctly update the playbackInfo.periodId when
seeking close to the end of a period with ads, as the seek operation
leads to an immediate source info refresh when midroll ads are marked as
played.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164257099
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 56 +++++++++++--------
 1 file changed, 32 insertions(+), 24 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 f77b32082b6..cb04501fc0b 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
@@ -1011,20 +1011,20 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
       return;
     }
 
+    int playingPeriodIndex = playbackInfo.periodId.periodIndex;
     MediaPeriodHolder periodHolder = playingPeriodHolder != null ? playingPeriodHolder
         : loadingPeriodHolder;
-    if (periodHolder == null) {
-      // We don't have any period holders, so we're done.
+    if (periodHolder == null && playingPeriodIndex >= oldTimeline.getPeriodCount()) {
       notifySourceInfoRefresh(manifest, processedInitialSeekCount);
       return;
     }
-
-    int periodIndex = timeline.getIndexOfPeriod(periodHolder.uid);
+    Object playingPeriodUid = periodHolder == null
+        ? oldTimeline.getPeriod(playingPeriodIndex, period, true).uid : 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.
-      int newPeriodIndex = resolveSubsequentPeriod(periodHolder.info.id.periodIndex, oldTimeline,
-          timeline);
+      int newPeriodIndex = resolveSubsequentPeriod(playingPeriodIndex, oldTimeline, timeline);
       if (newPeriodIndex == C.INDEX_UNSET) {
         // We failed to resolve a suitable restart position.
         handleSourceInfoRefreshEndedPlayback(manifest, processedInitialSeekCount);
@@ -1036,17 +1036,19 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
       newPeriodIndex = defaultPosition.first;
       long newPositionUs = defaultPosition.second;
       timeline.getPeriod(newPeriodIndex, period, true);
-      // Clear the index of each holder that doesn't contain the default position. If a holder
-      // contains the default position then update its index so it can be re-used when seeking.
-      Object newPeriodUid = period.uid;
-      periodHolder.info = periodHolder.info.copyWithPeriodIndex(C.INDEX_UNSET);
-      while (periodHolder.next != null) {
-        periodHolder = periodHolder.next;
-        if (periodHolder.uid.equals(newPeriodUid)) {
-          periodHolder.info = mediaPeriodInfoSequence.getUpdatedMediaPeriodInfo(periodHolder.info,
-              newPeriodIndex);
-        } else {
-          periodHolder.info = periodHolder.info.copyWithPeriodIndex(C.INDEX_UNSET);
+      if (periodHolder != null) {
+        // Clear the index of each holder that doesn't contain the default position. If a holder
+        // contains the default position then update its index so it can be re-used when seeking.
+        Object newPeriodUid = period.uid;
+        periodHolder.info = periodHolder.info.copyWithPeriodIndex(C.INDEX_UNSET);
+        while (periodHolder.next != null) {
+          periodHolder = periodHolder.next;
+          if (periodHolder.uid.equals(newPeriodUid)) {
+            periodHolder.info = mediaPeriodInfoSequence.getUpdatedMediaPeriodInfo(periodHolder.info,
+                newPeriodIndex);
+          } else {
+            periodHolder.info = periodHolder.info.copyWithPeriodIndex(C.INDEX_UNSET);
+          }
         }
       }
       // Actually do the seek.
@@ -1057,8 +1059,13 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
       return;
     }
 
-    // If playing an ad, check that it hasn't been marked as played. If it has, skip forward.
+    // The current period is in the new timeline. Update the playback info.
+    if (periodIndex != playingPeriodIndex) {
+      playbackInfo = playbackInfo.copyWithPeriodIndex(periodIndex);
+    }
+
     if (playbackInfo.periodId.isAd()) {
+      // Check that the playing ad hasn't been marked as played. If it has, skip forward.
       MediaPeriodId periodId = mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex,
           playbackInfo.contentPositionUs);
       if (!periodId.isAd() || periodId.adIndexInAdGroup != playbackInfo.periodId.adIndexInAdGroup) {
@@ -1070,14 +1077,15 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
       }
     }
 
-    // The current period is in the new timeline. Update the holder and playbackInfo.
-    periodHolder = updatePeriodInfo(periodHolder, periodIndex);
-    if (periodIndex != playbackInfo.periodId.periodIndex) {
-      playbackInfo = playbackInfo.copyWithPeriodIndex(periodIndex);
+    if (periodHolder == null) {
+      // We don't have any period holders, so we're done.
+      notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+      return;
     }
 
-    // If there are subsequent holders, update the index for each of them. If we find a holder
-    // that's inconsistent with the new timeline then take appropriate action.
+    // Update the holder indices. If we find a subsequent holder that's inconsistent with the new
+    // timeline then take appropriate action.
+    periodHolder = updatePeriodInfo(periodHolder, periodIndex);
     while (periodHolder.next != null) {
       MediaPeriodHolder previousPeriodHolder = periodHolder;
       periodHolder = periodHolder.next;

From c28ebf10f7f89b4b0a4b908a09788f533b762b00 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 4 Aug 2017 07:26:19 -0700
Subject: [PATCH 057/421] Fix playing local content after permission granted.

After maybeRequestReadExternalStoragePermission and the
subsequent granting of the permission, the media source
would never be created.

I can't see a case where initializePlayer shouldn't create
a new MediaSource, so I've just removed the condition.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164260074
---
 .../exoplayer2/demo/PlayerActivity.java       | 102 +++++++++---------
 1 file changed, 50 insertions(+), 52 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 40e77452eae..a98ab599ff8 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
@@ -119,7 +119,7 @@ public class PlayerActivity extends Activity implements OnClickListener, EventLi
   private DefaultTrackSelector trackSelector;
   private TrackSelectionHelper trackSelectionHelper;
   private DebugTextViewHelper debugViewHelper;
-  private boolean needRetrySource;
+  private boolean inErrorState;
   private TrackGroupArray lastSeenTrackGroupArray;
 
   private boolean shouldAutoPlay;
@@ -297,60 +297,58 @@ private void initializePlayer() {
       debugViewHelper = new DebugTextViewHelper(player, debugTextView);
       debugViewHelper.start();
     }
-    if (needNewPlayer || needRetrySource) {
-      String action = intent.getAction();
-      Uri[] uris;
-      String[] extensions;
-      if (ACTION_VIEW.equals(action)) {
-        uris = new Uri[] {intent.getData()};
-        extensions = new String[] {intent.getStringExtra(EXTENSION_EXTRA)};
-      } else if (ACTION_VIEW_LIST.equals(action)) {
-        String[] uriStrings = intent.getStringArrayExtra(URI_LIST_EXTRA);
-        uris = new Uri[uriStrings.length];
-        for (int i = 0; i < uriStrings.length; i++) {
-          uris[i] = Uri.parse(uriStrings[i]);
-        }
-        extensions = intent.getStringArrayExtra(EXTENSION_LIST_EXTRA);
-        if (extensions == null) {
-          extensions = new String[uriStrings.length];
-        }
-      } else {
-        showToast(getString(R.string.unexpected_intent_action, action));
-        return;
-      }
-      if (Util.maybeRequestReadExternalStoragePermission(this, uris)) {
-        // The player will be reinitialized if the permission is granted.
-        return;
+    String action = intent.getAction();
+    Uri[] uris;
+    String[] extensions;
+    if (ACTION_VIEW.equals(action)) {
+      uris = new Uri[]{intent.getData()};
+      extensions = new String[]{intent.getStringExtra(EXTENSION_EXTRA)};
+    } else if (ACTION_VIEW_LIST.equals(action)) {
+      String[] uriStrings = intent.getStringArrayExtra(URI_LIST_EXTRA);
+      uris = new Uri[uriStrings.length];
+      for (int i = 0; i < uriStrings.length; i++) {
+        uris[i] = Uri.parse(uriStrings[i]);
       }
-      MediaSource[] mediaSources = new MediaSource[uris.length];
-      for (int i = 0; i < uris.length; i++) {
-        mediaSources[i] = buildMediaSource(uris[i], extensions[i]);
+      extensions = intent.getStringArrayExtra(EXTENSION_LIST_EXTRA);
+      if (extensions == null) {
+        extensions = new String[uriStrings.length];
       }
-      MediaSource mediaSource = mediaSources.length == 1 ? mediaSources[0]
-          : new ConcatenatingMediaSource(mediaSources);
-      String adTagUriString = intent.getStringExtra(AD_TAG_URI_EXTRA);
-      if (adTagUriString != null) {
-        Uri adTagUri = Uri.parse(adTagUriString);
-        if (!adTagUri.equals(loadedAdTagUri)) {
-          releaseAdsLoader();
-          loadedAdTagUri = adTagUri;
-        }
-        try {
-          mediaSource = createAdsMediaSource(mediaSource, Uri.parse(adTagUriString));
-        } catch (Exception e) {
-          showToast(R.string.ima_not_loaded);
-        }
-      } else {
+    } else {
+      showToast(getString(R.string.unexpected_intent_action, action));
+      return;
+    }
+    if (Util.maybeRequestReadExternalStoragePermission(this, uris)) {
+      // The player will be reinitialized if the permission is granted.
+      return;
+    }
+    MediaSource[] mediaSources = new MediaSource[uris.length];
+    for (int i = 0; i < uris.length; i++) {
+      mediaSources[i] = buildMediaSource(uris[i], extensions[i]);
+    }
+    MediaSource mediaSource = mediaSources.length == 1 ? mediaSources[0]
+        : new ConcatenatingMediaSource(mediaSources);
+    String adTagUriString = intent.getStringExtra(AD_TAG_URI_EXTRA);
+    if (adTagUriString != null) {
+      Uri adTagUri = Uri.parse(adTagUriString);
+      if (!adTagUri.equals(loadedAdTagUri)) {
         releaseAdsLoader();
+        loadedAdTagUri = adTagUri;
       }
-      boolean haveResumePosition = resumeWindow != C.INDEX_UNSET;
-      if (haveResumePosition) {
-        player.seekTo(resumeWindow, resumePosition);
+      try {
+        mediaSource = createAdsMediaSource(mediaSource, Uri.parse(adTagUriString));
+      } catch (Exception e) {
+        showToast(R.string.ima_not_loaded);
       }
-      player.prepare(mediaSource, !haveResumePosition, false);
-      needRetrySource = false;
-      updateButtonVisibilities();
+    } else {
+      releaseAdsLoader();
     }
+    boolean haveResumePosition = resumeWindow != C.INDEX_UNSET;
+    if (haveResumePosition) {
+      player.seekTo(resumeWindow, resumePosition);
+    }
+    player.prepare(mediaSource, !haveResumePosition, false);
+    inErrorState = false;
+    updateButtonVisibilities();
   }
 
   private MediaSource buildMediaSource(Uri uri, String overrideExtension) {
@@ -502,7 +500,7 @@ public void onRepeatModeChanged(int repeatMode) {
 
   @Override
   public void onPositionDiscontinuity() {
-    if (needRetrySource) {
+    if (inErrorState) {
       // This will only occur if the user has performed a seek whilst in the error state. Update the
       // resume position so that if the user then retries, playback will resume from the position to
       // which they seeked.
@@ -548,7 +546,7 @@ public void onPlayerError(ExoPlaybackException e) {
     if (errorString != null) {
       showToast(errorString);
     }
-    needRetrySource = true;
+    inErrorState = true;
     if (isBehindLiveWindow(e)) {
       clearResumePosition();
       initializePlayer();
@@ -584,7 +582,7 @@ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray tra
   private void updateButtonVisibilities() {
     debugRootView.removeAllViews();
 
-    retryButton.setVisibility(needRetrySource ? View.VISIBLE : View.GONE);
+    retryButton.setVisibility(inErrorState ? View.VISIBLE : View.GONE);
     debugRootView.addView(retryButton);
 
     if (player == null) {

From 287b999723b2b73b9822ec897af84233cae6e5c8 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 13 Jul 2017 08:03:45 +0100
Subject: [PATCH 058/421] Fix detection of postroll when seeking to duration

Also mark all ads as played when the postroll plays, in the case the
player is backgrounded then resumed and the user seeks back.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164262738
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 28 +++++++++++++------
 .../ext/ima/SinglePeriodAdTimeline.java       |  2 +-
 2 files changed, 20 insertions(+), 10 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 a1db09b3d81..90593a6937f 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
@@ -572,15 +572,25 @@ public void onPositionDiscontinuity() {
       return;
     }
     if (!playingAd && !player.isPlayingAd()) {
-      long positionUs = C.msToUs(player.getCurrentPosition());
-      int adGroupIndex = timeline.getPeriod(0, period).getAdGroupIndexForPositionUs(positionUs);
-      if (adGroupIndex != C.INDEX_UNSET) {
-        sentPendingContentPositionMs = false;
-        pendingContentPositionMs = player.getCurrentPosition();
+      checkForContentComplete();
+      if (sentContentComplete) {
+        for (int i = 0; i < adPlaybackState.adGroupCount; i++) {
+          if (adPlaybackState.adGroupTimesUs[i] != C.TIME_END_OF_SOURCE) {
+            adPlaybackState.playedAdGroup(i);
+          }
+        }
+        updateAdPlaybackState();
+      } else {
+        long positionMs = player.getCurrentPosition();
+        timeline.getPeriod(0, period);
+        if (period.getAdGroupIndexForPositionUs(C.msToUs(positionMs)) != C.INDEX_UNSET) {
+          sentPendingContentPositionMs = false;
+          pendingContentPositionMs = positionMs;
+        }
       }
-      return;
+    } else {
+      updateImaStateForPlayerState();
     }
-    updateImaStateForPlayerState();
   }
 
   @Override
@@ -672,8 +682,8 @@ private void clearFlags() {
   }
 
   private void checkForContentComplete() {
-    if (contentDurationMs != C.TIME_UNSET
-        && player.getCurrentPosition() + END_OF_CONTENT_POSITION_THRESHOLD_MS >= contentDurationMs
+    if (contentDurationMs != C.TIME_UNSET && pendingContentPositionMs == C.TIME_UNSET
+        && player.getContentPosition() + END_OF_CONTENT_POSITION_THRESHOLD_MS >= contentDurationMs
         && !sentContentComplete) {
       adsLoader.contentComplete();
       if (DEBUG) {
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
index e3eef6a2b7b..0162d22c344 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
+++ b/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
@@ -23,7 +23,7 @@
 /**
  * A {@link Timeline} for sources that have ads.
  */
-public final class SinglePeriodAdTimeline extends ForwardingTimeline {
+/* package */ final class SinglePeriodAdTimeline extends ForwardingTimeline {
 
   private final long[] adGroupTimesUs;
   private final int[] adCounts;

From c449bae51aed45fcf28f95818a79a9670584ff23 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 4 Aug 2017 08:55:43 -0700
Subject: [PATCH 059/421] Log IMA LOG AdEvent ad data

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164267555
---
 .../android/exoplayer2/ext/ima/ImaAdsLoader.java  | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 90593a6937f..9bfe33e9881 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
@@ -26,6 +26,7 @@
 import com.google.ads.interactivemedia.v3.api.AdErrorEvent.AdErrorListener;
 import com.google.ads.interactivemedia.v3.api.AdEvent;
 import com.google.ads.interactivemedia.v3.api.AdEvent.AdEventListener;
+import com.google.ads.interactivemedia.v3.api.AdEvent.AdEventType;
 import com.google.ads.interactivemedia.v3.api.AdPodInfo;
 import com.google.ads.interactivemedia.v3.api.AdsLoader;
 import com.google.ads.interactivemedia.v3.api.AdsLoader.AdsLoadedListener;
@@ -51,6 +52,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Loads ads using the IMA SDK. All methods are called on the main thread.
@@ -324,14 +326,21 @@ public void onAdsManagerLoaded(AdsManagerLoadedEvent adsManagerLoadedEvent) {
 
   @Override
   public void onAdEvent(AdEvent adEvent) {
-    Ad ad = adEvent.getAd();
-    if (DEBUG) {
-      Log.d(TAG, "onAdEvent " + adEvent.getType());
+    AdEventType adEventType = adEvent.getType();
+    boolean isLogAdEvent = adEventType == AdEventType.LOG;
+    if (DEBUG || isLogAdEvent) {
+      Log.w(TAG, "onAdEvent: " + adEventType);
+      if (isLogAdEvent) {
+        for (Map.Entry<String, String> entry : adEvent.getAdData().entrySet()) {
+          Log.w(TAG, "  " + entry.getKey() + ": " + entry.getValue());
+        }
+      }
     }
     if (adsManager == null) {
       Log.w(TAG, "Dropping ad event after release: " + adEvent);
       return;
     }
+    Ad ad = adEvent.getAd();
     switch (adEvent.getType()) {
       case LOADED:
         // The ad position is not always accurate when using preloading. See [Internal: b/62613240].

From f502171e5fe78382e3972e8832b690c6eba97d71 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 4 Aug 2017 09:32:51 -0700
Subject: [PATCH 060/421] Remove unnecessary API level check in PlayerActivity
 of the demo app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164271226
---
 .../exoplayer2/demo/PlayerActivity.java       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 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 a98ab599ff8..9e53dff857b 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
@@ -264,13 +264,19 @@ private void initializePlayer() {
       if (drmSchemeUuid != null) {
         String drmLicenseUrl = intent.getStringExtra(DRM_LICENSE_URL);
         String[] keyRequestPropertiesArray = intent.getStringArrayExtra(DRM_KEY_REQUEST_PROPERTIES);
-        try {
-          drmSessionManager = buildDrmSessionManager(drmSchemeUuid, drmLicenseUrl,
-              keyRequestPropertiesArray);
-        } catch (UnsupportedDrmException e) {
-          int errorStringId = Util.SDK_INT < 18 ? R.string.error_drm_not_supported
-              : (e.reason == UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME
-                  ? R.string.error_drm_unsupported_scheme : R.string.error_drm_unknown);
+        int errorStringId = R.string.error_drm_unknown;
+        if (Util.SDK_INT < 18) {
+          errorStringId = R.string.error_drm_not_supported;
+        } else {
+          try {
+            drmSessionManager = buildDrmSessionManagerV18(drmSchemeUuid, drmLicenseUrl,
+                keyRequestPropertiesArray);
+          } catch (UnsupportedDrmException e) {
+            errorStringId = e.reason == UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME
+                ? R.string.error_drm_unsupported_scheme : R.string.error_drm_unknown;
+          }
+        }
+        if (drmSessionManager == null) {
           showToast(errorStringId);
           return;
         }
@@ -372,11 +378,8 @@ private MediaSource buildMediaSource(Uri uri, String overrideExtension) {
     }
   }
 
-  private DrmSessionManager<FrameworkMediaCrypto> buildDrmSessionManager(UUID uuid,
+  private DrmSessionManager<FrameworkMediaCrypto> buildDrmSessionManagerV18(UUID uuid,
       String licenseUrl, String[] keyRequestPropertiesArray) throws UnsupportedDrmException {
-    if (Util.SDK_INT < 18) {
-      return null;
-    }
     HttpMediaDrmCallback drmCallback = new HttpMediaDrmCallback(licenseUrl,
         buildHttpDataSourceFactory(false));
     if (keyRequestPropertiesArray != null) {

From 9ecec92b568c0c73fbb259ffd0ba4561a705a3f0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 Aug 2017 01:48:44 -0700
Subject: [PATCH 061/421] Finalize r2.5.0

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164434615
---
 RELEASENOTES.md                                           | 8 +++-----
 constants.gradle                                          | 2 +-
 .../google/android/exoplayer2/ExoPlayerLibraryInfo.java   | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index e96cd9ddabd..4101caad479 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,14 +1,13 @@
 # Release notes #
 
-### r2.5.0 (beta) ###
+### r2.5.0 ###
 
 * IMA extension: Wraps the Google Interactive Media Ads (IMA) SDK to provide an
   easy and seamless way of incorporating display ads into ExoPlayer playbacks.
   You can read more about the IMA extension
   [here](https://medium.com/google-exoplayer/playing-ads-with-exoplayer-and-ima-868dfd767ea).
 * MediaSession extension: Provides an easy to to connect ExoPlayer with
-  MediaSessionCompat in the Android Support Library. *A link to a blog post
-  about this extension will be added here prior to the stable 2.5.0 release.*
+  MediaSessionCompat in the Android Support Library.
 * RTMP extension: An extension for playing streams over RTMP.
 * Build: Made it easier for application developers to depend on a local checkout
   of ExoPlayer. You can learn how to do this
@@ -18,8 +17,7 @@
     playback of progressive streams
     ([#2926](https://github.com/google/ExoPlayer/issues/2926)).
   * New DynamicConcatenatingMediaSource class to support playback of dynamic
-    playlists. *A link to a blog post about DynamicConcatenatingMediaSource will
-    be added here prior to the stable 2.5.0 release.*
+    playlists.
   * New ExoPlayer.setRepeatMode method for dynamic toggling of repeat mode
     during playback. Use of setRepeatMode should be preferred to
     LoopingMediaSource for most looping use cases. You can read more about
diff --git a/constants.gradle b/constants.gradle
index 93284fd897d..7d126ccd891 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -24,7 +24,7 @@ project.ext {
     supportLibraryVersion = '25.4.0'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
-    releaseVersion = 'r2.5.0-beta3'
+    releaseVersion = 'r2.5.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
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 153c6cda9cf..fd5ead5c85a 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
@@ -31,13 +31,13 @@ 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.5.0-beta3";
+  public static final String VERSION = "2.5.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.5.0-beta3";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.0";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.

From d4c45861f49c943836f8bae6300358bee34a32ad Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 Aug 2017 01:51:26 -0700
Subject: [PATCH 062/421] Clean up extension READMEs

Issue: #1157

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164434768
---
 extensions/cronet/README.md       | 33 ++++++++++++++++++++++++++-----
 extensions/ffmpeg/README.md       |  2 +-
 extensions/flac/README.md         |  6 +++---
 extensions/gvr/README.md          |  2 +-
 extensions/mediasession/README.md |  4 ++--
 extensions/okhttp/README.md       | 29 +++++++++++++++++++++++++--
 extensions/opus/README.md         |  6 +++---
 extensions/rtmp/README.md         |  4 ++--
 extensions/vp9/README.md          |  6 +++---
 9 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/extensions/cronet/README.md b/extensions/cronet/README.md
index 30409fa99ec..2287c4c19b8 100644
--- a/extensions/cronet/README.md
+++ b/extensions/cronet/README.md
@@ -1,15 +1,13 @@
-# ExoPlayer Cronet Extension #
+# ExoPlayer Cronet extension #
 
 ## Description ##
 
-[Cronet][] is Chromium's Networking stack packaged as a library.
-
-The Cronet Extension is an [HttpDataSource][] implementation using [Cronet][].
+The Cronet extension is an [HttpDataSource][] implementation using [Cronet][].
 
 [HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/upstream/HttpDataSource.html
 [Cronet]: https://chromium.googlesource.com/chromium/src/+/master/components/cronet?autodive=0%2F%2F
 
-## Build Instructions ##
+## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's
@@ -33,3 +31,28 @@ gradle.ext.exoplayerIncludeCronetExtension = true;
 
 [top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
 [here]: https://console.cloud.google.com/storage/browser/chromium-cronet/android
+
+## Using the extension ##
+
+ExoPlayer requests data through `DataSource` instances. These instances are
+either instantiated and injected from application code, or obtained from
+instances of `DataSource.Factory` that are instantiated and injected from
+application code.
+
+If your application only needs to play http(s) content, using the Cronet
+extension is as simple as updating any `DataSource`s and `DataSource.Factory`
+instantiations in your application code to use `CronetDataSource` and
+`CronetDataSourceFactory` respectively. If your application also needs to play
+non-http(s) content such as local files, use
+```
+new DefaultDataSource(
+    ...
+    new CronetDataSource(...) /* baseDataSource argument */);
+```
+and
+```
+new DefaultDataSourceFactory(
+    ...
+    new CronetDataSourceFactory(...) /* baseDataSourceFactory argument */);
+```
+respectively.
diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index ab3e5ffb940..b4514effbce 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -1,4 +1,4 @@
-# FfmpegAudioRenderer #
+# ExoPlayer FFmpeg extension #
 
 ## Description ##
 
diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index a35dac78589..9db2e5727d7 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -1,14 +1,14 @@
-# ExoPlayer Flac Extension #
+# ExoPlayer Flac extension #
 
 ## Description ##
 
-The Flac Extension is a [Renderer][] implementation that helps you bundle
+The Flac extension is a [Renderer][] implementation that helps you bundle
 libFLAC (the Flac decoding library) into your app and use it along with
 ExoPlayer to play Flac audio on Android devices.
 
 [Renderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/Renderer.html
 
-## Build Instructions ##
+## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's
diff --git a/extensions/gvr/README.md b/extensions/gvr/README.md
index ad28569121a..7e072d070c1 100644
--- a/extensions/gvr/README.md
+++ b/extensions/gvr/README.md
@@ -1,4 +1,4 @@
-# ExoPlayer GVR Extension #
+# ExoPlayer GVR extension #
 
 ## Description ##
 
diff --git a/extensions/mediasession/README.md b/extensions/mediasession/README.md
index 7515cf9eeff..3acf8e4c79e 100644
--- a/extensions/mediasession/README.md
+++ b/extensions/mediasession/README.md
@@ -1,8 +1,8 @@
-# ExoPlayer MediaSession Extension #
+# ExoPlayer MediaSession extension #
 
 ## Description ##
 
-The MediaSession Extension mediates between an ExoPlayer instance and a
+The MediaSession extension mediates between an ExoPlayer instance and a
 [MediaSession][]. It automatically retrieves and implements playback actions
 and syncs the player state with the state of the media session. The behaviour
 can be extended to support other playback and custom actions.
diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md
index 52d5fabf382..b10c4ba629b 100644
--- a/extensions/okhttp/README.md
+++ b/extensions/okhttp/README.md
@@ -1,8 +1,8 @@
-# ExoPlayer OkHttp Extension #
+# ExoPlayer OkHttp extension #
 
 ## Description ##
 
-The OkHttp Extension is an [HttpDataSource][] implementation using Square's
+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
@@ -24,3 +24,28 @@ 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 ##
+
+ExoPlayer requests data through `DataSource` instances. These instances are
+either instantiated and injected from application code, or obtained from
+instances of `DataSource.Factory` that are instantiated and injected from
+application code.
+
+If your application only needs to play http(s) content, using the OkHttp
+extension is as simple as updating any `DataSource`s and `DataSource.Factory`
+instantiations in your application code to use `OkHttpDataSource` and
+`OkHttpDataSourceFactory` respectively. If your application also needs to play
+non-http(s) content such as local files, use
+```
+new DefaultDataSource(
+    ...
+    new OkHttpDataSource(...) /* baseDataSource argument */);
+```
+and
+```
+new DefaultDataSourceFactory(
+    ...
+    new OkHttpDataSourceFactory(...) /* baseDataSourceFactory argument */);
+```
+respectively.
diff --git a/extensions/opus/README.md b/extensions/opus/README.md
index ae42a9c310f..e5f5bcb1684 100644
--- a/extensions/opus/README.md
+++ b/extensions/opus/README.md
@@ -1,14 +1,14 @@
-# ExoPlayer Opus Extension #
+# ExoPlayer Opus extension #
 
 ## Description ##
 
-The Opus Extension is a [Renderer][] implementation that helps you bundle
+The Opus extension is a [Renderer][] implementation that helps you bundle
 libopus (the Opus decoding library) into your app and use it along with
 ExoPlayer to play Opus audio on Android devices.
 
 [Renderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/Renderer.html
 
-## Build Instructions ##
+## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's
diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md
index 2cfa6b8ff4f..042d7078dca 100644
--- a/extensions/rtmp/README.md
+++ b/extensions/rtmp/README.md
@@ -1,8 +1,8 @@
-# ExoPlayer RTMP Extension #
+# ExoPlayer RTMP extension #
 
 ## Description ##
 
-The RTMP Extension is a [DataSource][] implementation for playing [RTMP][]
+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
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 8bdfe652e68..87c5c8d54fe 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -1,14 +1,14 @@
-# ExoPlayer VP9 Extension #
+# ExoPlayer VP9 extension #
 
 ## Description ##
 
-The VP9 Extension is a [Renderer][] implementation that helps you bundle libvpx
+The VP9 extension is a [Renderer][] implementation that helps you bundle libvpx
 (the VP9 decoding library) into your app and use it along with ExoPlayer to play
 VP9 video on Android devices.
 
 [Renderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/Renderer.html
 
-## Build Instructions ##
+## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's

From 05179b4f1b36cb61e3ddee1653abe1239c9f986b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 Aug 2017 01:53:09 -0700
Subject: [PATCH 063/421] Set correct Content-Type for ClearKey requests

Issue: #3138

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164434858
---
 .../exoplayer2/drm/HttpMediaDrmCallback.java    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

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 f9d5efffb15..f08d9b59b53 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
@@ -38,14 +38,6 @@
 @TargetApi(18)
 public final class HttpMediaDrmCallback implements MediaDrmCallback {
 
-  private static final Map<String, String> PLAYREADY_KEY_REQUEST_PROPERTIES;
-  static {
-    PLAYREADY_KEY_REQUEST_PROPERTIES = new HashMap<>();
-    PLAYREADY_KEY_REQUEST_PROPERTIES.put("Content-Type", "text/xml");
-    PLAYREADY_KEY_REQUEST_PROPERTIES.put("SOAPAction",
-        "http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense");
-  }
-
   private final HttpDataSource.Factory dataSourceFactory;
   private final String defaultUrl;
   private final Map<String, String> keyRequestProperties;
@@ -124,10 +116,15 @@ public byte[] executeKeyRequest(UUID uuid, KeyRequest request) throws Exception
       url = defaultUrl;
     }
     Map<String, String> requestProperties = new HashMap<>();
-    requestProperties.put("Content-Type", "application/octet-stream");
+    // Add standard request properties for supported schemes.
+    String contentType = C.PLAYREADY_UUID.equals(uuid) ? "text/xml"
+        : (C.CLEARKEY_UUID.equals(uuid) ? "application/json" : "application/octet-stream");
+    requestProperties.put("Content-Type", contentType);
     if (C.PLAYREADY_UUID.equals(uuid)) {
-      requestProperties.putAll(PLAYREADY_KEY_REQUEST_PROPERTIES);
+      requestProperties.put("SOAPAction",
+          "http://schemas.microsoft.com/DRM/2007/03/protocols/AcquireLicense");
     }
+    // Add additional request properties.
     synchronized (keyRequestProperties) {
       requestProperties.putAll(keyRequestProperties);
     }

From 865d74cde0cf3b135404a6e951de0d6efb8011ed Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 Aug 2017 01:54:51 -0700
Subject: [PATCH 064/421] Don't use TextureView's SurfaceTexture unless
 available

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164434943
---
 .../java/com/google/android/exoplayer2/SimpleExoPlayer.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 9dea83cff29..db1b1a13f1c 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
@@ -276,7 +276,8 @@ public void setVideoTextureView(TextureView textureView) {
         Log.w(TAG, "Replacing existing SurfaceTextureListener.");
       }
       textureView.setSurfaceTextureListener(componentListener);
-      SurfaceTexture surfaceTexture = textureView.getSurfaceTexture();
+      SurfaceTexture surfaceTexture = textureView.isAvailable() ? textureView.getSurfaceTexture()
+          : null;
       setVideoSurfaceInternal(surfaceTexture == null ? null : new Surface(surfaceTexture), true);
     }
   }

From 87012f22f27337d3074839bbe3881621f4a81875 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 Aug 2017 03:45:10 -0700
Subject: [PATCH 065/421] Avoid rollover calculating sample offsets

I considered using Util.scaleLargeTimestamp for this, but
given sample offsets are relative and should always be
small (<<1s), it really shouldn't be necessary.

Issue: #3139

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164443795
---
 .../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 6dcae9c2d60..6b2077ef762 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
@@ -815,7 +815,7 @@ private static int parseTrun(TrackBundle trackBundle, int index, long decodeTime
         // here, because unsigned integers will still be parsed correctly (unless their top bit is
         // set, which is never true in practice because sample offsets are always small).
         int sampleOffset = trun.readInt();
-        sampleCompositionTimeOffsetTable[i] = (int) ((sampleOffset * 1000) / timescale);
+        sampleCompositionTimeOffsetTable[i] = (int) ((sampleOffset * 1000L) / timescale);
       } else {
         sampleCompositionTimeOffsetTable[i] = 0;
       }

From 427411befbff873b87fbc4846ab2953eafe902e7 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 7 Aug 2017 05:22:15 -0700
Subject: [PATCH 066/421] Disable test coverage again

https://issuetracker.google.com/issues/37019591 causes local variables can't be found while debugging.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164449443
---
 library/core/build.gradle            | 8 +++++---
 library/dash/build.gradle            | 8 +++++---
 library/hls/build.gradle             | 8 +++++---
 library/smoothstreaming/build.gradle | 8 +++++---
 library/ui/build.gradle              | 8 +++++---
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/library/core/build.gradle b/library/core/build.gradle
index 65a73536072..ecad1e58b52 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -31,9 +31,11 @@ android {
     }
 
     buildTypes {
-        debug {
-            testCoverageEnabled = true
-        }
+        // Re-enable test coverage when the following issue is fixed:
+        // https://issuetracker.google.com/issues/37019591
+        // debug {
+        //    testCoverageEnabled = true
+        // }
     }
 }
 
diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index aa8031467e3..2220e5b2500 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -24,9 +24,11 @@ android {
     }
 
     buildTypes {
-        debug {
-            testCoverageEnabled = true
-        }
+        // Re-enable test coverage when the following issue is fixed:
+        // https://issuetracker.google.com/issues/37019591
+        // debug {
+        //    testCoverageEnabled = true
+        // }
     }
 }
 
diff --git a/library/hls/build.gradle b/library/hls/build.gradle
index 14a26b0e12c..5471eacec65 100644
--- a/library/hls/build.gradle
+++ b/library/hls/build.gradle
@@ -24,9 +24,11 @@ android {
     }
 
     buildTypes {
-        debug {
-            testCoverageEnabled = true
-        }
+        // Re-enable test coverage when the following issue is fixed:
+        // https://issuetracker.google.com/issues/37019591
+        // debug {
+        //    testCoverageEnabled = true
+        // }
     }
 }
 
diff --git a/library/smoothstreaming/build.gradle b/library/smoothstreaming/build.gradle
index b5f918075f7..ee5a8c4e739 100644
--- a/library/smoothstreaming/build.gradle
+++ b/library/smoothstreaming/build.gradle
@@ -24,9 +24,11 @@ android {
     }
 
     buildTypes {
-        debug {
-            testCoverageEnabled = true
-        }
+        // Re-enable test coverage when the following issue is fixed:
+        // https://issuetracker.google.com/issues/37019591
+        // debug {
+        //    testCoverageEnabled = true
+        // }
     }
 }
 
diff --git a/library/ui/build.gradle b/library/ui/build.gradle
index c036bc98197..89734ed8064 100644
--- a/library/ui/build.gradle
+++ b/library/ui/build.gradle
@@ -24,9 +24,11 @@ android {
     }
 
     buildTypes {
-        debug {
-            testCoverageEnabled = true
-        }
+        // Re-enable test coverage when the following issue is fixed:
+        // https://issuetracker.google.com/issues/37019591
+        // debug {
+        //    testCoverageEnabled = true
+        // }
     }
 }
 

From 38360f626729a75a016ba20a546b40405b30ea80 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 7 Aug 2017 11:05:12 -0700
Subject: [PATCH 067/421] Add support for HLS's FRAME-RATE attribute

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164482135
---
 .../hls/playlist/HlsMasterPlaylistParserTest.java     |  7 +++++--
 .../source/hls/playlist/HlsPlaylistParser.java        | 11 ++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index f835c874662..35cd7f03d8f 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -42,10 +42,10 @@ public class HlsMasterPlaylistParserTest extends TestCase {
       + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,CODECS=\"mp4a.40.2 , avc1.66.30 \"\n"
       + "http://example.com/spaces_in_codecs.m3u8\n"
       + "\n"
-      + "#EXT-X-STREAM-INF:BANDWIDTH=2560000,RESOLUTION=384x160\n"
+      + "#EXT-X-STREAM-INF:BANDWIDTH=2560000,FRAME-RATE=25,RESOLUTION=384x160\n"
       + "http://example.com/mid.m3u8\n"
       + "\n"
-      + "#EXT-X-STREAM-INF:BANDWIDTH=7680000\n"
+      + "#EXT-X-STREAM-INF:BANDWIDTH=7680000,FRAME-RATE=29.997\n"
       + "http://example.com/hi.m3u8\n"
       + "\n"
       + "#EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS=\"mp4a.40.5\"\n"
@@ -96,18 +96,21 @@ public void testParseMasterPlaylist() throws IOException{
     assertNull(variants.get(2).format.codecs);
     assertEquals(384, variants.get(2).format.width);
     assertEquals(160, variants.get(2).format.height);
+    assertEquals(25.0f, variants.get(2).format.frameRate);
     assertEquals("http://example.com/mid.m3u8", variants.get(2).url);
 
     assertEquals(7680000, variants.get(3).format.bitrate);
     assertNull(variants.get(3).format.codecs);
     assertEquals(Format.NO_VALUE, variants.get(3).format.width);
     assertEquals(Format.NO_VALUE, variants.get(3).format.height);
+    assertEquals(29.997f, variants.get(3).format.frameRate);
     assertEquals("http://example.com/hi.m3u8", variants.get(3).url);
 
     assertEquals(65000, variants.get(4).format.bitrate);
     assertEquals("mp4a.40.5", variants.get(4).format.codecs);
     assertEquals(Format.NO_VALUE, variants.get(4).format.width);
     assertEquals(Format.NO_VALUE, variants.get(4).format.height);
+    assertEquals((float) Format.NO_VALUE, variants.get(4).format.frameRate);
     assertEquals("http://example.com/audio-only.m3u8", variants.get(4).url);
   }
 
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 09d6fcfa187..c5d3302eca7 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
@@ -81,6 +81,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static final Pattern REGEX_BANDWIDTH = Pattern.compile("[^-]BANDWIDTH=(\\d+)\\b");
   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");
   private static final Pattern REGEX_TARGET_DURATION = Pattern.compile(TAG_TARGET_DURATION
       + ":(\\d+)\\b");
   private static final Pattern REGEX_VERSION = Pattern.compile(TAG_VERSION + ":(\\d+)\\b");
@@ -238,6 +239,7 @@ private static HlsMasterPlaylist parseMasterPlaylist(LineIterator iterator, Stri
             break;
         }
       } else if (line.startsWith(TAG_STREAM_INF)) {
+        noClosedCaptions |= line.contains(ATTR_CLOSED_CAPTIONS_NONE);
         int bitrate = parseIntAttr(line, REGEX_BANDWIDTH);
         String averageBandwidthString = parseOptionalStringAttr(line, REGEX_AVERAGE_BANDWIDTH);
         if (averageBandwidthString != null) {
@@ -246,7 +248,6 @@ private static HlsMasterPlaylist parseMasterPlaylist(LineIterator iterator, Stri
         }
         String codecs = parseOptionalStringAttr(line, REGEX_CODECS);
         String resolutionString = parseOptionalStringAttr(line, REGEX_RESOLUTION);
-        noClosedCaptions |= line.contains(ATTR_CLOSED_CAPTIONS_NONE);
         int width;
         int height;
         if (resolutionString != null) {
@@ -262,11 +263,15 @@ private static HlsMasterPlaylist parseMasterPlaylist(LineIterator iterator, Stri
           width = Format.NO_VALUE;
           height = Format.NO_VALUE;
         }
+        float frameRate = Format.NO_VALUE;
+        String frameRateString = parseOptionalStringAttr(line, REGEX_FRAME_RATE);
+        if (frameRateString != null) {
+          frameRate = Float.parseFloat(frameRateString);
+        }
         line = iterator.next(); // #EXT-X-STREAM-INF's URI.
         if (variantUrls.add(line)) {
           Format format = Format.createVideoContainerFormat(Integer.toString(variants.size()),
-              MimeTypes.APPLICATION_M3U8, null, codecs, bitrate, width, height, Format.NO_VALUE,
-              null, 0);
+              MimeTypes.APPLICATION_M3U8, null, codecs, bitrate, width, height, frameRate, null, 0);
           variants.add(new HlsMasterPlaylist.HlsUrl(line, format));
         }
       }

From e45345e21b92df65510a64426b4ff031b90b58db Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 7 Aug 2017 13:28:01 -0700
Subject: [PATCH 068/421] Fix missing source info refresh notification

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164502580
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 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 cb04501fc0b..a789dbc1b26 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
@@ -975,11 +975,10 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
     mediaPeriodInfoSequence.setTimeline(timeline);
     Object manifest = timelineAndManifest.second;
 
-    int processedInitialSeekCount = 0;
     if (oldTimeline == null) {
       if (pendingInitialSeekCount > 0) {
         Pair<Integer, Long> periodPosition = resolveSeekPosition(pendingSeekPosition);
-        processedInitialSeekCount = pendingInitialSeekCount;
+        int processedInitialSeekCount = pendingInitialSeekCount;
         pendingInitialSeekCount = 0;
         pendingSeekPosition = null;
         if (periodPosition == null) {
@@ -996,7 +995,7 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
         }
       } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
         if (timeline.isEmpty()) {
-          handleSourceInfoRefreshEndedPlayback(manifest, processedInitialSeekCount);
+          handleSourceInfoRefreshEndedPlayback(manifest);
         } else {
           Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET);
           int periodIndex = defaultPosition.first;
@@ -1005,8 +1004,10 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
               startPositionUs);
           playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : startPositionUs,
               startPositionUs);
-          notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+          notifySourceInfoRefresh(manifest);
         }
+      } else {
+        notifySourceInfoRefresh(manifest);
       }
       return;
     }
@@ -1015,7 +1016,7 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
     MediaPeriodHolder periodHolder = playingPeriodHolder != null ? playingPeriodHolder
         : loadingPeriodHolder;
     if (periodHolder == null && playingPeriodIndex >= oldTimeline.getPeriodCount()) {
-      notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+      notifySourceInfoRefresh(manifest);
       return;
     }
     Object playingPeriodUid = periodHolder == null
@@ -1027,7 +1028,7 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
       int newPeriodIndex = resolveSubsequentPeriod(playingPeriodIndex, oldTimeline, timeline);
       if (newPeriodIndex == C.INDEX_UNSET) {
         // We failed to resolve a suitable restart position.
-        handleSourceInfoRefreshEndedPlayback(manifest, processedInitialSeekCount);
+        handleSourceInfoRefreshEndedPlayback(manifest);
         return;
       }
       // We resolved a subsequent period. Seek to the default position in the corresponding window.
@@ -1055,7 +1056,7 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
       MediaPeriodId periodId = new MediaPeriodId(newPeriodIndex);
       newPositionUs = seekToPeriodPosition(periodId, newPositionUs);
       playbackInfo = new PlaybackInfo(periodId, newPositionUs);
-      notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+      notifySourceInfoRefresh(manifest);
       return;
     }
 
@@ -1072,14 +1073,14 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
         long newPositionUs = seekToPeriodPosition(periodId, playbackInfo.contentPositionUs);
         long contentPositionUs = periodId.isAd() ? playbackInfo.contentPositionUs : C.TIME_UNSET;
         playbackInfo = new PlaybackInfo(periodId, newPositionUs, contentPositionUs);
-        notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+        notifySourceInfoRefresh(manifest);
         return;
       }
     }
 
     if (periodHolder == null) {
       // We don't have any period holders, so we're done.
-      notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+      notifySourceInfoRefresh(manifest);
       return;
     }
 
@@ -1117,7 +1118,7 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
       }
     }
 
-    notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+    notifySourceInfoRefresh(manifest);
   }
 
   private MediaPeriodHolder updatePeriodInfo(MediaPeriodHolder periodHolder, int periodIndex) {
@@ -1131,6 +1132,10 @@ private MediaPeriodHolder updatePeriodInfo(MediaPeriodHolder periodHolder, int p
     }
   }
 
+  private void handleSourceInfoRefreshEndedPlayback(Object manifest) {
+    handleSourceInfoRefreshEndedPlayback(manifest, 0);
+  }
+
   private void handleSourceInfoRefreshEndedPlayback(Object manifest,
       int processedInitialSeekCount) {
     // Set the playback position to (0,0) for notifying the eventHandler.
@@ -1143,6 +1148,10 @@ private void handleSourceInfoRefreshEndedPlayback(Object manifest,
     resetInternal(false);
   }
 
+  private void notifySourceInfoRefresh(Object manifest) {
+    notifySourceInfoRefresh(manifest, 0);
+  }
+
   private void notifySourceInfoRefresh(Object manifest, int processedInitialSeekCount) {
     eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED,
         new SourceInfo(timeline, manifest, playbackInfo, processedInitialSeekCount)).sendToTarget();

From 24bf2aa0e25041203a25b7172b88a3a01e591076 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Aug 2017 04:07:13 -0700
Subject: [PATCH 069/421] Support clip end greater than the child's duration

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164577001
---
 .../exoplayer2/source/ClippingMediaSource.java       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 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 4caafa31101..2387b43d5ed 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
@@ -47,7 +47,9 @@ public final class ClippingMediaSource implements MediaSource, MediaSource.Liste
    *     start providing samples, in microseconds.
    * @param endPositionUs The end position within {@code mediaSource}'s timeline 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.
+   *     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.
    */
   public ClippingMediaSource(MediaSource mediaSource, long startPositionUs, long endPositionUs) {
     this(mediaSource, startPositionUs, endPositionUs, true);
@@ -65,7 +67,9 @@ public ClippingMediaSource(MediaSource mediaSource, long startPositionUs, long e
    *     start providing samples, in microseconds.
    * @param endPositionUs The end position within {@code mediaSource}'s timeline 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.
+   *     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.
    */
   public ClippingMediaSource(MediaSource mediaSource, long startPositionUs, long endPositionUs,
@@ -148,8 +152,10 @@ public ClippingTimeline(Timeline timeline, long startUs, long endUs) {
       Assertions.checkArgument(!window.isDynamic);
       long resolvedEndUs = endUs == C.TIME_END_OF_SOURCE ? window.durationUs : endUs;
       if (window.durationUs != C.TIME_UNSET) {
+        if (resolvedEndUs > window.durationUs) {
+          resolvedEndUs = window.durationUs;
+        }
         Assertions.checkArgument(startUs == 0 || window.isSeekable);
-        Assertions.checkArgument(resolvedEndUs <= window.durationUs);
         Assertions.checkArgument(startUs <= resolvedEndUs);
       }
       Period period = timeline.getPeriod(0, new Period());

From 072788c88aa7f53ec2b671d7b95efd712fe0e2d8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Aug 2017 07:36:31 -0700
Subject: [PATCH 070/421] Support building of version 1 PSSH atoms

Issue: #3138

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164590835
---
 .../extractor/mp4/PsshAtomUtilTest.java       | 47 +++++++++++++++++++
 .../extractor/mp4/PsshAtomUtil.java           | 45 ++++++++++++++----
 2 files changed, 83 insertions(+), 9 deletions(-)
 create mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
new file mode 100644
index 00000000000..5ac39797466
--- /dev/null
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
@@ -0,0 +1,47 @@
+/*
+ * 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.extractor.mp4;
+
+import android.test.MoreAsserts;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.util.UUID;
+import junit.framework.TestCase;
+
+/**
+ * Tests for {@link PsshAtomUtil}.
+ */
+public class PsshAtomUtilTest extends TestCase {
+
+  public void testBuildPsshAtom() {
+    byte[] schemeData = new byte[]{0, 1, 2, 3, 4, 5};
+    byte[] psshAtom = PsshAtomUtil.buildPsshAtom(C.WIDEVINE_UUID, schemeData);
+    // Read the PSSH atom back and assert its content is as expected.
+    ParsableByteArray parsablePsshAtom = new ParsableByteArray(psshAtom);
+    assertEquals(psshAtom.length, parsablePsshAtom.readUnsignedIntToInt()); // length
+    assertEquals(Atom.TYPE_pssh, parsablePsshAtom.readInt()); // type
+    int fullAtomInt = parsablePsshAtom.readInt(); // version + flags
+    assertEquals(0, Atom.parseFullAtomVersion(fullAtomInt));
+    assertEquals(0, Atom.parseFullAtomFlags(fullAtomInt));
+    UUID systemId = new UUID(parsablePsshAtom.readLong(), parsablePsshAtom.readLong());
+    assertEquals(C.WIDEVINE_UUID, systemId);
+    assertEquals(schemeData.length, parsablePsshAtom.readUnsignedIntToInt());
+    byte[] psshSchemeData = new byte[schemeData.length];
+    parsablePsshAtom.readBytes(psshSchemeData, 0, schemeData.length);
+    MoreAsserts.assertEquals(schemeData, psshSchemeData);
+  }
+
+}
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 6d5c3726198..cfca0153484 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
@@ -31,22 +31,48 @@ public final class PsshAtomUtil {
   private PsshAtomUtil() {}
 
   /**
-   * Builds a PSSH atom for a given {@link UUID} containing the given scheme specific data.
+   * Builds a version 0 PSSH atom for a given system id, containing the given data.
    *
-   * @param uuid The UUID of the scheme.
+   * @param systemId The system id of the scheme.
    * @param data The scheme specific data.
    * @return The PSSH atom.
    */
-  public static byte[] buildPsshAtom(UUID uuid, byte[] data) {
-    int psshBoxLength = Atom.FULL_HEADER_SIZE + 16 /* UUID */ + 4 /* DataSize */ + data.length;
+  public static byte[] buildPsshAtom(UUID systemId, byte[] data) {
+    return buildPsshAtom(systemId, null, data);
+  }
+
+  /**
+   * Builds a PSSH atom for the given system id, containing the given key ids and data.
+   *
+   * @param systemId The system id of the scheme.
+   * @param keyIds The key ids for a version 1 PSSH atom, or null for a version 0 PSSH atom.
+   * @param data The scheme specific data.
+   * @return The PSSH atom.
+   */
+  public static byte[] buildPsshAtom(UUID systemId, UUID[] keyIds, byte[] data) {
+    boolean buildV1Atom = keyIds != null;
+    int dataLength = data != null ? data.length : 0;
+    int psshBoxLength = Atom.FULL_HEADER_SIZE + 16 /* SystemId */ + 4 /* DataSize */ + dataLength;
+    if (buildV1Atom) {
+      psshBoxLength += 4 /* KID_count */ + (keyIds.length * 16) /* KIDs */;
+    }
     ByteBuffer psshBox = ByteBuffer.allocate(psshBoxLength);
     psshBox.putInt(psshBoxLength);
     psshBox.putInt(Atom.TYPE_pssh);
-    psshBox.putInt(0 /* version=0, flags=0 */);
-    psshBox.putLong(uuid.getMostSignificantBits());
-    psshBox.putLong(uuid.getLeastSignificantBits());
-    psshBox.putInt(data.length);
-    psshBox.put(data);
+    psshBox.putInt(buildV1Atom ? 0x01000000 : 0 /* version=(buildV1Atom ? 1 : 0), flags=0 */);
+    psshBox.putLong(systemId.getMostSignificantBits());
+    psshBox.putLong(systemId.getLeastSignificantBits());
+    if (buildV1Atom) {
+      psshBox.putInt(keyIds.length);
+      for (UUID keyId : keyIds) {
+        psshBox.putLong(keyId.getMostSignificantBits());
+        psshBox.putLong(keyId.getLeastSignificantBits());
+      }
+    }
+    if (dataLength != 0) {
+      psshBox.putInt(data.length);
+      psshBox.put(data);
+    } // Else the last 4 bytes are a 0 DataSize.
     return psshBox.array();
   }
 
@@ -98,6 +124,7 @@ public static byte[] parseSchemeSpecificData(byte[] atom, UUID uuid) {
    * @return A pair consisting of the parsed UUID and scheme specific data. Null if the input is
    *     not a valid PSSH atom, or if the PSSH atom has an unsupported version.
    */
+  // TODO: Support parsing of the key ids for version 1 PSSH atoms.
   private static Pair<UUID, byte[]> parsePsshAtom(byte[] atom) {
     ParsableByteArray atomData = new ParsableByteArray(atom);
     if (atomData.limit() < Atom.FULL_HEADER_SIZE + 16 /* UUID */ + 4 /* DataSize */) {

From b8c6ed670138ee4f864dc9cd7ba9cb5ff8a43094 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Aug 2017 08:30:17 -0700
Subject: [PATCH 071/421] Bump to 2.5.1

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164595874
---
 RELEASENOTES.md                                            | 7 +++++++
 constants.gradle                                           | 2 +-
 demos/main/src/main/AndroidManifest.xml                    | 4 ++--
 .../google/android/exoplayer2/ExoPlayerLibraryInfo.java    | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 4101caad479..8ad866395e8 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,12 @@
 # Release notes #
 
+### r2.5.1 ###
+
+* Fix an issue that could cause the reported playback position to stop advancing
+  in some cases.
+* Fix an issue where a Surface could be released whilst still in use by the
+  player.
+
 ### r2.5.0 ###
 
 * IMA extension: Wraps the Google Interactive Media Ads (IMA) SDK to provide an
diff --git a/constants.gradle b/constants.gradle
index 7d126ccd891..b7cc8b69066 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -24,7 +24,7 @@ project.ext {
     supportLibraryVersion = '25.4.0'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
-    releaseVersion = 'r2.5.0'
+    releaseVersion = 'r2.5.1'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 0e04d9a4357..1f66822dc70 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
-    android:versionCode="2500"
-    android:versionName="2.5.0">
+    android:versionCode="2501"
+    android:versionName="2.5.1">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
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 fd5ead5c85a..33f992964a6 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
@@ -31,13 +31,13 @@ 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.5.0";
+  public static final String VERSION = "2.5.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.5.0";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.1";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -47,7 +47,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 = 2005000;
+  public static final int VERSION_INT = 2005001;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From 026ac1d69b8c0afb8236029a914196abf6e4e2c3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Aug 2017 08:31:52 -0700
Subject: [PATCH 072/421] Don't release a surface until we've stopped using it

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164596062
---
 .../java/com/google/android/exoplayer2/SimpleExoPlayer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 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 db1b1a13f1c..16a44aa0164 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
@@ -762,12 +762,12 @@ private void setVideoSurfaceInternal(Surface surface, boolean ownsSurface) {
       }
     }
     if (this.surface != null && this.surface != surface) {
-      // If we created this surface, we are responsible for releasing it.
+      // We're replacing a surface. Block to ensure that it's not accessed after the method returns.
+      player.blockingSendMessages(messages);
+      // If we created the previous surface, we are responsible for releasing it.
       if (this.ownsSurface) {
         this.surface.release();
       }
-      // We're replacing a surface. Block to ensure that it's not accessed after the method returns.
-      player.blockingSendMessages(messages);
     } else {
       player.sendMessages(messages);
     }

From ceb1e87219666f6c47f87f8f46df5de6f580a612 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 10 Aug 2017 12:57:06 +0100
Subject: [PATCH 073/421] Revert "Add possibility of forcing a specific license
 URL in HttpMediaDrmCallback"

This reverts commit 768a73b377d842aeefdd466cf7a5904f858cc8a4.
---
 .../exoplayer2/drm/HttpMediaDrmCallback.java  | 28 ++++++-------
 .../exoplayer2/drm/OfflineLicenseHelper.java  | 39 ++++---------------
 2 files changed, 22 insertions(+), 45 deletions(-)

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 5fef8b34bef..f08d9b59b53 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
@@ -39,29 +39,29 @@
 public final class HttpMediaDrmCallback implements MediaDrmCallback {
 
   private final HttpDataSource.Factory dataSourceFactory;
-  private final String defaultLicenseUrl;
-  private final boolean forceDefaultLicenseUrl;
+  private final String defaultUrl;
   private final Map<String, String> keyRequestProperties;
 
   /**
-   * @param defaultLicenseUrl The default license URL.
+   * @param defaultUrl The default license URL.
    * @param dataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
    */
-  public HttpMediaDrmCallback(String defaultLicenseUrl, HttpDataSource.Factory dataSourceFactory) {
-    this(defaultLicenseUrl, false, dataSourceFactory, null);
+  public HttpMediaDrmCallback(String defaultUrl, HttpDataSource.Factory dataSourceFactory) {
+    this(defaultUrl, dataSourceFactory, null);
   }
 
   /**
-   * @param defaultLicenseUrl The default license URL.
-   * @param forceDefaultLicenseUrl Whether to force use of {@code defaultLicenseUrl} even for key
-   *     requests that include their own license URL.
+   * @deprecated Use {@link HttpMediaDrmCallback#HttpMediaDrmCallback(String, Factory)}. Request
+   *     properties can be set by calling {@link #setKeyRequestProperty(String, String)}.
+   * @param defaultUrl The default license URL.
    * @param dataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
+   * @param keyRequestProperties Request properties to set when making key requests, or null.
    */
-  public HttpMediaDrmCallback(String defaultLicenseUrl, boolean forceDefaultLicenseUrl,
-      HttpDataSource.Factory dataSourceFactory, Map<String, String> keyRequestProperties) {
+  @Deprecated
+  public HttpMediaDrmCallback(String defaultUrl, HttpDataSource.Factory dataSourceFactory,
+      Map<String, String> keyRequestProperties) {
     this.dataSourceFactory = dataSourceFactory;
-    this.defaultLicenseUrl = defaultLicenseUrl;
-    this.forceDefaultLicenseUrl = forceDefaultLicenseUrl;
+    this.defaultUrl = defaultUrl;
     this.keyRequestProperties = new HashMap<>();
     if (keyRequestProperties != null) {
       this.keyRequestProperties.putAll(keyRequestProperties);
@@ -112,8 +112,8 @@ public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throw
   @Override
   public byte[] executeKeyRequest(UUID uuid, KeyRequest request) throws Exception {
     String url = request.getDefaultUrl();
-    if (forceDefaultLicenseUrl || TextUtils.isEmpty(url)) {
-      url = defaultLicenseUrl;
+    if (TextUtils.isEmpty(url)) {
+      url = defaultUrl;
     }
     Map<String, String> requestProperties = new HashMap<>();
     // Add standard request properties for supported schemes.
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 5ae06b76919..2eb3463b3dc 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
@@ -43,44 +43,23 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
    * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
    * is no longer required.
    *
-   * @param defaultLicenseUrl The default license URL.
+   * @param licenseUrl The default license URL.
    * @param httpDataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
    * @return A new instance which uses Widevine CDM.
    * @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
    *     instantiated.
    */
   public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
-      String defaultLicenseUrl, Factory httpDataSourceFactory)
-      throws UnsupportedDrmException {
-    return newWidevineInstance(defaultLicenseUrl, false, httpDataSourceFactory, null);
+      String licenseUrl, Factory httpDataSourceFactory) throws UnsupportedDrmException {
+    return newWidevineInstance(
+        new HttpMediaDrmCallback(licenseUrl, httpDataSourceFactory), null);
   }
 
   /**
    * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
    * is no longer required.
    *
-   * @param defaultLicenseUrl The default license URL.
-   * @param forceDefaultLicenseUrl Whether to force use of {@code defaultLicenseUrl} even for key
-   *     requests that include their own license URL.
-   * @param httpDataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
-   * @return A new instance which uses Widevine CDM.
-   * @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
-   *     instantiated.
-   */
-  public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
-      String defaultLicenseUrl, boolean forceDefaultLicenseUrl, Factory httpDataSourceFactory)
-      throws UnsupportedDrmException {
-    return newWidevineInstance(defaultLicenseUrl, forceDefaultLicenseUrl, httpDataSourceFactory,
-        null);
-  }
-
-  /**
-   * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
-   * is no longer required.
-   *
-   * @param defaultLicenseUrl The default license URL.
-   * @param forceDefaultLicenseUrl Whether to force use of {@code defaultLicenseUrl} even for key
-   *     requests that include their own license URL.
+   * @param callback Performs key and provisioning requests.
    * @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.
    * @return A new instance which uses Widevine CDM.
@@ -90,12 +69,10 @@ public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
    *     MediaDrmCallback, HashMap, Handler, EventListener)
    */
   public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
-      String defaultLicenseUrl, boolean forceDefaultLicenseUrl, Factory httpDataSourceFactory,
-      HashMap<String, String> optionalKeyRequestParameters)
+      MediaDrmCallback callback, HashMap<String, String> optionalKeyRequestParameters)
       throws UnsupportedDrmException {
-    return new OfflineLicenseHelper<>(FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID),
-        new HttpMediaDrmCallback(defaultLicenseUrl, forceDefaultLicenseUrl, httpDataSourceFactory,
-        null), optionalKeyRequestParameters);
+    return new OfflineLicenseHelper<>(FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID), callback,
+        optionalKeyRequestParameters);
   }
 
   /**

From 91adba5d1bc8dae54ef62f3276f81df2559c388b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 8 Aug 2017 10:54:06 -0700
Subject: [PATCH 074/421] Minimal change to expose segment indices in
 DefaultDashChunkSource

Issue: #3037

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164614478
---
 .../source/dash/DefaultDashChunkSource.java       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 297052f65a6..dd62d47621d 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
@@ -85,14 +85,14 @@ public DashChunkSource createDashChunkSource(LoaderErrorThrower manifestLoaderEr
   private final int[] adaptationSetIndices;
   private final TrackSelection trackSelection;
   private final int trackType;
-  private final RepresentationHolder[] representationHolders;
   private final DataSource dataSource;
   private final long elapsedRealtimeOffsetMs;
   private final int maxSegmentsPerLoad;
 
+  protected final RepresentationHolder[] representationHolders;
+
   private DashManifest manifest;
   private int periodIndex;
-
   private IOException fatalError;
   private boolean missingLastSegment;
 
@@ -377,9 +377,12 @@ private static Chunk newMediaChunk(RepresentationHolder representationHolder,
 
   // Protected classes.
 
+  /**
+   * Holds information about a single {@link Representation}.
+   */
   protected static final class RepresentationHolder {
 
-    public final ChunkExtractorWrapper extractorWrapper;
+    /* package */ final ChunkExtractorWrapper extractorWrapper;
 
     public Representation representation;
     public DashSegmentIndex segmentIndex;
@@ -387,7 +390,7 @@ protected static final class RepresentationHolder {
     private long periodDurationUs;
     private int segmentNumShift;
 
-    public RepresentationHolder(long periodDurationUs, Representation representation,
+    /* package */ RepresentationHolder(long periodDurationUs, Representation representation,
         boolean enableEventMessageTrack, boolean enableCea608Track) {
       this.periodDurationUs = periodDurationUs;
       this.representation = representation;
@@ -417,8 +420,8 @@ public RepresentationHolder(long periodDurationUs, Representation representation
       segmentIndex = representation.getIndex();
     }
 
-    public void updateRepresentation(long newPeriodDurationUs, Representation newRepresentation)
-        throws BehindLiveWindowException{
+    /* package */ void updateRepresentation(long newPeriodDurationUs,
+        Representation newRepresentation) throws BehindLiveWindowException {
       DashSegmentIndex oldIndex = representation.getIndex();
       DashSegmentIndex newIndex = newRepresentation.getIndex();
 

From 98d50c13ef9436ab018ee8381ebaf0a0adb6b6dc Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 9 Aug 2017 03:21:25 -0700
Subject: [PATCH 075/421] Clean up terminology for MediaSession extension

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164705750
---
 extensions/mediasession/README.md                         | 8 ++++----
 .../ext/mediasession/MediaSessionConnector.java           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/extensions/mediasession/README.md b/extensions/mediasession/README.md
index 3acf8e4c79e..60fec9fb608 100644
--- a/extensions/mediasession/README.md
+++ b/extensions/mediasession/README.md
@@ -2,10 +2,10 @@
 
 ## Description ##
 
-The MediaSession extension mediates between an ExoPlayer instance and a
-[MediaSession][]. It automatically retrieves and implements playback actions
-and syncs the player state with the state of the media session. The behaviour
-can be extended to support other playback and custom actions.
+The MediaSession extension mediates between a Player (or ExoPlayer) instance
+and a [MediaSession][]. It automatically retrieves and implements playback
+actions and syncs the player state with the state of the media session. The
+behaviour can be extended to support other playback and custom actions.
 
 [MediaSession]: https://developer.android.com/reference/android/support/v4/media/session/MediaSessionCompat.html
 
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 0e839b80831..33807930a53 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
@@ -47,7 +47,7 @@
  * Connects a {@link MediaSessionCompat} to a {@link Player}.
  * <p>
  * The connector listens for actions sent by the media session's controller and implements these
- * actions by calling appropriate ExoPlayer methods. The playback state of the media session is
+ * 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
  * various collaborators:
  * <ul>

From ebbf9f635bdbb1b7b4ba418955bc5be207afeca6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 9 Aug 2017 03:26:18 -0700
Subject: [PATCH 076/421] Fix minor Javadoc error

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164706078
---
 .../android/exoplayer2/ui/SimpleExoPlayerView.java    | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 2bba9071fd2..17923767d1c 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
@@ -668,10 +668,15 @@ public void setShowMultiWindowTimeBar(boolean showMultiWindowTimeBar) {
   }
 
   /**
-   * Gets the view onto which video is rendered. This is either a {@link SurfaceView} (default)
-   * or a {@link TextureView} if the {@code use_texture_view} view attribute has been set to true.
+   * Gets the view onto which video is rendered. This is a:
+   * <ul>
+   *   <li>{@link SurfaceView} by default, or if the {@code surface_type} attribute is set to
+   *   {@code surface_view}.</li>
+   *   <li>{@link TextureView} if {@code surface_type} is {@code texture_view}.</li>
+   *   <li>{@code null} if {@code surface_type} is {@code none}.</li>
+   * </ul>
    *
-   * @return Either a {@link SurfaceView} or a {@link TextureView}.
+   * @return The {@link SurfaceView}, {@link TextureView} or {@code null}.
    */
   public View getVideoSurfaceView() {
     return surfaceView;

From 55d1abaa2190aaabc1c022aa2e080d018725a824 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 9 Aug 2017 03:27:13 -0700
Subject: [PATCH 077/421] Document usage of the RTMP extension

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164706135
---
 extensions/rtmp/README.md | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md
index 042d7078dca..80074f119c6 100644
--- a/extensions/rtmp/README.md
+++ b/extensions/rtmp/README.md
@@ -9,7 +9,7 @@ streams using [LibRtmp Client for Android][].
 [RTMP]: https://en.wikipedia.org/wiki/Real-Time_Messaging_Protocol
 [LibRtmp Client for Android]: https://github.com/ant-media/LibRtmp-Client-for-Android
 
-## Using the extension ##
+## Getting the extension ##
 
 The easiest way to use the extension is to add it as a gradle dependency:
 
@@ -25,3 +25,19 @@ 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 ##
+
+ExoPlayer requests data through `DataSource` instances. These instances are
+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
+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
+application code are required. Alternatively, if you know that your application
+doesn't need to handle any other protocols, you can update any `DataSource`s and
+`DataSource.Factory` instantiations in your application code to use
+`RtmpDataSource` and `RtmpDataSourceFactory` directly.

From b6b84839ed25476667abe6cdf6ccf0a41c8ab9b7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 9 Aug 2017 07:10:42 -0700
Subject: [PATCH 078/421] Add ErrorMessageProvider to util package

It's needed in multiple places. MediaSessionConnector uses it
today. Our leanback connector will also use it. Maybe
SimpleExoPlayerView should use one too, to show the message to
the user when an error occurs.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164720020
---
 .../mediasession/MediaSessionConnector.java   | 17 +++-------
 .../exoplayer2/util/ErrorMessageProvider.java | 33 +++++++++++++++++++
 2 files changed, 37 insertions(+), 13 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.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 33807930a53..743b2e066f8 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
@@ -38,6 +38,7 @@
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.util.ErrorMessageProvider;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -293,17 +294,6 @@ public interface CustomActionProvider {
     PlaybackStateCompat.CustomAction getCustomAction();
   }
 
-  /**
-   * Converts an exception into an error code and a user readable error message.
-   */
-  public interface ErrorMessageProvider {
-    /**
-     * Returns a pair consisting of an error code and a user readable error message for a given
-     * exception.
-     */
-    Pair<Integer, String> getErrorMessage(ExoPlaybackException playbackException);
-  }
-
   /**
    * The wrapped {@link MediaSessionCompat}.
    */
@@ -320,7 +310,7 @@ public interface ErrorMessageProvider {
   private CustomActionProvider[] customActionProviders;
   private int currentWindowIndex;
   private Map<String, CustomActionProvider> customActionMap;
-  private ErrorMessageProvider errorMessageProvider;
+  private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   private PlaybackPreparer playbackPreparer;
   private QueueNavigator queueNavigator;
   private QueueEditor queueEditor;
@@ -411,7 +401,8 @@ public void setPlayer(Player player, PlaybackPreparer playbackPreparer,
    *
    * @param errorMessageProvider The error message provider.
    */
-  public void setErrorMessageProvider(ErrorMessageProvider errorMessageProvider) {
+  public void setErrorMessageProvider(
+      ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider) {
     this.errorMessageProvider = errorMessageProvider;
   }
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
new file mode 100644
index 00000000000..3d2c043a91b
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ErrorMessageProvider.java
@@ -0,0 +1,33 @@
+/*
+ * 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.util;
+
+import android.util.Pair;
+
+/**
+ * Converts exceptions into error codes and user readable error messages.
+ */
+public interface ErrorMessageProvider<T extends Exception> {
+
+  /**
+   * Returns a pair consisting of an error code and a user readable error message for the given
+   * exception.
+   *
+   * @param exception The exception for which an error code and message should be generated.
+   */
+  Pair<Integer, String> getErrorMessage(T exception);
+
+}

From 0d11ebdf2d814eb6dbe0a820ae5c4b7d415a95ba Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 9 Aug 2017 08:25:06 -0700
Subject: [PATCH 079/421] Run optimage to optimize demo app's PNGs

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164726319
---
 .../src/main/res/drawable-xhdpi/ic_banner.png | Bin 6884 -> 4299 bytes
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 3441 -> 3394 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 2186 -> 2184 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4951 -> 4886 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 7732 -> 7492 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 11241 -> 10801 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/demos/main/src/main/res/drawable-xhdpi/ic_banner.png b/demos/main/src/main/res/drawable-xhdpi/ic_banner.png
index 520d83cc3b9e8ee1438d884a94c853373b0f6923..09de177387a3aa03fb29e8dd83bba0b3858b4f31 100644
GIT binary patch
literal 4299
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

literal 6884
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
ZG`#Q!#3CUK%qf8fR8d2rRL(T`{{S|C2|oY;

diff --git a/demos/main/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-hdpi/ic_launcher.png
index 6e8b5499deb00bdfb2256fa23eade5567db7a762..adaa93220eb81c58e5c85874d1cf127a3188e419 100644
GIT binary patch
delta 3391
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
VrO+?soTUH&002ovPDHLkV1fX2e`Wvx

delta 3438
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
QY5)KL07*qoM6N<$f={2TaR2}S

diff --git a/demos/main/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-mdpi/ic_launcher.png
index 26fe2f0782aabc52a1a4a98e0a91eaecfd84bc23..9b6f7d5e8065c8a943bb33bc152bcbd1ca887b35 100644
GIT binary patch
delta 2171
zcmV->2!!{F5r`3xB!5pyL_t(&-o;vJP*YbF7KK`u+WNy<x+u8d!c2?PvF&uGW9^Ur
z>4*`Dgw3%!TD58&?O1hc)z+oj#i`>uR)N|mRTcrotzyBbjG$#HB2r+4A|_xG2oOkK
za(Yg@FTUhuc_dNa%o!fZefNIfz28~xed*WF&kF#8&<3D|(0^YE?d@&p*?!OJ!omBa
z1-tofC|W35I5WB*>ZWZl_4Q1F<Npz8pQ0VGTCIOsES6d{HQwvU=$<~K@2CxH8}ZbM
z(9%22ax#KCk7hsv1S#3rGv}!fv>~p>2qf?zUf=9~F@mUZ0&V3u&LYLAtrMXd>XY{g
zwi-c!0zW`-|9>umE*1bMKxWIM3;JlHXYv1H8pGAtfdIb}fpdbvIUhi~G}f1eNsI1R
z`b|RkAa=NqpLI5C)<A)GlAxLY-()f!@R@`#8enHi2A<b1JV|@J7#8U5?LCGNg8D>4
z=seijegZG-)ILyi5ts@VqAdchAs;N9Igmu`lVva%4u1+r1W6$f%x3-ze&$6^YSe-0
zYz&yr%&?oea0PIhvVfAn@hxVv8FV_`Dj_znaUS*e4)3t8WW#A|9KbseDcug1&ietA
z6HOvYiED0de&1uB5b7RT7YiI#+_CnKTLLyaI~&Z^zk$Wn6$lbG40^r(214uaj8!BZ
zoc+%P(tok~M1Z$T^MGr-gwJq(MJJLH;sRWSWiF+}Gs3@varSEju^Id#z{^Ut8n}nm
ze&q?8R9uC-`T6<7M619v>g?=H7R)|KCD5G}4JAo($ek1qxsw%ebFLhW+0l+f@}t36
zybDa4R-Z`FDxfbweSQ4`hgA@Urk<Xj^PaTtj(@;a*&N6mrEsufx!nGJ@97y(_e~6(
zc{2_k%t?T*6Mq0_H2UNVYPI@LfiDEv6NE;i8IO$&d<c_Dz>q!@GDj;!1hT>uw(rz?
zW<kNUIQ!=<(J}BaMh3dYi=aoP!u%oGKP-rq@`6F7QbpR68y}WXUkjLgyp{<<0=iV0
z2!A|pxfA0=<ah$SwQu+uOm+WCm64TXbo=)0rS_1@uRupf$02ud-xC3n$GNErw<Mg+
znSjk=W5BR~A8<OI*SvrR4Gj&cl%0j;MNn5)*A-s~kZJbMgzT~ILFbKAK>h>;oC=Qv
zjck^f05ffJB6R2GVE!<9s*|9lrR5r8et#TFFJHbq)Mzx;`b=QoOvo8827W4B0e3!%
zwF7LMC36d2X!_-!Lr+PG+sxeB+FG}L`}W~>0%c`ouVJEi&{qN-$D-keLJnD@UC(^w
zv{*@i-I-zU9+w2#+uPMCDJfxg0;Q#;V=;kgr4le{YM^RGEaXJQdDOdF7ULHIGJkVZ
zqlf_dt1crWW1^ivVPWC;z7VK=V1RWil%Slvz$1YNGXp@N`9GHgQd3hS?F91j@<w42
zQ%faqSKS5jlqyI#a0|93`~oM#6I~K0|G*Ck&7K9FM-ID`5Qcos?%lh`+6k;(yLNbY
zcXw@H3Gg=m$0A6Nm?t8TjmfME{eOUWUX4tm6Mwl1djF|(>%^Fi>ynd`Ul!JL198)!
z@|D2S&FA3cm_)Zy${7=H3#HkkJ^O`r{yZ>Vya2e1@fb!M8ykxe^I%~i7mTqr#TNo|
zj#R?YsKx#zvN^HPnVJHe!5}G-RaRF1j+jGi*jXtNR8di}jIY1Fl@me&3x9qpatl@&
zxezkK5<C*<*t!KHO_S7pffaofE?l^<nq}h0r9@g<+7!$M?NW+4A%VGjOCV!(ya+r2
zPuf=k3%@Ub{U5Fu5zwz#2E8|L_Gx=b#T-h#W5<pi@390NEG(yoVntdYrJQ#5fuCn=
z6%qI$W~W1&)n8>nTGSFyCx6U^?z~*L<$||zx~8V45V5}Kuod9_ps1*5Irpf%^(Z4}
z0*XWBunoiM(YF?(KP-VQNqZpf*9wO=@oBf=sHzD}`gUJ-WLCsz#c~I-v$IJ)!4BI>
zetR}`>eM%IiSByaQaTgxX4@{_gGQ~<?=2-ppW3LXs4$lsd&cPbf`5X7^>h|v+ey1w
z1*rs9X4OLJy>`Ek90jw#kubVE9}+MMy?_6HsV86XMqr-u4&+s~g2~JU>{tc0e+#j_
zP5@7wI5EJ}socO_yLQQNgWt=J6-832)wm`Qms$k}Rn4I5G6m#d3zfi8<k4!iy_+|0
zmJ>ECJVT@$Exv@u7k^tR=F;*xC$|ox36hRhJAmJKwgKu|y8?R1OJn0k3o<h^cMvA8
zM~i%DlFQ|^M6X`IeqBj>P`pGZ(|<R0z`DG8Sbw@6uGZ^;3-AdwjY$)Tu|A!!5GKiQ
zZJ0mMQiYe4l;pCNur2A6K3?Z#Lt|dMcI`A`7(-ax>fXx>j(>q@W3ODfaty0g8wqkM
zifT{by@2fn2aQ3p!DvV`KaMciGOjNddyq(kkq$9O^swU@YoLe-fZO_NYisLCPfy=T
zWBLVND5uEC$md9hxNnHBuC6Yn)u0F^AY$p`YbXAVrVTjtMSbFVPwAR9YZ7TJ8ne%`
z@#NUp8IhoqfPYEHk01XQ&t~q@QnMAYUHqFBFRxfFg7!AKP+v-=@;mH%GL1oFJ&~Uw
zuoz5|dS%3j5mOEyKD@rXyu1*PIrKDxX0{PwtK)F-FA1p)WmS}l9!vN_>Vx{CJ|)HZ
zK&%EEWDwd&v<V7@;u9>#H()WCjxs2wngzFgEtr7X$aLtwsi~<J<yTB?s4YE%&rW20
z45B_aZQArqeltO2hA|-Ic#}dyL*Jf0efl(+O!hGu-P33E9cwd^JrnZOf9&CEMJQ5K
xRaHI5{DfZ}`u)QT%!aVfLYTfo=$Sz1{C~*2=VDQilGgwL002ovPDHLkV1gsJ6!HK7

delta 2173
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

diff --git a/demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xhdpi/ic_launcher.png
index d3251491ceab2edd0085cc3babc6ebd1b46f1782..2101026c9fe1b48ab11a23fd440cf2f80af2afae 100644
GIT binary patch
literal 4886
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
IM6N<$f{P}YasU7T

literal 4951
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%0D@=Bcm~b+d1m*6~
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
VxK7YlkA?sM002ovPDHLkV1knZn^*t<

diff --git a/demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b5a12d35f337790ea7c6eb6cd43ac4cf5761efb1..223ec8bd1132aab759469bd5ad2232f35f7be2c2 100644
GIT binary patch
literal 7492
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
O0000<MNUMnLSTZ5-A2{`

literal 7732
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

diff --git a/demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/main/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 9c26192c32b87b8d312d1e9265df532d8026eae2..698ed68c429d3c14b617d6ff4bab26e01df89a14 100644
GIT binary patch
literal 10801
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%0Dj^J4_SbOxi?LOAH?pqcJIPrNphD%I2G8C
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

literal 11241
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


From ab277675a15afa7d546bfa0c7e92a61bf5484dc3 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Wed, 9 Aug 2017 14:35:38 -0700
Subject: [PATCH 080/421] set mediaSession flags properly and keep queue in
 sync when timeline changes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164774783
---
 .../mediasession/MediaSessionConnector.java   | 19 ++++++++++++++++---
 1 file changed, 16 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 743b2e066f8..419614347f0 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
@@ -74,6 +74,10 @@ public final class MediaSessionConnector {
   }
 
   public static final String EXTRAS_PITCH = "EXO_PITCH";
+  private static final int BASE_MEDIA_SESSION_FLAGS = MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
+      | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS;
+  private static final int EDITOR_MEDIA_SESSION_FLAGS = BASE_MEDIA_SESSION_FLAGS
+      | MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS;
 
   /**
    * Interface to which playback preparation actions are delegated.
@@ -308,7 +312,6 @@ public interface CustomActionProvider {
 
   private Player player;
   private CustomActionProvider[] customActionProviders;
-  private int currentWindowIndex;
   private Map<String, CustomActionProvider> customActionMap;
   private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   private PlaybackPreparer playbackPreparer;
@@ -359,8 +362,7 @@ public MediaSessionConnector(MediaSessionCompat mediaSession,
     this.handler = new Handler(Looper.myLooper() != null ? Looper.myLooper()
         : Looper.getMainLooper());
     this.doMaintainMetadata = doMaintainMetadata;
-    mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
-        | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
+    mediaSession.setFlags(BASE_MEDIA_SESSION_FLAGS);
     mediaController = mediaSession.getController();
     mediaSessionCallback = new MediaSessionCallback();
     exoPlayerEventListener = new ExoPlayerEventListener();
@@ -424,6 +426,8 @@ public void setQueueNavigator(QueueNavigator queueNavigator) {
    */
   public void setQueueEditor(QueueEditor queueEditor) {
     this.queueEditor = queueEditor;
+    mediaSession.setFlags(queueEditor == null ? BASE_MEDIA_SESSION_FLAGS
+        : EDITOR_MEDIA_SESSION_FLAGS);
   }
 
   private void updateMediaSessionPlaybackState() {
@@ -574,11 +578,20 @@ private boolean canDispatchToQueueEditor(long action) {
 
   private class ExoPlayerEventListener implements Player.EventListener {
 
+    private int currentWindowIndex;
+    private int currentWindowCount;
+
     @Override
     public void onTimelineChanged(Timeline timeline, Object manifest) {
       if (queueNavigator != null) {
         queueNavigator.onTimelineChanged(player);
       }
+      int windowCount = player.getCurrentTimeline().getWindowCount();
+      if (currentWindowCount != windowCount) {
+        // active queue item and queue navigation actions may need to be updated
+        updateMediaSessionPlaybackState();
+      }
+      currentWindowCount = windowCount;
       currentWindowIndex = player.getCurrentWindowIndex();
       updateMediaSessionMetadata();
     }

From 2d0044fee4f99097cc4c53854b5f91322adaf282 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 10 Aug 2017 02:25:55 -0700
Subject: [PATCH 081/421] Generic DownloadManager and DownloadService

Downloader specific parameters and constructor is moved to DownloadAction class.

DownloadAction objects need to be serialized so they can be passed in Intents and can be stored to
filesystem (to be implemented). So  DownloadAction.Serializer is added. Didn't use Serializable interface
because of the concerns over incompabilities when the new versions of classes are used.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164831115
---
 library/dash/build.gradle | 1 -
 1 file changed, 1 deletion(-)

diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index 2220e5b2500..48e9b9b97e2 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -35,7 +35,6 @@ android {
 dependencies {
     compile project(modulePrefix + 'library-core')
     compile 'com.android.support:support-annotations:' + supportLibraryVersion
-    compile 'com.android.support:support-core-utils:' + supportLibraryVersion
     androidTestCompile project(modulePrefix + 'testutils')
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion

From 5ab0c620bf84f8d24b9a1894359c25a17c7ab479 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 10 Aug 2017 04:31:01 -0700
Subject: [PATCH 082/421] Clean up ClearKey UUIDs

- There is a proper ClearKey UUID now. This change requires
  it to be used instead of the Common PSSH UUID when instantiating
  DRM components.
- Internally, we'll map the ClearKey UUID onto the Common PSSH
  UUID where necessary to (a) access the ClearKey CDM on older
  devices, and (b) access drm init data stored under the Common
  PSSH UUID in the stream.

Issue: #3138

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164839213
---
 .../android/exoplayer2/demo/SampleChooserActivity.java   | 2 +-
 .../src/main/java/com/google/android/exoplayer2/C.java   | 9 ++++++++-
 .../android/exoplayer2/drm/DefaultDrmSessionManager.java | 6 ++++++
 .../google/android/exoplayer2/drm/FrameworkMediaDrm.java | 8 +++++++-
 4 files changed, 22 insertions(+), 3 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 87b8e92e835..382c7835985 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
@@ -271,7 +271,7 @@ private UUID getDrmUuid(String typeString) throws ParserException {
           return C.WIDEVINE_UUID;
         case "playready":
           return C.PLAYREADY_UUID;
-        case "cenc":
+        case "clearkey":
           return C.CLEARKEY_UUID;
         default:
           try {
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 d7d0ed40aaf..1cfcded1cb0 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
@@ -604,12 +604,19 @@ private C() {}
    */
   public static final UUID UUID_NIL = new UUID(0L, 0L);
 
+  /**
+   * UUID for the W3C
+   * <a href="https://w3c.github.io/encrypted-media/format-registry/initdata/cenc.html">Common PSSH
+   * box</a>.
+   */
+  public static final UUID COMMON_PSSH_UUID = new UUID(0x1077EFECC0B24D02L, 0xACE33C1E52E2FB4BL);
+
   /**
    * UUID for the ClearKey DRM scheme.
    * <p>
    * ClearKey is supported on Android devices running Android 5.0 (API Level 21) and up.
    */
-  public static final UUID CLEARKEY_UUID = new UUID(0x1077EFECC0B24D02L, 0xACE33C1E52E2FB4BL);
+  public static final UUID CLEARKEY_UUID = new UUID(0xE2719D58A985B3C9L, 0x781AB030AF78D30EL);
 
   /**
    * UUID for the Widevine DRM scheme.
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 cafbe6e8f7b..fcd8ac862b3 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
@@ -216,6 +216,8 @@ public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstanc
   public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCallback callback,
       HashMap<String, String> optionalKeyRequestParameters, Handler eventHandler,
       EventListener eventListener) {
+    Assertions.checkNotNull(uuid);
+    Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");
     this.uuid = uuid;
     this.mediaDrm = mediaDrm;
     this.callback = callback;
@@ -346,6 +348,10 @@ public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitDa
 
     if (offlineLicenseKeySetId == null) {
       SchemeData schemeData = drmInitData.get(uuid);
+      if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
+        // If present, the Common PSSH box should be used for ClearKey.
+        schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
+      }
       if (schemeData == null) {
         onError(new IllegalStateException("Media does not support uuid: " + uuid));
         return this;
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 ed4494559ac..5d0cb038d45 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
@@ -57,7 +57,13 @@ public static FrameworkMediaDrm newInstance(UUID uuid) throws UnsupportedDrmExce
   }
 
   private FrameworkMediaDrm(UUID uuid) throws UnsupportedSchemeException {
-    this.mediaDrm = new MediaDrm(Assertions.checkNotNull(uuid));
+    Assertions.checkNotNull(uuid);
+    Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");
+    if (Util.SDK_INT < 27 && C.CLEARKEY_UUID.equals(uuid)) {
+      // ClearKey had to be accessed using the Common PSSH UUID prior to API level 27.
+      uuid = C.COMMON_PSSH_UUID;
+    }
+    this.mediaDrm = new MediaDrm(uuid);
   }
 
   @Override

From 88bae5d9750333f0706e475d0024600ea057a1e6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 10 Aug 2017 04:42:27 -0700
Subject: [PATCH 083/421] Support multiple video/text/metadata outputs

We've seen more than one issue filed where a developer has
registered a video listener and been confused by the fact
their SimpleExoPlayerView no longer works properly. There
are also valid use cases for having multiple metadata/text
outputs.

Issue: #2933
Issue: #2800
Issue: #2286
Issue: #2240

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164839882
---
 .../exoplayer2/demo/PlayerActivity.java       |   2 +-
 .../android/exoplayer2/SimpleExoPlayer.java   | 127 ++++++++++++++----
 .../exoplayer2/ui/SimpleExoPlayerView.java    |  12 +-
 3 files changed, 107 insertions(+), 34 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 9e53dff857b..6416cd5aa27 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
@@ -294,9 +294,9 @@ private void initializePlayer() {
       player = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector);
       player.addListener(this);
       player.addListener(eventLogger);
+      player.addMetadataOutput(eventLogger);
       player.setAudioDebugListener(eventLogger);
       player.setVideoDebugListener(eventLogger);
-      player.setMetadataOutput(eventLogger);
 
       simpleExoPlayerView.setPlayer(player);
       player.setPlayWhenReady(shouldAutoPlay);
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 16a44aa0164..cc0791bf44b 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
@@ -41,6 +41,7 @@
 import com.google.android.exoplayer2.util.Util;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
 import java.util.List;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * An {@link ExoPlayer} implementation that uses default {@link Renderer} components. Instances can
@@ -87,6 +88,9 @@ void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
 
   private final ExoPlayer player;
   private final ComponentListener componentListener;
+  private final CopyOnWriteArraySet<VideoListener> videoListeners;
+  private final CopyOnWriteArraySet<TextRenderer.Output> textOutputs;
+  private final CopyOnWriteArraySet<MetadataRenderer.Output> metadataOutputs;
   private final int videoRendererCount;
   private final int audioRendererCount;
 
@@ -99,9 +103,6 @@ void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
   private int videoScalingMode;
   private SurfaceHolder surfaceHolder;
   private TextureView textureView;
-  private TextRenderer.Output textOutput;
-  private MetadataRenderer.Output metadataOutput;
-  private VideoListener videoListener;
   private AudioRendererEventListener audioDebugListener;
   private VideoRendererEventListener videoDebugListener;
   private DecoderCounters videoDecoderCounters;
@@ -113,6 +114,9 @@ void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
   protected SimpleExoPlayer(RenderersFactory renderersFactory, TrackSelector trackSelector,
       LoadControl loadControl) {
     componentListener = new ComponentListener();
+    videoListeners = new CopyOnWriteArraySet<>();
+    textOutputs = new CopyOnWriteArraySet<>();
+    metadataOutputs = new CopyOnWriteArraySet<>();
     Looper eventLooper = Looper.myLooper() != null ? Looper.myLooper() : Looper.getMainLooper();
     Handler eventHandler = new Handler(eventLooper);
     renderers = renderersFactory.createRenderers(eventHandler, componentListener, componentListener,
@@ -440,63 +444,132 @@ public DecoderCounters getAudioDecoderCounters() {
   }
 
   /**
-   * Sets a listener to receive video events.
+   * Adds a listener to receive video events.
+   *
+   * @param listener The listener to register.
+   */
+  public void addVideoListener(VideoListener listener) {
+    videoListeners.add(listener);
+  }
+
+  /**
+   * Removes a listener of video events.
+   *
+   * @param listener The listener to unregister.
+   */
+  public void removeVideoListener(VideoListener listener) {
+    videoListeners.remove(listener);
+  }
+
+  /**
+   * Sets a listener to receive video events, removing all existing listeners.
    *
    * @param listener The listener.
+   * @deprecated Use {@link #addVideoListener(VideoListener)}.
    */
+  @Deprecated
   public void setVideoListener(VideoListener listener) {
-    videoListener = listener;
+    videoListeners.clear();
+    if (listener != null) {
+      addVideoListener(listener);
+    }
   }
 
   /**
-   * Clears the listener receiving video events if it matches the one passed. Else does nothing.
+   * Equivalent to {@link #removeVideoListener(VideoListener)}.
    *
    * @param listener The listener to clear.
+   * @deprecated Use {@link #removeVideoListener(VideoListener)}.
    */
+  @Deprecated
   public void clearVideoListener(VideoListener listener) {
-    if (videoListener == listener) {
-      videoListener = null;
-    }
+    removeVideoListener(listener);
+  }
+
+  /**
+   * Registers an output to receive text events.
+   *
+   * @param listener The output to register.
+   */
+  public void addTextOutput(TextRenderer.Output listener) {
+    textOutputs.add(listener);
+  }
+
+  /**
+   * Removes a text output.
+   *
+   * @param listener The output to remove.
+   */
+  public void removeTextOutput(TextRenderer.Output listener) {
+    textOutputs.remove(listener);
   }
 
   /**
-   * Sets an output to receive text events.
+   * Sets an output to receive text events, removing all existing outputs.
    *
    * @param output The output.
+   * @deprecated Use {@link #addTextOutput(TextRenderer.Output)}.
    */
+  @Deprecated
   public void setTextOutput(TextRenderer.Output output) {
-    textOutput = output;
+    textOutputs.clear();
+    if (output != null) {
+      addTextOutput(output);
+    }
   }
 
   /**
-   * Clears the output receiving text events if it matches the one passed. Else does nothing.
+   * Equivalent to {@link #removeTextOutput(TextRenderer.Output)}.
    *
    * @param output The output to clear.
+   * @deprecated Use {@link #removeTextOutput(TextRenderer.Output)}.
    */
+  @Deprecated
   public void clearTextOutput(TextRenderer.Output output) {
-    if (textOutput == output) {
-      textOutput = null;
-    }
+    removeTextOutput(output);
   }
 
   /**
-   * Sets a listener to receive metadata events.
+   * Registers an output to receive metadata events.
+   *
+   * @param listener The output to register.
+   */
+  public void addMetadataOutput(MetadataRenderer.Output listener) {
+    metadataOutputs.add(listener);
+  }
+
+  /**
+   * Removes a metadata output.
+   *
+   * @param listener The output to remove.
+   */
+  public void removeMetadataOutput(MetadataRenderer.Output listener) {
+    metadataOutputs.remove(listener);
+  }
+
+  /**
+   * Sets an output to receive metadata events, removing all existing outputs.
    *
    * @param output The output.
+   * @deprecated Use {@link #addMetadataOutput(MetadataRenderer.Output)}.
    */
+  @Deprecated
   public void setMetadataOutput(MetadataRenderer.Output output) {
-    metadataOutput = output;
+    metadataOutputs.clear();
+    if (output != null) {
+      addMetadataOutput(output);
+    }
   }
 
   /**
-   * Clears the output receiving metadata events if it matches the one passed. Else does nothing.
+   * Equivalent to {@link #removeMetadataOutput(MetadataRenderer.Output)}.
    *
    * @param output The output to clear.
+   * @deprecated Use {@link #removeMetadataOutput(MetadataRenderer.Output)}.
    */
+  @Deprecated
   public void clearMetadataOutput(MetadataRenderer.Output output) {
-    if (metadataOutput == output) {
-      metadataOutput = null;
-    }
+    removeMetadataOutput(output);
   }
 
   /**
@@ -816,7 +889,7 @@ public void onDroppedFrames(int count, long elapsed) {
     @Override
     public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
         float pixelWidthHeightRatio) {
-      if (videoListener != null) {
+      for (VideoListener videoListener : videoListeners) {
         videoListener.onVideoSizeChanged(width, height, unappliedRotationDegrees,
             pixelWidthHeightRatio);
       }
@@ -828,8 +901,10 @@ public void onVideoSizeChanged(int width, int height, int unappliedRotationDegre
 
     @Override
     public void onRenderedFirstFrame(Surface surface) {
-      if (videoListener != null && SimpleExoPlayer.this.surface == surface) {
-        videoListener.onRenderedFirstFrame();
+      if (SimpleExoPlayer.this.surface == surface) {
+        for (VideoListener videoListener : videoListeners) {
+          videoListener.onRenderedFirstFrame();
+        }
       }
       if (videoDebugListener != null) {
         videoDebugListener.onRenderedFirstFrame(surface);
@@ -902,7 +977,7 @@ public void onAudioDisabled(DecoderCounters counters) {
 
     @Override
     public void onCues(List<Cue> cues) {
-      if (textOutput != null) {
+      for (TextRenderer.Output textOutput : textOutputs) {
         textOutput.onCues(cues);
       }
     }
@@ -911,7 +986,7 @@ public void onCues(List<Cue> cues) {
 
     @Override
     public void onMetadata(Metadata metadata) {
-      if (metadataOutput != null) {
+      for (MetadataRenderer.Output metadataOutput : metadataOutputs) {
         metadataOutput.onMetadata(metadata);
       }
     }
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 17923767d1c..b3dc3c72645 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
@@ -379,9 +379,7 @@ public SimpleExoPlayer getPlayer() {
   }
 
   /**
-   * Set the {@link SimpleExoPlayer} to use. The {@link SimpleExoPlayer#setTextOutput} and
-   * {@link SimpleExoPlayer#setVideoListener} method of the player will be called and previous
-   * assignments are overridden.
+   * Set the {@link SimpleExoPlayer} to use.
    * <p>
    * To transition a {@link SimpleExoPlayer} from targeting one view to another, it's recommended to
    * use {@link #switchTargetView(SimpleExoPlayer, SimpleExoPlayerView, SimpleExoPlayerView)} rather
@@ -397,8 +395,8 @@ public void setPlayer(SimpleExoPlayer player) {
     }
     if (this.player != null) {
       this.player.removeListener(componentListener);
-      this.player.clearTextOutput(componentListener);
-      this.player.clearVideoListener(componentListener);
+      this.player.removeTextOutput(componentListener);
+      this.player.removeVideoListener(componentListener);
       if (surfaceView instanceof TextureView) {
         this.player.clearVideoTextureView((TextureView) surfaceView);
       } else if (surfaceView instanceof SurfaceView) {
@@ -418,8 +416,8 @@ public void setPlayer(SimpleExoPlayer player) {
       } else if (surfaceView instanceof SurfaceView) {
         player.setVideoSurfaceView((SurfaceView) surfaceView);
       }
-      player.setVideoListener(componentListener);
-      player.setTextOutput(componentListener);
+      player.addVideoListener(componentListener);
+      player.addTextOutput(componentListener);
       player.addListener(componentListener);
       maybeShowController(false);
       updateForCurrentTrackSelections();

From 1b28d83f16e5a35e78082c79f8fed3c556122955 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 10 Aug 2017 04:45:40 -0700
Subject: [PATCH 084/421] Fix maskingX variables when timeline becomes empty

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

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 c3a76cd9620..f22c08f585d 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
@@ -448,6 +448,12 @@ public Object getCurrentManifest() {
       case ExoPlayerImplInternal.MSG_SEEK_ACK: {
         if (--pendingSeekAcks == 0) {
           playbackInfo = (ExoPlayerImplInternal.PlaybackInfo) msg.obj;
+          if (timeline.isEmpty()) {
+            // Update the masking variables, which are used when the timeline is empty.
+            maskingPeriodIndex = 0;
+            maskingWindowIndex = 0;
+            maskingWindowPositionMs = 0;
+          }
           if (msg.arg1 != 0) {
             for (Player.EventListener listener : listeners) {
               listener.onPositionDiscontinuity();
@@ -472,6 +478,12 @@ public Object getCurrentManifest() {
           timeline = sourceInfo.timeline;
           manifest = sourceInfo.manifest;
           playbackInfo = sourceInfo.playbackInfo;
+          if (pendingSeekAcks == 0 && timeline.isEmpty()) {
+            // Update the masking variables, which are used when the timeline is empty.
+            maskingPeriodIndex = 0;
+            maskingWindowIndex = 0;
+            maskingWindowPositionMs = 0;
+          }
           for (Player.EventListener listener : listeners) {
             listener.onTimelineChanged(timeline, manifest);
           }

From fc9a58529a1fddc2ef9ade587266846e47bfc535 Mon Sep 17 00:00:00 2001
From: ybai001 <ybai@dolby.com>
Date: Thu, 10 Aug 2017 14:32:52 +0800
Subject: [PATCH 085/421] Support 7.1 EAC3 in MP4, DASH and HLS formats

---
 .../android/exoplayer2/audio/Ac3Util.java     | 42 ++++++++++++++++---
 .../dash/manifest/DashManifestParser.java     | 31 +++++++++++++-
 2 files changed, 66 insertions(+), 7 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 4b64ffb030d..bc46a4f10a8 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
@@ -38,6 +38,10 @@ public static final class Ac3SyncFrameInfo {
      * {@link MimeTypes#AUDIO_E_AC3}.
      */
     public final String mimeType;
+    /**
+     * The type of the bitstream, only for AUDIO_E_AC3
+     */
+    public final int streamType;
     /**
      * The audio sampling rate in Hz.
      */
@@ -55,9 +59,10 @@ public static final class Ac3SyncFrameInfo {
      */
     public final int sampleCount;
 
-    private Ac3SyncFrameInfo(String mimeType, int channelCount, int sampleRate, int frameSize,
-        int sampleCount) {
+    private Ac3SyncFrameInfo(String mimeType, int streamType, int channelCount, int sampleRate,
+        int frameSize, int sampleCount) {
       this.mimeType = mimeType;
+      this.streamType = streamType;
       this.channelCount = channelCount;
       this.sampleRate = sampleRate;
       this.frameSize = frameSize;
@@ -101,6 +106,13 @@ private Ac3SyncFrameInfo(String mimeType, int channelCount, int sampleRate, int
   private static final int[] SYNCFRAME_SIZE_WORDS_BY_HALF_FRMSIZECOD_44_1 = new int[] {69, 87, 104,
       121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835, 975, 1114, 1253, 1393};
 
+  /**
+   * Stream type. See ETSI TS 102 366 E.1.3.1.1.
+   */
+  public static final int STREAM_TYPE_UNDEFINED = -1;
+  public static final int STREAM_TYPE_TYPE0 = 0;
+  public static final int STREAM_TYPE_TYPE1 = 1;
+
   /**
    * Returns the AC-3 format given {@code data} containing the AC3SpecificBox according to
    * ETSI TS 102 366 Annex F. The reading position of {@code data} will be modified.
@@ -138,8 +150,8 @@ public static Format parseEAc3AnnexFFormat(ParsableByteArray data, String trackI
       String language, DrmInitData drmInitData) {
     data.skipBytes(2); // data_rate, num_ind_sub
 
-    // Read only the first substream.
-    // TODO: Read later substreams?
+    // Read only the first independent substream.
+    // TODO: Read later independent substreams?
     int fscod = (data.readUnsignedByte() & 0xC0) >> 6;
     int sampleRate = SAMPLE_RATE_BY_FSCOD[fscod];
     int nextByte = data.readUnsignedByte();
@@ -147,6 +159,19 @@ public static Format parseEAc3AnnexFFormat(ParsableByteArray data, String trackI
     if ((nextByte & 0x01) != 0) { // lfeon
       channelCount++;
     }
+
+    // Read only the first dependent substream.
+    // TODO: Read later dependent substreams?
+    nextByte = data.readUnsignedByte();
+    int numDepSub = ((nextByte & 0x1E) >> 1);
+    if (numDepSub > 0) {
+      int lowByteChanLoc = data.readUnsignedByte();
+      // Read Lrs/Rrs pair
+      // TODO: Read other channel configuration
+      if ((lowByteChanLoc & 0x02) != 0) {
+        channelCount += 2;
+      }
+    }
     return Format.createAudioSampleFormat(trackId, MimeTypes.AUDIO_E_AC3, null, Format.NO_VALUE,
         Format.NO_VALUE, channelCount, sampleRate, null, drmInitData, 0, language);
   }
@@ -164,13 +189,16 @@ public static Ac3SyncFrameInfo parseAc3SyncframeInfo(ParsableBitArray data) {
     boolean isEac3 = data.readBits(5) == 16;
     data.setPosition(initialPosition);
     String mimeType;
+    int streamType;
     int sampleRate;
     int acmod;
     int frameSize;
     int sampleCount;
     if (isEac3) {
       mimeType = MimeTypes.AUDIO_E_AC3;
-      data.skipBits(16 + 2 + 3); // syncword, strmtype, substreamid
+      data.skipBits(16); // syncword
+      streamType = data.readBits(2);
+      data.skipBits(3); // substreamid
       frameSize = (data.readBits(11) + 1) * 2;
       int fscod = data.readBits(2);
       int audioBlocks;
@@ -187,6 +215,7 @@ public static Ac3SyncFrameInfo parseAc3SyncframeInfo(ParsableBitArray data) {
     } else /* is AC-3 */ {
       mimeType = MimeTypes.AUDIO_AC3;
       data.skipBits(16 + 16); // syncword, crc1
+      streamType = STREAM_TYPE_UNDEFINED; // AC-3 stream hasn't streamType
       int fscod = data.readBits(2);
       int frmsizecod = data.readBits(6);
       frameSize = getAc3SyncframeSize(fscod, frmsizecod);
@@ -206,7 +235,8 @@ public static Ac3SyncFrameInfo parseAc3SyncframeInfo(ParsableBitArray data) {
     }
     boolean lfeon = data.readBit();
     int channelCount = CHANNEL_COUNT_BY_ACMOD[acmod] + (lfeon ? 1 : 0);
-    return new Ac3SyncFrameInfo(mimeType, channelCount, sampleRate, frameSize, sampleCount);
+    return new Ac3SyncFrameInfo(mimeType, streamType, channelCount, sampleRate,
+        frameSize, sampleCount);
   }
 
   /**
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 53115a7a0ed..a34d248006d 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
@@ -690,7 +690,9 @@ protected int parseAudioChannelConfiguration(XmlPullParser xpp)
       throws XmlPullParserException, IOException {
     String schemeIdUri = parseString(xpp, "schemeIdUri", null);
     int audioChannels = "urn:mpeg:dash:23003:3:audio_channel_configuration:2011".equals(schemeIdUri)
-        ? parseInt(xpp, "value", Format.NO_VALUE) : Format.NO_VALUE;
+        ? parseInt(xpp, "value", Format.NO_VALUE) :
+        ("tag:dolby.com,2014:dash:audio_channel_configuration:2011".equals(schemeIdUri)
+        ? parseDolbyChannelConfiguration(xpp, "value", Format.NO_VALUE) : Format.NO_VALUE);
     do {
       xpp.next();
     } while (!XmlPullParserUtil.isEndTag(xpp, "AudioChannelConfiguration"));
@@ -901,6 +903,33 @@ protected static String parseString(XmlPullParser xpp, String name, String defau
     return value == null ? defaultValue : value;
   }
 
+  protected static int parseDolbyChannelConfiguration(XmlPullParser xpp, String name,
+      int defaultValue) {
+    String value = Util.toLowerInvariant(xpp.getAttributeValue(null, name));
+    if (value == null) {
+      return defaultValue;
+    }
+    int channels;
+    // TODO: Parse other channel configurations
+    switch (value) {
+      case "4000":
+        channels = 1;
+        break;
+      case "a000":
+        channels = 2;
+        break;
+      case "f801":
+        channels = 6;
+        break;
+      case "fa01":
+        channels = 8;
+        break;
+      default:
+        channels = defaultValue;
+    }
+    return channels;
+  }
+
   private static final class RepresentationInfo {
 
     public final Format format;

From 40f34956a836557ba7dac681984bb076658715f1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 10 Aug 2017 09:34:25 -0700
Subject: [PATCH 086/421] Bump minimum and target API levels + support lib
 version

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164863447
---
 constants.gradle                                   | 12 ++++++------
 demos/main/src/main/AndroidManifest.xml            |  2 +-
 .../cronet/src/androidTest/AndroidManifest.xml     |  2 +-
 .../flac/src/androidTest/AndroidManifest.xml       |  2 +-
 .../opus/src/androidTest/AndroidManifest.xml       |  2 +-
 extensions/vp9/src/androidTest/AndroidManifest.xml |  2 +-
 .../exoplayer2/ext/vp9/VpxVideoSurfaceView.java    |  2 --
 library/core/src/androidTest/AndroidManifest.xml   |  2 +-
 library/dash/src/androidTest/AndroidManifest.xml   |  2 +-
 library/hls/src/androidTest/AndroidManifest.xml    |  2 +-
 .../src/androidTest/AndroidManifest.xml            |  2 +-
 .../android/exoplayer2/ui/PlaybackControlView.java | 14 ++------------
 playbacktests/src/androidTest/AndroidManifest.xml  |  2 +-
 .../android/exoplayer2/testutil/HostActivity.java  |  9 +--------
 14 files changed, 19 insertions(+), 38 deletions(-)

diff --git a/constants.gradle b/constants.gradle
index b7cc8b69066..576091f9371 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 project.ext {
-    // Important: ExoPlayer specifies a minSdkVersion of 9 because various
+    // 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 = 9
-    compileSdkVersion = 25
-    targetSdkVersion = 25
-    buildToolsVersion = '25'
+    minSdkVersion = 14
+    compileSdkVersion = 26
+    targetSdkVersion = 26
+    buildToolsVersion = '26'
     testSupportLibraryVersion = '0.5'
-    supportLibraryVersion = '25.4.0'
+    supportLibraryVersion = '26.0.1'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     releaseVersion = 'r2.5.1'
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 1f66822dc70..4f90cef623d 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -23,7 +23,7 @@
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
   <uses-feature android:name="android.software.leanback" android:required="false"/>
   <uses-feature android:name="android.hardware.touchscreen" android:required="false"/>
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="25"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
 
   <application
       android:label="@string/application_name"
diff --git a/extensions/cronet/src/androidTest/AndroidManifest.xml b/extensions/cronet/src/androidTest/AndroidManifest.xml
index 1f371a1864d..7f14a28e836 100644
--- a/extensions/cronet/src/androidTest/AndroidManifest.xml
+++ b/extensions/cronet/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer.ext.cronet">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/flac/src/androidTest/AndroidManifest.xml b/extensions/flac/src/androidTest/AndroidManifest.xml
index 73032ab50c2..8a7ad50429f 100644
--- a/extensions/flac/src/androidTest/AndroidManifest.xml
+++ b/extensions/flac/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.flac.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/opus/src/androidTest/AndroidManifest.xml b/extensions/opus/src/androidTest/AndroidManifest.xml
index e77590dc657..aba71a08211 100644
--- a/extensions/opus/src/androidTest/AndroidManifest.xml
+++ b/extensions/opus/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.opus.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/vp9/src/androidTest/AndroidManifest.xml b/extensions/vp9/src/androidTest/AndroidManifest.xml
index b8b28fc3464..f29381a3202 100644
--- a/extensions/vp9/src/androidTest/AndroidManifest.xml
+++ b/extensions/vp9/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.ext.vp9.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java
index e7468d8593a..8c765952e7a 100644
--- a/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java
+++ b/extensions/vp9/src/main/java/com/google/android/exoplayer2/ext/vp9/VpxVideoSurfaceView.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.ext.vp9;
 
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.opengl.GLSurfaceView;
 import android.util.AttributeSet;
@@ -23,7 +22,6 @@
 /**
  * A GLSurfaceView extension that scales itself to the given aspect ratio.
  */
-@TargetApi(11)
 public class VpxVideoSurfaceView extends GLSurfaceView implements VpxOutputBufferRenderer {
 
   private final VpxRenderer renderer;
diff --git a/library/core/src/androidTest/AndroidManifest.xml b/library/core/src/androidTest/AndroidManifest.xml
index aeddc611cf6..4997994e187 100644
--- a/library/core/src/androidTest/AndroidManifest.xml
+++ b/library/core/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.core.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/library/dash/src/androidTest/AndroidManifest.xml b/library/dash/src/androidTest/AndroidManifest.xml
index a9b143253fc..3a5b0c1fa25 100644
--- a/library/dash/src/androidTest/AndroidManifest.xml
+++ b/library/dash/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.source.dash.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/library/hls/src/androidTest/AndroidManifest.xml b/library/hls/src/androidTest/AndroidManifest.xml
index dcf6c2f9402..1abbcad8101 100644
--- a/library/hls/src/androidTest/AndroidManifest.xml
+++ b/library/hls/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.source.hls.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
diff --git a/library/smoothstreaming/src/androidTest/AndroidManifest.xml b/library/smoothstreaming/src/androidTest/AndroidManifest.xml
index ab314ce806d..1d2317677b2 100644
--- a/library/smoothstreaming/src/androidTest/AndroidManifest.xml
+++ b/library/smoothstreaming/src/androidTest/AndroidManifest.xml
@@ -18,7 +18,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="com.google.android.exoplayer2.source.smoothstreaming.test">
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
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 6ddbfed973b..d3ee9bbab06 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
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.ui;
 
 import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
@@ -814,17 +813,8 @@ private void setButtonEnabled(boolean enabled, View view) {
       return;
     }
     view.setEnabled(enabled);
-    if (Util.SDK_INT >= 11) {
-      setViewAlphaV11(view, enabled ? 1f : 0.3f);
-      view.setVisibility(VISIBLE);
-    } else {
-      view.setVisibility(enabled ? VISIBLE : INVISIBLE);
-    }
-  }
-
-  @TargetApi(11)
-  private void setViewAlphaV11(View view, float alpha) {
-    view.setAlpha(alpha);
+    view.setAlpha(enabled ? 1f : 0.3f);
+    view.setVisibility(VISIBLE);
   }
 
   private void previous() {
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index 053fe4e61cd..1a660591d88 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -21,7 +21,7 @@
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.WAKE_LOCK"/>
 
-  <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="24"/>
+  <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="26"/>
 
   <application android:debuggable="true"
       android:allowBackup="false"
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 8e4b9001ddd..66b992e652f 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
@@ -17,7 +17,6 @@
 
 import static junit.framework.Assert.fail;
 
-import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.net.wifi.WifiManager;
@@ -32,7 +31,6 @@
 import android.view.SurfaceView;
 import android.view.Window;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.Util;
 
 /**
  * A host activity for performing playback tests.
@@ -164,7 +162,7 @@ public void onCreate(Bundle savedInstanceState) {
   public void onStart() {
     Context appContext = getApplicationContext();
     WifiManager wifiManager = (WifiManager) appContext.getSystemService(Context.WIFI_SERVICE);
-    wifiLock = wifiManager.createWifiLock(getWifiLockMode(), TAG);
+    wifiLock = wifiManager.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, TAG);
     wifiLock.acquire();
     PowerManager powerManager = (PowerManager) appContext.getSystemService(Context.POWER_SERVICE);
     wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
@@ -225,9 +223,4 @@ private void maybeStopHostedTest() {
     }
   }
 
-  @SuppressLint("InlinedApi")
-  private static int getWifiLockMode() {
-    return Util.SDK_INT < 12 ? WifiManager.WIFI_MODE_FULL : WifiManager.WIFI_MODE_FULL_HIGH_PERF;
-  }
-
 }

From c661ed42de666cbd6043dc6d43acd24058b67e8a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 11 Aug 2017 06:27:59 -0700
Subject: [PATCH 087/421] Add possibility of forcing a specific license URL in
 HttpMediaDrmCallback

Resubmit of https://github.com/google/ExoPlayer/pull/3136

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=164971900
---
 .../exoplayer2/drm/HttpMediaDrmCallback.java  | 35 ++++++++--------
 .../exoplayer2/drm/OfflineLicenseHelper.java  | 40 +++++++++++++++----
 2 files changed, 50 insertions(+), 25 deletions(-)

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 f08d9b59b53..dfbf3dee07d 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
@@ -24,7 +24,6 @@
 import com.google.android.exoplayer2.upstream.DataSourceInputStream;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
-import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
@@ -39,33 +38,33 @@
 public final class HttpMediaDrmCallback implements MediaDrmCallback {
 
   private final HttpDataSource.Factory dataSourceFactory;
-  private final String defaultUrl;
+  private final String defaultLicenseUrl;
+  private final boolean forceDefaultLicenseUrl;
   private final Map<String, String> keyRequestProperties;
 
   /**
-   * @param defaultUrl The default license URL.
+   * @param defaultLicenseUrl The default license URL. Used for key requests that do not specify
+   *     their own license URL.
    * @param dataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
    */
-  public HttpMediaDrmCallback(String defaultUrl, HttpDataSource.Factory dataSourceFactory) {
-    this(defaultUrl, dataSourceFactory, null);
+  public HttpMediaDrmCallback(String defaultLicenseUrl, HttpDataSource.Factory dataSourceFactory) {
+    this(defaultLicenseUrl, false, dataSourceFactory);
   }
 
   /**
-   * @deprecated Use {@link HttpMediaDrmCallback#HttpMediaDrmCallback(String, Factory)}. Request
-   *     properties can be set by calling {@link #setKeyRequestProperty(String, String)}.
-   * @param defaultUrl The default license URL.
+   * @param defaultLicenseUrl The default license URL. Used for key requests that do not specify
+   *     their own license URL, or for all key requests if {@code forceDefaultLicenseUrl} is
+   *     set to true.
+   * @param forceDefaultLicenseUrl Whether to use {@code defaultLicenseUrl} for key requests that
+   *     include their own license URL.
    * @param dataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
-   * @param keyRequestProperties Request properties to set when making key requests, or null.
    */
-  @Deprecated
-  public HttpMediaDrmCallback(String defaultUrl, HttpDataSource.Factory dataSourceFactory,
-      Map<String, String> keyRequestProperties) {
+  public HttpMediaDrmCallback(String defaultLicenseUrl, boolean forceDefaultLicenseUrl,
+      HttpDataSource.Factory dataSourceFactory) {
     this.dataSourceFactory = dataSourceFactory;
-    this.defaultUrl = defaultUrl;
+    this.defaultLicenseUrl = defaultLicenseUrl;
+    this.forceDefaultLicenseUrl = forceDefaultLicenseUrl;
     this.keyRequestProperties = new HashMap<>();
-    if (keyRequestProperties != null) {
-      this.keyRequestProperties.putAll(keyRequestProperties);
-    }
   }
 
   /**
@@ -112,8 +111,8 @@ public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throw
   @Override
   public byte[] executeKeyRequest(UUID uuid, KeyRequest request) throws Exception {
     String url = request.getDefaultUrl();
-    if (TextUtils.isEmpty(url)) {
-      url = defaultUrl;
+    if (forceDefaultLicenseUrl || TextUtils.isEmpty(url)) {
+      url = defaultLicenseUrl;
     }
     Map<String, String> requestProperties = new HashMap<>();
     // Add standard request properties for supported schemes.
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 2eb3463b3dc..741ad1f06f3 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
@@ -43,23 +43,47 @@ public final class OfflineLicenseHelper<T extends ExoMediaCrypto> {
    * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
    * is no longer required.
    *
-   * @param licenseUrl The default license URL.
+   * @param defaultLicenseUrl The default license URL. Used for key requests that do not specify
+   *     their own license URL.
    * @param httpDataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
    * @return A new instance which uses Widevine CDM.
    * @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
    *     instantiated.
    */
   public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
-      String licenseUrl, Factory httpDataSourceFactory) throws UnsupportedDrmException {
-    return newWidevineInstance(
-        new HttpMediaDrmCallback(licenseUrl, httpDataSourceFactory), null);
+      String defaultLicenseUrl, Factory httpDataSourceFactory)
+      throws UnsupportedDrmException {
+    return newWidevineInstance(defaultLicenseUrl, false, httpDataSourceFactory, null);
   }
 
   /**
    * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
    * is no longer required.
    *
-   * @param callback Performs key and provisioning requests.
+   * @param defaultLicenseUrl The default license URL. Used for key requests that do not specify
+   *     their own license URL.
+   * @param forceDefaultLicenseUrl Whether to use {@code defaultLicenseUrl} for key requests that
+   *     include their own license URL.
+   * @param httpDataSourceFactory A factory from which to obtain {@link HttpDataSource} instances.
+   * @return A new instance which uses Widevine CDM.
+   * @throws UnsupportedDrmException If the Widevine DRM scheme is unsupported or cannot be
+   *     instantiated.
+   */
+  public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
+      String defaultLicenseUrl, boolean forceDefaultLicenseUrl, Factory httpDataSourceFactory)
+      throws UnsupportedDrmException {
+    return newWidevineInstance(defaultLicenseUrl, forceDefaultLicenseUrl, httpDataSourceFactory,
+        null);
+  }
+
+  /**
+   * Instantiates a new instance which uses Widevine CDM. Call {@link #release()} when the instance
+   * is no longer required.
+   *
+   * @param defaultLicenseUrl The default license URL. Used for key requests that do not specify
+   *     their own license URL.
+   * @param forceDefaultLicenseUrl Whether to use {@code defaultLicenseUrl} for key requests that
+   *     include their own license URL.
    * @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.
    * @return A new instance which uses Widevine CDM.
@@ -69,9 +93,11 @@ public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
    *     MediaDrmCallback, HashMap, Handler, EventListener)
    */
   public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
-      MediaDrmCallback callback, HashMap<String, String> optionalKeyRequestParameters)
+      String defaultLicenseUrl, boolean forceDefaultLicenseUrl, Factory httpDataSourceFactory,
+      HashMap<String, String> optionalKeyRequestParameters)
       throws UnsupportedDrmException {
-    return new OfflineLicenseHelper<>(FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID), callback,
+    return new OfflineLicenseHelper<>(FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID),
+        new HttpMediaDrmCallback(defaultLicenseUrl, forceDefaultLicenseUrl, httpDataSourceFactory),
         optionalKeyRequestParameters);
   }
 

From 730d2dd18ffa8902d84e08adf807c8bbb9f8afc6 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 11 Aug 2017 15:46:49 +0100
Subject: [PATCH 088/421] Formatting cleanup

---
 .../android/exoplayer2/audio/Ac3Util.java     | 40 +++++++++++--------
 .../dash/manifest/DashManifestParser.java     | 39 +++++++++---------
 2 files changed, 44 insertions(+), 35 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 bc46a4f10a8..e1a70e2579e 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
@@ -33,13 +33,31 @@ public final class Ac3Util {
    */
   public static final class Ac3SyncFrameInfo {
 
+    /**
+     * Undefined AC3 stream type.
+     */
+    public static final int STREAM_TYPE_UNDEFINED = -1;
+    /**
+     * Type 0 AC3 stream type. See ETSI TS 102 366 E.1.3.1.1.
+     */
+    public static final int STREAM_TYPE_TYPE0 = 0;
+    /**
+     * Type 1 AC3 stream type. See ETSI TS 102 366 E.1.3.1.1.
+     */
+    public static final int STREAM_TYPE_TYPE1 = 1;
+    /**
+     * Type 2 AC3 stream type. See ETSI TS 102 366 E.1.3.1.1.
+     */
+    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}.
      */
     public final String mimeType;
     /**
-     * The type of the bitstream, only for AUDIO_E_AC3
+     * The type of the stream if {@link #mimeType} is {@link MimeTypes#AUDIO_E_AC3}, or
+     * {@link #STREAM_TYPE_UNDEFINED} otherwise.
      */
     public final int streamType;
     /**
@@ -106,13 +124,6 @@ private Ac3SyncFrameInfo(String mimeType, int streamType, int channelCount, int
   private static final int[] SYNCFRAME_SIZE_WORDS_BY_HALF_FRMSIZECOD_44_1 = new int[] {69, 87, 104,
       121, 139, 174, 208, 243, 278, 348, 417, 487, 557, 696, 835, 975, 1114, 1253, 1393};
 
-  /**
-   * Stream type. See ETSI TS 102 366 E.1.3.1.1.
-   */
-  public static final int STREAM_TYPE_UNDEFINED = -1;
-  public static final int STREAM_TYPE_TYPE0 = 0;
-  public static final int STREAM_TYPE_TYPE1 = 1;
-
   /**
    * Returns the AC-3 format given {@code data} containing the AC3SpecificBox according to
    * ETSI TS 102 366 Annex F. The reading position of {@code data} will be modified.
@@ -150,8 +161,7 @@ public static Format parseEAc3AnnexFFormat(ParsableByteArray data, String trackI
       String language, DrmInitData drmInitData) {
     data.skipBytes(2); // data_rate, num_ind_sub
 
-    // Read only the first independent substream.
-    // TODO: Read later independent substreams?
+    // Read the first independent substream.
     int fscod = (data.readUnsignedByte() & 0xC0) >> 6;
     int sampleRate = SAMPLE_RATE_BY_FSCOD[fscod];
     int nextByte = data.readUnsignedByte();
@@ -160,8 +170,7 @@ public static Format parseEAc3AnnexFFormat(ParsableByteArray data, String trackI
       channelCount++;
     }
 
-    // Read only the first dependent substream.
-    // TODO: Read later dependent substreams?
+    // Read the first dependent substream.
     nextByte = data.readUnsignedByte();
     int numDepSub = ((nextByte & 0x1E) >> 1);
     if (numDepSub > 0) {
@@ -189,7 +198,7 @@ public static Ac3SyncFrameInfo parseAc3SyncframeInfo(ParsableBitArray data) {
     boolean isEac3 = data.readBits(5) == 16;
     data.setPosition(initialPosition);
     String mimeType;
-    int streamType;
+    int streamType = Ac3SyncFrameInfo.STREAM_TYPE_UNDEFINED;
     int sampleRate;
     int acmod;
     int frameSize;
@@ -215,7 +224,6 @@ public static Ac3SyncFrameInfo parseAc3SyncframeInfo(ParsableBitArray data) {
     } else /* is AC-3 */ {
       mimeType = MimeTypes.AUDIO_AC3;
       data.skipBits(16 + 16); // syncword, crc1
-      streamType = STREAM_TYPE_UNDEFINED; // AC-3 stream hasn't streamType
       int fscod = data.readBits(2);
       int frmsizecod = data.readBits(6);
       frameSize = getAc3SyncframeSize(fscod, frmsizecod);
@@ -235,8 +243,8 @@ public static Ac3SyncFrameInfo parseAc3SyncframeInfo(ParsableBitArray data) {
     }
     boolean lfeon = data.readBit();
     int channelCount = CHANNEL_COUNT_BY_ACMOD[acmod] + (lfeon ? 1 : 0);
-    return new Ac3SyncFrameInfo(mimeType, streamType, channelCount, sampleRate,
-        frameSize, sampleCount);
+    return new Ac3SyncFrameInfo(mimeType, streamType, channelCount, sampleRate, frameSize,
+        sampleCount);
   }
 
   /**
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 a34d248006d..2e85f3a1ad9 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
@@ -690,9 +690,9 @@ protected int parseAudioChannelConfiguration(XmlPullParser xpp)
       throws XmlPullParserException, IOException {
     String schemeIdUri = parseString(xpp, "schemeIdUri", null);
     int audioChannels = "urn:mpeg:dash:23003:3:audio_channel_configuration:2011".equals(schemeIdUri)
-        ? parseInt(xpp, "value", Format.NO_VALUE) :
-        ("tag:dolby.com,2014:dash:audio_channel_configuration:2011".equals(schemeIdUri)
-        ? parseDolbyChannelConfiguration(xpp, "value", Format.NO_VALUE) : Format.NO_VALUE);
+        ? parseInt(xpp, "value", Format.NO_VALUE)
+        : ("tag:dolby.com,2014:dash:audio_channel_configuration:2011".equals(schemeIdUri)
+        ? parseDolbyChannelConfiguration(xpp) : Format.NO_VALUE);
     do {
       xpp.next();
     } while (!XmlPullParserUtil.isEndTag(xpp, "AudioChannelConfiguration"));
@@ -903,31 +903,32 @@ protected static String parseString(XmlPullParser xpp, String name, String defau
     return value == null ? defaultValue : value;
   }
 
-  protected static int parseDolbyChannelConfiguration(XmlPullParser xpp, String name,
-      int defaultValue) {
-    String value = Util.toLowerInvariant(xpp.getAttributeValue(null, name));
+  /**
+   * Parses the number of channels from the value attribute of an AudioElementConfiguration with
+   * schemeIdUri "tag:dolby.com,2014:dash:audio_channel_configuration:2011", as defined by table E.5
+   * in ETSI TS 102 366.
+   *
+   * @param xpp The parser from which to read.
+   * @return The parsed number of channels, or {@link Format#NO_VALUE} if the channel count could
+   *     not be parsed.
+   */
+  protected static int parseDolbyChannelConfiguration(XmlPullParser xpp) {
+    String value = Util.toLowerInvariant(xpp.getAttributeValue(null, "value"));
     if (value == null) {
-      return defaultValue;
+      return Format.NO_VALUE;
     }
-    int channels;
-    // TODO: Parse other channel configurations
     switch (value) {
       case "4000":
-        channels = 1;
-        break;
+        return 1;
       case "a000":
-        channels = 2;
-        break;
+        return 2;
       case "f801":
-        channels = 6;
-        break;
+        return 6;
       case "fa01":
-        channels = 8;
-        break;
+        return 8;
       default:
-        channels = defaultValue;
+        return Format.NO_VALUE;
     }
-    return channels;
   }
 
   private static final class RepresentationInfo {

From 1829d71d29435ca1eb4240d4aed7cb1315e2b606 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 11 Aug 2017 15:47:03 +0100
Subject: [PATCH 089/421] Restrict usage of secure DummySurface for all Samsung
 devices.

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

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 e32f23fed73..7a802949291 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
@@ -154,7 +154,7 @@ private static void assertApiLevel17OrHigher() {
    */
   private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) {
     return Util.SDK_INT == 24
-        && (Util.MODEL.startsWith("SM-G950") || Util.MODEL.startsWith("SM-G955"))
+        && "samsung".equals(Util.MANUFACTURER)
         && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager());
   }
 

From 469780f7ea5ec59ccf8b72b085ed98249724b195 Mon Sep 17 00:00:00 2001
From: WeiChungChang <r97922153@gmail.com>
Date: Thu, 17 Aug 2017 13:49:41 +0800
Subject: [PATCH 090/421] Support H262 video in MP4

---
 .../google/android/exoplayer2/extractor/mp4/AtomParsers.java  | 4 ++++
 1 file changed, 4 insertions(+)

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 0a5e0e8a6db..cc70804a296 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
@@ -1027,6 +1027,10 @@ private static Pair<String, byte[]> parseEsdsFromParent(ParsableByteArray parent
       case 0xAB:
         mimeType = MimeTypes.AUDIO_DTS_HD;
         return Pair.create(mimeType, null);
+      case 0x60: /* Visual 13818-2 Simple Profile */
+      case 0x61: /* Visual 13818-2 Main Profile */
+        mimeType = MimeTypes.VIDEO_MPEG2;
+        break;
       default:
         mimeType = null;
         break;

From 571f98f546d7c846ed672ff5250e47b43177c3d9 Mon Sep 17 00:00:00 2001
From: Danny Brain <me@danielbrain.com>
Date: Thu, 17 Aug 2017 21:30:46 +1000
Subject: [PATCH 091/421] Fix possible subrip timing line NPE

---
 .../google/android/exoplayer2/text/subrip/SubripDecoder.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 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 e76f0fd7e2e..49ebe84d67b 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
@@ -69,8 +69,8 @@ protected SubripSubtitle decode(byte[] bytes, int length, boolean reset) {
       // Read and parse the timing line.
       boolean haveEndTimecode = false;
       currentLine = subripData.readLine();
-      Matcher matcher = SUBRIP_TIMING_LINE.matcher(currentLine);
-      if (matcher.matches()) {
+      Matcher matcher = currentLine == null ? null : SUBRIP_TIMING_LINE.matcher(currentLine);
+      if (matcher != null && matcher.matches()) {
         cueTimesUs.add(parseTimecode(matcher, 1));
         if (!TextUtils.isEmpty(matcher.group(6))) {
           haveEndTimecode = true;

From f764fe70b0306d7650cf83345f06ce3dd753470e Mon Sep 17 00:00:00 2001
From: Bei Yi <stellabei@gmail.com>
Date: Thu, 17 Aug 2017 11:01:42 -0700
Subject: [PATCH 092/421] Support crop mode for AspectRatioFrameLayout

---
 .../exoplayer2/ui/AspectRatioFrameLayout.java | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

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 b0df16b4840..2f04b8800d1 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
@@ -32,7 +32,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    * Resize modes for {@link AspectRatioFrameLayout}.
    */
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL})
+  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_CROP})
   public @interface ResizeMode {}
 
   /**
@@ -51,6 +51,10 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    * The specified aspect ratio is ignored.
    */
   public static final int RESIZE_MODE_FILL = 3;
+  /**
+   * The height or width is increased or decreased to crop and to obtain the desired aspect ratio.
+   */
+  public static final int RESIZE_MODE_CROP = 4;
 
   /**
    * The {@link FrameLayout} will not resize itself if the fractional difference between its natural
@@ -96,6 +100,15 @@ public void setAspectRatio(float widthHeightRatio) {
     }
   }
 
+  /**
+   * Gets the resize mode.
+   *
+   * @return The resize mode.
+   */
+  public int getResizeMode() {
+    return this.resizeMode;
+  }
+
   /**
    * Sets the resize mode.
    *
@@ -132,6 +145,13 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       case RESIZE_MODE_FIXED_HEIGHT:
         width = (int) (height * videoAspectRatio);
         break;
+      case RESIZE_MODE_CROP:
+        if (videoAspectRatio > viewAspectRatio) {
+          width = (int) (height * videoAspectRatio);
+        } else {
+          height = (int) (width / videoAspectRatio);
+        }
+        break;
       default:
         if (aspectDeformation > 0) {
           height = (int) (width / videoAspectRatio);

From 870c8ae4df9b3a0157318bcd4790906efc48430e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Aug 2017 03:15:43 -0700
Subject: [PATCH 093/421] Fix canAcquireSession for ClearKey

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165159376
---
 .../drm/DefaultDrmSessionManager.java         | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 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 fcd8ac862b3..69403a90a6d 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
@@ -311,7 +311,7 @@ public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
 
   @Override
   public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
-    SchemeData schemeData = drmInitData.get(uuid);
+    SchemeData schemeData = getSchemeData(drmInitData);
     if (schemeData == null) {
       // No data for this manager's scheme.
       return false;
@@ -347,11 +347,7 @@ public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitDa
     postRequestHandler = new PostRequestHandler(requestHandlerThread.getLooper());
 
     if (offlineLicenseKeySetId == null) {
-      SchemeData schemeData = drmInitData.get(uuid);
-      if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
-        // If present, the Common PSSH box should be used for ClearKey.
-        schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
-      }
+      SchemeData schemeData = getSchemeData(drmInitData);
       if (schemeData == null) {
         onError(new IllegalStateException("Media does not support uuid: " + uuid));
         return this;
@@ -627,6 +623,21 @@ public void run() {
     }
   }
 
+  /**
+   * Extracts {@link SchemeData} suitable for this manager.
+   *
+   * @param drmInitData The {@link DrmInitData} from which to extract the {@link SchemeData}.
+   * @return The extracted {@link SchemeData}, or null if no suitable data is present.
+   */
+  private SchemeData getSchemeData(DrmInitData drmInitData) {
+    SchemeData schemeData = drmInitData.get(uuid);
+    if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
+      // If present, the Common PSSH box should be used for ClearKey.
+      schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
+    }
+    return schemeData;
+  }
+
   @SuppressLint("HandlerLeak")
   private class MediaDrmHandler extends Handler {
 

From fb83872365f8023f019567c65757addccbc0dbda Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Aug 2017 05:57:59 -0700
Subject: [PATCH 094/421] Remove unused method

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165168924
---
 .../exoplayer2/source/dash/DashUtil.java      | 43 -------------------
 1 file changed, 43 deletions(-)

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 2febeb8c819..2d093a5a688 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
@@ -25,7 +25,6 @@
 import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor;
 import com.google.android.exoplayer2.source.chunk.ChunkExtractorWrapper;
 import com.google.android.exoplayer2.source.chunk.InitializationChunk;
-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;
@@ -66,48 +65,6 @@ public static DashManifest loadManifest(DataSource dataSource, String manifestUr
   }
 
   /**
-   * Loads {@link DrmInitData} for a given manifest.
-   *
-   * @param dataSource The {@link HttpDataSource} from which data should be loaded.
-   * @param dashManifest The {@link DashManifest} of the DASH content.
-   * @return The loaded {@link DrmInitData}.
-   */
-  public static DrmInitData loadDrmInitData(DataSource dataSource, DashManifest dashManifest)
-      throws IOException, InterruptedException {
-    // Prefer drmInitData obtained from the manifest over drmInitData obtained from the stream,
-    // as per DASH IF Interoperability Recommendations V3.0, 7.5.3.
-    if (dashManifest.getPeriodCount() < 1) {
-      return null;
-    }
-    Period period = dashManifest.getPeriod(0);
-    int adaptationSetIndex = period.getAdaptationSetIndex(C.TRACK_TYPE_VIDEO);
-    if (adaptationSetIndex == C.INDEX_UNSET) {
-      adaptationSetIndex = period.getAdaptationSetIndex(C.TRACK_TYPE_AUDIO);
-      if (adaptationSetIndex == C.INDEX_UNSET) {
-        return null;
-      }
-    }
-    AdaptationSet adaptationSet = period.adaptationSets.get(adaptationSetIndex);
-    if (adaptationSet.representations.isEmpty()) {
-      return null;
-    }
-    Representation representation = adaptationSet.representations.get(0);
-    DrmInitData drmInitData = representation.format.drmInitData;
-    if (drmInitData == null) {
-      Format sampleFormat = DashUtil.loadSampleFormat(dataSource, representation);
-      if (sampleFormat != null) {
-        drmInitData = sampleFormat.drmInitData;
-      }
-      if (drmInitData == null) {
-        return null;
-      }
-    }
-    return drmInitData;
-  }
-
-  /**
-   * Loads initialization data for the {@code representation} and returns the sample {@link
-   * Format}.
    * Loads {@link DrmInitData} for a given period in a DASH manifest.
    *
    * @param dataSource The {@link HttpDataSource} from which data should be loaded.

From cf6534ea5b50855488f78011d5907ef84101acc8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Aug 2017 08:31:59 -0700
Subject: [PATCH 095/421] SegmentDownloader loadManifest cleanup.

- HlsDownloader.loadManifest (previously called getHlsPlaylist)
  suppressed errors for the offline case, where-as the DashUtil
  equivalent method did not. This change makes them consistent
  and moves both other to use ParsingLoadable.
- Enable GZIP for manifest loads in both cases.
- Use Uri rather than String to represent Uris. Previously the
  strings were parsed into Uris quite deep in the code, which
  isn't ideal if the parsing fails; you'd probably prefer the
  error to occur early at the top level.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165181398
---
 .../exoplayer2/upstream/ParsingLoadable.java  | 15 +++++++-
 .../exoplayer2/source/dash/DashUtil.java      | 21 +++++------
 .../gts/DashWidevineOfflineTest.java          |  3 +-
 .../exoplayer2/testutil/CacheAsserts.java     | 37 ++++++++++++-------
 .../exoplayer2/testutil/FakeDataSet.java      | 37 +++++++++++++++----
 5 files changed, 77 insertions(+), 36 deletions(-)

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 adf245d9aa3..308340b8b21 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
@@ -72,8 +72,19 @@ public interface Parser<T> {
    * @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), type, parser);
+  }
+
+  /**
+   * @param dataSource A {@link DataSource} to use when loading the data.
+   * @param dataSpec The {@link DataSpec} from which the object should be loaded.
+   * @param type See {@link #type}.
+   * @param parser Parses the object from the response.
+   */
+  public ParsingLoadable(DataSource dataSource, DataSpec dataSpec, int type,
+      Parser<? extends T> parser) {
     this.dataSource = dataSource;
-    this.dataSpec = new DataSpec(uri, DataSpec.FLAG_ALLOW_GZIP);
+    this.dataSpec = dataSpec;
     this.type = type;
     this.parser = parser;
   }
@@ -108,7 +119,7 @@ public final boolean isLoadCanceled() {
   }
 
   @Override
-  public final void load() throws IOException, InterruptedException {
+  public final void load() throws IOException {
     DataSourceInputStream inputStream = new DataSourceInputStream(dataSource, dataSpec);
     try {
       inputStream.open();
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 2d093a5a688..83cb10b99c0 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
@@ -31,9 +31,9 @@
 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.DataSourceInputStream;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
+import com.google.android.exoplayer2.upstream.ParsingLoadable;
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.io.IOException;
 import java.util.List;
@@ -47,21 +47,18 @@ public final class DashUtil {
    * Loads a DASH manifest.
    *
    * @param dataSource The {@link HttpDataSource} from which the manifest should be read.
-   * @param manifestUri The URI of the manifest to be read.
+   * @param uri The {@link Uri} of the manifest to be read.
    * @return An instance of {@link DashManifest}.
    * @throws IOException Thrown when there is an error while loading.
    */
-  public static DashManifest loadManifest(DataSource dataSource, String manifestUri)
+  public static DashManifest loadManifest(DataSource dataSource, Uri uri)
       throws IOException {
-    DataSourceInputStream inputStream = new DataSourceInputStream(dataSource,
-        new DataSpec(Uri.parse(manifestUri), DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH));
-    try {
-      inputStream.open();
-      DashManifestParser parser = new DashManifestParser();
-      return parser.parse(dataSource.getUri(), inputStream);
-    } finally {
-      inputStream.close();
-    }
+    DataSpec dataSpec = new DataSpec(uri,
+        DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH | DataSpec.FLAG_ALLOW_GZIP);
+    ParsingLoadable<DashManifest> loadable = new ParsingLoadable<>(dataSource, dataSpec,
+        C.DATA_TYPE_MANIFEST, new DashManifestParser());
+    loadable.load();
+    return loadable.getResult();
   }
 
   /**
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 c2b102d1ec2..88215ae1eb6 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
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.playbacktests.gts;
 
 import android.media.MediaDrm.MediaDrmStateException;
+import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Pair;
 import com.google.android.exoplayer2.drm.DrmInitData;
@@ -170,7 +171,7 @@ public void testWidevineOfflineLicenseExpiresOnPause() throws Exception {
   private void downloadLicense() throws InterruptedException, DrmSessionException, IOException {
     DataSource dataSource = httpDataSourceFactory.createDataSource();
     DashManifest dashManifest = DashUtil.loadManifest(dataSource,
-        DashTestData.WIDEVINE_H264_MANIFEST);
+        Uri.parse(DashTestData.WIDEVINE_H264_MANIFEST));
     DrmInitData drmInitData = DashUtil.loadDrmInitData(dataSource, dashManifest.getPeriod(0));
     offlineLicenseKeySetId = offlineLicenseHelper.downloadLicense(drmInitData);
     Assert.assertNotNull(offlineLicenseKeySetId);
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
index c8ead5dcba3..82fff0d4fe5 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/CacheAsserts.java
@@ -39,11 +39,11 @@ public final class CacheAsserts {
   /** Asserts that the cache content is equal to the data in the {@code fakeDataSet}. */
   public static void assertCachedData(Cache cache, FakeDataSet fakeDataSet) throws IOException {
     ArrayList<FakeData> allData = fakeDataSet.getAllData();
-    String[] uriStrings = new String[allData.size()];
+    Uri[] uris = new Uri[allData.size()];
     for (int i = 0; i < allData.size(); i++) {
-      uriStrings[i] = allData.get(i).uri;
+      uris[i] = allData.get(i).uri;
     }
-    assertCachedData(cache, fakeDataSet, uriStrings);
+    assertCachedData(cache, fakeDataSet, uris);
   }
 
   /**
@@ -51,30 +51,41 @@ public static void assertCachedData(Cache cache, FakeDataSet fakeDataSet) throws
    */
   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}.
+   */
+  public static void assertCachedData(Cache cache, FakeDataSet fakeDataSet, Uri... uris)
+      throws IOException {
     int totalLength = 0;
-    for (String uriString : uriStrings) {
-      byte[] data = fakeDataSet.getData(uriString).getData();
-      assertDataCached(cache, uriString, data);
+    for (Uri uri : uris) {
+      byte[] data = fakeDataSet.getData(uri).getData();
+      assertDataCached(cache, uri, data);
       totalLength += data.length;
     }
     assertEquals(totalLength, cache.getCacheSpace());
   }
 
   /** Asserts that the cache contains the given subset of data in the {@code fakeDataSet}. */
-  public static void assertDataCached(Cache cache, FakeDataSet fakeDataSet, String... uriStrings)
+  public static void assertDataCached(Cache cache, FakeDataSet fakeDataSet, Uri... uris)
       throws IOException {
-    for (String uriString : uriStrings) {
-      assertDataCached(cache, uriString, fakeDataSet.getData(uriString).getData());
+    for (Uri uri : uris) {
+      assertDataCached(cache, uri, fakeDataSet.getData(uri).getData());
     }
   }
 
   /** Asserts that the cache contains the given data for {@code uriString}. */
-  public static void assertDataCached(Cache cache, String uriString, byte[] expected)
-      throws IOException {
+  public static void assertDataCached(Cache cache, Uri uri, byte[] expected) throws IOException {
     CacheDataSource dataSource = new CacheDataSource(cache, DummyDataSource.INSTANCE, 0);
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     DataSourceInputStream inputStream = new DataSourceInputStream(dataSource,
-        new DataSpec(Uri.parse(uriString), DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH));
+        new DataSpec(uri, DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH));
     try {
       inputStream.open();
       byte[] buffer = new byte[1024];
@@ -87,7 +98,7 @@ public static void assertDataCached(Cache cache, String uriString, byte[] expect
     } finally {
       inputStream.close();
     }
-    MoreAsserts.assertEquals("Cached data doesn't match expected for '" + uriString + "',",
+    MoreAsserts.assertEquals("Cached data doesn't match expected for '" + uri + "',",
         expected, outputStream.toByteArray());
   }
 
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 fd85b02d789..e77e0714e7e 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
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.testutil;
 
+import android.net.Uri;
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.upstream.DataSpec;
@@ -28,11 +29,11 @@
 /**
  * Collection of {@link FakeData} to be served by a {@link FakeDataSource}.
  *
- * <p>Multiple fake data can be defined by {@link FakeDataSet#setData(String, byte[])} and {@link
- * FakeDataSet#newData(String)} methods. It's also possible to define a default data by {@link
+ * <p>Multiple fake data can be defined by {@link FakeDataSet#setData(Uri, byte[])} and {@link
+ * FakeDataSet#newData(Uri)} methods. It's also possible to define a default data by {@link
  * FakeDataSet#newDefaultData()}.
  *
- * <p>{@link FakeDataSet#newData(String)} and {@link FakeDataSet#newDefaultData()} return a {@link
+ * <p>{@link FakeDataSet#newData(Uri)} and {@link FakeDataSet#newDefaultData()} return a {@link
  * FakeData} instance which can be used to define specific results during
  * {@link FakeDataSource#read(byte[], int, int)} calls.
  *
@@ -104,8 +105,8 @@ private Segment(Runnable action, Segment previousSegment) {
         this(null, 0, null, action, previousSegment);
       }
 
-      private Segment(byte[] data, int length, IOException exception, Runnable action,
-          Segment previousSegment) {
+      private Segment(@Nullable byte[] data, int length, @Nullable IOException exception,
+          @Nullable Runnable action, Segment previousSegment) {
         this.exception = exception;
         this.action = action;
         this.data = data;
@@ -125,12 +126,12 @@ public boolean isActionSegment() {
     }
 
     /** Uri of the data or null if this is the default FakeData. */
-    public final String uri;
+    public final Uri uri;
     private final ArrayList<Segment> segments;
     private final FakeDataSet dataSet;
     private boolean simulateUnknownLength;
 
-    private FakeData(FakeDataSet dataSet, String uri) {
+    private FakeData(FakeDataSet dataSet, Uri uri) {
       this.uri = uri;
       this.segments = new ArrayList<>();
       this.dataSet = dataSet;
@@ -219,7 +220,7 @@ private Segment getLastSegment() {
 
   }
 
-  private final HashMap<String, FakeData> dataMap;
+  private final HashMap<Uri, FakeData> dataMap;
   private FakeData defaultData;
 
   public FakeDataSet() {
@@ -234,16 +235,31 @@ public FakeData newDefaultData() {
 
   /** Sets random data with the given {@code length} for the given {@code uri}. */
   public FakeDataSet setRandomData(String uri, int length) {
+    return setRandomData(Uri.parse(uri), length);
+  }
+
+  /** Sets random data with the given {@code length} for the given {@code uri}. */
+  public FakeDataSet setRandomData(Uri uri, int length) {
     return setData(uri, TestUtil.buildTestData(length));
   }
 
   /** Sets the given {@code data} for the given {@code uri}. */
   public FakeDataSet setData(String uri, byte[] data) {
+    return setData(Uri.parse(uri), data);
+  }
+
+  /** Sets the given {@code data} for the given {@code uri}. */
+  public FakeDataSet setData(Uri uri, byte[] data) {
     return newData(uri).appendReadData(data).endData();
   }
 
   /** Returns a new {@link FakeData} with the given {@code uri}. */
   public FakeData newData(String uri) {
+    return newData(Uri.parse(uri));
+  }
+
+  /** Returns a new {@link FakeData} with the given {@code uri}. */
+  public FakeData newData(Uri uri) {
     FakeData data = new FakeData(this, uri);
     dataMap.put(uri, data);
     return data;
@@ -251,6 +267,11 @@ public FakeData newData(String uri) {
 
   /** Returns the data for the given {@code uri}, or {@code defaultData} if no data is set. */
   public FakeData getData(String uri) {
+    return getData(Uri.parse(uri));
+  }
+
+  /** Returns the data for the given {@code uri}, or {@code defaultData} if no data is set. */
+  public FakeData getData(Uri uri) {
     FakeData data = dataMap.get(uri);
     return data != null ? data : defaultData;
   }

From c9393db8789edfacdaff47fd7254990d11c3ff0f Mon Sep 17 00:00:00 2001
From: susnata <susnata@google.com>
Date: Mon, 14 Aug 2017 08:53:03 -0700
Subject: [PATCH 096/421] Creating an leanback extension for ExoPlayer.
 Leanback added support for new transport control, which allows developers to
 plug in any media player. This extension provides the PlayerAdapter
 implementation for ExoPlayer.

Demo:
https://drive.google.com/open?id=0B1GHUu5ruGULZTJVV1pVNlBuVjQ

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165183497
---
 core_settings.gradle                          |   2 +
 extensions/leanback/README.md                 |  26 ++
 extensions/leanback/build.gradle              |  41 +++
 .../leanback/src/main/AndroidManifest.xml     |  17 +
 .../ext/leanback/LeanbackPlayerAdapter.java   | 314 ++++++++++++++++++
 5 files changed, 400 insertions(+)
 create mode 100644 extensions/leanback/README.md
 create mode 100644 extensions/leanback/build.gradle
 create mode 100644 extensions/leanback/src/main/AndroidManifest.xml
 create mode 100644 extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java

diff --git a/core_settings.gradle b/core_settings.gradle
index 20e7b235a27..7a8320b1a12 100644
--- a/core_settings.gradle
+++ b/core_settings.gradle
@@ -33,6 +33,7 @@ include modulePrefix + 'extension-okhttp'
 include modulePrefix + 'extension-opus'
 include modulePrefix + 'extension-vp9'
 include modulePrefix + 'extension-rtmp'
+include modulePrefix + 'extension-leanback'
 
 project(modulePrefix + 'library').projectDir = new File(rootDir, 'library/all')
 project(modulePrefix + 'library-core').projectDir = new File(rootDir, 'library/core')
@@ -50,6 +51,7 @@ project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'exten
 project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
 project(modulePrefix + 'extension-vp9').projectDir = new File(rootDir, 'extensions/vp9')
 project(modulePrefix + 'extension-rtmp').projectDir = new File(rootDir, 'extensions/rtmp')
+project(modulePrefix + 'extension-leanback').projectDir = new File(rootDir, 'extensions/leanback')
 
 if (gradle.ext.has('exoplayerIncludeCronetExtension')
         && gradle.ext.exoplayerIncludeCronetExtension) {
diff --git a/extensions/leanback/README.md b/extensions/leanback/README.md
new file mode 100644
index 00000000000..2326887724d
--- /dev/null
+++ b/extensions/leanback/README.md
@@ -0,0 +1,26 @@
+# ExoPlayer Leanback Extension #
+
+## Description ##
+
+This [Leanback][] Extension provides a [PlayerAdapter][] implementation for
+Exoplayer.
+
+[PlayerAdapter]: https://developer.android.com/reference/android/support/v17/leanback/media/PlayerAdapter.html
+[Leanback]: https://developer.android.com/reference/android/support/v17/leanback/package-summary.html
+
+## Getting the extension ##
+
+The easiest way to use the extension is to add it as a gradle dependency:
+
+```gradle
+compile 'com.google.android.exoplayer:extension-leanback:rX.X.X'
+```
+
+where `rX.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
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
new file mode 100644
index 00000000000..eaf58cc9907
--- /dev/null
+++ b/extensions/leanback/build.gradle
@@ -0,0 +1,41 @@
+// 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.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion project.ext.minSdkVersion
+        targetSdkVersion project.ext.targetSdkVersion
+    }
+}
+
+dependencies {
+    compile project(modulePrefix + 'library-core')
+    compile('com.android.support:leanback-v17:' + supportLibraryVersion)
+}
+
+ext {
+    javadocTitle = 'Leanback extension for Exoplayer library'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+    releaseArtifact = 'extension-leanback'
+    releaseDescription = 'Leanback extension for ExoPlayer.'
+}
+apply from: '../../publish.gradle'
diff --git a/extensions/leanback/src/main/AndroidManifest.xml b/extensions/leanback/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..20cc9bf2850
--- /dev/null
+++ b/extensions/leanback/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?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 package="com.google.android.exoplayer2.ext.leanback"/>
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
new file mode 100644
index 00000000000..58c8ee973db
--- /dev/null
+++ b/extensions/leanback/src/main/java/com/google/android/exoplayer2/ext/leanback/LeanbackPlayerAdapter.java
@@ -0,0 +1,314 @@
+/*
+ * 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.leanback;
+
+import android.content.Context;
+import android.os.Handler;
+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 android.util.Pair;
+import android.view.SurfaceHolder;
+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.PlaybackParameters;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.util.ErrorMessageProvider;
+
+/**
+ * Leanback {@link PlayerAdapter} implementation for {@link SimpleExoPlayer}.
+ */
+public final class LeanbackPlayerAdapter extends PlayerAdapter {
+
+  private final Context context;
+  private final SimpleExoPlayer player;
+  private final Handler handler;
+  private final Runnable updatePlayerRunnable = new Runnable() {
+      @Override
+      public void run() {
+          getCallback().onCurrentPositionChanged(LeanbackPlayerAdapter.this);
+          getCallback().onBufferedPositionChanged(LeanbackPlayerAdapter.this);
+          handler.postDelayed(this, updatePeriod);
+      }
+  };
+
+  private SurfaceHolderGlueHost surfaceHolderGlueHost;
+  private boolean initialized;
+  private boolean hasDisplay;
+  private boolean isBuffering;
+  private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
+  private final int updatePeriod;
+  private final ExoPlayerEventListenerImpl exoPlayerListener = new ExoPlayerEventListenerImpl();
+  private final SimpleExoPlayer.VideoListener videoListener = new SimpleExoPlayer.VideoListener() {
+        @Override
+      public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
+          float pixelWidthHeightRatio) {
+            getCallback().onVideoSizeChanged(LeanbackPlayerAdapter.this, width, height);
+      }
+
+      @Override
+      public void onRenderedFirstFrame() {
+      }
+  };
+
+  static {
+    ExoPlayerLibraryInfo.registerModule("goog.exo.leanback");
+  }
+
+  /**
+   * Constructor.
+   * Users are responsible for managing {@link SimpleExoPlayer} lifecycle. You must
+   * stop/release the player once you're done playing the media.
+   *
+   * @param context The current context (activity).
+   * @param player Instance of your exoplayer that needs to be configured.
+   */
+  public LeanbackPlayerAdapter(Context context, SimpleExoPlayer player, int updatePeriod) {
+    this.context = context;
+    this.player = player;
+    this.handler = new Handler();
+    this.updatePeriod = updatePeriod;
+  }
+
+  @Override
+  public void onAttachedToHost(PlaybackGlueHost host) {
+    if (host instanceof SurfaceHolderGlueHost) {
+        surfaceHolderGlueHost = ((SurfaceHolderGlueHost) host);
+        surfaceHolderGlueHost.setSurfaceHolderCallback(new VideoPlayerSurfaceHolderCallback());
+    }
+    initializePlayer();
+  }
+
+  private void initializePlayer() {
+    notifyListeners();
+    this.player.addListener(exoPlayerListener);
+    this.player.setVideoListener(videoListener);
+  }
+
+  private void notifyListeners() {
+    boolean oldIsPrepared = isPrepared();
+    int playbackState = player.getPlaybackState();
+    boolean isInitialized = playbackState != ExoPlayer.STATE_IDLE;
+    isBuffering = playbackState == ExoPlayer.STATE_BUFFERING;
+    boolean hasEnded = playbackState == ExoPlayer.STATE_ENDED;
+
+    initialized = isInitialized;
+    if (oldIsPrepared != isPrepared()) {
+      getCallback().onPreparedStateChanged(LeanbackPlayerAdapter.this);
+    }
+
+    getCallback().onPlayStateChanged(this);
+    notifyBufferingState();
+
+    if (hasEnded) {
+      getCallback().onPlayCompleted(this);
+    }
+  }
+
+  /**
+   * Sets the optional {@link ErrorMessageProvider}.
+   *
+   * @param errorMessageProvider The {@link ErrorMessageProvider}.
+   */
+  public void setErrorMessageProvider(
+      ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider) {
+    this.errorMessageProvider = errorMessageProvider;
+  }
+
+  private void uninitializePlayer() {
+    if (initialized) {
+      initialized = false;
+      notifyBufferingState();
+      if (hasDisplay) {
+        getCallback().onPlayStateChanged(LeanbackPlayerAdapter.this);
+        getCallback().onPreparedStateChanged(LeanbackPlayerAdapter.this);
+      }
+
+      player.removeListener(exoPlayerListener);
+      player.clearVideoListener(videoListener);
+    }
+  }
+
+  /**
+   * Notify the state of buffering. For example, an app may enable/disable a loading figure
+   * according to the state of buffering.
+   */
+  private void notifyBufferingState() {
+    getCallback().onBufferingStateChanged(LeanbackPlayerAdapter.this,
+        isBuffering || !initialized);
+  }
+
+  @Override
+  public void onDetachedFromHost() {
+    if (surfaceHolderGlueHost != null) {
+      surfaceHolderGlueHost.setSurfaceHolderCallback(null);
+      surfaceHolderGlueHost = null;
+    }
+    uninitializePlayer();
+    hasDisplay = false;
+  }
+
+  @Override
+  public void setProgressUpdatingEnabled(final boolean enabled) {
+    handler.removeCallbacks(updatePlayerRunnable);
+    if (!enabled) {
+      return;
+    }
+    handler.postDelayed(updatePlayerRunnable, updatePeriod);
+  }
+
+  @Override
+  public boolean isPlaying() {
+    return initialized && player.getPlayWhenReady();
+  }
+
+  @Override
+  public long getDuration() {
+    long duration = player.getDuration();
+    return duration != C.TIME_UNSET ? duration : -1;
+  }
+
+  @Override
+  public long getCurrentPosition() {
+    return initialized ? player.getCurrentPosition() : -1;
+  }
+
+  @Override
+  public void play() {
+    if (player.getPlaybackState() == ExoPlayer.STATE_ENDED) {
+      seekTo(0);
+    }
+    player.setPlayWhenReady(true);
+    getCallback().onPlayStateChanged(this);
+  }
+
+  @Override
+  public void pause() {
+    player.setPlayWhenReady(false);
+    getCallback().onPlayStateChanged(this);
+  }
+
+  @Override
+  public void seekTo(long newPosition) {
+    player.seekTo(newPosition);
+  }
+
+  @Override
+  public long getBufferedPosition() {
+    return player.getBufferedPosition();
+  }
+
+  /**
+   * @return True if ExoPlayer is ready and got a SurfaceHolder if
+   * {@link PlaybackGlueHost} provides SurfaceHolder.
+   */
+  @Override
+  public boolean isPrepared() {
+    return initialized && (surfaceHolderGlueHost == null || hasDisplay);
+  }
+
+  /**
+   * @see SimpleExoPlayer#setVideoSurfaceHolder(SurfaceHolder)
+   */
+  private void setDisplay(SurfaceHolder surfaceHolder) {
+    hasDisplay = surfaceHolder != null;
+    player.setVideoSurface(surfaceHolder.getSurface());
+    getCallback().onPreparedStateChanged(this);
+  }
+
+  /**
+   * Implements {@link SurfaceHolder.Callback} that can then be set on the
+   * {@link PlaybackGlueHost}.
+   */
+  private final class VideoPlayerSurfaceHolderCallback implements SurfaceHolder.Callback {
+    @Override
+    public void surfaceCreated(SurfaceHolder surfaceHolder) {
+      setDisplay(surfaceHolder);
+    }
+
+    @Override
+    public void surfaceChanged(SurfaceHolder surfaceHolder, int i, int i1, int i2) {
+    }
+
+    @Override
+    public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
+      setDisplay(null);
+    }
+  }
+
+  private final class ExoPlayerEventListenerImpl implements ExoPlayer.EventListener {
+
+    @Override
+    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+      LeanbackPlayerAdapter.this.notifyListeners();
+    }
+
+    @Override
+    public void onPlayerError(ExoPlaybackException exception) {
+      String errMsg = "";
+      if (errorMessageProvider != null) {
+        Pair<Integer, String> message = errorMessageProvider.getErrorMessage(exception);
+        if (message != null) {
+          getCallback().onError(LeanbackPlayerAdapter.this,
+              message.first,
+              message.second);
+            return;
+        }
+      }
+      getCallback().onError(LeanbackPlayerAdapter.this,
+          exception.type,
+          context.getString(R.string.lb_media_player_error,
+          exception.type,
+          exception.rendererIndex));
+    }
+
+    @Override
+    public void onLoadingChanged(boolean isLoading) {
+    }
+
+    @Override
+    public void onTimelineChanged(Timeline timeline, Object manifest) {
+      getCallback().onDurationChanged(LeanbackPlayerAdapter.this);
+      getCallback().onCurrentPositionChanged(LeanbackPlayerAdapter.this);
+      getCallback().onBufferedPositionChanged(LeanbackPlayerAdapter.this);
+    }
+
+    @Override
+    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+    }
+
+    @Override
+    public void onPositionDiscontinuity() {
+      getCallback().onCurrentPositionChanged(LeanbackPlayerAdapter.this);
+      getCallback().onBufferedPositionChanged(LeanbackPlayerAdapter.this);
+    }
+
+    @Override
+    public void onPlaybackParametersChanged(PlaybackParameters params) {
+    }
+
+    @Override
+    public void onRepeatModeChanged(int repeatMode) {
+    }
+  }
+}
+

From d9cd4641f2bc3678cc232bf3358b0f40b04d9dee Mon Sep 17 00:00:00 2001
From: mdoucleff <mdoucleff@google.com>
Date: Mon, 14 Aug 2017 10:35:37 -0700
Subject: [PATCH 097/421] Add flag to CachedContentIndex to disable encryption.
  This allows the encryption feature to be disabled gracefully: encrypted
 index files may be read, but plaintext will be written.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165196508
---
 .../upstream/cache/CachedContentIndex.java    | 21 +++++++++++++++----
 .../upstream/cache/SimpleCache.java           | 16 +++++++++++++-
 2 files changed, 32 insertions(+), 5 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 10bc2985799..e1c2c13865a 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
@@ -64,6 +64,7 @@
   private final AtomicFile atomicFile;
   private final Cipher cipher;
   private final SecretKeySpec secretKeySpec;
+  private final boolean encrypt;
   private boolean changed;
   private ReusableBufferedOutputStream bufferedOutputStream;
 
@@ -80,10 +81,21 @@ public CachedContentIndex(File cacheDir) {
    * Creates a CachedContentIndex which works on the index file in the given cacheDir.
    *
    * @param cacheDir Directory where the index file is kept.
-   * @param secretKey If not null, cache keys will be stored encrypted on filesystem using AES/CBC.
-   *     The key must be 16 bytes long.
+   * @param secretKey 16 byte AES key for reading and writing the cache index.
    */
   public CachedContentIndex(File cacheDir, 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 When false, a plaintext index will be written.
+   */
+  public CachedContentIndex(File cacheDir, byte[] secretKey, boolean encrypt) {
+    this.encrypt = encrypt;
     if (secretKey != null) {
       Assertions.checkArgument(secretKey.length == 16);
       try {
@@ -288,10 +300,11 @@ private void writeFile() throws CacheException {
       output = new DataOutputStream(bufferedOutputStream);
       output.writeInt(VERSION);
 
-      int flags = cipher != null ? FLAG_ENCRYPTED_INDEX : 0;
+      boolean writeEncrypted = encrypt && cipher != null;
+      int flags = writeEncrypted ? FLAG_ENCRYPTED_INDEX : 0;
       output.writeInt(flags);
 
-      if (cipher != null) {
+      if (writeEncrypted) {
         byte[] initializationVector = new byte[16];
         new Random().nextBytes(initializationVector);
         output.write(initializationVector);
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 62bd2783b86..bb1ac83698a 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
@@ -60,10 +60,24 @@ public SimpleCache(File cacheDir, CacheEvictor evictor) {
    *     The key must be 16 bytes long.
    */
   public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey) {
+    this(cacheDir, evictor, secretKey, secretKey != 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 secretKey If not null, cache keys will be stored encrypted on filesystem using AES/CBC.
+   *     The key must be 16 bytes long.
+   * @param encrypt When false, a plaintext index will be written.
+   */
+  public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey, boolean encrypt) {
     this.cacheDir = cacheDir;
     this.evictor = evictor;
     this.lockedSpans = new HashMap<>();
-    this.index = new CachedContentIndex(cacheDir, secretKey);
+    this.index = new CachedContentIndex(cacheDir, secretKey, encrypt);
     this.listeners = new HashMap<>();
     // Start cache initialization.
     final ConditionVariable conditionVariable = new ConditionVariable();

From 08d16c55d4713eb5865c05fff890f4a5770b0376 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 14 Aug 2017 13:20:23 -0700
Subject: [PATCH 098/421] Some Leanback extension + minVersion bump fixes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165219604
---
 .../ByteArrayUploadDataProviderTest.java      |  4 -
 extensions/leanback/README.md                 |  2 +-
 extensions/leanback/build.gradle              |  2 +-
 .../ext/leanback/LeanbackPlayerAdapter.java   | 92 +++++++------------
 .../android/exoplayer2/ui/DefaultTimeBar.java |  1 -
 5 files changed, 36 insertions(+), 65 deletions(-)

diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
index 203fd5e21c7..a65bb0951b0 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/ByteArrayUploadDataProviderTest.java
@@ -21,11 +21,8 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.MockitoAnnotations.initMocks;
 
-import android.annotation.TargetApi;
-import android.os.Build.VERSION_CODES;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.runner.AndroidJUnit4;
-
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
@@ -67,7 +64,6 @@ public void testReadFullBuffer() throws IOException {
     assertArrayEquals(TEST_DATA, byteBuffer.array());
   }
 
-  @TargetApi(VERSION_CODES.GINGERBREAD)
   @Test
   public void testReadPartialBuffer() throws IOException {
     byte[] firstHalf = Arrays.copyOfRange(TEST_DATA, 0, TEST_DATA.length / 2);
diff --git a/extensions/leanback/README.md b/extensions/leanback/README.md
index 2326887724d..0fb3846f7ef 100644
--- a/extensions/leanback/README.md
+++ b/extensions/leanback/README.md
@@ -3,7 +3,7 @@
 ## Description ##
 
 This [Leanback][] Extension provides a [PlayerAdapter][] implementation for
-Exoplayer.
+ExoPlayer.
 
 [PlayerAdapter]: https://developer.android.com/reference/android/support/v17/leanback/media/PlayerAdapter.html
 [Leanback]: https://developer.android.com/reference/android/support/v17/leanback/package-summary.html
diff --git a/extensions/leanback/build.gradle b/extensions/leanback/build.gradle
index eaf58cc9907..715e2e56d72 100644
--- a/extensions/leanback/build.gradle
+++ b/extensions/leanback/build.gradle
@@ -19,7 +19,7 @@ android {
     buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion project.ext.minSdkVersion
+        minSdkVersion 17
         targetSdkVersion project.ext.targetSdkVersion
     }
 }
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 58c8ee973db..df77a737b8c 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
@@ -22,12 +22,14 @@
 import android.support.v17.leanback.media.PlayerAdapter;
 import android.support.v17.leanback.media.SurfaceHolderGlueHost;
 import android.util.Pair;
+import android.view.Surface;
 import android.view.SurfaceHolder;
 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.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -39,6 +41,10 @@
  */
 public final class LeanbackPlayerAdapter extends PlayerAdapter {
 
+  static {
+    ExoPlayerLibraryInfo.registerModule("goog.exo.leanback");
+  }
+
   private final Context context;
   private final SimpleExoPlayer player;
   private final Handler handler;
@@ -53,7 +59,7 @@ public void run() {
 
   private SurfaceHolderGlueHost surfaceHolderGlueHost;
   private boolean initialized;
-  private boolean hasDisplay;
+  private boolean hasSurface;
   private boolean isBuffering;
   private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   private final int updatePeriod;
@@ -70,10 +76,6 @@ public void onRenderedFirstFrame() {
       }
   };
 
-  static {
-    ExoPlayerLibraryInfo.registerModule("goog.exo.leanback");
-  }
-
   /**
    * Constructor.
    * Users are responsible for managing {@link SimpleExoPlayer} lifecycle. You must
@@ -92,32 +94,28 @@ public LeanbackPlayerAdapter(Context context, SimpleExoPlayer player, int update
   @Override
   public void onAttachedToHost(PlaybackGlueHost host) {
     if (host instanceof SurfaceHolderGlueHost) {
-        surfaceHolderGlueHost = ((SurfaceHolderGlueHost) host);
-        surfaceHolderGlueHost.setSurfaceHolderCallback(new VideoPlayerSurfaceHolderCallback());
+      surfaceHolderGlueHost = ((SurfaceHolderGlueHost) host);
+      surfaceHolderGlueHost.setSurfaceHolderCallback(new VideoPlayerSurfaceHolderCallback());
     }
-    initializePlayer();
-  }
-
-  private void initializePlayer() {
     notifyListeners();
-    this.player.addListener(exoPlayerListener);
-    this.player.setVideoListener(videoListener);
+    player.addListener(exoPlayerListener);
+    player.addVideoListener(videoListener);
   }
 
   private void notifyListeners() {
     boolean oldIsPrepared = isPrepared();
     int playbackState = player.getPlaybackState();
-    boolean isInitialized = playbackState != ExoPlayer.STATE_IDLE;
-    isBuffering = playbackState == ExoPlayer.STATE_BUFFERING;
-    boolean hasEnded = playbackState == ExoPlayer.STATE_ENDED;
+    boolean isInitialized = playbackState != Player.STATE_IDLE;
+    isBuffering = playbackState == Player.STATE_BUFFERING;
+    boolean hasEnded = playbackState == Player.STATE_ENDED;
 
     initialized = isInitialized;
     if (oldIsPrepared != isPrepared()) {
-      getCallback().onPreparedStateChanged(LeanbackPlayerAdapter.this);
+      getCallback().onPreparedStateChanged(this);
     }
 
     getCallback().onPlayStateChanged(this);
-    notifyBufferingState();
+    getCallback().onBufferingStateChanged(this, isBuffering || !initialized);
 
     if (hasEnded) {
       getCallback().onPlayCompleted(this);
@@ -134,37 +132,20 @@ public void setErrorMessageProvider(
     this.errorMessageProvider = errorMessageProvider;
   }
 
-  private void uninitializePlayer() {
-    if (initialized) {
-      initialized = false;
-      notifyBufferingState();
-      if (hasDisplay) {
-        getCallback().onPlayStateChanged(LeanbackPlayerAdapter.this);
-        getCallback().onPreparedStateChanged(LeanbackPlayerAdapter.this);
-      }
-
-      player.removeListener(exoPlayerListener);
-      player.clearVideoListener(videoListener);
-    }
-  }
-
-  /**
-   * Notify the state of buffering. For example, an app may enable/disable a loading figure
-   * according to the state of buffering.
-   */
-  private void notifyBufferingState() {
-    getCallback().onBufferingStateChanged(LeanbackPlayerAdapter.this,
-        isBuffering || !initialized);
-  }
-
   @Override
   public void onDetachedFromHost() {
+    player.removeListener(exoPlayerListener);
+    player.removeVideoListener(videoListener);
     if (surfaceHolderGlueHost != null) {
       surfaceHolderGlueHost.setSurfaceHolderCallback(null);
       surfaceHolderGlueHost = null;
     }
-    uninitializePlayer();
-    hasDisplay = false;
+    initialized = false;
+    hasSurface = false;
+    Callback callback = getCallback();
+    callback.onBufferingStateChanged(this, false);
+    callback.onPlayStateChanged(this);
+    callback.onPreparedStateChanged(this);
   }
 
   @Override
@@ -194,7 +175,7 @@ public long getCurrentPosition() {
 
   @Override
   public void play() {
-    if (player.getPlaybackState() == ExoPlayer.STATE_ENDED) {
+    if (player.getPlaybackState() == Player.STATE_ENDED) {
       seekTo(0);
     }
     player.setPlayWhenReady(true);
@@ -208,8 +189,8 @@ public void pause() {
   }
 
   @Override
-  public void seekTo(long newPosition) {
-    player.seekTo(newPosition);
+  public void seekTo(long positionMs) {
+    player.seekTo(positionMs);
   }
 
   @Override
@@ -223,26 +204,22 @@ public long getBufferedPosition() {
    */
   @Override
   public boolean isPrepared() {
-    return initialized && (surfaceHolderGlueHost == null || hasDisplay);
+    return initialized && (surfaceHolderGlueHost == null || hasSurface);
   }
 
-  /**
-   * @see SimpleExoPlayer#setVideoSurfaceHolder(SurfaceHolder)
-   */
-  private void setDisplay(SurfaceHolder surfaceHolder) {
-    hasDisplay = surfaceHolder != null;
-    player.setVideoSurface(surfaceHolder.getSurface());
+  private void setVideoSurface(Surface surface) {
+    hasSurface = surface != null;
+    player.setVideoSurface(surface);
     getCallback().onPreparedStateChanged(this);
   }
 
   /**
-   * Implements {@link SurfaceHolder.Callback} that can then be set on the
-   * {@link PlaybackGlueHost}.
+   * Implements {@link SurfaceHolder.Callback} that can then be set on the {@link PlaybackGlueHost}.
    */
   private final class VideoPlayerSurfaceHolderCallback implements SurfaceHolder.Callback {
     @Override
     public void surfaceCreated(SurfaceHolder surfaceHolder) {
-      setDisplay(surfaceHolder);
+      setVideoSurface(surfaceHolder.getSurface());
     }
 
     @Override
@@ -251,7 +228,7 @@ public void surfaceChanged(SurfaceHolder surfaceHolder, int i, int i1, int i2) {
 
     @Override
     public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
-      setDisplay(null);
+      setVideoSurface(null);
     }
   }
 
@@ -264,7 +241,6 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
 
     @Override
     public void onPlayerError(ExoPlaybackException exception) {
-      String errMsg = "";
       if (errorMessageProvider != null) {
         Pair<Integer, String> message = errorMessageProvider.getErrorMessage(exception);
         if (message != null) {
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 523c7fd73d8..8fe8dbfa5da 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
@@ -378,7 +378,6 @@ protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight)
     super.onSizeChanged(width, height, oldWidth, oldHeight);
   }
 
-  @TargetApi(14)
   @Override
   public void onInitializeAccessibilityEvent(AccessibilityEvent event) {
     super.onInitializeAccessibilityEvent(event);

From 00547c578345676bc26fdfe1d84339adfd7c067e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 15 Aug 2017 04:06:29 -0700
Subject: [PATCH 099/421] Disable secure dummy surface on all Samsung N devices

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165291627
---
 .../google/android/exoplayer2/video/DummySurface.java | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

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 7a802949291..a45616c6edd 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
@@ -42,7 +42,6 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.graphics.SurfaceTexture;
 import android.graphics.SurfaceTexture.OnFrameAvailableListener;
 import android.opengl.EGL14;
@@ -152,15 +151,9 @@ private static void assertApiLevel17OrHigher() {
    *
    * @param context Any {@link Context}.
    */
+  @SuppressWarnings("unused") // Context may be needed in the future for better targeting.
   private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) {
-    return Util.SDK_INT == 24
-        && "samsung".equals(Util.MANUFACTURER)
-        && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager());
-  }
-
-  @TargetApi(24)
-  private static boolean hasVrModeHighPerformanceSystemFeatureV24(PackageManager packageManager) {
-    return packageManager.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
+    return Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER);
   }
 
   private static class DummySurfaceThread extends HandlerThread implements OnFrameAvailableListener,

From 757bcf7c6346a4c8757b1d3a462bc5a84a21123c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 15 Aug 2017 04:14:24 -0700
Subject: [PATCH 100/421] Update instructions to include Google Maven
 repository

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165291982
---
 README.md                | 11 +++++++----
 extensions/gvr/README.md | 12 +-----------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index d7bc23f7009..f4dd9b69ec4 100644
--- a/README.md
+++ b/README.md
@@ -20,18 +20,21 @@ and extend, and can be updated through Play Store application updates.
 
 ## Using ExoPlayer ##
 
-ExoPlayer modules can be obtained via jCenter. It's also possible to clone the
+ExoPlayer modules can be obtained via JCenter. It's also possible to clone the
 repository and depend on the modules locally.
 
-### Via jCenter ###
+### Via 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 repository included in
-the `build.gradle` file in the root of your project:
+dependency. You need to make sure you have the JCenter and Google Maven
+repositories included in the `build.gradle` file in the root of your project:
 
 ```gradle
 repositories {
     jcenter()
+    maven {
+        url "https://maven.google.com"
+    }
 }
 ```
 
diff --git a/extensions/gvr/README.md b/extensions/gvr/README.md
index 7e072d070c1..4e08ee6387e 100644
--- a/extensions/gvr/README.md
+++ b/extensions/gvr/README.md
@@ -11,17 +11,7 @@ of surround sound and ambisonic soundfields.
 
 ## Getting the extension ##
 
-The easiest way to use the extension is to add it as a gradle dependency. You
-need to make sure you have the jcenter repository included in the `build.gradle`
-file in the root of your project:
-
-```gradle
-repositories {
-    jcenter()
-}
-```
-
-Next, include the following in your module's `build.gradle` file:
+The easiest way to use the extension is to add it as a gradle dependency:
 
 ```gradle
 compile 'com.google.android.exoplayer:extension-gvr:rX.X.X'

From f8e47553e8c34c2105b0865f33918f300d37a823 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 15 Aug 2017 04:45:22 -0700
Subject: [PATCH 101/421] Destroy GL context when releasing dummy surface

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165293386
---
 .../exoplayer2/video/DummySurface.java        | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

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 a45616c6edd..a1820ed7a11 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
@@ -34,6 +34,7 @@
 import static android.opengl.EGL14.eglChooseConfig;
 import static android.opengl.EGL14.eglCreateContext;
 import static android.opengl.EGL14.eglCreatePbufferSurface;
+import static android.opengl.EGL14.eglDestroyContext;
 import static android.opengl.EGL14.eglGetDisplay;
 import static android.opengl.EGL14.eglInitialize;
 import static android.opengl.EGL14.eglMakeCurrent;
@@ -164,6 +165,8 @@ private static class DummySurfaceThread extends HandlerThread implements OnFrame
     private static final int MSG_RELEASE = 3;
 
     private final int[] textureIdHolder;
+    private EGLContext context;
+    private EGLDisplay display;
     private Handler handler;
     private SurfaceTexture surfaceTexture;
 
@@ -248,7 +251,7 @@ public boolean handleMessage(Message msg) {
     }
 
     private void initInternal(boolean secure) {
-      EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+      display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
       Assertions.checkState(display != null, "eglGetDisplay failed");
 
       int[] version = new int[2];
@@ -285,8 +288,8 @@ private void initInternal(boolean secure) {
             EGL_CONTEXT_CLIENT_VERSION, 2,
             EGL_NONE};
       }
-      EGLContext context = eglCreateContext(display, config, android.opengl.EGL14.EGL_NO_CONTEXT,
-          glAttributes, 0);
+      context = eglCreateContext(display, config, android.opengl.EGL14.EGL_NO_CONTEXT, glAttributes,
+          0);
       Assertions.checkState(context != null, "eglCreateContext failed");
 
       int[] pbufferAttributes;
@@ -316,11 +319,18 @@ private void initInternal(boolean secure) {
 
     private void releaseInternal() {
       try {
-        surfaceTexture.release();
+        if (surfaceTexture != null) {
+          surfaceTexture.release();
+          glDeleteTextures(1, textureIdHolder, 0);
+        }
       } finally {
+        if (context != null) {
+          eglDestroyContext(display, context);
+        }
+        display = null;
+        context = null;
         surface = null;
         surfaceTexture = null;
-        glDeleteTextures(1, textureIdHolder, 0);
       }
     }
 

From c94bce17b4d8c39046d81c7ec4aa16a9a8f43b75 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sun, 16 Jul 2017 05:14:19 +0100
Subject: [PATCH 102/421] Make data sources private in SegmentDownloader

Also fix SegmentDownloader.remove to not return early

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165295432
---
 .../com/google/android/exoplayer2/source/dash/DashUtil.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 83cb10b99c0..59fbfb18fe1 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
@@ -111,7 +111,8 @@ public static Format loadSampleFormat(DataSource dataSource, Representation repr
    *
    * @param dataSource The source from which the data should be loaded.
    * @param representation The representation which initialization chunk belongs to.
-   * @return {@link ChunkIndex} of the given representation.
+   * @return The {@link ChunkIndex} of the given representation, or null if no initialization or
+   *     index data exists.
    * @throws IOException Thrown when there is an error while loading.
    * @throws InterruptedException Thrown if the thread was interrupted.
    */

From 4b706d948471c9d2e2794d4e780f3de9ac207796 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 15 Aug 2017 05:23:15 -0700
Subject: [PATCH 103/421] Add SsManifest.copy and TrackKey for SmoothStreaming
 downloads

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165295985
---
 .../manifest/SsManifestTest.java              | 128 ++++++++++++++++++
 .../smoothstreaming/manifest/SsManifest.java  |  86 ++++++++++--
 2 files changed, 205 insertions(+), 9 deletions(-)
 create mode 100644 library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java

diff --git a/library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java b/library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
new file mode 100644
index 00000000000..0a221b6932d
--- /dev/null
+++ b/library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
@@ -0,0 +1,128 @@
+/*
+ * 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.manifest;
+
+import android.test.MoreAsserts;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+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.util.MimeTypes;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for {@link SsManifest}.
+ */
+public class SsManifestTest extends TestCase {
+
+  private static ProtectionElement DUMMY_PROTECTION_ELEMENT =
+      new ProtectionElement(C.WIDEVINE_UUID, new byte[] {0, 1, 2});
+
+  public void testCopy() throws Exception {
+    Format[][] formats = newFormats(2, 3);
+    SsManifest sourceManifest = newSsManifest(
+        newStreamElement("1",formats[0]),
+        newStreamElement("2", formats[1]));
+
+    List<TrackKey> keys = Arrays.asList(
+        new TrackKey(0, 0),
+        new TrackKey(0, 2),
+        new TrackKey(1, 0));
+    // Keys don't need to be in any particular order
+    Collections.shuffle(keys, new Random(0));
+
+    SsManifest copyManifest = sourceManifest.copy(keys);
+
+    SsManifest expectedManifest = newSsManifest(
+        newStreamElement("1", formats[0][0], formats[0][2]),
+        newStreamElement("2", formats[1][0]));
+    assertManifestEquals(expectedManifest, copyManifest);
+  }
+
+  public void testCopyRemoveStreamElement() throws Exception {
+    Format[][] formats = newFormats(2, 3);
+    SsManifest sourceManifest = newSsManifest(
+        newStreamElement("1", formats[0]),
+        newStreamElement("2", formats[1]));
+
+    List<TrackKey> keys = Arrays.asList(
+        new TrackKey(1, 0));
+    // Keys don't need to be in any particular order
+    Collections.shuffle(keys, new Random(0));
+
+    SsManifest copyManifest = sourceManifest.copy(keys);
+
+    SsManifest expectedManifest = newSsManifest(
+        newStreamElement("2", formats[1][0]));
+    assertManifestEquals(expectedManifest, copyManifest);
+  }
+
+  private static void assertManifestEquals(SsManifest expected, SsManifest actual) {
+    assertEquals(expected.durationUs, actual.durationUs);
+    assertEquals(expected.dvrWindowLengthUs, actual.dvrWindowLengthUs);
+    assertEquals(expected.isLive, actual.isLive);
+    assertEquals(expected.lookAheadCount, actual.lookAheadCount);
+    assertEquals(expected.majorVersion, actual.majorVersion);
+    assertEquals(expected.minorVersion, actual.minorVersion);
+    assertEquals(expected.protectionElement.uuid, actual.protectionElement.uuid);
+    assertEquals(expected.protectionElement, actual.protectionElement);
+    for (int i = 0; i < expected.streamElements.length; i++) {
+      StreamElement expectedStreamElement = expected.streamElements[i];
+      StreamElement actualStreamElement = actual.streamElements[i];
+      assertEquals(expectedStreamElement.chunkCount, actualStreamElement.chunkCount);
+      assertEquals(expectedStreamElement.displayHeight, actualStreamElement.displayHeight);
+      assertEquals(expectedStreamElement.displayWidth, actualStreamElement.displayWidth);
+      assertEquals(expectedStreamElement.language, actualStreamElement.language);
+      assertEquals(expectedStreamElement.maxHeight, actualStreamElement.maxHeight);
+      assertEquals(expectedStreamElement.maxWidth, actualStreamElement.maxWidth);
+      assertEquals(expectedStreamElement.name, actualStreamElement.name);
+      assertEquals(expectedStreamElement.subType, actualStreamElement.subType);
+      assertEquals(expectedStreamElement.timescale, actualStreamElement.timescale);
+      assertEquals(expectedStreamElement.type, actualStreamElement.type);
+      MoreAsserts.assertEquals(expectedStreamElement.formats, actualStreamElement.formats);
+    }
+  }
+
+  private static Format[][] newFormats(int streamElementCount, int trackCounts) {
+    Format[][] formats = new Format[streamElementCount][];
+    for (int i = 0; i < streamElementCount; i++) {
+      formats[i] = new Format[trackCounts];
+      for (int j = 0; j < trackCounts; j++) {
+        formats[i][j] = newFormat(i + "." + j);
+      }
+    }
+    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.<Long>emptyList(), 0);
+  }
+
+  private static Format newFormat(String id) {
+    return Format.createContainerFormat(id, MimeTypes.VIDEO_MP4, MimeTypes.VIDEO_H264, null,
+        Format.NO_VALUE, 0, null);
+  }
+
+}
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 1bb877eb59a..fbc3726a0e7 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
@@ -21,6 +21,9 @@
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.UriUtil;
 import com.google.android.exoplayer2.util.Util;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.UUID;
 
@@ -96,16 +99,60 @@ public class SsManifest {
   public SsManifest(int majorVersion, int minorVersion, long timescale, long duration,
       long dvrWindowLength, int lookAheadCount, boolean isLive, ProtectionElement protectionElement,
       StreamElement[] streamElements) {
+    this(majorVersion, minorVersion,
+        duration == 0 ? C.TIME_UNSET
+            : Util.scaleLargeTimestamp(duration, C.MICROS_PER_SECOND, timescale),
+        dvrWindowLength == 0 ? C.TIME_UNSET
+            : Util.scaleLargeTimestamp(dvrWindowLength, C.MICROS_PER_SECOND, timescale),
+        lookAheadCount, isLive, protectionElement, streamElements);
+  }
+
+  private SsManifest(int majorVersion, int minorVersion, long durationUs, long dvrWindowLengthUs,
+      int lookAheadCount, boolean isLive, ProtectionElement protectionElement,
+      StreamElement[] streamElements) {
     this.majorVersion = majorVersion;
     this.minorVersion = minorVersion;
+    this.durationUs = durationUs;
+    this.dvrWindowLengthUs = dvrWindowLengthUs;
     this.lookAheadCount = lookAheadCount;
     this.isLive = isLive;
     this.protectionElement = protectionElement;
     this.streamElements = streamElements;
-    dvrWindowLengthUs = dvrWindowLength == 0 ? C.TIME_UNSET
-        : Util.scaleLargeTimestamp(dvrWindowLength, C.MICROS_PER_SECOND, timescale);
-    durationUs = duration == 0 ? C.TIME_UNSET
-        : Util.scaleLargeTimestamp(duration, C.MICROS_PER_SECOND, timescale);
+  }
+
+  /**
+   * Creates a copy of this manifest which includes only the tracks identified by the given keys.
+   *
+   * @param trackKeys List of keys for the tracks to be included in the copy.
+   * @return A copy of this manifest with the selected tracks.
+   * @throws IndexOutOfBoundsException If a key has an invalid index.
+   */
+  public final SsManifest copy(List<TrackKey> trackKeys) {
+    LinkedList<TrackKey> sortedKeys = new LinkedList<>(trackKeys);
+    Collections.sort(sortedKeys);
+
+    StreamElement currentStreamElement = null;
+    List<StreamElement> copiedStreamElements = new ArrayList<>();
+    List<Format> copiedFormats = new ArrayList<>();
+    for (int i = 0; i < sortedKeys.size(); i++) {
+      TrackKey key = sortedKeys.get(i);
+      StreamElement streamElement = streamElements[key.streamElementIndex];
+      if (streamElement != currentStreamElement && currentStreamElement != null) {
+        // We're advancing to a new stream element. Add the current one.
+        copiedStreamElements.add(currentStreamElement.copy(copiedFormats.toArray(new Format[0])));
+        copiedFormats.clear();
+      }
+      currentStreamElement = streamElement;
+      copiedFormats.add(streamElement.formats[key.trackIndex]);
+    }
+    if (currentStreamElement != null) {
+      // Add the last stream element.
+      copiedStreamElements.add(currentStreamElement.copy(copiedFormats.toArray(new Format[0])));
+    }
+
+    StreamElement[] copiedStreamElementsArray = copiedStreamElements.toArray(new StreamElement[0]);
+    return new SsManifest(majorVersion, minorVersion, durationUs, dvrWindowLengthUs, lookAheadCount,
+        isLive, protectionElement, copiedStreamElementsArray);
   }
 
   /**
@@ -156,6 +203,16 @@ public StreamElement(String baseUri, String chunkTemplate, int type, String subT
         long timescale, String name, int maxWidth, int maxHeight, int displayWidth,
         int displayHeight, String language, Format[] formats, List<Long> chunkStartTimes,
         long lastChunkDuration) {
+      this (baseUri, chunkTemplate, type, subType, timescale, name, maxWidth, maxHeight,
+          displayWidth, displayHeight, language, formats, chunkStartTimes,
+          Util.scaleLargeTimestamps(chunkStartTimes, C.MICROS_PER_SECOND, timescale),
+          Util.scaleLargeTimestamp(lastChunkDuration, C.MICROS_PER_SECOND, timescale));
+    }
+
+    private StreamElement(String baseUri, String chunkTemplate, int type, String subType,
+        long timescale, String name, int maxWidth, int maxHeight, int displayWidth,
+        int displayHeight, String language, Format[] formats, List<Long> chunkStartTimes,
+        long[] chunkStartTimesUs, long lastChunkDurationUs) {
       this.baseUri = baseUri;
       this.chunkTemplate = chunkTemplate;
       this.type = type;
@@ -168,12 +225,23 @@ public StreamElement(String baseUri, String chunkTemplate, int type, String subT
       this.displayHeight = displayHeight;
       this.language = language;
       this.formats = formats;
-      this.chunkCount = chunkStartTimes.size();
       this.chunkStartTimes = chunkStartTimes;
-      lastChunkDurationUs =
-          Util.scaleLargeTimestamp(lastChunkDuration, C.MICROS_PER_SECOND, timescale);
-      chunkStartTimesUs =
-          Util.scaleLargeTimestamps(chunkStartTimes, C.MICROS_PER_SECOND, timescale);
+      this.chunkStartTimesUs = chunkStartTimesUs;
+      this.lastChunkDurationUs = lastChunkDurationUs;
+      chunkCount = chunkStartTimes.size();
+    }
+
+    /**
+     * Creates a copy of this stream element with the formats replaced with those specified.
+     *
+     * @param formats The formats to be included in the copy.
+     * @return A copy of this stream element with the formats replaced.
+     * @throws IndexOutOfBoundsException If a key has an invalid index.
+     */
+    public StreamElement copy(Format[] formats) {
+      return new StreamElement(baseUri, chunkTemplate, type, subType, timescale, name, maxWidth,
+          maxHeight, displayWidth, displayHeight, language, formats, chunkStartTimes,
+          chunkStartTimesUs, lastChunkDurationUs);
     }
 
     /**

From b9f5cc7256041f869dfef259f6311cfed4d9c49d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 15 Aug 2017 05:26:13 -0700
Subject: [PATCH 104/421] Add missing TrackKey class

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165296184
---
 .../smoothstreaming/manifest/TrackKey.java    | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/TrackKey.java

diff --git a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/TrackKey.java b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/TrackKey.java
new file mode 100644
index 00000000000..ed52e6fa12d
--- /dev/null
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/TrackKey.java
@@ -0,0 +1,76 @@
+/*
+ * 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.manifest;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.NonNull;
+
+/**
+ * Uniquely identifies a track in a {@link SsManifest}.
+ */
+public final class TrackKey implements Parcelable, Comparable<TrackKey> {
+
+  public final int streamElementIndex;
+  public final int trackIndex;
+
+  public TrackKey(int streamElementIndex, int trackIndex) {
+    this.streamElementIndex = streamElementIndex;
+    this.trackIndex = trackIndex;
+  }
+
+  @Override
+  public String toString() {
+    return streamElementIndex + "." + trackIndex;
+  }
+
+  // Parcelable implementation.
+
+  @Override
+  public int describeContents() {
+    return 0;
+  }
+
+  @Override
+  public void writeToParcel(Parcel dest, int flags) {
+    dest.writeInt(streamElementIndex);
+    dest.writeInt(trackIndex);
+  }
+
+  public static final Creator<TrackKey> CREATOR = new Creator<TrackKey>() {
+    @Override
+    public TrackKey createFromParcel(Parcel in) {
+      return new TrackKey(in.readInt(), in.readInt());
+    }
+
+    @Override
+    public TrackKey[] newArray(int size) {
+      return new TrackKey[size];
+    }
+  };
+
+  // Comparable implementation.
+
+  @Override
+  public int compareTo(@NonNull TrackKey o) {
+    int result = streamElementIndex - o.streamElementIndex;
+    if (result == 0) {
+      result = trackIndex - o.trackIndex;
+    }
+    return result;
+  }
+
+}

From f72cd2b01484698e8c6ffe6ea47d6dd71d6b1722 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 15 Aug 2017 07:36:28 -0700
Subject: [PATCH 105/421] Add SmoothStreaming downloader and download action

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165305815
---
 .../offline/SsDownloadAction.java             |  85 ++++++++++++++
 .../smoothstreaming/offline/SsDownloader.java | 111 ++++++++++++++++++
 2 files changed, 196 insertions(+)
 create mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
 create mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java

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
new file mode 100644
index 00000000000..29b6ad15164
--- /dev/null
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
@@ -0,0 +1,85 @@
+/*
+ * 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 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.source.smoothstreaming.manifest.TrackKey;
+import com.google.android.exoplayer2.util.ClosedSource;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/** An action to download or remove downloaded SmoothStreaming streams. */
+@ClosedSource(reason = "Not ready yet")
+public final class SsDownloadAction extends SegmentDownloadAction<TrackKey> {
+
+  public static final Serializer SERIALIZER = new SegmentDownloadActionSerializer<TrackKey>() {
+
+    private static final String TYPE = "SsDownloadAction";
+
+    @Override
+    public String getType() {
+      return TYPE;
+    }
+
+    @Override
+    protected void writeKey(DataOutputStream output, TrackKey key) throws IOException {
+      output.writeInt(key.streamElementIndex);
+      output.writeInt(key.trackIndex);
+    }
+
+    @Override
+    protected TrackKey readKey(DataInputStream input) throws IOException {
+      return new TrackKey(input.readInt(), input.readInt());
+    }
+
+    @Override
+    protected TrackKey[] createKeyArray(int keyCount) {
+      return new TrackKey[keyCount];
+    }
+
+    @Override
+    protected DownloadAction createDownloadAction(Uri manifestUri, boolean removeAction,
+        TrackKey[] keys) {
+      return new SsDownloadAction(manifestUri, removeAction, keys);
+    }
+
+  };
+
+  /** @see SegmentDownloadAction#SegmentDownloadAction(Uri, boolean, Object[]) */
+  public SsDownloadAction(Uri manifestUri, boolean removeAction, TrackKey... keys) {
+    super(manifestUri, removeAction, keys);
+  }
+
+  @Override
+  public SsDownloader createDownloader(DownloaderConstructorHelper constructorHelper)
+      throws IOException {
+    SsDownloader downloader = new SsDownloader(manifestUri, constructorHelper);
+    if (!isRemoveAction()) {
+      downloader.selectRepresentations(keys);
+    }
+    return downloader;
+  }
+
+  @Override
+  public Serializer getSerializer() {
+    return SERIALIZER;
+  }
+
+}
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
new file mode 100644
index 00000000000..fe9c21d8551
--- /dev/null
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
@@ -0,0 +1,111 @@
+/*
+ * 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 com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.offline.SegmentDownloader;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.TrackKey;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.ParsingLoadable;
+import com.google.android.exoplayer2.util.ClosedSource;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helper class to download SmoothStreaming streams.
+ *
+ * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link
+ * #getDownloadedBytes()}, this class isn't thread safe.
+ *
+ * <p>Example usage:
+ *
+ * <pre>
+ * {@code
+ * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor());
+ * DefaultHttpDataSourceFactory factory = new DefaultHttpDataSourceFactory("ExoPlayer", null);
+ * DownloaderConstructorHelper constructorHelper =
+ *     new DownloaderConstructorHelper(cache, factory);
+ * SsDownloader ssDownloader = new SsDownloader(manifestUrl, constructorHelper);
+ * // Select the first track of the first stream element
+ * ssDownloader.selectRepresentations(new TrackKey[] {new TrackKey(0, 0)});
+ * ssDownloader.download(new ProgressListener() {
+ *   @Override
+ *   public void onDownloadProgress(Downloader downloader, float downloadPercentage,
+ *       long downloadedBytes) {
+ *     // Invoked periodically during the download.
+ *   }
+ * });
+ * // Access downloaded data using CacheDataSource
+ * CacheDataSource cacheDataSource =
+ *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);}
+ * </pre>
+ */
+@ClosedSource(reason = "Not ready yet")
+public final class SsDownloader extends SegmentDownloader<SsManifest, TrackKey> {
+
+  /**
+   * @see SegmentDownloader#SegmentDownloader(Uri, DownloaderConstructorHelper)
+   */
+  public SsDownloader(Uri manifestUri, DownloaderConstructorHelper constructorHelper)  {
+    super(manifestUri, constructorHelper);
+  }
+
+  @Override
+  public SsManifest getManifest(DataSource dataSource, Uri uri) throws IOException {
+    DataSpec dataSpec = new DataSpec(uri,
+        DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH | DataSpec.FLAG_ALLOW_GZIP);
+    ParsingLoadable<SsManifest> loadable = new ParsingLoadable<>(dataSource, dataSpec,
+        C.DATA_TYPE_MANIFEST, new SsManifestParser());
+    loadable.load();
+    return loadable.getResult();
+  }
+
+  @Override
+  protected List<Segment> getAllSegments(DataSource dataSource, SsManifest manifest,
+      boolean allowIndexLoadErrors) throws InterruptedException, IOException {
+    ArrayList<Segment> segments = new ArrayList<>();
+    for (int i = 0; i < manifest.streamElements.length; i++) {
+      StreamElement streamElement = manifest.streamElements[i];
+      for (int j = 0; j < streamElement.formats.length; j++) {
+        segments.addAll(getSegments(dataSource, manifest, new TrackKey[] {new TrackKey(i, j)},
+            allowIndexLoadErrors));
+      }
+    }
+    return segments;
+  }
+
+  @Override
+  protected List<Segment> getSegments(DataSource dataSource, SsManifest manifest,
+      TrackKey[] keys, boolean allowIndexLoadErrors) throws InterruptedException, IOException {
+    ArrayList<Segment> segments = new ArrayList<>();
+    for (TrackKey key : keys) {
+      StreamElement streamElement = manifest.streamElements[key.streamElementIndex];
+      for (int i = 0; i < streamElement.chunkCount; i++) {
+        segments.add(new Segment(streamElement.getStartTimeUs(i),
+            new DataSpec(streamElement.buildRequestUri(key.trackIndex, i))));
+      }
+    }
+    return segments;
+  }
+
+}

From e0b69b8115290b884f1f2f56eae1571449cfc620 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 15 Aug 2017 09:04:00 -0700
Subject: [PATCH 106/421] Add Format.copyWithRotationDegrees

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165314250
---
 .../com/google/android/exoplayer2/Format.java | 68 +++++++++++--------
 1 file changed, 38 insertions(+), 30 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 4e387ac7ce5..c6be2e2ebaf 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
@@ -428,28 +428,28 @@ public static Format createSampleFormat(String id, String sampleMimeType, String
   }
 
   public Format copyWithMaxInputSize(int maxInputSize) {
-    return new Format(id, 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);
+    return new Format(id, 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 copyWithSubsampleOffsetUs(long subsampleOffsetUs) {
-    return new Format(id, 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);
+    return new Format(id, 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 copyWithContainerInfo(String id, String codecs, int bitrate, int width, int height,
       @C.SelectionFlags int selectionFlags, String language) {
-    return new Format(id, 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);
+    return new Format(id, 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);
   }
 
   @SuppressWarnings("ReferenceEquality")
@@ -474,27 +474,35 @@ public Format copyWithManifestFormatInfo(Format manifestFormat) {
   }
 
   public Format copyWithGaplessInfo(int encoderDelay, int encoderPadding) {
-    return new Format(id, 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);
+    return new Format(id, 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(DrmInitData drmInitData) {
-    return new Format(id, 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);
+    return new Format(id, 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 copyWithMetadata(Metadata metadata) {
-    return new Format(id, 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);
+    return new Format(id, 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 copyWithRotationDegrees(int rotationDegrees) {
+    return new Format(id, 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);
   }
 
   /**

From bbc3b182bbd3bdfeeeb758c67d030b7e73e52615 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 16 Aug 2017 04:47:51 -0700
Subject: [PATCH 107/421] Restore the interrupted flag after blocking
 operations

If the main thread was interrupted during
ExoPlayerImplInternal.blockingSendMessage/release, the interrupted flag was
immediately set but then wait() was called on the next iteration. wait() would
immediately throw InterruptedException, causing the main thread to spin until
the blocking operation completed.

Instead of resetting the flag immediately, reset it after the blocking
operation completes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165426493
---
 .../android/exoplayer2/ExoPlayerImplInternal.java  | 14 ++++++++++++--
 1 file changed, 12 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 a789dbc1b26..b8274126b59 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
@@ -263,13 +263,18 @@ public synchronized void blockingSendMessages(ExoPlayerMessage... messages) {
     }
     int messageNumber = customMessagesSent++;
     handler.obtainMessage(MSG_CUSTOM, messages).sendToTarget();
+    boolean wasInterrupted = false;
     while (customMessagesProcessed <= messageNumber) {
       try {
         wait();
       } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
+        wasInterrupted = true;
       }
     }
+    if (wasInterrupted) {
+      // Restore the interrupted status.
+      Thread.currentThread().interrupt();
+    }
   }
 
   public synchronized void release() {
@@ -277,13 +282,18 @@ public synchronized void release() {
       return;
     }
     handler.sendEmptyMessage(MSG_RELEASE);
+    boolean wasInterrupted = false;
     while (!released) {
       try {
         wait();
       } catch (InterruptedException e) {
-        Thread.currentThread().interrupt();
+        wasInterrupted = true;
       }
     }
+    if (wasInterrupted) {
+      // Restore the interrupted status.
+      Thread.currentThread().interrupt();
+    }
     internalPlaybackThread.quit();
   }
 

From 8e45bd27df2b37be2b3ac9cfda3774698e497a0a Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 16 Aug 2017 07:29:11 -0700
Subject: [PATCH 108/421] Add nullable annotations to Renderer constructors

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165437929
---
 .../exoplayer2/DefaultRenderersFactory.java   | 29 ++++++++++---------
 .../android/exoplayer2/ExoPlayerFactory.java  |  8 +++--
 .../audio/AudioRendererEventListener.java     |  8 +++--
 .../android/exoplayer2/audio/AudioTrack.java  |  5 ++--
 .../audio/MediaCodecAudioRenderer.java        | 21 +++++++-------
 .../mediacodec/MediaCodecRenderer.java        |  6 ++--
 .../video/MediaCodecVideoRenderer.java        | 12 ++++----
 .../video/VideoRendererEventListener.java     |  8 +++--
 8 files changed, 54 insertions(+), 43 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 3e7cb8a68b5..27852f0c156 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,6 +19,7 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.support.annotation.IntDef;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.audio.AudioCapabilities;
 import com.google.android.exoplayer2.audio.AudioProcessor;
@@ -79,7 +80,7 @@ public class DefaultRenderersFactory implements RenderersFactory {
   protected static final int MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY = 50;
 
   private final Context context;
-  private final DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
+  @Nullable private final DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
   private final @ExtensionRendererMode int extensionRendererMode;
   private final long allowedVideoJoiningTimeMs;
 
@@ -96,29 +97,28 @@ public DefaultRenderersFactory(Context context) {
    *     playbacks are not required.
    */
   public DefaultRenderersFactory(Context context,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
     this(context, drmSessionManager, EXTENSION_RENDERER_MODE_OFF);
   }
 
   /**
    * @param context A {@link Context}.
    * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if DRM protected
-   *     playbacks are not required..
+   *     playbacks are not required.
    * @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.
    */
   public DefaultRenderersFactory(Context context,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       @ExtensionRendererMode int extensionRendererMode) {
-    this(context, drmSessionManager, extensionRendererMode,
-        DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS);
+    this(context, drmSessionManager, extensionRendererMode, DEFAULT_ALLOWED_VIDEO_JOINING_TIME_MS);
   }
 
   /**
    * @param context A {@link Context}.
    * @param drmSessionManager An optional {@link DrmSessionManager}. May be null if DRM protected
-   *     playbacks are not required..
+   *     playbacks are not required.
    * @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.
@@ -126,7 +126,7 @@ public DefaultRenderersFactory(Context context,
    *     to seamlessly join an ongoing playback.
    */
   public DefaultRenderersFactory(Context context,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       @ExtensionRendererMode int extensionRendererMode, long allowedVideoJoiningTimeMs) {
     this.context = context;
     this.drmSessionManager = drmSessionManager;
@@ -137,8 +137,8 @@ public DefaultRenderersFactory(Context context,
   @Override
   public Renderer[] createRenderers(Handler eventHandler,
       VideoRendererEventListener videoRendererEventListener,
-      AudioRendererEventListener audioRendererEventListener,
-      TextRenderer.Output textRendererOutput, MetadataRenderer.Output metadataRendererOutput) {
+      AudioRendererEventListener audioRendererEventListener, TextRenderer.Output textRendererOutput,
+      MetadataRenderer.Output metadataRendererOutput) {
     ArrayList<Renderer> renderersList = new ArrayList<>();
     buildVideoRenderers(context, drmSessionManager, allowedVideoJoiningTimeMs,
         eventHandler, videoRendererEventListener, extensionRendererMode, renderersList);
@@ -166,9 +166,10 @@ public Renderer[] createRenderers(Handler eventHandler,
    * @param out An array to which the built renderers should be appended.
    */
   protected void buildVideoRenderers(Context context,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager, long allowedVideoJoiningTimeMs,
-      Handler eventHandler, VideoRendererEventListener eventListener,
-      @ExtensionRendererMode int extensionRendererMode, ArrayList<Renderer> out) {
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      long allowedVideoJoiningTimeMs, Handler eventHandler,
+      VideoRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode,
+      ArrayList<Renderer> out) {
     out.add(new MediaCodecVideoRenderer(context, MediaCodecSelector.DEFAULT,
         allowedVideoJoiningTimeMs, drmSessionManager, false, eventHandler, eventListener,
         MAX_DROPPED_VIDEO_FRAME_COUNT_TO_NOTIFY));
@@ -211,7 +212,7 @@ protected void buildVideoRenderers(Context context,
    * @param out An array to which the built renderers should be appended.
    */
   protected void buildAudioRenderers(Context context,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       AudioProcessor[] audioProcessors, Handler eventHandler,
       AudioRendererEventListener eventListener, @ExtensionRendererMode int extensionRendererMode,
       ArrayList<Renderer> out) {
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 97a310c3da3..b647e541bc4 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
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2;
 
 import android.content.Context;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
@@ -54,7 +55,8 @@ public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector t
    */
   @Deprecated
   public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector trackSelector,
-      LoadControl loadControl, DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
+      LoadControl loadControl,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager) {
     RenderersFactory renderersFactory = new DefaultRenderersFactory(context, drmSessionManager);
     return newSimpleInstance(renderersFactory, trackSelector, loadControl);
   }
@@ -74,7 +76,7 @@ public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector t
    */
   @Deprecated
   public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector trackSelector,
-      LoadControl loadControl, DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      LoadControl loadControl, @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode) {
     RenderersFactory renderersFactory = new DefaultRenderersFactory(context, drmSessionManager,
         extensionRendererMode);
@@ -98,7 +100,7 @@ public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector t
    */
   @Deprecated
   public static SimpleExoPlayer newSimpleInstance(Context context, TrackSelector trackSelector,
-      LoadControl loadControl, DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      LoadControl loadControl, @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       @DefaultRenderersFactory.ExtensionRendererMode int extensionRendererMode,
       long allowedVideoJoiningTimeMs) {
     RenderersFactory renderersFactory = new DefaultRenderersFactory(context, drmSessionManager,
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 612018917bc..5f9f599f017 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,6 +17,7 @@
 
 import android.os.Handler;
 import android.os.SystemClock;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.Renderer;
@@ -84,15 +85,16 @@ void onAudioDecoderInitialized(String decoderName, long initializedTimestampMs,
    */
   final class EventDispatcher {
 
-    private final Handler handler;
-    private final AudioRendererEventListener listener;
+    @Nullable private final Handler handler;
+    @Nullable private final AudioRendererEventListener listener;
 
     /**
      * @param handler A handler for dispatching events, or null if creating a dummy instance.
      * @param listener The listener to which events should be dispatched, or null if creating a
      *     dummy instance.
      */
-    public EventDispatcher(Handler handler, AudioRendererEventListener listener) {
+    public EventDispatcher(@Nullable Handler handler,
+        @Nullable AudioRendererEventListener listener) {
       this.handler = listener != null ? Assertions.checkNotNull(handler) : null;
       this.listener = listener;
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
index 79cb26bf393..d7ebd69fbf3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
@@ -22,6 +22,7 @@
 import android.media.AudioTimestamp;
 import android.os.ConditionVariable;
 import android.os.SystemClock;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.PlaybackParameters;
@@ -277,7 +278,7 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
    */
   public static boolean failOnSpuriousAudioTimestamp = false;
 
-  private final AudioCapabilities audioCapabilities;
+  @Nullable private final AudioCapabilities audioCapabilities;
   private final ChannelMappingAudioProcessor channelMappingAudioProcessor;
   private final SonicAudioProcessor sonicAudioProcessor;
   private final AudioProcessor[] availableAudioProcessors;
@@ -355,7 +356,7 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
    *     output. May be empty.
    * @param listener Listener for audio track events.
    */
-  public AudioTrack(AudioCapabilities audioCapabilities, AudioProcessor[] audioProcessors,
+  public AudioTrack(@Nullable AudioCapabilities audioCapabilities, AudioProcessor[] audioProcessors,
       Listener listener) {
     this.audioCapabilities = audioCapabilities;
     this.listener = listener;
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 4d97c292ac9..e146238dccc 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
@@ -21,6 +21,7 @@
 import android.media.MediaFormat;
 import android.media.audiofx.Virtualizer;
 import android.os.Handler;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
@@ -72,7 +73,7 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector) {
    *     has obtained the keys necessary to decrypt encrypted regions of the media.
    */
   public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       boolean playClearSamplesWithoutKeys) {
     this(mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys, null, null);
   }
@@ -83,8 +84,8 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
    *     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 MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector, Handler eventHandler,
-      AudioRendererEventListener eventListener) {
+  public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
+      @Nullable Handler eventHandler, @Nullable AudioRendererEventListener eventListener) {
     this(mediaCodecSelector, null, true, eventHandler, eventListener);
   }
 
@@ -102,9 +103,9 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector, Handler ev
    * @param eventListener A listener of events. May be null if delivery of events is not required.
    */
   public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-      boolean playClearSamplesWithoutKeys, Handler eventHandler,
-      AudioRendererEventListener eventListener) {
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys, @Nullable Handler eventHandler,
+      @Nullable AudioRendererEventListener eventListener) {
     this(mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys, eventHandler,
         eventListener, null);
   }
@@ -127,10 +128,10 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
    *     output.
    */
   public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-      boolean playClearSamplesWithoutKeys, Handler eventHandler,
-      AudioRendererEventListener eventListener, AudioCapabilities audioCapabilities,
-      AudioProcessor... audioProcessors) {
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys, @Nullable Handler eventHandler,
+      @Nullable AudioRendererEventListener eventListener,
+      @Nullable AudioCapabilities audioCapabilities, AudioProcessor... audioProcessors) {
     super(C.TRACK_TYPE_AUDIO, mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys);
     audioTrack = new AudioTrack(audioCapabilities, audioProcessors, new AudioTrackListener());
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
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 7c0549de25a..31c6a824ef5 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
@@ -169,7 +169,7 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
   private static final int ADAPTATION_WORKAROUND_SLICE_WIDTH_HEIGHT = 32;
 
   private final MediaCodecSelector mediaCodecSelector;
-  private final DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
+  @Nullable private final DrmSessionManager<FrameworkMediaCrypto> drmSessionManager;
   private final boolean playClearSamplesWithoutKeys;
   private final DecoderInputBuffer buffer;
   private final DecoderInputBuffer flagsOnlyBuffer;
@@ -223,7 +223,7 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
    *     has obtained the keys necessary to decrypt encrypted regions of the media.
    */
   public MediaCodecRenderer(int trackType, MediaCodecSelector mediaCodecSelector,
-      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
       boolean playClearSamplesWithoutKeys) {
     super(trackType);
     Assertions.checkState(Util.SDK_INT >= 16);
@@ -1090,7 +1090,7 @@ private boolean shouldSkipOutputBuffer(long presentationTimeUs) {
    * @param drmInitData {@link DrmInitData} of the format to check for support.
    * @return Whether the encryption scheme is supported, or true if {@code drmInitData} is null.
    */
-  private static boolean isDrmSchemeSupported(DrmSessionManager drmSessionManager,
+  private static boolean isDrmSchemeSupported(@Nullable DrmSessionManager drmSessionManager,
       @Nullable DrmInitData drmInitData) {
     if (drmInitData == null) {
       // Content is unencrypted.
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 9a2927cc3f4..8fe3476351a 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
@@ -26,6 +26,7 @@
 import android.os.Handler;
 import android.os.SystemClock;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import android.util.Log;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
@@ -137,8 +138,8 @@ public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSel
    *     invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
    */
   public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector,
-      long allowedJoiningTimeMs, Handler eventHandler, VideoRendererEventListener eventListener,
-      int maxDroppedFrameCountToNotify) {
+      long allowedJoiningTimeMs, @Nullable Handler eventHandler,
+      @Nullable VideoRendererEventListener eventListener, int maxDroppedFrameCountToNotify) {
     this(context, mediaCodecSelector, allowedJoiningTimeMs, null, false, eventHandler,
         eventListener, maxDroppedFrameCountToNotify);
   }
@@ -162,9 +163,10 @@ public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSel
    *     invocations of {@link VideoRendererEventListener#onDroppedFrames(int, long)}.
    */
   public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector,
-      long allowedJoiningTimeMs, DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
-      boolean playClearSamplesWithoutKeys, Handler eventHandler,
-      VideoRendererEventListener eventListener, int maxDroppedFramesToNotify) {
+      long allowedJoiningTimeMs,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys, @Nullable Handler eventHandler,
+      @Nullable VideoRendererEventListener eventListener, int maxDroppedFramesToNotify) {
     super(C.TRACK_TYPE_VIDEO, mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys);
     this.allowedJoiningTimeMs = allowedJoiningTimeMs;
     this.maxDroppedFramesToNotify = maxDroppedFramesToNotify;
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 53d6a76b8db..d6ea0ebae29 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,6 +17,7 @@
 
 import android.os.Handler;
 import android.os.SystemClock;
+import android.support.annotation.Nullable;
 import android.view.Surface;
 import android.view.TextureView;
 import com.google.android.exoplayer2.Format;
@@ -109,15 +110,16 @@ void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
    */
   final class EventDispatcher {
 
-    private final Handler handler;
-    private final VideoRendererEventListener listener;
+    @Nullable private final Handler handler;
+    @Nullable private final VideoRendererEventListener listener;
 
     /**
      * @param handler A handler for dispatching events, or null if creating a dummy instance.
      * @param listener The listener to which events should be dispatched, or null if creating a
      *     dummy instance.
      */
-    public EventDispatcher(Handler handler, VideoRendererEventListener listener) {
+    public EventDispatcher(@Nullable Handler handler,
+        @Nullable VideoRendererEventListener listener) {
       this.handler = listener != null ? Assertions.checkNotNull(handler) : null;
       this.listener = listener;
     }

From 978019a1a383eb4c87a3a628597a8c4df35ec433 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 16 Aug 2017 08:45:10 -0700
Subject: [PATCH 109/421] Add ProgressiveDownloadAction

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165447436
---
 .../ProgressiveDownloadActionTest.java        | 126 ++++++++++++++++++
 1 file changed, 126 insertions(+)
 create mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
new file mode 100644
index 00000000000..b172b7692af
--- /dev/null
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
@@ -0,0 +1,126 @@
+/*
+ * 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.test.InstrumentationTestCase;
+import com.google.android.exoplayer2.offline.DownloadAction.Serializer;
+import com.google.android.exoplayer2.testutil.TestUtil;
+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 org.mockito.Mockito;
+
+/**
+ * Unit tests for {@link ProgressiveDownloadAction}.
+ */
+public class ProgressiveDownloadActionTest extends InstrumentationTestCase {
+
+  public void testDownloadActionIsNotRemoveAction() throws Exception {
+    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
+    assertFalse(action.isRemoveAction());
+  }
+
+  public void testRemoveActionIsRemoveAction() throws Exception {
+    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
+    assertTrue(action2.isRemoveAction());
+  }
+
+  public void testCreateDownloader() throws Exception {
+    TestUtil.setUpMockito(this);
+    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
+    DownloaderConstructorHelper constructorHelper = new DownloaderConstructorHelper(
+        Mockito.mock(Cache.class), DummyDataSource.FACTORY);
+    assertNotNull(action.createDownloader(constructorHelper));
+  }
+
+  public void testSameUriCacheKeyDifferentAction_IsSameMedia() throws Exception {
+    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, false);
+    assertTrue(action1.isSameMedia(action2));
+  }
+
+  public void testNullCacheKeyDifferentUriAction_IsNotSameMedia() throws Exception {
+    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri2", null, true);
+    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, false);
+    assertFalse(action3.isSameMedia(action4));
+  }
+
+  public void testSameCacheKeyDifferentUriAction_IsSameMedia() throws Exception {
+    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri2", "key", true);
+    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", "key", false);
+    assertTrue(action5.isSameMedia(action6));
+  }
+
+  public void testSameUriDifferentCacheKeyAction_IsNotSameMedia() throws Exception {
+    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
+    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", false);
+    assertFalse(action7.isSameMedia(action8));
+  }
+
+  public void testEquals() throws Exception {
+    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
+    assertTrue(action1.equals(action1));
+
+    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri", null, true);
+    assertTrue(action2.equals(action3));
+
+    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri", null, false);
+    assertFalse(action4.equals(action5));
+
+    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
+    assertFalse(action6.equals(action7));
+
+    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", true);
+    ProgressiveDownloadAction action9 = new ProgressiveDownloadAction("uri", "key", true);
+    assertFalse(action8.equals(action9));
+
+    ProgressiveDownloadAction action10 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action11 = new ProgressiveDownloadAction("uri2", null, true);
+    assertFalse(action10.equals(action11));
+  }
+
+  public void testSerializerGetType() throws Exception {
+    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
+    Serializer serializer = action.getSerializer();
+    assertNotNull(serializer.getType());
+  }
+
+  public void testSerializerWriteRead() throws Exception {
+    doTestSerializationRoundtrip(new ProgressiveDownloadAction("uri1", null, false));
+    doTestSerializationRoundtrip(new ProgressiveDownloadAction("uri2", "key", true));
+  }
+
+  private void doTestSerializationRoundtrip(ProgressiveDownloadAction action1) throws IOException {
+    Serializer serializer = action1.getSerializer();
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    DataOutputStream output = new DataOutputStream(out);
+    serializer.writeToStream(output, action1);
+
+    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+    DataInputStream input = new DataInputStream(in);
+    DownloadAction action2 = serializer.readFromStream(input);
+
+    assertEquals(action1, action2);
+  }
+
+}

From c2d2d967e93a1156e3c4c5e218d5193e2ec99967 Mon Sep 17 00:00:00 2001
From: zhihuichen <zhihuichen@google.com>
Date: Wed, 16 Aug 2017 14:38:57 -0700
Subject: [PATCH 110/421] Refactor DrmSession part into a separate class to
 prepare for multi session scenario. NO_SQ=flaky

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165497666
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 546 ++++++++++++++++++
 .../drm/DefaultDrmSessionManager.java         | 453 +--------------
 2 files changed, 561 insertions(+), 438 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java

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
new file mode 100644
index 00000000000..cfb2cf9d8aa
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DefaultDrmSession.java
@@ -0,0 +1,546 @@
+/*
+ * 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.drm;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.media.DeniedByServerException;
+import android.media.MediaDrm;
+import android.media.NotProvisionedException;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.Looper;
+import android.os.Message;
+import android.util.Log;
+import android.util.Pair;
+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.OnEventListener;
+import com.google.android.exoplayer2.drm.ExoMediaDrm.ProvisionRequest;
+import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * A {@link DrmSession} that supports playbacks using {@link MediaDrm}.
+ */
+@TargetApi(18)
+/* package */ class DefaultDrmSession<T extends ExoMediaCrypto> implements DrmSession<T> {
+  private static final String TAG = "DefaultDrmSession";
+
+  private static final String CENC_SCHEME_MIME_TYPE = "cenc";
+
+  private static final int MSG_PROVISION = 0;
+  private static final int MSG_KEYS = 1;
+
+  private static final int MAX_LICENSE_DURATION_TO_RENEW = 60;
+
+  private final Handler eventHandler;
+  private final DefaultDrmSessionManager.EventListener eventListener;
+  private final ExoMediaDrm<T> mediaDrm;
+  private final HashMap<String, String> optionalKeyRequestParameters;
+  /* package */ final MediaDrmCallback callback;
+  /* package */ final UUID uuid;
+  /* package */ MediaDrmHandler mediaDrmHandler;
+  /* package */ PostResponseHandler postResponseHandler;
+  private HandlerThread requestHandlerThread;
+  private Handler postRequestHandler;
+
+  @DefaultDrmSessionManager.Mode
+  private final int mode;
+  private int openCount;
+  private boolean provisioningInProgress;
+  @DrmSession.State
+  private int state;
+  private T mediaCrypto;
+  private DrmSessionException lastException;
+  private final byte[] schemeInitData;
+  private final String schemeMimeType;
+  private byte[] sessionId;
+  private byte[] offlineLicenseKeySetId;
+
+  /**
+   * Instantiates a new DRM session.
+   *
+   * @param uuid The UUID of the drm scheme.
+   * @param mediaDrm The media DRM.
+   * @param initData The DRM init data.
+   * @param mode The DRM mode.
+   * @param offlineLicenseKeySetId The offlineLicense KeySetId.
+   * @param optionalKeyRequestParameters The optional key request parameters.
+   * @param callback The media DRM callback.
+   * @param playbackLooper The playback looper.
+   * @param eventHandler The handler to post listener events.
+   * @param eventListener The DRM session manager event listener.
+   */
+  public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm, DrmInitData initData,
+      @DefaultDrmSessionManager.Mode int mode, byte[] offlineLicenseKeySetId,
+      HashMap<String, String> optionalKeyRequestParameters, MediaDrmCallback callback,
+      Looper playbackLooper, Handler eventHandler,
+      DefaultDrmSessionManager.EventListener eventListener) {
+    this.uuid = uuid;
+    this.mediaDrm = mediaDrm;
+    this.mode = mode;
+    this.offlineLicenseKeySetId = offlineLicenseKeySetId;
+    this.optionalKeyRequestParameters = optionalKeyRequestParameters;
+    this.callback = callback;
+
+    this.eventHandler = eventHandler;
+    this.eventListener = eventListener;
+    state = STATE_OPENING;
+
+    mediaDrmHandler = new MediaDrmHandler(playbackLooper);
+    mediaDrm.setOnEventListener(new MediaDrmEventListener());
+    postResponseHandler = new PostResponseHandler(playbackLooper);
+    requestHandlerThread = new HandlerThread("DrmRequestHandler");
+    requestHandlerThread.start();
+    postRequestHandler = new PostRequestHandler(requestHandlerThread.getLooper());
+
+    // Parse init data.
+    byte[] schemeInitData = null;
+    String schemeMimeType = null;
+    if (offlineLicenseKeySetId == null) {
+      SchemeData data = getSchemeData(initData, uuid);
+      if (data == null) {
+        onError(new IllegalStateException("Media does not support uuid: " + uuid));
+      } else {
+        schemeInitData = data.data;
+        schemeMimeType = data.mimeType;
+        if (Util.SDK_INT < 21) {
+          // Prior to L the Widevine CDM required data to be extracted from the PSSH atom.
+          byte[] psshData = PsshAtomUtil.parseSchemeSpecificData(schemeInitData, uuid);
+          if (psshData == null) {
+            // Extraction failed. schemeData isn't a Widevine PSSH atom, so leave it unchanged.
+          } else {
+            schemeInitData = psshData;
+          }
+        }
+        if (Util.SDK_INT < 26 && C.CLEARKEY_UUID.equals(uuid)
+            && (MimeTypes.VIDEO_MP4.equals(schemeMimeType)
+            || MimeTypes.AUDIO_MP4.equals(schemeMimeType))) {
+          // Prior to API level 26 the ClearKey CDM only accepted "cenc" as the scheme for MP4.
+          schemeMimeType = CENC_SCHEME_MIME_TYPE;
+        }
+      }
+    }
+    this.schemeInitData = schemeInitData;
+    this.schemeMimeType = schemeMimeType;
+  }
+
+  // Life cycle.
+
+  public void acquire() {
+    if (++openCount == 1) {
+      if (state == STATE_ERROR) {
+        return;
+      }
+      if (openInternal(true)) {
+        doLicense();
+      }
+    }
+  }
+
+  /**
+   * @return True if the session is closed and cleaned up, false otherwise.
+   */
+  public boolean release() {
+    if (--openCount == 0) {
+      state = STATE_RELEASED;
+      provisioningInProgress = false;
+      mediaDrmHandler.removeCallbacksAndMessages(null);
+      mediaDrmHandler = null;
+      postResponseHandler.removeCallbacksAndMessages(null);
+      postRequestHandler.removeCallbacksAndMessages(null);
+      postRequestHandler = null;
+      requestHandlerThread.quit();
+      requestHandlerThread = null;
+      mediaCrypto = null;
+      lastException = null;
+      if (sessionId != null) {
+        mediaDrm.closeSession(sessionId);
+        sessionId = null;
+      }
+      return true;
+    }
+    return false;
+  }
+
+  // DrmSession Implementation.
+
+  @Override
+  @DrmSession.State
+  public final int getState() {
+    return state;
+  }
+
+  @Override
+  public final DrmSessionException getError() {
+    return state == STATE_ERROR ? lastException : null;
+  }
+
+  @Override
+  public final T getMediaCrypto() {
+    return mediaCrypto;
+  }
+
+  @Override
+  public Map<String, String> queryKeyStatus() {
+    return sessionId == null ? null : mediaDrm.queryKeyStatus(sessionId);
+  }
+
+  @Override
+  public 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.
+   */
+  private boolean openInternal(boolean allowProvisioning) {
+    if (isOpen()) {
+      // Already opened
+      return true;
+    }
+
+    try {
+      sessionId = mediaDrm.openSession();
+      mediaCrypto = mediaDrm.createMediaCrypto(uuid, sessionId);
+      state = STATE_OPENED;
+      return true;
+    } catch (NotProvisionedException e) {
+      if (allowProvisioning) {
+        postProvisionRequest();
+      } else {
+        onError(e);
+      }
+    } catch (Exception e) {
+      // MediaCryptoException
+      // ResourceBusyException only available on 19+
+      onError(e);
+    }
+
+    return false;
+  }
+
+  private void postProvisionRequest() {
+    if (provisioningInProgress) {
+      return;
+    }
+    provisioningInProgress = true;
+    ProvisionRequest request = mediaDrm.getProvisionRequest();
+    postRequestHandler.obtainMessage(MSG_PROVISION, request).sendToTarget();
+  }
+
+  private void onProvisionResponse(Object response) {
+    provisioningInProgress = false;
+    if (state != STATE_OPENING && !isOpen()) {
+      // This event is stale.
+      return;
+    }
+
+    if (response instanceof Exception) {
+      onError((Exception) response);
+      return;
+    }
+
+    try {
+      mediaDrm.provideProvisionResponse((byte[]) response);
+      if (openInternal(false)) {
+        doLicense();
+      }
+    } catch (DeniedByServerException e) {
+      onError(e);
+    }
+  }
+
+  private void doLicense() {
+    switch (mode) {
+      case DefaultDrmSessionManager.MODE_PLAYBACK:
+      case DefaultDrmSessionManager.MODE_QUERY:
+        if (offlineLicenseKeySetId == null) {
+          postKeyRequest(MediaDrm.KEY_TYPE_STREAMING);
+        } else {
+          if (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(MediaDrm.KEY_TYPE_OFFLINE);
+            } else if (licenseDurationRemainingSec <= 0) {
+              onError(new KeysExpiredException());
+            } else {
+              state = STATE_OPENED_WITH_KEYS;
+              if (eventHandler != null && eventListener != null) {
+                eventHandler.post(new Runnable() {
+                  @Override
+                  public void run() {
+                    eventListener.onDrmKeysRestored();
+                  }
+                });
+              }
+            }
+          }
+        }
+        break;
+      case DefaultDrmSessionManager.MODE_DOWNLOAD:
+        if (offlineLicenseKeySetId == null) {
+          postKeyRequest(MediaDrm.KEY_TYPE_OFFLINE);
+        } else {
+          // Renew
+          if (restoreKeys()) {
+            postKeyRequest(MediaDrm.KEY_TYPE_OFFLINE);
+          }
+        }
+        break;
+      case DefaultDrmSessionManager.MODE_RELEASE:
+        // 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(MediaDrm.KEY_TYPE_RELEASE);
+        }
+        break;
+    }
+  }
+
+  private boolean restoreKeys() {
+    try {
+      mediaDrm.restoreKeys(sessionId, offlineLicenseKeySetId);
+      return true;
+    } catch (Exception e) {
+      Log.e(TAG, "Error trying to restore Widevine keys.", e);
+      onError(e);
+    }
+    return false;
+  }
+
+  private long getLicenseDurationRemainingSec() {
+    if (!C.WIDEVINE_UUID.equals(uuid)) {
+      return Long.MAX_VALUE;
+    }
+    Pair<Long, Long> pair = WidevineUtil.getLicenseDurationRemainingSec(this);
+    return Math.min(pair.first, pair.second);
+  }
+
+  private void postKeyRequest(int type) {
+    byte[] scope = type == MediaDrm.KEY_TYPE_RELEASE ? offlineLicenseKeySetId : sessionId;
+    try {
+      KeyRequest request = mediaDrm.getKeyRequest(scope, schemeInitData, schemeMimeType, type,
+          optionalKeyRequestParameters);
+      postRequestHandler.obtainMessage(MSG_KEYS, request).sendToTarget();
+    } catch (Exception e) {
+      onKeysError(e);
+    }
+  }
+
+  private void onKeyResponse(Object response) {
+    if (!isOpen()) {
+      // This event is stale.
+      return;
+    }
+
+    if (response instanceof Exception) {
+      onKeysError((Exception) response);
+      return;
+    }
+
+    try {
+      if (mode == DefaultDrmSessionManager.MODE_RELEASE) {
+        mediaDrm.provideKeyResponse(offlineLicenseKeySetId, (byte[]) response);
+        if (eventHandler != null && eventListener != null) {
+          eventHandler.post(new Runnable() {
+            @Override
+            public void run() {
+              eventListener.onDrmKeysRemoved();
+            }
+          });
+        }
+      } else {
+        byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, (byte[]) response);
+        if ((mode == DefaultDrmSessionManager.MODE_DOWNLOAD
+            || (mode == DefaultDrmSessionManager.MODE_PLAYBACK && offlineLicenseKeySetId != null))
+            && keySetId != null && keySetId.length != 0) {
+          offlineLicenseKeySetId = keySetId;
+        }
+        state = STATE_OPENED_WITH_KEYS;
+        if (eventHandler != null && eventListener != null) {
+          eventHandler.post(new Runnable() {
+            @Override
+            public void run() {
+              eventListener.onDrmKeysLoaded();
+            }
+          });
+        }
+      }
+    } catch (Exception e) {
+      onKeysError(e);
+    }
+  }
+
+  private void onKeysExpired() {
+    if (state == STATE_OPENED_WITH_KEYS) {
+      state = STATE_OPENED;
+      onError(new KeysExpiredException());
+    }
+  }
+
+  private void onKeysError(Exception e) {
+    if (e instanceof NotProvisionedException) {
+      postProvisionRequest();
+    } else {
+      onError(e);
+    }
+  }
+
+  private void onError(final Exception e) {
+    lastException = new DrmSessionException(e);
+    if (eventHandler != null && eventListener != null) {
+      eventHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          eventListener.onDrmSessionManagerError(e);
+        }
+      });
+    }
+    if (state != STATE_OPENED_WITH_KEYS) {
+      state = STATE_ERROR;
+    }
+  }
+
+  private boolean isOpen() {
+    return state == STATE_OPENED || state == STATE_OPENED_WITH_KEYS;
+  }
+
+  @SuppressLint("HandlerLeak")
+  private class MediaDrmHandler extends Handler {
+
+    public MediaDrmHandler(Looper looper) {
+      super(looper);
+    }
+
+    @SuppressWarnings("deprecation")
+    @Override
+    public void handleMessage(Message msg) {
+      if (!isOpen()) {
+        return;
+      }
+      switch (msg.what) {
+        case MediaDrm.EVENT_KEY_REQUIRED:
+          doLicense();
+          break;
+        case MediaDrm.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 MediaDrm.EVENT_PROVISION_REQUIRED:
+          state = STATE_OPENED;
+          postProvisionRequest();
+          break;
+      }
+    }
+
+  }
+
+  private class MediaDrmEventListener implements OnEventListener<T> {
+
+    @Override
+    public void onEvent(ExoMediaDrm<? extends T> md, byte[] sessionId, int event, int extra,
+        byte[] data) {
+      if (mode == DefaultDrmSessionManager.MODE_PLAYBACK) {
+        mediaDrmHandler.sendEmptyMessage(event);
+      }
+    }
+
+  }
+
+  @SuppressLint("HandlerLeak")
+  private class PostResponseHandler extends Handler {
+
+    public PostResponseHandler(Looper looper) {
+      super(looper);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+      switch (msg.what) {
+        case MSG_PROVISION:
+          onProvisionResponse(msg.obj);
+          break;
+        case MSG_KEYS:
+          onKeyResponse(msg.obj);
+          break;
+      }
+    }
+
+  }
+
+  @SuppressLint("HandlerLeak")
+  private class PostRequestHandler extends Handler {
+
+    public PostRequestHandler(Looper backgroundLooper) {
+      super(backgroundLooper);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+      Object response;
+      try {
+        switch (msg.what) {
+          case MSG_PROVISION:
+            response = callback.executeProvisionRequest(uuid, (ProvisionRequest) msg.obj);
+            break;
+          case MSG_KEYS:
+            response = callback.executeKeyRequest(uuid, (KeyRequest) msg.obj);
+            break;
+          default:
+            throw new RuntimeException();
+        }
+      } catch (Exception e) {
+        response = e;
+      }
+      postResponseHandler.obtainMessage(msg.what, response).sendToTarget();
+    }
+
+  }
+
+  /**
+   * Extracts {@link SchemeData} suitable for the given DRM scheme {@link UUID}.
+   *
+   * @param drmInitData The {@link DrmInitData} from which to extract the {@link SchemeData}.
+   * @param uuid The UUID of the scheme.
+   * @return The extracted {@link SchemeData}, or null if no suitable data is present.
+   */
+  public static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid) {
+    SchemeData schemeData = drmInitData.get(uuid);
+    if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
+      // If present, the Common PSSH box should be used for ClearKey.
+      schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
+    }
+    return 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 69403a90a6d..25a73a67c19 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
@@ -15,41 +15,27 @@
  */
 package com.google.android.exoplayer2.drm;
 
-import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.media.DeniedByServerException;
 import android.media.MediaDrm;
-import android.media.NotProvisionedException;
 import android.os.Handler;
-import android.os.HandlerThread;
 import android.os.Looper;
-import android.os.Message;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
-import android.util.Log;
-import android.util.Pair;
 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.OnEventListener;
-import com.google.android.exoplayer2.drm.ExoMediaDrm.ProvisionRequest;
-import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 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.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.HashMap;
-import java.util.Map;
 import java.util.UUID;
 
 /**
  * A {@link DrmSessionManager} that supports playbacks using {@link MediaDrm}.
  */
 @TargetApi(18)
-public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>,
-    DrmSession<T> {
+public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T> {
 
   /**
    * Listener of {@link DefaultDrmSessionManager} events.
@@ -95,8 +81,7 @@ public interface EventListener {
    */
   public static final int MODE_PLAYBACK = 0;
   /**
-   * Restores an offline license to allow its status to be queried. If the offline license is
-   * expired sets state to {@link #STATE_ERROR}.
+   * Restores an offline license to allow its status to be queried.
    */
   public static final int MODE_QUERY = 1;
   /** Downloads an offline license or renews an existing one. */
@@ -104,40 +89,18 @@ public interface EventListener {
   /** Releases an existing offline license. */
   public static final int MODE_RELEASE = 3;
 
-  private static final String TAG = "OfflineDrmSessionMngr";
-  private static final String CENC_SCHEME_MIME_TYPE = "cenc";
-
-  private static final int MSG_PROVISION = 0;
-  private static final int MSG_KEYS = 1;
-
-  private static final int MAX_LICENSE_DURATION_TO_RENEW = 60;
-
   private final Handler eventHandler;
   private final EventListener eventListener;
   private final ExoMediaDrm<T> mediaDrm;
   private final HashMap<String, String> optionalKeyRequestParameters;
 
-  /* package */ final MediaDrmCallback callback;
-  /* package */ final UUID uuid;
-
-  /* package */ MediaDrmHandler mediaDrmHandler;
-  /* package */ PostResponseHandler postResponseHandler;
+  private final MediaDrmCallback callback;
+  private final UUID uuid;
 
   private Looper playbackLooper;
-  private HandlerThread requestHandlerThread;
-  private Handler postRequestHandler;
-
   private int mode;
-  private int openCount;
-  private boolean provisioningInProgress;
-  @DrmSession.State
-  private int state;
-  private T mediaCrypto;
-  private DrmSessionException lastException;
-  private byte[] schemeInitData;
-  private String schemeMimeType;
-  private byte[] sessionId;
   private byte[] offlineLicenseKeySetId;
+  private DefaultDrmSession<T> session;
 
   /**
    * Instantiates a new instance using the Widevine scheme.
@@ -224,7 +187,6 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
     this.optionalKeyRequestParameters = optionalKeyRequestParameters;
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
-    mediaDrm.setOnEventListener(new MediaDrmEventListener());
     mode = MODE_PLAYBACK;
   }
 
@@ -299,7 +261,7 @@ public final void setPropertyByteArray(String key, byte[] value) {
    * @param offlineLicenseKeySetId The key set id of the license to be used with the given mode.
    */
   public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
-    Assertions.checkState(openCount == 0);
+    Assertions.checkState(session == null);
     if (mode == MODE_QUERY || mode == MODE_RELEASE) {
       Assertions.checkNotNull(offlineLicenseKeySetId);
     }
@@ -311,7 +273,7 @@ public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
 
   @Override
   public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
-    SchemeData schemeData = getSchemeData(drmInitData);
+    SchemeData schemeData = DefaultDrmSession.getSchemeData(drmInitData, uuid);
     if (schemeData == null) {
       // No data for this manager's scheme.
       return false;
@@ -332,407 +294,22 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
   @Override
   public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitData) {
     Assertions.checkState(this.playbackLooper == null || this.playbackLooper == playbackLooper);
-    if (++openCount != 1) {
-      return this;
-    }
-
-    if (this.playbackLooper == null) {
+    if (session == null) {
       this.playbackLooper = playbackLooper;
-      mediaDrmHandler = new MediaDrmHandler(playbackLooper);
-      postResponseHandler = new PostResponseHandler(playbackLooper);
+      session = new DefaultDrmSession<T>(uuid, mediaDrm, drmInitData, mode, offlineLicenseKeySetId,
+          optionalKeyRequestParameters, callback, playbackLooper, eventHandler, eventListener);
     }
 
-    requestHandlerThread = new HandlerThread("DrmRequestHandler");
-    requestHandlerThread.start();
-    postRequestHandler = new PostRequestHandler(requestHandlerThread.getLooper());
-
-    if (offlineLicenseKeySetId == null) {
-      SchemeData schemeData = getSchemeData(drmInitData);
-      if (schemeData == null) {
-        onError(new IllegalStateException("Media does not support uuid: " + uuid));
-        return this;
-      }
-      schemeInitData = schemeData.data;
-      schemeMimeType = schemeData.mimeType;
-      if (Util.SDK_INT < 21) {
-        // Prior to L the Widevine CDM required data to be extracted from the PSSH atom.
-        byte[] psshData = PsshAtomUtil.parseSchemeSpecificData(schemeInitData, C.WIDEVINE_UUID);
-        if (psshData == null) {
-          // Extraction failed. schemeData isn't a Widevine PSSH atom, so leave it unchanged.
-        } else {
-          schemeInitData = psshData;
-        }
-      }
-      if (Util.SDK_INT < 26 && C.CLEARKEY_UUID.equals(uuid)
-          && (MimeTypes.VIDEO_MP4.equals(schemeMimeType)
-          || MimeTypes.AUDIO_MP4.equals(schemeMimeType))) {
-        // Prior to API level 26 the ClearKey CDM only accepted "cenc" as the scheme for MP4.
-        schemeMimeType = CENC_SCHEME_MIME_TYPE;
-      }
-    }
-    state = STATE_OPENING;
-    openInternal(true);
-    return this;
+    session.acquire();
+    return session;
   }
 
   @Override
   public void releaseSession(DrmSession<T> session) {
-    if (--openCount != 0) {
-      return;
-    }
-    state = STATE_RELEASED;
-    provisioningInProgress = false;
-    mediaDrmHandler.removeCallbacksAndMessages(null);
-    postResponseHandler.removeCallbacksAndMessages(null);
-    postRequestHandler.removeCallbacksAndMessages(null);
-    postRequestHandler = null;
-    requestHandlerThread.quit();
-    requestHandlerThread = null;
-    schemeInitData = null;
-    schemeMimeType = null;
-    mediaCrypto = null;
-    lastException = null;
-    if (sessionId != null) {
-      mediaDrm.closeSession(sessionId);
-      sessionId = null;
-    }
-  }
-
-  // DrmSession implementation.
-
-  @Override
-  @DrmSession.State
-  public final int getState() {
-    return state;
-  }
-
-  @Override
-  public final DrmSessionException getError() {
-    return state == STATE_ERROR ? lastException : null;
-  }
-
-  @Override
-  public final T getMediaCrypto() {
-    return mediaCrypto;
-  }
-
-  @Override
-  public Map<String, String> queryKeyStatus() {
-    return sessionId == null ? null : mediaDrm.queryKeyStatus(sessionId);
-  }
-
-  @Override
-  public byte[] getOfflineLicenseKeySetId() {
-    return offlineLicenseKeySetId;
-  }
-
-  // Internal methods.
-
-  private void openInternal(boolean allowProvisioning) {
-    try {
-      sessionId = mediaDrm.openSession();
-      mediaCrypto = mediaDrm.createMediaCrypto(uuid, sessionId);
-      state = STATE_OPENED;
-      doLicense();
-    } catch (NotProvisionedException e) {
-      if (allowProvisioning) {
-        postProvisionRequest();
-      } else {
-        onError(e);
-      }
-    } catch (Exception e) {
-      onError(e);
-    }
-  }
-
-  private void postProvisionRequest() {
-    if (provisioningInProgress) {
-      return;
-    }
-    provisioningInProgress = true;
-    ProvisionRequest request = mediaDrm.getProvisionRequest();
-    postRequestHandler.obtainMessage(MSG_PROVISION, request).sendToTarget();
-  }
-
-  private void onProvisionResponse(Object response) {
-    provisioningInProgress = false;
-    if (state != STATE_OPENING && state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS) {
-      // This event is stale.
-      return;
-    }
-
-    if (response instanceof Exception) {
-      onError((Exception) response);
-      return;
-    }
-
-    try {
-      mediaDrm.provideProvisionResponse((byte[]) response);
-      if (state == STATE_OPENING) {
-        openInternal(false);
-      } else {
-        doLicense();
-      }
-    } catch (DeniedByServerException e) {
-      onError(e);
-    }
-  }
-
-  private void doLicense() {
-    switch (mode) {
-      case MODE_PLAYBACK:
-      case MODE_QUERY:
-        if (offlineLicenseKeySetId == null) {
-          postKeyRequest(sessionId, MediaDrm.KEY_TYPE_STREAMING);
-        } else {
-          if (restoreKeys()) {
-            long licenseDurationRemainingSec = getLicenseDurationRemainingSec();
-            if (mode == MODE_PLAYBACK
-                && licenseDurationRemainingSec <= MAX_LICENSE_DURATION_TO_RENEW) {
-              Log.d(TAG, "Offline license has expired or will expire soon. "
-                  + "Remaining seconds: " + licenseDurationRemainingSec);
-              postKeyRequest(sessionId, MediaDrm.KEY_TYPE_OFFLINE);
-            } else if (licenseDurationRemainingSec <= 0) {
-              onError(new KeysExpiredException());
-            } else {
-              state = STATE_OPENED_WITH_KEYS;
-              if (eventHandler != null && eventListener != null) {
-                eventHandler.post(new Runnable() {
-                  @Override
-                  public void run() {
-                    eventListener.onDrmKeysRestored();
-                  }
-                });
-              }
-            }
-          }
-        }
-        break;
-      case MODE_DOWNLOAD:
-        if (offlineLicenseKeySetId == null) {
-          postKeyRequest(sessionId, MediaDrm.KEY_TYPE_OFFLINE);
-        } else {
-          // Renew
-          if (restoreKeys()) {
-            postKeyRequest(sessionId, MediaDrm.KEY_TYPE_OFFLINE);
-          }
-        }
-        break;
-      case MODE_RELEASE:
-        // 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(offlineLicenseKeySetId, MediaDrm.KEY_TYPE_RELEASE);
-        }
-        break;
-    }
-  }
-
-  private boolean restoreKeys() {
-    try {
-      mediaDrm.restoreKeys(sessionId, offlineLicenseKeySetId);
-      return true;
-    } catch (Exception e) {
-      Log.e(TAG, "Error trying to restore Widevine keys.", e);
-      onError(e);
-    }
-    return false;
-  }
-
-  private long getLicenseDurationRemainingSec() {
-    if (!C.WIDEVINE_UUID.equals(uuid)) {
-      return Long.MAX_VALUE;
+    Assertions.checkState(session == this.session);
+    if (this.session.release()) {
+      this.session = null;
     }
-    Pair<Long, Long> pair = WidevineUtil.getLicenseDurationRemainingSec(this);
-    return Math.min(pair.first, pair.second);
-  }
-
-  private void postKeyRequest(byte[] scope, int keyType) {
-    try {
-      KeyRequest keyRequest = mediaDrm.getKeyRequest(scope, schemeInitData, schemeMimeType, keyType,
-          optionalKeyRequestParameters);
-      postRequestHandler.obtainMessage(MSG_KEYS, keyRequest).sendToTarget();
-    } catch (Exception e) {
-      onKeysError(e);
-    }
-  }
-
-  private void onKeyResponse(Object response) {
-    if (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS) {
-      // This event is stale.
-      return;
-    }
-
-    if (response instanceof Exception) {
-      onKeysError((Exception) response);
-      return;
-    }
-
-    try {
-      if (mode == MODE_RELEASE) {
-        mediaDrm.provideKeyResponse(offlineLicenseKeySetId, (byte[]) response);
-        if (eventHandler != null && eventListener != null) {
-          eventHandler.post(new Runnable() {
-            @Override
-            public void run() {
-              eventListener.onDrmKeysRemoved();
-            }
-          });
-        }
-      } else {
-        byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, (byte[]) response);
-        if ((mode == MODE_DOWNLOAD || (mode == MODE_PLAYBACK && offlineLicenseKeySetId != null))
-            && keySetId != null && keySetId.length != 0) {
-          offlineLicenseKeySetId = keySetId;
-        }
-        state = STATE_OPENED_WITH_KEYS;
-        if (eventHandler != null && eventListener != null) {
-          eventHandler.post(new Runnable() {
-            @Override
-            public void run() {
-              eventListener.onDrmKeysLoaded();
-            }
-          });
-        }
-      }
-    } catch (Exception e) {
-      onKeysError(e);
-    }
-  }
-
-  private void onKeysError(Exception e) {
-    if (e instanceof NotProvisionedException) {
-      postProvisionRequest();
-    } else {
-      onError(e);
-    }
-  }
-
-  private void onError(final Exception e) {
-    lastException = new DrmSessionException(e);
-    if (eventHandler != null && eventListener != null) {
-      eventHandler.post(new Runnable() {
-        @Override
-        public void run() {
-          eventListener.onDrmSessionManagerError(e);
-        }
-      });
-    }
-    if (state != STATE_OPENED_WITH_KEYS) {
-      state = STATE_ERROR;
-    }
-  }
-
-  /**
-   * Extracts {@link SchemeData} suitable for this manager.
-   *
-   * @param drmInitData The {@link DrmInitData} from which to extract the {@link SchemeData}.
-   * @return The extracted {@link SchemeData}, or null if no suitable data is present.
-   */
-  private SchemeData getSchemeData(DrmInitData drmInitData) {
-    SchemeData schemeData = drmInitData.get(uuid);
-    if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
-      // If present, the Common PSSH box should be used for ClearKey.
-      schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
-    }
-    return schemeData;
-  }
-
-  @SuppressLint("HandlerLeak")
-  private class MediaDrmHandler extends Handler {
-
-    public MediaDrmHandler(Looper looper) {
-      super(looper);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void handleMessage(Message msg) {
-      if (openCount == 0 || (state != STATE_OPENED && state != STATE_OPENED_WITH_KEYS)) {
-        return;
-      }
-      switch (msg.what) {
-        case MediaDrm.EVENT_KEY_REQUIRED:
-          doLicense();
-          break;
-        case MediaDrm.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.
-          if (state == STATE_OPENED_WITH_KEYS) {
-            state = STATE_OPENED;
-            onError(new KeysExpiredException());
-          }
-          break;
-        case MediaDrm.EVENT_PROVISION_REQUIRED:
-          state = STATE_OPENED;
-          postProvisionRequest();
-          break;
-      }
-    }
-
-  }
-
-  private class MediaDrmEventListener implements OnEventListener<T> {
-
-    @Override
-    public void onEvent(ExoMediaDrm<? extends T> md, byte[] sessionId, int event, int extra,
-        byte[] data) {
-      if (mode == MODE_PLAYBACK) {
-        mediaDrmHandler.sendEmptyMessage(event);
-      }
-    }
-
-  }
-
-  @SuppressLint("HandlerLeak")
-  private class PostResponseHandler extends Handler {
-
-    public PostResponseHandler(Looper looper) {
-      super(looper);
-    }
-
-    @Override
-    public void handleMessage(Message msg) {
-      switch (msg.what) {
-        case MSG_PROVISION:
-          onProvisionResponse(msg.obj);
-          break;
-        case MSG_KEYS:
-          onKeyResponse(msg.obj);
-          break;
-      }
-    }
-
-  }
-
-  @SuppressLint("HandlerLeak")
-  private class PostRequestHandler extends Handler {
-
-    public PostRequestHandler(Looper backgroundLooper) {
-      super(backgroundLooper);
-    }
-
-    @Override
-    public void handleMessage(Message msg) {
-      Object response;
-      try {
-        switch (msg.what) {
-          case MSG_PROVISION:
-            response = callback.executeProvisionRequest(uuid, (ProvisionRequest) msg.obj);
-            break;
-          case MSG_KEYS:
-            response = callback.executeKeyRequest(uuid, (KeyRequest) msg.obj);
-            break;
-          default:
-            throw new RuntimeException();
-        }
-      } catch (Exception e) {
-        response = e;
-      }
-      postResponseHandler.obtainMessage(msg.what, response).sendToTarget();
-    }
-
   }
 
 }

From a24f2b75b0e3c60813ef1d5e13728a8f0af3cb77 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 17 Aug 2017 04:04:01 -0700
Subject: [PATCH 111/421] Host GTS content ourselves + prevent spurious test
 passes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165561808
---
 .../playbacktests/gts/CommonEncryptionDrmTest.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 3f84b9ea855..c6dd72debdc 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
@@ -29,18 +29,18 @@ public final class CommonEncryptionDrmTest extends ActivityInstrumentationTestCa
   private static final String TAG = "CencDrmTest";
 
   private static final String URL_cenc =
-      "https://storage.googleapis.com/wvmedia/cenc/h264/tears/tears.mpd";
+      "https://storage.googleapis.com/exoplayer-test-media-1/gts/tears-cenc.mpd";
   private static final String URL_cbc1 =
-      "https://storage.googleapis.com/wvmedia/cbc1/h264/tears/tears_aes_cbc1.mpd";
+      "https://storage.googleapis.com/exoplayer-test-media-1/gts/tears-aes-cbc1.mpd";
   private static final String URL_cbcs =
-      "https://storage.googleapis.com/wvmedia/cbcs/h264/tears/tears_aes_cbcs.mpd";
+      "https://storage.googleapis.com/exoplayer-test-media-1/gts/tears-aes-cbcs.mpd";
   private static final String ID_AUDIO = "0";
   private static final String[] IDS_VIDEO = new String[] {"1", "2"};
 
   // Seeks help reproduce playback issues in certain devices.
   private static final ActionSchedule ACTION_SCHEDULE_WITH_SEEKS = new ActionSchedule.Builder(TAG)
       .delay(30000).seek(300000).delay(10000).seek(270000).delay(10000).seek(200000).delay(10000)
-      .stop().build();
+      .seek(732000).build();
 
   private DashTestRunner testRunner;
 

From 1cfd246cd32f901148c36d7671c6aebc93fa5361 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 17 Aug 2017 06:40:44 -0700
Subject: [PATCH 112/421] Update extension README with usage instructions

Issue: #3162

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165572088
---
 extensions/ffmpeg/README.md | 49 ++++++++++++++++++++++++++++++------
 extensions/flac/README.md   | 50 +++++++++++++++++++++++++++++++------
 extensions/opus/README.md   | 41 ++++++++++++++++++++++++------
 extensions/vp9/README.md    | 48 +++++++++++++++++++++++++++++------
 4 files changed, 160 insertions(+), 28 deletions(-)

diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index b4514effbce..fbc919c36d2 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -2,17 +2,18 @@
 
 ## Description ##
 
-The FFmpeg extension is a [Renderer][] implementation that uses FFmpeg to decode
-audio.
-
-[Renderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/Renderer.html
+The FFmpeg extension provides `FfmpegAudioRenderer`, which uses FFmpeg for
+decoding and can render audio encoded in a variety of formats.
 
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's
-[top level README][]. In addition, it's necessary to build the extension's
-native components as follows:
+[top level README][]. The extension is not provided via JCenter (see [#2781][]
+for more information).
+
+In addition, it's necessary to build the extension's native components as
+follows:
 
 * Set the following environment variables:
 
@@ -34,7 +35,11 @@ NDK_PATH="<path to Android NDK>"
 HOST_PLATFORM="linux-x86_64"
 ```
 
-* Fetch and build FFmpeg. For example, to fetch and build for armeabi-v7a,
+* Fetch and build FFmpeg. The configuration flags determine which formats will
+  be supported. See the [Supported formats][] page for more details of the
+  available flags.
+
+For example, to fetch and build for armeabi-v7a,
   arm64-v8a and x86 on Linux x86_64:
 
 ```
@@ -103,5 +108,35 @@ cd "${FFMPEG_EXT_PATH}"/jni && \
 ${NDK_PATH}/ndk-build APP_ABI="armeabi-v7a arm64-v8a x86" -j4
 ```
 
+## Using the extension ##
+
+Once you've followed the instructions above to check out, build and depend on
+the extension, the next step is to tell ExoPlayer to use `FfmpegAudioRenderer`.
+How you do this depends on which player API you're using:
+
+* If you're passing a `DefaultRenderersFactory` to
+  `ExoPlayerFactory.newSimpleInstance`, you can enable using the extension by
+  setting the `extensionRendererMode` parameter of the `DefaultRenderersFactory`
+  constructor to `EXTENSION_RENDERER_MODE_ON`. This will use
+  `FfmpegAudioRenderer` for playback if `MediaCodecAudioRenderer` doesn't
+  support the input format. Pass `EXTENSION_RENDERER_MODE_PREFER` to give
+  `FfmpegAudioRenderer` priority over `MediaCodecAudioRenderer`.
+* If you've subclassed `DefaultRenderersFactory`, add an `FfmpegAudioRenderer`
+  to the output list in `buildAudioRenderers`. ExoPlayer will use the first
+  `Renderer` in the list that supports the input media format.
+* If you've implemented your own `RenderersFactory`, return an
+  `FfmpegAudioRenderer` instance from `createRenderers`. ExoPlayer will use the
+  first `Renderer` in the returned array that supports the input media format.
+* If you're using `ExoPlayerFactory.newInstance`, pass an `FfmpegAudioRenderer`
+  in the array of `Renderer`s. ExoPlayer will use the first `Renderer` in the
+  list that supports the input media format.
+
+Note: These instructions assume you're using `DefaultTrackSelector`. If you have
+a custom track selector the choice of `Renderer` is up to your implementation,
+so you need to make sure you are passing an `FfmpegAudioRenderer` to the player,
+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
diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index 9db2e5727d7..505482f7ed2 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -2,18 +2,17 @@
 
 ## Description ##
 
-The Flac extension is a [Renderer][] implementation that helps you bundle
-libFLAC (the Flac decoding library) into your app and use it along with
-ExoPlayer to play Flac audio on Android devices.
-
-[Renderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/Renderer.html
+The Flac extension provides `FlacExtractor` and `LibflacAudioRenderer`, which
+use libFLAC (the Flac decoding library) to extract and decode FLAC audio.
 
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's
-[top level README][]. In addition, it's necessary to build the extension's
-native components as follows:
+[top level README][].
+
+In addition, it's necessary to build the extension's native components as
+follows:
 
 * Set the following environment variables:
 
@@ -46,3 +45,40 @@ ${NDK_PATH}/ndk-build APP_ABI=all -j4
 
 [top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
 [Android NDK]: https://developer.android.com/tools/sdk/ndk/index.html
+
+## Using the extension ##
+
+Once you've followed the instructions above to check out, build and depend on
+the extension, the next step is to tell ExoPlayer to use the extractor and/or
+renderer.
+
+### Using `FlacExtractor` ###
+
+`FlacExtractor` is used via `ExtractorMediaSource`. If you're using
+`DefaultExtractorsFactory`, `FlacExtractor` will automatically be used to read
+`.flac` files. If you're not using `DefaultExtractorsFactory`, return a
+`FlacExtractor` from your `ExtractorsFactory.createExtractors` implementation.
+
+### Using `LibflacAudioRenderer` ###
+
+* If you're passing a `DefaultRenderersFactory` to
+  `ExoPlayerFactory.newSimpleInstance`, you can enable using the extension by
+  setting the `extensionRendererMode` parameter of the `DefaultRenderersFactory`
+  constructor to `EXTENSION_RENDERER_MODE_ON`. This will use
+  `LibflacAudioRenderer` for playback if `MediaCodecAudioRenderer` doesn't
+  support the input format. Pass `EXTENSION_RENDERER_MODE_PREFER` to give
+  `LibflacAudioRenderer` priority over `MediaCodecAudioRenderer`.
+* If you've subclassed `DefaultRenderersFactory`, add a `LibflacAudioRenderer`
+  to the output list in `buildAudioRenderers`. ExoPlayer will use the first
+  `Renderer` in the list that supports the input media format.
+* If you've implemented your own `RenderersFactory`, return a
+  `LibflacAudioRenderer` instance from `createRenderers`. ExoPlayer will use the
+  first `Renderer` in the returned array that supports the input media format.
+* If you're using `ExoPlayerFactory.newInstance`, pass a `LibflacAudioRenderer`
+  in the array of `Renderer`s. ExoPlayer will use the first `Renderer` in the
+  list that supports the input media format.
+
+Note: These instructions assume you're using `DefaultTrackSelector`. If you have
+a custom track selector the choice of `Renderer` is up to your implementation,
+so you need to make sure you are passing an `LibflacAudioRenderer` to the
+player, then implement your own logic to use the renderer for a given track.
diff --git a/extensions/opus/README.md b/extensions/opus/README.md
index e5f5bcb1684..cc21c77cf99 100644
--- a/extensions/opus/README.md
+++ b/extensions/opus/README.md
@@ -2,18 +2,17 @@
 
 ## Description ##
 
-The Opus extension is a [Renderer][] implementation that helps you bundle
-libopus (the Opus decoding library) into your app and use it along with
-ExoPlayer to play Opus audio on Android devices.
-
-[Renderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/Renderer.html
+The Opus extension provides `LibopusAudioRenderer`, which uses
+libopus (the Opus decoding library) to decode Opus audio.
 
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's
-[top level README][]. In addition, it's necessary to build the extension's
-native components as follows:
+[top level README][].
+
+In addition, it's necessary to build the extension's native components as
+follows:
 
 * Set the following environment variables:
 
@@ -59,3 +58,31 @@ ${NDK_PATH}/ndk-build APP_ABI=all -j4
   * Clean and re-build the project.
 * If you want to use your own version of libopus, place it in
   `${OPUS_EXT_PATH}/jni/libopus`.
+
+## Using the extension ##
+
+Once you've followed the instructions above to check out, build and depend on
+the extension, the next step is to tell ExoPlayer to use `LibopusAudioRenderer`.
+How you do this depends on which player API you're using:
+
+* If you're passing a `DefaultRenderersFactory` to
+  `ExoPlayerFactory.newSimpleInstance`, you can enable using the extension by
+  setting the `extensionRendererMode` parameter of the `DefaultRenderersFactory`
+  constructor to `EXTENSION_RENDERER_MODE_ON`. This will use
+  `LibopusAudioRenderer` for playback if `MediaCodecAudioRenderer` doesn't
+  support the input format. Pass `EXTENSION_RENDERER_MODE_PREFER` to give
+  `LibopusAudioRenderer` priority over `MediaCodecAudioRenderer`.
+* If you've subclassed `DefaultRenderersFactory`, add a `LibopusAudioRenderer`
+  to the output list in `buildAudioRenderers`. ExoPlayer will use the first
+  `Renderer` in the list that supports the input media format.
+* If you've implemented your own `RenderersFactory`, return a
+  `LibopusAudioRenderer` instance from `createRenderers`. ExoPlayer will use the
+  first `Renderer` in the returned array that supports the input media format.
+* If you're using `ExoPlayerFactory.newInstance`, pass a `LibopusAudioRenderer`
+  in the array of `Renderer`s. ExoPlayer will use the first `Renderer` in the
+  list that supports the input media format.
+
+Note: These instructions assume you're using `DefaultTrackSelector`. If you have
+a custom track selector the choice of `Renderer` is up to your implementation,
+so you need to make sure you are passing an `LibopusAudioRenderer` to the
+player, then implement your own logic to use the renderer for a given track.
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 87c5c8d54fe..d28aa70db0c 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -2,18 +2,17 @@
 
 ## Description ##
 
-The VP9 extension is a [Renderer][] implementation that helps you bundle libvpx
-(the VP9 decoding library) into your app and use it along with ExoPlayer to play
-VP9 video on Android devices.
-
-[Renderer]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/Renderer.html
+The VP9 extension provides `LibvpxVideoRenderer`, which uses
+libvpx (the VPx decoding library) to decode VP9 video.
 
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
 its modules locally. Instructions for doing this can be found in ExoPlayer's
-[top level README][]. In addition, it's necessary to build the extension's
-native components as follows:
+[top level README][].
+
+In addition, it's necessary to build the extension's native components as
+follows:
 
 * Set the following environment variables:
 
@@ -76,3 +75,38 @@ ${NDK_PATH}/ndk-build APP_ABI=all -j4
   `${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 ##
+
+Once you've followed the instructions above to check out, build and depend on
+the extension, the next step is to tell ExoPlayer to use `LibvpxVideoRenderer`.
+How you do this depends on which player API you're using:
+
+* If you're passing a `DefaultRenderersFactory` to
+  `ExoPlayerFactory.newSimpleInstance`, you can enable using the extension by
+  setting the `extensionRendererMode` parameter of the `DefaultRenderersFactory`
+  constructor to `EXTENSION_RENDERER_MODE_ON`. This will use
+  `LibvpxVideoRenderer` for playback if `MediaCodecVideoRenderer` doesn't
+  support decoding the input VP9 stream. Pass `EXTENSION_RENDERER_MODE_PREFER`
+  to give `LibvpxVideoRenderer` priority over `MediaCodecVideoRenderer`.
+* If you've subclassed `DefaultRenderersFactory`, add a `LibvpxVideoRenderer`
+  to the output list in `buildVideoRenderers`. ExoPlayer will use the first
+  `Renderer` in the list that supports the input media format.
+* If you've implemented your own `RenderersFactory`, return a
+  `LibvpxVideoRenderer` instance from `createRenderers`. ExoPlayer will use the
+  first `Renderer` in the returned array that supports the input media format.
+* If you're using `ExoPlayerFactory.newInstance`, pass a `LibvpxVideoRenderer`
+  in the array of `Renderer`s. ExoPlayer will use the first `Renderer` in the
+  list that supports the input media format.
+
+Note: These instructions assume you're using `DefaultTrackSelector`. If you have
+a custom track selector the choice of `Renderer` is up to your implementation,
+so you need to make sure you are passing an `LibvpxVideoRenderer` to the
+player, then implement your own logic to use the renderer for a given track.
+
+`LibvpxVideoRenderer` can optionally output to a `VpxVideoSurfaceView` when not
+being used via `SimpleExoPlayer`, in which case color space conversion will be
+performed using a GL shader. To enable this mode, send the renderer a message of
+type `LibvpxVideoRenderer.MSG_SET_OUTPUT_BUFFER_RENDERER` with the
+`VpxVideoSurfaceView` as its object, instead of sending `MSG_SET_SURFACE` with a
+`Surface`.

From 04d76fa8fc3f997580c38ef1965dd8e6a58a7f29 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 17 Aug 2017 07:41:10 -0700
Subject: [PATCH 113/421] Allow easier ExoPlayer/Cast integration

This CL adds the fundamental pieces for ExoPlayer/Cast integration and includes a
demo app to showcase this functionality. However, media queues should be supported
in the first release of this extension.

Issue:#2283

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165576892
---
 constants.gradle                              |   1 +
 core_settings.gradle                          |   2 +
 demos/cast/README.md                          |   4 +
 demos/cast/build.gradle                       |  51 ++
 demos/cast/src/main/AndroidManifest.xml       |  43 ++
 .../exoplayer2/castdemo/CastDemoUtil.java     |  92 +++
 .../exoplayer2/castdemo/MainActivity.java     | 152 ++++
 .../exoplayer2/castdemo/PlayerManager.java    | 196 ++++++
 .../src/main/res/layout/main_activity.xml     |  41 ++
 demos/cast/src/main/res/menu/menu.xml         |  25 +
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 4315 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 2734 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 6159 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 10578 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 11743 bytes
 demos/cast/src/main/res/values/strings.xml    |  25 +
 demos/cast/src/main/res/values/styles.xml     |  22 +
 extensions/cast/README.md                     |  33 +
 extensions/cast/build.gradle                  |  45 ++
 extensions/cast/src/main/AndroidManifest.xml  |  16 +
 .../exoplayer2/ext/cast/CastPlayer.java       | 649 ++++++++++++++++++
 .../exoplayer2/ext/cast/CastUtils.java        |  94 +++
 .../ext/cast/DefaultCastOptionsProvider.java  |  42 ++
 extensions/ima/build.gradle                   |   2 +-
 library/all/src/main/AndroidManifest.xml      |   1 -
 25 files changed, 1534 insertions(+), 2 deletions(-)
 create mode 100644 demos/cast/README.md
 create mode 100644 demos/cast/build.gradle
 create mode 100644 demos/cast/src/main/AndroidManifest.xml
 create mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
 create mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
 create mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
 create mode 100644 demos/cast/src/main/res/layout/main_activity.xml
 create mode 100644 demos/cast/src/main/res/menu/menu.xml
 create mode 100644 demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 demos/cast/src/main/res/values/strings.xml
 create mode 100644 demos/cast/src/main/res/values/styles.xml
 create mode 100644 extensions/cast/README.md
 create mode 100644 extensions/cast/build.gradle
 create mode 100644 extensions/cast/src/main/AndroidManifest.xml
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java

diff --git a/constants.gradle b/constants.gradle
index 576091f9371..4107faab4c5 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -22,6 +22,7 @@ project.ext {
     buildToolsVersion = '26'
     testSupportLibraryVersion = '0.5'
     supportLibraryVersion = '26.0.1'
+    playServicesLibraryVersion = '11.0.2'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     releaseVersion = 'r2.5.1'
diff --git a/core_settings.gradle b/core_settings.gradle
index 7a8320b1a12..20a7c87bde2 100644
--- a/core_settings.gradle
+++ b/core_settings.gradle
@@ -28,6 +28,7 @@ include modulePrefix + 'extension-ffmpeg'
 include modulePrefix + 'extension-flac'
 include modulePrefix + 'extension-gvr'
 include modulePrefix + 'extension-ima'
+include modulePrefix + 'extension-cast'
 include modulePrefix + 'extension-mediasession'
 include modulePrefix + 'extension-okhttp'
 include modulePrefix + 'extension-opus'
@@ -46,6 +47,7 @@ project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'exten
 project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
 project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')
 project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensions/ima')
+project(modulePrefix + 'extension-cast').projectDir = new File(rootDir, 'extensions/cast')
 project(modulePrefix + 'extension-mediasession').projectDir = new File(rootDir, 'extensions/mediasession')
 project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'extensions/okhttp')
 project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
diff --git a/demos/cast/README.md b/demos/cast/README.md
new file mode 100644
index 00000000000..2c68a5277a5
--- /dev/null
+++ b/demos/cast/README.md
@@ -0,0 +1,4 @@
+# Cast demo application #
+
+This folder contains a demo application that showcases ExoPlayer integration
+with Google Cast.
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
new file mode 100644
index 00000000000..a9fa27ad586
--- /dev/null
+++ b/demos/cast/build.gradle
@@ -0,0 +1,51 @@
+// 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.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion 16
+        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 {
+    compile project(modulePrefix + 'library-core')
+    compile project(modulePrefix + 'library-dash')
+    compile project(modulePrefix + 'library-hls')
+    compile project(modulePrefix + 'library-smoothstreaming')
+    compile project(modulePrefix + 'library-ui')
+    compile project(modulePrefix + 'extension-cast')
+}
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..eeb28438bd3
--- /dev/null
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -0,0 +1,43 @@
+<?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"
+    package="com.google.android.exoplayer2.castdemo"
+    android:versionCode="0001"
+    android:versionName="0.0.1">
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
+
+  <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
+      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" />
+
+    <activity android:name="com.google.android.exoplayer2.castdemo.MainActivity"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+        android:launchMode="singleTop" 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"/>
+        <category android:name="android.intent.category.BROWSABLE"/>
+      </intent-filter>
+    </activity>
+
+  </application>
+
+</manifest>
diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
new file mode 100644
index 00000000000..f819e54e50d
--- /dev/null
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
@@ -0,0 +1,92 @@
+/*
+ * 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 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;
+
+/**
+ * Utility methods and constants for the Cast demo application.
+ */
+/* package */ final class CastDemoUtil {
+
+  public static final String MIME_TYPE_DASH = "application/dash+xml";
+  public static final String MIME_TYPE_HLS = "application/vnd.apple.mpegurl";
+  public static final String MIME_TYPE_SS = "application/vnd.ms-sstr+xml";
+  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 type;
+
+    /**
+     * @param uri See {@link #uri}.
+     * @param name See {@link #name}.
+     * @param type See {@link #type}.
+     */
+    public Sample(String uri, String name, String type) {
+      this.uri = uri;
+      this.name = name;
+      this.type = type;
+    }
+
+    @Override
+    public String toString() {
+      return name;
+    }
+
+  }
+
+  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));
+
+
+    SAMPLES = Collections.unmodifiableList(samples);
+
+  }
+
+  private CastDemoUtil() {}
+
+}
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
new file mode 100644
index 00000000000..e1367858aa4
--- /dev/null
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
@@ -0,0 +1,152 @@
+/*
+ * 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.graphics.Color;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.view.KeyEvent;
+import android.view.Menu;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.ListView;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.ext.cast.CastPlayer;
+import com.google.android.exoplayer2.ui.PlaybackControlView;
+import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
+import com.google.android.exoplayer2.util.Util;
+import com.google.android.gms.cast.framework.CastButtonFactory;
+
+/**
+ * An activity that plays video using {@link SimpleExoPlayer} and {@link CastPlayer}.
+ */
+public class MainActivity extends AppCompatActivity {
+
+  private SimpleExoPlayerView simpleExoPlayerView;
+  private PlaybackControlView castControlView;
+  private PlayerManager playerManager;
+
+  // Activity lifecycle methods.
+
+  @Override
+  public void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+
+    setContentView(R.layout.main_activity);
+
+    simpleExoPlayerView = (SimpleExoPlayerView) findViewById(R.id.player_view);
+    simpleExoPlayerView.requestFocus();
+
+    castControlView = (PlaybackControlView) findViewById(R.id.cast_control_view);
+
+    ListView sampleList = (ListView) findViewById(R.id.sample_list);
+    sampleList.setAdapter(new SampleListAdapter());
+    sampleList.setOnItemClickListener(new SampleClickListener());
+  }
+
+  @Override
+  public boolean onCreateOptionsMenu(Menu menu) {
+    super.onCreateOptionsMenu(menu);
+    getMenuInflater().inflate(R.menu.menu, menu);
+    CastButtonFactory.setUpMediaRouteButton(getApplicationContext(), menu,
+        R.id.media_route_menu_item);
+    return true;
+  }
+
+  @Override
+  public void onStart() {
+    super.onStart();
+    if (Util.SDK_INT > 23) {
+      setupPlayerManager();
+    }
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    if ((Util.SDK_INT <= 23)) {
+      setupPlayerManager();
+    }
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    if (Util.SDK_INT <= 23) {
+      releasePlayerManager();
+    }
+  }
+
+  @Override
+  public void onStop() {
+    super.onStop();
+    if (Util.SDK_INT > 23) {
+      releasePlayerManager();
+    }
+  }
+
+  // Activity input.
+
+  @Override
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    // If the event was not handled then see if the player view can handle it.
+    return super.dispatchKeyEvent(event) || playerManager.dispatchKeyEvent(event);
+  }
+
+  // Internal methods.
+
+  private void setupPlayerManager() {
+    playerManager = new PlayerManager(simpleExoPlayerView, castControlView,
+        getApplicationContext());
+  }
+
+  private void releasePlayerManager() {
+    playerManager.release();
+    playerManager = null;
+  }
+
+  // User controls.
+
+  private final class SampleListAdapter extends ArrayAdapter<CastDemoUtil.Sample> {
+
+    public SampleListAdapter() {
+      super(getApplicationContext(), android.R.layout.simple_list_item_1, CastDemoUtil.SAMPLES);
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+      View view = super.getView(position, convertView, parent);
+      view.setBackgroundColor(Color.WHITE);
+      return view;
+    }
+
+  }
+
+  private class SampleClickListener implements AdapterView.OnItemClickListener {
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+      if (parent.getSelectedItemPosition() != position) {
+        CastDemoUtil.Sample currentSample = CastDemoUtil.SAMPLES.get(position);
+        playerManager.setCurrentSample(currentSample, 0, true);
+      }
+    }
+
+  }
+
+}
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 00000000000..741df7eff18
--- /dev/null
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
@@ -0,0 +1,196 @@
+/*
+ * 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.view.KeyEvent;
+import android.view.View;
+import com.google.android.exoplayer2.DefaultRenderersFactory;
+import com.google.android.exoplayer2.ExoPlayerFactory;
+import com.google.android.exoplayer2.RenderersFactory;
+import com.google.android.exoplayer2.SimpleExoPlayer;
+import com.google.android.exoplayer2.ext.cast.CastPlayer;
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
+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.dash.DefaultDashChunkSource;
+import com.google.android.exoplayer2.source.hls.HlsMediaSource;
+import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource;
+import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
+import com.google.android.exoplayer2.ui.PlaybackControlView;
+import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
+import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
+import com.google.android.gms.cast.framework.CastContext;
+
+/**
+ * Manages players for the ExoPlayer/Cast integration app.
+ */
+/* package */ final class PlayerManager implements CastPlayer.SessionAvailabilityListener {
+
+  private static final int PLAYBACK_REMOTE = 1;
+  private static final int PLAYBACK_LOCAL = 2;
+
+  private static final String USER_AGENT = "ExoCastDemoPlayer";
+  private static final DefaultBandwidthMeter BANDWIDTH_METER = new DefaultBandwidthMeter();
+  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
+      new DefaultHttpDataSourceFactory(USER_AGENT, BANDWIDTH_METER);
+
+  private final SimpleExoPlayerView exoPlayerView;
+  private final PlaybackControlView castControlView;
+  private final CastContext castContext;
+  private final SimpleExoPlayer exoPlayer;
+  private final CastPlayer castPlayer;
+
+  private int playbackLocation;
+  private CastDemoUtil.Sample currentSample;
+
+  /**
+   * @param exoPlayerView The {@link SimpleExoPlayerView} for local playback.
+   * @param castControlView The {@link PlaybackControlView} to control remote playback.
+   * @param context A {@link Context}.
+   */
+  public PlayerManager(SimpleExoPlayerView exoPlayerView, PlaybackControlView castControlView,
+      Context context) {
+    this.exoPlayerView = exoPlayerView;
+    this.castControlView = castControlView;
+    castContext = CastContext.getSharedInstance(context);
+
+    DefaultTrackSelector trackSelector = new DefaultTrackSelector(BANDWIDTH_METER);
+    RenderersFactory renderersFactory = new DefaultRenderersFactory(context, null);
+    exoPlayer = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector);
+    exoPlayerView.setPlayer(exoPlayer);
+
+    castPlayer = new CastPlayer(castContext);
+    castPlayer.setSessionAvailabilityListener(this);
+    castControlView.setPlayer(castPlayer);
+
+    setPlaybackLocation(castPlayer.isCastSessionAvailable() ? PLAYBACK_REMOTE : PLAYBACK_LOCAL);
+  }
+
+  /**
+   * Starts playback of the given sample at the given position.
+   *
+   * @param currentSample The {@link CastDemoUtil} to play.
+   * @param positionMs The position at which playback should start.
+   * @param playWhenReady Whether the player should proceed when ready to do so.
+   */
+  public void setCurrentSample(CastDemoUtil.Sample currentSample, long positionMs,
+      boolean playWhenReady) {
+    this.currentSample = currentSample;
+    if (playbackLocation == PLAYBACK_REMOTE) {
+        castPlayer.load(currentSample.name, currentSample.uri, currentSample.type, positionMs,
+            playWhenReady);
+    } else /* playbackLocation == PLAYBACK_LOCAL */ {
+      exoPlayer.setPlayWhenReady(playWhenReady);
+      exoPlayer.seekTo(positionMs);
+      exoPlayer.prepare(buildMediaSource(currentSample), true, true);
+    }
+  }
+
+  /**
+   * Dispatches a given {@link KeyEvent} to whichever view corresponds according to the current
+   * playback location.
+   *
+   * @param event The {@link KeyEvent}.
+   * @return Whether the event was handled by the target view.
+   */
+  public boolean dispatchKeyEvent(KeyEvent event) {
+    if (playbackLocation == PLAYBACK_REMOTE) {
+      return castControlView.dispatchKeyEvent(event);
+    } else /* playbackLocation == PLAYBACK_REMOTE */ {
+      return exoPlayerView.dispatchKeyEvent(event);
+    }
+  }
+
+  /**
+   * Releases the manager and the players that it holds.
+   */
+  public void release() {
+    castPlayer.setSessionAvailabilityListener(null);
+    castPlayer.release();
+    exoPlayerView.setPlayer(null);
+    exoPlayer.release();
+  }
+
+  // CastPlayer.SessionAvailabilityListener implementation.
+
+  @Override
+  public void onCastSessionAvailable() {
+    setPlaybackLocation(PLAYBACK_REMOTE);
+  }
+
+  @Override
+  public void onCastSessionUnavailable() {
+    setPlaybackLocation(PLAYBACK_LOCAL);
+  }
+
+  // Internal methods.
+
+  private static MediaSource buildMediaSource(CastDemoUtil.Sample sample) {
+    Uri uri = Uri.parse(sample.uri);
+    switch (sample.type) {
+      case CastDemoUtil.MIME_TYPE_SS:
+        return new SsMediaSource(uri, DATA_SOURCE_FACTORY,
+            new DefaultSsChunkSource.Factory(DATA_SOURCE_FACTORY), null, null);
+      case CastDemoUtil.MIME_TYPE_DASH:
+        return new DashMediaSource(uri, DATA_SOURCE_FACTORY,
+            new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), null, null);
+      case CastDemoUtil.MIME_TYPE_HLS:
+        return new HlsMediaSource(uri, DATA_SOURCE_FACTORY, null, null);
+      case CastDemoUtil.MIME_TYPE_VIDEO_MP4:
+        return new ExtractorMediaSource(uri, DATA_SOURCE_FACTORY, new DefaultExtractorsFactory(),
+            null, null);
+      default: {
+        throw new IllegalStateException("Unsupported type: " + sample.type);
+      }
+    }
+  }
+
+  private void setPlaybackLocation(int playbackLocation) {
+    if (this.playbackLocation == playbackLocation) {
+      return;
+    }
+
+    // View management.
+    if (playbackLocation == PLAYBACK_LOCAL) {
+      exoPlayerView.setVisibility(View.VISIBLE);
+      castControlView.hide();
+    } else {
+      exoPlayerView.setVisibility(View.GONE);
+      castControlView.show();
+    }
+
+    long playbackPositionMs = 0;
+    boolean playWhenReady = true;
+    if (exoPlayer != null) {
+      playbackPositionMs = exoPlayer.getCurrentPosition();
+      playWhenReady = exoPlayer.getPlayWhenReady();
+    } else if (this.playbackLocation == PLAYBACK_REMOTE) {
+      playbackPositionMs = castPlayer.getCurrentPosition();
+      playWhenReady = castPlayer.getPlayWhenReady();
+    }
+
+    this.playbackLocation = playbackLocation;
+    if (currentSample != null) {
+      setCurrentSample(currentSample, playbackPositionMs, playWhenReady);
+    }
+  }
+
+}
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
new file mode 100644
index 00000000000..7e39320e3bb
--- /dev/null
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -0,0 +1,41 @@
+<?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.
+-->
+<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"
+    android:keepScreenOn="true">
+  <com.google.android.exoplayer2.ui.SimpleExoPlayerView android:id="@+id/player_view"
+      android:layout_width="match_parent"
+      app:repeat_toggle_modes="all|one"
+      android:layout_height="0dp"
+      android:layout_weight="12" />
+  <ListView
+      android:id="@+id/sample_list"
+      android:choiceMode="singleChoice"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      android:layout_weight="12" />
+  <com.google.android.exoplayer2.ui.PlaybackControlView
+      android:id="@+id/cast_control_view"
+      android:layout_width="match_parent"
+      android:layout_height="0dp"
+      app:show_timeout="-1"
+      android:layout_weight="2"
+      android:visibility="gone"/>
+</LinearLayout>
diff --git a/demos/cast/src/main/res/menu/menu.xml b/demos/cast/src/main/res/menu/menu.xml
new file mode 100644
index 00000000000..075ad34ec42
--- /dev/null
+++ b/demos/cast/src/main/res/menu/menu.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+
+  <item
+      android:id="@+id/media_route_menu_item"
+      android:title="@string/media_route_menu_title"
+      app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
+      app:showAsAction="always" />
+
+</menu>
diff --git a/demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..52e8dc93d9895cf4e991eb391eb3f608d89b4743
GIT binary patch
literal 4315
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
JPDHLkV1g_qPgei{

literal 0
HcmV?d00001

diff --git a/demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..b55576eff33fc89f4297a425580fd78e2db6f886
GIT binary patch
literal 2734
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

literal 0
HcmV?d00001

diff --git a/demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..ca84d6a60e76c7095cebbff5d99732d82f43c55b
GIT binary patch
literal 6159
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

literal 0
HcmV?d00001

diff --git a/demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..27ab9b1054ea5ae051c443ddf9110d9754c5b39f
GIT binary patch
literal 10578
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

literal 0
HcmV?d00001

diff --git a/demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..d1eb9b78cf195a355c8354f38c22999778ceb52a
GIT binary patch
literal 11743
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

literal 0
HcmV?d00001

diff --git a/demos/cast/src/main/res/values/strings.xml b/demos/cast/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..503892da276
--- /dev/null
+++ b/demos/cast/src/main/res/values/strings.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+
+<resources>
+
+  <string name="application_name">ExoCast Demo</string>
+
+  <string name="media_route_menu_title">ExoCast</string>
+
+  <string name="error_unsupported_drm">DRM scheme not supported by this device.</string>
+
+</resources>
diff --git a/demos/cast/src/main/res/values/styles.xml b/demos/cast/src/main/res/values/styles.xml
new file mode 100644
index 00000000000..1484a68a68d
--- /dev/null
+++ b/demos/cast/src/main/res/values/styles.xml
@@ -0,0 +1,22 @@
+<?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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <style name="PlayerTheme" parent="android:Theme.Holo">
+    <item name="android:windowBackground">@android:color/black</item>
+  </style>
+
+</resources>
diff --git a/extensions/cast/README.md b/extensions/cast/README.md
new file mode 100644
index 00000000000..73f7041729c
--- /dev/null
+++ b/extensions/cast/README.md
@@ -0,0 +1,33 @@
+# ExoPlayer Cast extension #
+
+## Description ##
+
+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
+
+## Getting the extension ##
+
+The easiest way to use the extension is to add it as a gradle dependency:
+
+```gradle
+compile 'com.google.android.exoplayer:extension-cast:rX.X.X'
+```
+
+where `rX.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 ##
+
+Create a `CastPlayer` and use it to integrate Cast into your app using
+ExoPlayer's common Player interface. You can try the Cast Extension to see how a
+[PlaybackControlView][] can be used to control playback in a remote receiver app.
+
+[PlaybackControlView]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/ui/PlaybackControlView.html
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
new file mode 100644
index 00000000000..7d252332c98
--- /dev/null
+++ b/extensions/cast/build.gradle
@@ -0,0 +1,45 @@
+// 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.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion project.ext.targetSdkVersion
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:' + supportLibraryVersion
+    compile 'com.android.support:mediarouter-v7:' + supportLibraryVersion
+    compile 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion
+    compile project(modulePrefix + 'library-core')
+    compile project(modulePrefix + 'library-ui')
+}
+
+ext {
+    javadocTitle = 'Cast extension'
+}
+apply from: '../../javadoc_library.gradle'
+
+ext {
+    releaseArtifact = 'extension-cast'
+    releaseDescription = 'Cast extension for ExoPlayer.'
+}
+apply from: '../../publish.gradle'
diff --git a/extensions/cast/src/main/AndroidManifest.xml b/extensions/cast/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..c12fc1289fd
--- /dev/null
+++ b/extensions/cast/src/main/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?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 package="com.google.android.exoplayer2.ext.cast"/>
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
new file mode 100644
index 00000000000..ef84c04c04a
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
@@ -0,0 +1,649 @@
+/*
+ * 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.cast;
+
+import android.support.annotation.Nullable;
+import android.util.Log;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.PlaybackParameters;
+import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.SinglePeriodTimeline;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+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.MediaMetadata;
+import com.google.android.gms.cast.MediaStatus;
+import com.google.android.gms.cast.MediaTrack;
+import com.google.android.gms.cast.framework.CastContext;
+import com.google.android.gms.cast.framework.CastSession;
+import com.google.android.gms.cast.framework.SessionManager;
+import com.google.android.gms.cast.framework.SessionManagerListener;
+import com.google.android.gms.cast.framework.media.RemoteMediaClient;
+import com.google.android.gms.cast.framework.media.RemoteMediaClient.MediaChannelResult;
+import com.google.android.gms.common.api.CommonStatusCodes;
+import com.google.android.gms.common.api.ResultCallback;
+import java.util.List;
+import java.util.concurrent.CopyOnWriteArraySet;
+
+/**
+ * {@link Player} implementation that communicates with a Cast receiver app.
+ *
+ * <p>Calls to the methods in this class depend on the availability of an underlying cast session.
+ * If no session is available, method calls have no effect. To keep track of the underyling session,
+ * {@link #isCastSessionAvailable()} can be queried and {@link SessionAvailabilityListener} can be
+ * implemented and attached to the player.
+ *
+ * <p>Methods should be called on the application's main thread.
+ *
+ * <p>Known issues:
+ * <ul>
+ *   <li>Part of the Cast API is not exposed through this interface. For instance, volume settings
+ *   and track selection.</li>
+ *   <li> Repeat mode is not working. See [internal: b/64137174].</li>
+ * </ul>
+ */
+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;
+  private static final int RENDERER_INDEX_VIDEO = 0;
+  private static final int RENDERER_INDEX_AUDIO = 1;
+  private static final int RENDERER_INDEX_TEXT = 2;
+  private static final long PROGRESS_REPORT_PERIOD_MS = 1000;
+  private static final TrackGroupArray EMPTY_TRACK_GROUP_ARRAY = new TrackGroupArray();
+  private static final TrackSelectionArray EMPTY_TRACK_SELECTION_ARRAY =
+      new TrackSelectionArray(null, null, null);
+  private static final long[] EMPTY_TRACK_ID_ARRAY = new long[0];
+
+  private final CastContext castContext;
+  private final Timeline.Window window;
+
+  // Result callbacks.
+  private final StatusListener statusListener;
+  private final RepeatModeResultCallback repeatModeResultCallback;
+  private final SeekResultCallback seekResultCallback;
+
+  // Listeners.
+  private final CopyOnWriteArraySet<EventListener> listeners;
+  private SessionAvailabilityListener sessionAvailabilityListener;
+
+  // Internal state.
+  private RemoteMediaClient remoteMediaClient;
+  private Timeline currentTimeline;
+  private TrackGroupArray currentTrackGroups;
+  private TrackSelectionArray currentTrackSelection;
+  private long lastReportedPositionMs;
+  private long pendingSeekPositionMs;
+
+  /**
+   * @param castContext The context from which the cast session is obtained.
+   */
+  public CastPlayer(CastContext castContext) {
+    this.castContext = castContext;
+    window = new Timeline.Window();
+    statusListener = new StatusListener();
+    repeatModeResultCallback = new RepeatModeResultCallback();
+    seekResultCallback = new SeekResultCallback();
+    listeners = new CopyOnWriteArraySet<>();
+    SessionManager sessionManager = castContext.getSessionManager();
+    sessionManager.addSessionManagerListener(statusListener, CastSession.class);
+    CastSession session = sessionManager.getCurrentCastSession();
+    remoteMediaClient = session != null ? session.getRemoteMediaClient() : null;
+    pendingSeekPositionMs = C.TIME_UNSET;
+    updateInternalState();
+  }
+
+  /**
+   * Loads media into the receiver app.
+   *
+   * @param title The title of the media sample.
+   * @param url The url from which the media is obtained.
+   * @param contentMimeType The mime type of the content to play.
+   * @param positionMs The position at which the playback should start in milliseconds.
+   * @param playWhenReady Whether the player should start playback as soon as it is ready to do so.
+   */
+  public void load(String title, String url, String contentMimeType, long positionMs,
+      boolean playWhenReady) {
+    lastReportedPositionMs = 0;
+    if (remoteMediaClient != null) {
+      MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
+      movieMetadata.putString(MediaMetadata.KEY_TITLE, title);
+      MediaInfo mediaInfo = new MediaInfo.Builder(url).setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
+          .setContentType(contentMimeType).setMetadata(movieMetadata).build();
+      remoteMediaClient.load(mediaInfo, playWhenReady, positionMs);
+    }
+  }
+
+  /**
+   * Returns whether a cast session is available for playback.
+   */
+  public boolean isCastSessionAvailable() {
+    return remoteMediaClient != null;
+  }
+
+  /**
+   * Sets a listener for updates on the cast session availability.
+   *
+   * @param listener The {@link SessionAvailabilityListener}.
+   */
+  public void setSessionAvailabilityListener(SessionAvailabilityListener listener) {
+    sessionAvailabilityListener = listener;
+  }
+
+  // Player implementation.
+
+  @Override
+  public void addListener(EventListener listener) {
+    listeners.add(listener);
+  }
+
+  @Override
+  public void removeListener(EventListener listener) {
+    listeners.remove(listener);
+  }
+
+  @Override
+  public int getPlaybackState() {
+    if (remoteMediaClient == null) {
+      return STATE_IDLE;
+    }
+    int receiverAppStatus = remoteMediaClient.getPlayerState();
+    switch (receiverAppStatus) {
+      case MediaStatus.PLAYER_STATE_BUFFERING:
+        return STATE_BUFFERING;
+      case MediaStatus.PLAYER_STATE_PLAYING:
+      case MediaStatus.PLAYER_STATE_PAUSED:
+        return STATE_READY;
+      case MediaStatus.PLAYER_STATE_IDLE:
+      case MediaStatus.PLAYER_STATE_UNKNOWN:
+      default:
+        return STATE_IDLE;
+    }
+  }
+
+  @Override
+  public void setPlayWhenReady(boolean playWhenReady) {
+    if (remoteMediaClient == null) {
+      return;
+    }
+    if (playWhenReady) {
+      remoteMediaClient.play();
+    } else {
+      remoteMediaClient.pause();
+    }
+  }
+
+  @Override
+  public boolean getPlayWhenReady() {
+    return remoteMediaClient != null && !remoteMediaClient.isPaused();
+  }
+
+  @Override
+  public void seekToDefaultPosition() {
+    seekTo(0);
+  }
+
+  @Override
+  public void seekToDefaultPosition(int windowIndex) {
+    seekTo(windowIndex, 0);
+  }
+
+  @Override
+  public void seekTo(long positionMs) {
+    seekTo(0, positionMs);
+  }
+
+  @Override
+  public void seekTo(int windowIndex, long positionMs) {
+    if (remoteMediaClient != null) {
+      remoteMediaClient.seek(positionMs).setResultCallback(seekResultCallback);
+      pendingSeekPositionMs = positionMs;
+      for (EventListener listener : listeners) {
+        listener.onPositionDiscontinuity();
+      }
+    }
+  }
+
+  @Override
+  public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
+    // Unsupported by the RemoteMediaClient API. Do nothing.
+  }
+
+  @Override
+  public PlaybackParameters getPlaybackParameters() {
+    return PlaybackParameters.DEFAULT;
+  }
+
+  @Override
+  public void stop() {
+    if (remoteMediaClient != null) {
+      remoteMediaClient.stop();
+    }
+  }
+
+  @Override
+  public void release() {
+    castContext.getSessionManager().removeSessionManagerListener(statusListener, CastSession.class);
+  }
+
+  @Override
+  public int getRendererCount() {
+    // We assume there are three renderers: video, audio, and text.
+    return RENDERER_COUNT;
+  }
+
+  @Override
+  public int getRendererType(int index) {
+    switch (index) {
+      case RENDERER_INDEX_VIDEO:
+        return C.TRACK_TYPE_VIDEO;
+      case RENDERER_INDEX_AUDIO:
+        return C.TRACK_TYPE_AUDIO;
+      case RENDERER_INDEX_TEXT:
+        return C.TRACK_TYPE_TEXT;
+      default:
+        throw new IndexOutOfBoundsException();
+    }
+  }
+
+  @Override
+  public void setRepeatMode(@RepeatMode int repeatMode) {
+    if (remoteMediaClient != null) {
+      int castRepeatMode;
+      switch (repeatMode) {
+        case REPEAT_MODE_ONE:
+          castRepeatMode = MediaStatus.REPEAT_MODE_REPEAT_SINGLE;
+          break;
+        case REPEAT_MODE_ALL:
+          castRepeatMode = MediaStatus.REPEAT_MODE_REPEAT_ALL;
+          break;
+        case REPEAT_MODE_OFF:
+          castRepeatMode = MediaStatus.REPEAT_MODE_REPEAT_OFF;
+          break;
+        default:
+          throw new IllegalArgumentException();
+      }
+      remoteMediaClient.queueSetRepeatMode(castRepeatMode, null)
+          .setResultCallback(repeatModeResultCallback);
+    }
+  }
+
+  @Override
+  @RepeatMode public int getRepeatMode() {
+    if (remoteMediaClient == null) {
+      return REPEAT_MODE_OFF;
+    }
+    MediaStatus mediaStatus = getMediaStatus();
+    if (mediaStatus == null) {
+      // No media session active, yet.
+      return REPEAT_MODE_OFF;
+    }
+    int castRepeatMode = mediaStatus.getQueueRepeatMode();
+    switch (castRepeatMode) {
+      case MediaStatus.REPEAT_MODE_REPEAT_SINGLE:
+        return REPEAT_MODE_ONE;
+      case MediaStatus.REPEAT_MODE_REPEAT_ALL:
+      case MediaStatus.REPEAT_MODE_REPEAT_ALL_AND_SHUFFLE:
+          return REPEAT_MODE_ALL;
+      case MediaStatus.REPEAT_MODE_REPEAT_OFF:
+        return REPEAT_MODE_OFF;
+      default:
+        throw new IllegalStateException();
+    }
+  }
+
+  @Override
+  public TrackSelectionArray getCurrentTrackSelections() {
+    return currentTrackSelection;
+  }
+
+  @Override
+  public TrackGroupArray getCurrentTrackGroups() {
+    return currentTrackGroups;
+  }
+
+  @Override
+  public Timeline getCurrentTimeline() {
+    return currentTimeline;
+  }
+
+  @Override
+  @Nullable public Object getCurrentManifest() {
+    return null;
+  }
+
+  @Override
+  public int getCurrentPeriodIndex() {
+    return 0;
+  }
+
+  @Override
+  public int getCurrentWindowIndex() {
+    return 0;
+  }
+
+  @Override
+  public long getDuration() {
+    return currentTimeline.isEmpty() ? C.TIME_UNSET
+        : currentTimeline.getWindow(0, window).getDurationMs();
+  }
+
+  @Override
+  public long getCurrentPosition() {
+    return remoteMediaClient == null ? lastReportedPositionMs
+        : pendingSeekPositionMs != C.TIME_UNSET ? pendingSeekPositionMs
+        : remoteMediaClient.getApproximateStreamPosition();
+  }
+
+  @Override
+  public long getBufferedPosition() {
+    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 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;
+  }
+
+  @Override
+  public int getCurrentAdGroupIndex() {
+    return C.INDEX_UNSET;
+  }
+
+  @Override
+  public int getCurrentAdIndexInAdGroup() {
+    return C.INDEX_UNSET;
+  }
+
+  @Override
+  public boolean isLoading() {
+    return false;
+  }
+
+  @Override
+  public long getContentPosition() {
+    return getCurrentPosition();
+  }
+
+  // Internal methods.
+
+  private void setRemoteMediaClient(@Nullable RemoteMediaClient remoteMediaClient) {
+    if (this.remoteMediaClient == remoteMediaClient) {
+      // Do nothing.
+      return;
+    }
+    if (this.remoteMediaClient != null) {
+      this.remoteMediaClient.removeListener(statusListener);
+      this.remoteMediaClient.removeProgressListener(statusListener);
+    }
+    this.remoteMediaClient = remoteMediaClient;
+    if (remoteMediaClient != null) {
+      if (sessionAvailabilityListener != null) {
+        sessionAvailabilityListener.onCastSessionAvailable();
+      }
+      remoteMediaClient.addListener(statusListener);
+      remoteMediaClient.addProgressListener(statusListener, PROGRESS_REPORT_PERIOD_MS);
+    } else {
+      if (sessionAvailabilityListener != null) {
+        sessionAvailabilityListener.onCastSessionUnavailable();
+      }
+    }
+  }
+
+  private @Nullable MediaStatus getMediaStatus() {
+    return remoteMediaClient != null ? remoteMediaClient.getMediaStatus() : null;
+  }
+
+  private @Nullable MediaInfo getMediaInfo() {
+    return remoteMediaClient != null ? remoteMediaClient.getMediaInfo() : null;
+  }
+
+  private void updateInternalState() {
+    currentTimeline = Timeline.EMPTY;
+    currentTrackGroups = EMPTY_TRACK_GROUP_ARRAY;
+    currentTrackSelection = EMPTY_TRACK_SELECTION_ARRAY;
+    MediaInfo mediaInfo = getMediaInfo();
+    if (mediaInfo == null) {
+      return;
+    }
+    long streamDurationMs = mediaInfo.getStreamDuration();
+    boolean isSeekable = streamDurationMs != MediaInfo.UNKNOWN_DURATION;
+    currentTimeline = new SinglePeriodTimeline(
+        isSeekable ? C.msToUs(streamDurationMs) : C.TIME_UNSET, isSeekable);
+
+    List<MediaTrack> tracks = mediaInfo.getMediaTracks();
+    if (tracks == null) {
+      return;
+    }
+
+    MediaStatus mediaStatus = getMediaStatus();
+    long[] activeTrackIds = mediaStatus != null ? mediaStatus.getActiveTrackIds() : null;
+    if (activeTrackIds == null) {
+      activeTrackIds = EMPTY_TRACK_ID_ARRAY;
+    }
+
+    TrackGroup[] trackGroups = new TrackGroup[tracks.size()];
+    TrackSelection[] trackSelections = new TrackSelection[RENDERER_COUNT];
+    for (int i = 0; i < tracks.size(); i++) {
+      MediaTrack mediaTrack = tracks.get(i);
+      trackGroups[i] = new TrackGroup(CastUtils.mediaTrackToFormat(mediaTrack));
+
+      long id = mediaTrack.getId();
+      int trackType = MimeTypes.getTrackType(mediaTrack.getContentType());
+      int rendererIndex = getRendererIndexForTrackType(trackType);
+      if (isTrackActive(id, activeTrackIds) && rendererIndex != C.INDEX_UNSET
+          && trackSelections[rendererIndex] == null) {
+        trackSelections[rendererIndex] = new FixedTrackSelection(trackGroups[i], 0);
+      }
+    }
+    currentTrackSelection = new TrackSelectionArray(trackSelections);
+    currentTrackGroups = new TrackGroupArray(trackGroups);
+  }
+
+  private static boolean isTrackActive(long id, long[] activeTrackIds) {
+    for (long activeTrackId : activeTrackIds) {
+      if (activeTrackId == id) {
+        return true;
+      }
+    }
+    return false;
+  }
+
+  private static int getRendererIndexForTrackType(int trackType) {
+    return trackType == C.TRACK_TYPE_VIDEO ? RENDERER_INDEX_VIDEO
+        : trackType == C.TRACK_TYPE_AUDIO ? RENDERER_INDEX_AUDIO
+        : trackType == C.TRACK_TYPE_TEXT ? RENDERER_INDEX_TEXT
+        : C.INDEX_UNSET;
+  }
+
+  private final class StatusListener implements RemoteMediaClient.Listener,
+      SessionManagerListener<CastSession>, RemoteMediaClient.ProgressListener {
+
+    // RemoteMediaClient.ProgressListener implementation.
+
+    @Override
+    public void onProgressUpdated(long progressMs, long unusedDurationMs) {
+      lastReportedPositionMs = progressMs;
+    }
+
+    // RemoteMediaClient.Listener implementation.
+
+    @Override
+    public void onStatusUpdated() {
+      boolean playWhenReady = getPlayWhenReady();
+      int playbackState = getPlaybackState();
+      for (EventListener listener : listeners) {
+        listener.onPlayerStateChanged(playWhenReady, playbackState);
+      }
+    }
+
+    @Override
+    public void onMetadataUpdated() {
+      updateInternalState();
+      for (EventListener listener : listeners) {
+        listener.onTracksChanged(currentTrackGroups, currentTrackSelection);
+        listener.onTimelineChanged(currentTimeline, null);
+      }
+    }
+
+    @Override
+    public void onQueueStatusUpdated() {}
+
+    @Override
+    public void onPreloadStatusUpdated() {}
+
+    @Override
+    public void onSendingRemoteMediaRequest() {}
+
+    @Override
+    public void onAdBreakStatusUpdated() {}
+
+
+    // SessionManagerListener implementation.
+
+    @Override
+    public void onSessionStarted(CastSession castSession, String s) {
+      setRemoteMediaClient(castSession.getRemoteMediaClient());
+    }
+
+    @Override
+    public void onSessionResumed(CastSession castSession, boolean b) {
+      setRemoteMediaClient(castSession.getRemoteMediaClient());
+    }
+
+    @Override
+    public void onSessionEnded(CastSession castSession, int i) {
+      setRemoteMediaClient(null);
+    }
+
+    @Override
+    public void onSessionSuspended(CastSession castSession, int i) {
+      setRemoteMediaClient(null);
+    }
+
+    @Override
+    public void onSessionResumeFailed(CastSession castSession, int statusCode) {
+      Log.e(TAG, "Session resume failed. Error code " + statusCode + ": "
+          + CastUtils.getLogString(statusCode));
+    }
+
+    @Override
+    public void onSessionStarting(CastSession castSession) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onSessionStartFailed(CastSession castSession, int statusCode) {
+      Log.e(TAG, "Session start failed. Error code " + statusCode + ": "
+          + CastUtils.getLogString(statusCode));
+    }
+
+    @Override
+    public void onSessionEnding(CastSession castSession) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onSessionResuming(CastSession castSession, String s) {
+      // Do nothing.
+    }
+
+  }
+
+  // Result callbacks hooks.
+
+  private final class RepeatModeResultCallback implements ResultCallback<MediaChannelResult> {
+
+    @Override
+    public void onResult(MediaChannelResult result) {
+      int statusCode = result.getStatus().getStatusCode();
+      if (statusCode == CommonStatusCodes.SUCCESS) {
+        int repeatMode = getRepeatMode();
+        for (EventListener listener : listeners) {
+          listener.onRepeatModeChanged(repeatMode);
+        }
+      } else {
+        Log.e(TAG, "Set repeat mode failed. Error code " + statusCode + ": "
+            + CastUtils.getLogString(statusCode));
+      }
+    }
+
+  }
+
+  private final class SeekResultCallback implements ResultCallback<MediaChannelResult> {
+
+    @Override
+    public void onResult(MediaChannelResult result) {
+      int statusCode = result.getStatus().getStatusCode();
+      if (statusCode == CommonStatusCodes.SUCCESS) {
+        pendingSeekPositionMs = C.TIME_UNSET;
+      } else if (statusCode == CastStatusCodes.REPLACED) {
+        // A seek was executed before this one completed. Do nothing.
+      } else {
+        Log.e(TAG, "Seek failed. Error code " + statusCode + ": "
+            + CastUtils.getLogString(statusCode));
+      }
+    }
+
+  }
+
+}
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
new file mode 100644
index 00000000000..de604374442
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
@@ -0,0 +1,94 @@
+/*
+ * 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.cast;
+
+import com.google.android.exoplayer2.Format;
+import com.google.android.gms.cast.CastStatusCodes;
+import com.google.android.gms.cast.MediaTrack;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Utility methods for ExoPlayer/Cast integration.
+ */
+/* package */ final class CastUtils {
+
+  private static final Map<Integer, String> CAST_STATUS_CODE_TO_STRING;
+
+  /**
+   * Returns a descriptive log string for the given {@code statusCode}, or "Unknown." if not one of
+   * {@link CastStatusCodes}.
+   *
+   * @param statusCode A Cast API status code.
+   * @return A descriptive log string for the given {@code statusCode}, or "Unknown." if not one of
+   *     {@link CastStatusCodes}.
+   */
+  public static String getLogString(int statusCode) {
+    String description = CAST_STATUS_CODE_TO_STRING.get(statusCode);
+    return description != null ? description : "Unknown.";
+  }
+
+  /**
+   * Creates a {@link Format} instance containing all information contained in the given
+   * {@link MediaTrack} object.
+   *
+   * @param mediaTrack The {@link MediaTrack}.
+   * @return The equivalent {@link Format}.
+   */
+  public static Format mediaTrackToFormat(MediaTrack mediaTrack) {
+    return Format.createContainerFormat(mediaTrack.getContentId(), mediaTrack.getContentType(),
+        null, null, Format.NO_VALUE, 0, mediaTrack.getLanguage());
+  }
+
+  static {
+    HashMap<Integer, String> statusCodeToString = new HashMap<>();
+    statusCodeToString.put(CastStatusCodes.APPLICATION_NOT_FOUND,
+        "A requested application could not be found.");
+    statusCodeToString.put(CastStatusCodes.APPLICATION_NOT_RUNNING,
+        "A requested application is not currently running.");
+    statusCodeToString.put(CastStatusCodes.AUTHENTICATION_FAILED, "Authentication failure.");
+    statusCodeToString.put(CastStatusCodes.CANCELED, "An in-progress request has been "
+        + "canceled, most likely because another action has preempted it.");
+    statusCodeToString.put(CastStatusCodes.ERROR_SERVICE_CREATION_FAILED,
+        "The Cast Remote Display service could not be created.");
+    statusCodeToString.put(CastStatusCodes.ERROR_SERVICE_DISCONNECTED,
+        "The Cast Remote Display service was disconnected.");
+    statusCodeToString.put(CastStatusCodes.FAILED, "The in-progress request failed.");
+    statusCodeToString.put(CastStatusCodes.INTERNAL_ERROR, "An internal error has occurred.");
+    statusCodeToString.put(CastStatusCodes.INTERRUPTED,
+        "A blocking call was interrupted while waiting and did not run to completion.");
+    statusCodeToString.put(CastStatusCodes.INVALID_REQUEST, "An invalid request was made.");
+    statusCodeToString.put(CastStatusCodes.MESSAGE_SEND_BUFFER_TOO_FULL, "A message could "
+        + "not be sent because there is not enough room in the send buffer at this time.");
+    statusCodeToString.put(CastStatusCodes.MESSAGE_TOO_LARGE,
+        "A message could not be sent because it is too large.");
+    statusCodeToString.put(CastStatusCodes.NETWORK_ERROR, "Network I/O error.");
+    statusCodeToString.put(CastStatusCodes.NOT_ALLOWED,
+        "The request was disallowed and could not be completed.");
+    statusCodeToString.put(CastStatusCodes.REPLACED,
+        "The request's progress is no longer being tracked because another request of the same type"
+            + " has been made before the first request completed.");
+    statusCodeToString.put(CastStatusCodes.SUCCESS, "Success.");
+    statusCodeToString.put(CastStatusCodes.TIMEOUT, "An operation has timed out.");
+    statusCodeToString.put(CastStatusCodes.UNKNOWN_ERROR,
+        "An unknown, unexpected error has occurred.");
+    CAST_STATUS_CODE_TO_STRING = Collections.unmodifiableMap(statusCodeToString);
+  }
+
+  private CastUtils() {}
+
+}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
new file mode 100644
index 00000000000..06f0bec971a
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
@@ -0,0 +1,42 @@
+/*
+ * 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.cast;
+
+import android.content.Context;
+import com.google.android.gms.cast.CastMediaControlIntent;
+import com.google.android.gms.cast.framework.CastOptions;
+import com.google.android.gms.cast.framework.OptionsProvider;
+import com.google.android.gms.cast.framework.SessionProvider;
+import java.util.List;
+
+/**
+ * A convenience {@link OptionsProvider} to target the default cast receiver app.
+ */
+public final class DefaultCastOptionsProvider implements OptionsProvider {
+
+  @Override
+  public CastOptions getCastOptions(Context context) {
+    return new CastOptions.Builder()
+        .setReceiverApplicationId(CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID)
+        .setStopReceiverApplicationWhenEndingSession(true).build();
+  }
+
+  @Override
+  public List<SessionProvider> getAdditionalSessionProviders(Context context) {
+    return null;
+  }
+
+}
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index a4ead9e01fb..c084ec6bf8c 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     //     |-- com.android.support:support-v4:25.2.0
     compile 'com.android.support:support-v4:' + supportLibraryVersion
     compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
-    compile 'com.google.android.gms:play-services-ads:11.0.2'
+    compile 'com.google.android.gms:play-services-ads:' + playServicesLibraryVersion
     androidTestCompile project(modulePrefix + 'library')
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
diff --git a/library/all/src/main/AndroidManifest.xml b/library/all/src/main/AndroidManifest.xml
index 1efda648e9d..f31f55b40a2 100644
--- a/library/all/src/main/AndroidManifest.xml
+++ b/library/all/src/main/AndroidManifest.xml
@@ -13,5 +13,4 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <manifest package="com.google.android.exoplayer2"/>

From 4d7f37f5a9b55010f3a2f5354a45d86d63c80d25 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 17 Aug 2017 07:48:49 -0700
Subject: [PATCH 114/421] Work around issue with Xiaomi JB devices

Issue: #3171

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165577562
---
 .../android/exoplayer2/mediacodec/MediaCodecUtil.java       | 6 ++++--
 1 file changed, 4 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 d3f3dae344c..1073e8d9c18 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
@@ -288,9 +288,11 @@ private static boolean isCodecUsableDecoder(android.media.MediaCodecInfo info, S
       return false;
     }
 
-    // Work around https://github.com/google/ExoPlayer/issues/1528
+    // 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)
-        && "a70".equals(Util.DEVICE)) {
+        && ("a70".equals(Util.DEVICE)
+            || ("Xiaomi".equals(Util.MANUFACTURER) && Util.DEVICE.startsWith("HM")))) {
       return false;
     }
 

From 34960ad891645514917545926877ad8d009b9ed6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 17 Aug 2017 07:59:29 -0700
Subject: [PATCH 115/421] Tweak and add READMEs + remove refs to V1

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165578518
---
 README.md                         | 43 ++++++++++++++++---------------
 demos/README.md                   |  4 +++
 demos/main/README.md              |  4 +--
 extensions/README.md              |  5 ++++
 extensions/cronet/README.md       |  9 +++++--
 extensions/ffmpeg/README.md       |  9 +++++--
 extensions/flac/README.md         |  9 +++++--
 extensions/gvr/README.md          | 18 ++++++++-----
 extensions/ima/README.md          |  9 +++++--
 extensions/leanback/README.md     | 11 +++++---
 extensions/mediasession/README.md |  9 +++++--
 extensions/okhttp/README.md       |  9 +++++--
 extensions/opus/README.md         | 13 +++++++---
 extensions/rtmp/README.md         |  9 +++++--
 extensions/vp9/README.md          | 13 +++++++---
 library/README.md                 |  7 +++++
 library/all/README.md             | 13 ++++++++++
 library/core/README.md            |  9 +++++++
 library/dash/README.md            | 12 +++++++++
 library/hls/README.md             | 11 ++++++++
 library/smoothstreaming/README.md | 12 +++++++++
 library/ui/README.md              | 10 +++++++
 22 files changed, 194 insertions(+), 54 deletions(-)
 create mode 100644 demos/README.md
 create mode 100644 extensions/README.md
 create mode 100644 library/README.md
 create mode 100644 library/all/README.md
 create mode 100644 library/core/README.md
 create mode 100644 library/dash/README.md
 create mode 100644 library/hls/README.md
 create mode 100644 library/smoothstreaming/README.md
 create mode 100644 library/ui/README.md

diff --git a/README.md b/README.md
index f4dd9b69ec4..c67fb09d73f 100644
--- a/README.md
+++ b/README.md
@@ -9,21 +9,23 @@ and extend, and can be updated through Play Store application updates.
 
 ## Documentation ##
 
-* The [developer guide][] provides a wealth of information to help you get
-  started.
-* The [class reference][] documents the ExoPlayer library classes.
+* The [developer guide][] provides a wealth of information.
+* The [class reference][] documents ExoPlayer classes.
 * The [release notes][] document the major changes in each release.
+* 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
-[release notes]: https://github.com/google/ExoPlayer/blob/dev-v2/RELEASENOTES.md
+[release notes]: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
+[developer blog]: https://medium.com/google-exoplayer
 
 ## Using ExoPlayer ##
 
-ExoPlayer modules can be obtained via JCenter. It's also possible to clone the
+ExoPlayer modules can be obtained from JCenter. It's also possible to clone the
 repository and depend on the modules locally.
 
-### Via JCenter ###
+### 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 Maven
@@ -39,7 +41,7 @@ repositories {
 ```
 
 Next add a gradle compile dependency to the `build.gradle` file of your app
-module. The following will add a dependency to the full ExoPlayer library:
+module. The following will add a dependency to the full library:
 
 ```gradle
 compile 'com.google.android.exoplayer:exoplayer:r2.X.X'
@@ -56,8 +58,8 @@ compile 'com.google.android.exoplayer:exoplayer-dash:r2.X.X'
 compile 'com.google.android.exoplayer:exoplayer-ui:r2.X.X'
 ```
 
-The available modules are listed below. Adding a dependency to the full
-ExoPlayer library is equivalent to adding dependencies on all of the modules
+The available library modules are listed below. Adding a dependency to the full
+library is equivalent to adding dependencies on all of the library modules
 individually.
 
 * `exoplayer-core`: Core functionality (required).
@@ -66,11 +68,16 @@ individually.
 * `exoplayer-smoothstreaming`: Support for SmoothStreaming content.
 * `exoplayer-ui`: UI components and resources for use with ExoPlayer.
 
-For more details, see the project on [Bintray][]. For information about the
-latest versions, see the [Release notes][].
+In addition to library modules, ExoPlayer has multiple extension modules that
+depend on external libraries to provide additional functionality. Some
+extensions are available from JCenter, whereas others must be built manaully.
+Browse the [extensions directory] and their individual READMEs for details.
 
+More information on the library and extension modules that are available from
+JCenter can be found on [Bintray][].
+
+[extensions directory][]: https://github.com/google/ExoPlayer/tree/release-v2/extensions/
 [Bintray]: https://bintray.com/google/exoplayer
-[Release notes]: https://github.com/google/ExoPlayer/blob/release-v2/RELEASENOTES.md
 
 ### Locally ###
 
@@ -109,15 +116,9 @@ compile project(':exoplayer-library-ui)
 
 #### Project branches ####
 
-  * The project has `dev-vX` and `release-vX` branches, where `X` is the major
-    version number.
-  * Most development work happens on the `dev-vX` branch with the highest major
-    version number. Pull requests should normally be made to this branch.
-  * Bug fixes may be submitted to older `dev-vX` branches. When doing this, the
-    same (or an equivalent) fix should also be submitted to all subsequent
-    `dev-vX` branches.
-  * A `release-vX` branch holds the most recent stable release for major version
-    `X`.
+* Development work happens on the `dev-v2` branch. Pull requests should
+  normally be made to this branch.
+* The `release-v2` branch holds the most recent release.
 
 #### Using Android Studio ####
 
diff --git a/demos/README.md b/demos/README.md
new file mode 100644
index 00000000000..7e62249db1b
--- /dev/null
+++ b/demos/README.md
@@ -0,0 +1,4 @@
+# ExoPlayer demos #
+
+This directory contains applications that demonstrate how to use ExoPlayer.
+Browse the individual demos and their READMEs to learn more.
diff --git a/demos/main/README.md b/demos/main/README.md
index ca37392623d..bdb04e5ba8e 100644
--- a/demos/main/README.md
+++ b/demos/main/README.md
@@ -1,5 +1,5 @@
-# Demo application #
+# ExoPlayer main demo #
 
-This folder contains a demo application that uses ExoPlayer to play a number
+This is the main ExoPlayer demo application. It uses ExoPlayer to play a number
 of test streams. It can be used as a starting point or reference project when
 developing other applications that make use of the ExoPlayer library.
diff --git a/extensions/README.md b/extensions/README.md
new file mode 100644
index 00000000000..bf0effb3580
--- /dev/null
+++ b/extensions/README.md
@@ -0,0 +1,5 @@
+# ExoPlayer extensions #
+
+ExoPlayer extensions are modules that depend on external libraries to provide
+additional functionality. Browse the individual extensions and their READMEs to
+learn more.
diff --git a/extensions/cronet/README.md b/extensions/cronet/README.md
index 2287c4c19b8..37c031f35f5 100644
--- a/extensions/cronet/README.md
+++ b/extensions/cronet/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer Cronet extension #
 
-## Description ##
-
 The Cronet extension is an [HttpDataSource][] implementation using [Cronet][].
 
 [HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer/upstream/HttpDataSource.html
@@ -56,3 +54,10 @@ new DefaultDataSourceFactory(
     new CronetDataSourceFactory(...) /* baseDataSourceFactory argument */);
 ```
 respectively.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.cronet.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index fbc919c36d2..57b637d1e26 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer FFmpeg extension #
 
-## Description ##
-
 The FFmpeg extension provides `FfmpegAudioRenderer`, which uses FFmpeg for
 decoding and can render audio encoded in a variety of formats.
 
@@ -140,3 +138,10 @@ then implement your own logic to use the renderer for a given track.
 [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
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.ffmpeg.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index 505482f7ed2..113b41a93de 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer Flac extension #
 
-## Description ##
-
 The Flac extension provides `FlacExtractor` and `LibflacAudioRenderer`, which
 use libFLAC (the Flac decoding library) to extract and decode FLAC audio.
 
@@ -82,3 +80,10 @@ Note: These instructions assume you're using `DefaultTrackSelector`. If you have
 a custom track selector the choice of `Renderer` is up to your implementation,
 so you need to make sure you are passing an `LibflacAudioRenderer` to the
 player, then implement your own logic to use the renderer for a given track.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.flac.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/gvr/README.md b/extensions/gvr/README.md
index 4e08ee6387e..250cf58c2f2 100644
--- a/extensions/gvr/README.md
+++ b/extensions/gvr/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer GVR extension #
 
-## Description ##
-
 The GVR extension wraps the [Google VR SDK for Android][]. It provides a
 GvrAudioProcessor, which uses [GvrAudioSurround][] to provide binaural rendering
 of surround sound and ambisonic soundfields.
@@ -26,9 +24,17 @@ locally. Instructions for doing this can be found in ExoPlayer's
 
 ## Using the extension ##
 
-* If using SimpleExoPlayer, override SimpleExoPlayer.buildAudioProcessors to
-  return a GvrAudioProcessor.
-* If constructing renderers directly, pass a GvrAudioProcessor to
-  MediaCodecAudioRenderer's constructor.
+* If using `DefaultRenderersFactory`, override
+  `DefaultRenderersFactory.buildAudioProcessors` to return a
+  `GvrAudioProcessor`.
+* If constructing renderers directly, pass a `GvrAudioProcessor` to
+  `MediaCodecAudioRenderer`'s constructor.
 
 [top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.gvr.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/ima/README.md b/extensions/ima/README.md
index f328bb44cb1..4f63214f046 100644
--- a/extensions/ima/README.md
+++ b/extensions/ima/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer IMA extension #
 
-## Description ##
-
 The IMA extension is a [MediaSource][] implementation wrapping the
 [Interactive Media Ads SDK for Android][IMA]. You can use it to insert ads
 alongside content.
@@ -55,3 +53,10 @@ playback.
 
 [top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
 [sample ad tags]: https://developers.google.com/interactive-media-ads/docs/sdks/android/tags
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.ima.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/leanback/README.md b/extensions/leanback/README.md
index 0fb3846f7ef..1fa71c9a8c2 100644
--- a/extensions/leanback/README.md
+++ b/extensions/leanback/README.md
@@ -1,6 +1,4 @@
-# ExoPlayer Leanback Extension #
-
-## Description ##
+# ExoPlayer Leanback extension #
 
 This [Leanback][] Extension provides a [PlayerAdapter][] implementation for
 ExoPlayer.
@@ -24,3 +22,10 @@ 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
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.leanback.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/mediasession/README.md b/extensions/mediasession/README.md
index 60fec9fb608..3278e8dba59 100644
--- a/extensions/mediasession/README.md
+++ b/extensions/mediasession/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer MediaSession extension #
 
-## Description ##
-
 The MediaSession extension mediates between a Player (or ExoPlayer) instance
 and a [MediaSession][]. It automatically retrieves and implements playback
 actions and syncs the player state with the state of the media session. The
@@ -25,3 +23,10 @@ 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
+
+## Links ##
+
+* [Javadoc][]: Classes matching
+  `com.google.android.exoplayer2.ext.mediasession.*` belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md
index b10c4ba629b..f84d0c35f26 100644
--- a/extensions/okhttp/README.md
+++ b/extensions/okhttp/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer OkHttp extension #
 
-## Description ##
-
 The OkHttp extension is an [HttpDataSource][] implementation using Square's
 [OkHttp][].
 
@@ -49,3 +47,10 @@ new DefaultDataSourceFactory(
     new OkHttpDataSourceFactory(...) /* baseDataSourceFactory argument */);
 ```
 respectively.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.okhttp.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/opus/README.md b/extensions/opus/README.md
index cc21c77cf99..d766e8c9c40 100644
--- a/extensions/opus/README.md
+++ b/extensions/opus/README.md
@@ -1,9 +1,7 @@
 # ExoPlayer Opus extension #
 
-## Description ##
-
-The Opus extension provides `LibopusAudioRenderer`, which uses
-libopus (the Opus decoding library) to decode Opus audio.
+The Opus extension provides `LibopusAudioRenderer`, which uses libopus (the Opus
+decoding library) to decode Opus audio.
 
 ## Build instructions ##
 
@@ -86,3 +84,10 @@ Note: These instructions assume you're using `DefaultTrackSelector`. If you have
 a custom track selector the choice of `Renderer` is up to your implementation,
 so you need to make sure you are passing an `LibopusAudioRenderer` to the
 player, then implement your own logic to use the renderer for a given track.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.opus.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md
index 80074f119c6..7e6bc0d641a 100644
--- a/extensions/rtmp/README.md
+++ b/extensions/rtmp/README.md
@@ -1,7 +1,5 @@
 # ExoPlayer RTMP extension #
 
-## Description ##
-
 The RTMP extension is a [DataSource][] implementation for playing [RTMP][]
 streams using [LibRtmp Client for Android][].
 
@@ -41,3 +39,10 @@ application code are required. Alternatively, if you know that your application
 doesn't need to handle any other protocols, you can update any `DataSource`s and
 `DataSource.Factory` instantiations in your application code to use
 `RtmpDataSource` and `RtmpDataSourceFactory` directly.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.rtmp.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index d28aa70db0c..7bce4a2a256 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -1,9 +1,7 @@
 # ExoPlayer VP9 extension #
 
-## Description ##
-
-The VP9 extension provides `LibvpxVideoRenderer`, which uses
-libvpx (the VPx decoding library) to decode VP9 video.
+The VP9 extension provides `LibvpxVideoRenderer`, which uses libvpx (the VPx
+decoding library) to decode VP9 video.
 
 ## Build instructions ##
 
@@ -110,3 +108,10 @@ performed using a GL shader. To enable this mode, send the renderer a message of
 type `LibvpxVideoRenderer.MSG_SET_OUTPUT_BUFFER_RENDERER` with the
 `VpxVideoSurfaceView` as its object, instead of sending `MSG_SET_SURFACE` with a
 `Surface`.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.vp9.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/library/README.md b/library/README.md
new file mode 100644
index 00000000000..7aa07fc5218
--- /dev/null
+++ b/library/README.md
@@ -0,0 +1,7 @@
+# ExoPlayer library #
+
+The ExoPlayer library is split into multiple modules. See ExoPlayer's
+[top level README][] for more information about the available library modules
+and how to use them.
+
+[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
diff --git a/library/all/README.md b/library/all/README.md
new file mode 100644
index 00000000000..8746e3afc66
--- /dev/null
+++ b/library/all/README.md
@@ -0,0 +1,13 @@
+# ExoPlayer full library #
+
+An empty module that depends on all of the other library modules. Depending on
+the full library is equivalent to depending on all of the other library modules
+individually. See ExoPlayer's [top level README][] for more information.
+
+[top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
+
+## Links ##
+
+* [Javadoc][]: Note that this Javadoc is combined with that of other modules.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/library/core/README.md b/library/core/README.md
new file mode 100644
index 00000000000..f31ffed131e
--- /dev/null
+++ b/library/core/README.md
@@ -0,0 +1,9 @@
+# ExoPlayer core library module #
+
+The core of the ExoPlayer library.
+
+## Links ##
+
+* [Javadoc][]: Note that this Javadoc is combined with that of other modules.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/library/dash/README.md b/library/dash/README.md
new file mode 100644
index 00000000000..394a38a3321
--- /dev/null
+++ b/library/dash/README.md
@@ -0,0 +1,12 @@
+# ExoPlayer DASH library module #
+
+Provides support for Dynamic Adaptive Streaming over HTTP (DASH) content. To
+play DASH content, instantiate a `DashMediaSource` and pass it to
+`ExoPlayer.prepare`.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.source.dash.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/library/hls/README.md b/library/hls/README.md
new file mode 100644
index 00000000000..6f7e9d08d98
--- /dev/null
+++ b/library/hls/README.md
@@ -0,0 +1,11 @@
+# ExoPlayer HLS library module #
+
+Provides support for HTTP Live Streaming (HLS) content. To play HLS content,
+instantiate a `HlsMediaSource` and pass it to `ExoPlayer.prepare`.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.source.hls.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/library/smoothstreaming/README.md b/library/smoothstreaming/README.md
new file mode 100644
index 00000000000..69265e87020
--- /dev/null
+++ b/library/smoothstreaming/README.md
@@ -0,0 +1,12 @@
+# ExoPlayer SmoothStreaming library module #
+
+Provides support for Smooth Streaming content. To play Smooth Streaming content,
+instantiate a `SsMediaSource` and pass it to `ExoPlayer.prepare`.
+
+## Links ##
+
+* [Javadoc][]: Classes matching
+  `com.google.android.exoplayer2.source.smoothstreaming.*` belong to this
+  module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
diff --git a/library/ui/README.md b/library/ui/README.md
new file mode 100644
index 00000000000..34e93e43af1
--- /dev/null
+++ b/library/ui/README.md
@@ -0,0 +1,10 @@
+# ExoPlayer UI library module #
+
+Provides UI components and resources for use with ExoPlayer.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ui.*`
+  belong to this module.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html

From e3f305b5c09de7b635125d22d6e14d80c9a4857b Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 17 Aug 2017 08:14:46 -0700
Subject: [PATCH 116/421] Improve FORMAT_UNSUPPORTED_DRM related documentation
 and logging

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165580016
---
 .../android/exoplayer2/demo/EventLogger.java       |  2 ++
 .../android/exoplayer2/RendererCapabilities.java   |  6 +++---
 .../trackselection/MappingTrackSelector.java       | 14 ++++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 30dfb5140af..2ea4b5b7cfc 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -431,6 +431,8 @@ private static String getFormatSupportString(int formatSupport) {
         return "YES";
       case RendererCapabilities.FORMAT_EXCEEDS_CAPABILITIES:
         return "NO_EXCEEDS_CAPABILITIES";
+      case RendererCapabilities.FORMAT_UNSUPPORTED_DRM:
+        return "NO_UNSUPPORTED_DRM";
       case RendererCapabilities.FORMAT_UNSUPPORTED_SUBTYPE:
         return "NO_UNSUPPORTED_TYPE";
       case RendererCapabilities.FORMAT_UNSUPPORTED_TYPE:
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
index f841a1b8b5f..3f1be20cfb1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
@@ -24,7 +24,7 @@ public interface RendererCapabilities {
 
   /**
    * A mask to apply to the result of {@link #supportsFormat(Format)} to obtain one of
-   * {@link #FORMAT_HANDLED}, {@link #FORMAT_EXCEEDS_CAPABILITIES},
+   * {@link #FORMAT_HANDLED}, {@link #FORMAT_EXCEEDS_CAPABILITIES}, {@link #FORMAT_UNSUPPORTED_DRM},
    * {@link #FORMAT_UNSUPPORTED_SUBTYPE} and {@link #FORMAT_UNSUPPORTED_TYPE}.
    */
   int FORMAT_SUPPORT_MASK = 0b111;
@@ -117,8 +117,8 @@ public interface RendererCapabilities {
    * the bitwise OR of three properties:
    * <ul>
    * <li>The level of support for the format itself. One of {@link #FORMAT_HANDLED},
-   * {@link #FORMAT_EXCEEDS_CAPABILITIES}, {@link #FORMAT_UNSUPPORTED_SUBTYPE} and
-   * {@link #FORMAT_UNSUPPORTED_TYPE}.</li>
+   * {@link #FORMAT_EXCEEDS_CAPABILITIES}, {@link #FORMAT_UNSUPPORTED_DRM},
+   * {@link #FORMAT_UNSUPPORTED_SUBTYPE} and {@link #FORMAT_UNSUPPORTED_TYPE}.</li>
    * <li>The level of support for adapting from the format to another format of the same mime type.
    * One of {@link #ADAPTIVE_SEAMLESS}, {@link #ADAPTIVE_NOT_SEAMLESS} and
    * {@link #ADAPTIVE_NOT_SUPPORTED}.</li>
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 45ac9eab6e6..d518b5a6bea 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
@@ -199,6 +199,7 @@ public int getTrackTypeRendererSupport(int trackType) {
      * @param trackIndex The index of the track within the track group.
      * @return One of {@link RendererCapabilities#FORMAT_HANDLED},
      *     {@link RendererCapabilities#FORMAT_EXCEEDS_CAPABILITIES},
+     *     {@link RendererCapabilities#FORMAT_UNSUPPORTED_DRM},
      *     {@link RendererCapabilities#FORMAT_UNSUPPORTED_SUBTYPE} and
      *     {@link RendererCapabilities#FORMAT_UNSUPPORTED_TYPE}.
      */
@@ -214,6 +215,7 @@ public int getTrackFormatSupport(int rendererIndex, int groupIndex, int trackInd
      * Tracks for which {@link #getTrackFormatSupport(int, int, int)} returns
      * {@link RendererCapabilities#FORMAT_HANDLED} are always considered.
      * Tracks for which {@link #getTrackFormatSupport(int, int, int)} returns
+     * {@link RendererCapabilities#FORMAT_UNSUPPORTED_DRM},
      * {@link RendererCapabilities#FORMAT_UNSUPPORTED_TYPE} or
      * {@link RendererCapabilities#FORMAT_UNSUPPORTED_SUBTYPE} are never considered.
      * Tracks for which {@link #getTrackFormatSupport(int, int, int)} returns
@@ -615,12 +617,12 @@ protected abstract TrackSelection[] selectTracks(RendererCapabilities[] renderer
   /**
    * Finds the renderer to which the provided {@link TrackGroup} should be mapped.
    * <p>
-   * A {@link TrackGroup} is mapped to the renderer that reports
-   * {@link RendererCapabilities#FORMAT_HANDLED} support for one or more of the tracks in the group,
-   * or {@link RendererCapabilities#FORMAT_EXCEEDS_CAPABILITIES} if no such renderer exists, or
-   * {@link RendererCapabilities#FORMAT_UNSUPPORTED_SUBTYPE} if again no such renderer exists. In
-   * the case that two or more renderers report the same level of support, the renderer with the
-   * lowest index is associated.
+   * A {@link TrackGroup} is mapped to the renderer that reports the highest of (listed in
+   * decreasing order of support) {@link RendererCapabilities#FORMAT_HANDLED},
+   * {@link RendererCapabilities#FORMAT_EXCEEDS_CAPABILITIES},
+   * {@link RendererCapabilities#FORMAT_UNSUPPORTED_DRM} and
+   * {@link RendererCapabilities#FORMAT_UNSUPPORTED_SUBTYPE}. In the case that two or more renderers
+   * report the same level of support, the renderer with the lowest index is associated.
    * <p>
    * If all renderers report {@link RendererCapabilities#FORMAT_UNSUPPORTED_TYPE} for all of the
    * tracks in the group, then {@code renderers.length} is returned to indicate that the group was

From 106d88df41974ce3c2e5ed2cbd62de1c68e710ba Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 19 Jul 2017 11:26:49 +0100
Subject: [PATCH 117/421] Some no-op LeanbackPlayerAdapter cleanup

- Have a single inner class for all listeners. This is inline
  with what we do elsewhere in the library.
- Avoid repeated getCallback() calls within methods.
- Seek to default position from ended state, rather than 0.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165603927
---
 .../ext/leanback/LeanbackPlayerAdapter.java   | 150 +++++++++---------
 1 file changed, 75 insertions(+), 75 deletions(-)

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 df77a737b8c..26fd4e9c8f3 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
@@ -26,7 +26,6 @@
 import android.view.SurfaceHolder;
 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.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
@@ -37,7 +36,7 @@
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
 
 /**
- * Leanback {@link PlayerAdapter} implementation for {@link SimpleExoPlayer}.
+ * Leanback {@code PlayerAdapter} implementation for {@link SimpleExoPlayer}.
  */
 public final class LeanbackPlayerAdapter extends PlayerAdapter {
 
@@ -48,58 +47,49 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter {
   private final Context context;
   private final SimpleExoPlayer player;
   private final Handler handler;
-  private final Runnable updatePlayerRunnable = new Runnable() {
-      @Override
-      public void run() {
-          getCallback().onCurrentPositionChanged(LeanbackPlayerAdapter.this);
-          getCallback().onBufferedPositionChanged(LeanbackPlayerAdapter.this);
-          handler.postDelayed(this, updatePeriod);
-      }
-  };
+  private final ComponentListener componentListener;
+  private final Runnable updatePlayerRunnable;
 
+  private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   private SurfaceHolderGlueHost surfaceHolderGlueHost;
   private boolean initialized;
   private boolean hasSurface;
   private boolean isBuffering;
-  private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
-  private final int updatePeriod;
-  private final ExoPlayerEventListenerImpl exoPlayerListener = new ExoPlayerEventListenerImpl();
-  private final SimpleExoPlayer.VideoListener videoListener = new SimpleExoPlayer.VideoListener() {
-        @Override
-      public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
-          float pixelWidthHeightRatio) {
-            getCallback().onVideoSizeChanged(LeanbackPlayerAdapter.this, width, height);
-      }
-
-      @Override
-      public void onRenderedFirstFrame() {
-      }
-  };
 
   /**
-   * Constructor.
-   * Users are responsible for managing {@link SimpleExoPlayer} lifecycle. You must
-   * stop/release the player once you're done playing the media.
+   * Builds an instance. Note that the {@code PlayerAdapter} does not manage the lifecycle of the
+   * {@link SimpleExoPlayer} instance. The caller remains responsible for releasing the player when
+   * it's no longer required.
    *
    * @param context The current context (activity).
    * @param player Instance of your exoplayer that needs to be configured.
+   * @param updatePeriodMs The delay between player control updates, in milliseconds.
    */
-  public LeanbackPlayerAdapter(Context context, SimpleExoPlayer player, int updatePeriod) {
+  public LeanbackPlayerAdapter(Context context, SimpleExoPlayer player, final int updatePeriodMs) {
     this.context = context;
     this.player = player;
-    this.handler = new Handler();
-    this.updatePeriod = updatePeriod;
+    handler = new Handler();
+    componentListener = new ComponentListener();
+    updatePlayerRunnable = new Runnable() {
+      @Override
+      public void run() {
+        Callback callback = getCallback();
+        callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
+        callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
+        handler.postDelayed(this, updatePeriodMs);
+      }
+    };
   }
 
   @Override
   public void onAttachedToHost(PlaybackGlueHost host) {
     if (host instanceof SurfaceHolderGlueHost) {
       surfaceHolderGlueHost = ((SurfaceHolderGlueHost) host);
-      surfaceHolderGlueHost.setSurfaceHolderCallback(new VideoPlayerSurfaceHolderCallback());
+      surfaceHolderGlueHost.setSurfaceHolderCallback(componentListener);
     }
     notifyListeners();
-    player.addListener(exoPlayerListener);
-    player.addVideoListener(videoListener);
+    player.addListener(componentListener);
+    player.addVideoListener(componentListener);
   }
 
   private void notifyListeners() {
@@ -110,15 +100,14 @@ private void notifyListeners() {
     boolean hasEnded = playbackState == Player.STATE_ENDED;
 
     initialized = isInitialized;
+    Callback callback = getCallback();
     if (oldIsPrepared != isPrepared()) {
-      getCallback().onPreparedStateChanged(this);
+      callback.onPreparedStateChanged(this);
     }
-
-    getCallback().onPlayStateChanged(this);
-    getCallback().onBufferingStateChanged(this, isBuffering || !initialized);
-
+    callback.onPlayStateChanged(this);
+    callback.onBufferingStateChanged(this, isBuffering || !initialized);
     if (hasEnded) {
-      getCallback().onPlayCompleted(this);
+      callback.onPlayCompleted(this);
     }
   }
 
@@ -134,8 +123,8 @@ public void setErrorMessageProvider(
 
   @Override
   public void onDetachedFromHost() {
-    player.removeListener(exoPlayerListener);
-    player.removeVideoListener(videoListener);
+    player.removeListener(componentListener);
+    player.removeVideoListener(componentListener);
     if (surfaceHolderGlueHost != null) {
       surfaceHolderGlueHost.setSurfaceHolderCallback(null);
       surfaceHolderGlueHost = null;
@@ -151,10 +140,9 @@ public void onDetachedFromHost() {
   @Override
   public void setProgressUpdatingEnabled(final boolean enabled) {
     handler.removeCallbacks(updatePlayerRunnable);
-    if (!enabled) {
-      return;
+    if (enabled) {
+      handler.post(updatePlayerRunnable);
     }
-    handler.postDelayed(updatePlayerRunnable, updatePeriod);
   }
 
   @Override
@@ -164,8 +152,8 @@ public boolean isPlaying() {
 
   @Override
   public long getDuration() {
-    long duration = player.getDuration();
-    return duration != C.TIME_UNSET ? duration : -1;
+    long durationMs = player.getDuration();
+    return durationMs != C.TIME_UNSET ? durationMs : -1;
   }
 
   @Override
@@ -176,7 +164,7 @@ public long getCurrentPosition() {
   @Override
   public void play() {
     if (player.getPlaybackState() == Player.STATE_ENDED) {
-      seekTo(0);
+      player.seekToDefaultPosition();
     }
     player.setPlayWhenReady(true);
     getCallback().onPlayStateChanged(this);
@@ -198,10 +186,6 @@ public long getBufferedPosition() {
     return player.getBufferedPosition();
   }
 
-  /**
-   * @return True if ExoPlayer is ready and got a SurfaceHolder if
-   * {@link PlaybackGlueHost} provides SurfaceHolder.
-   */
   @Override
   public boolean isPrepared() {
     return initialized && (surfaceHolderGlueHost == null || hasSurface);
@@ -213,10 +197,11 @@ private void setVideoSurface(Surface surface) {
     getCallback().onPreparedStateChanged(this);
   }
 
-  /**
-   * Implements {@link SurfaceHolder.Callback} that can then be set on the {@link PlaybackGlueHost}.
-   */
-  private final class VideoPlayerSurfaceHolderCallback implements SurfaceHolder.Callback {
+  private final class ComponentListener implements Player.EventListener,
+      SimpleExoPlayer.VideoListener, SurfaceHolder.Callback {
+
+    // SurfaceHolder.Callback implementation.
+
     @Override
     public void surfaceCreated(SurfaceHolder surfaceHolder) {
       setVideoSurface(surfaceHolder.getSurface());
@@ -224,67 +209,82 @@ public void surfaceCreated(SurfaceHolder surfaceHolder) {
 
     @Override
     public void surfaceChanged(SurfaceHolder surfaceHolder, int i, int i1, int i2) {
+      // Do nothing.
     }
 
     @Override
     public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
       setVideoSurface(null);
     }
-  }
 
-  private final class ExoPlayerEventListenerImpl implements ExoPlayer.EventListener {
+    // Player.EventListener implementation.
 
     @Override
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-      LeanbackPlayerAdapter.this.notifyListeners();
+      notifyListeners();
     }
 
     @Override
     public void onPlayerError(ExoPlaybackException exception) {
+      Callback callback = getCallback();
       if (errorMessageProvider != null) {
-        Pair<Integer, String> message = errorMessageProvider.getErrorMessage(exception);
-        if (message != null) {
-          getCallback().onError(LeanbackPlayerAdapter.this,
-              message.first,
-              message.second);
-            return;
-        }
+        Pair<Integer, String> errorMessage = errorMessageProvider.getErrorMessage(exception);
+        callback.onError(LeanbackPlayerAdapter.this, errorMessage.first, errorMessage.second);
+      } else {
+        callback.onError(LeanbackPlayerAdapter.this, exception.type, context.getString(
+            R.string.lb_media_player_error, exception.type, exception.rendererIndex));
       }
-      getCallback().onError(LeanbackPlayerAdapter.this,
-          exception.type,
-          context.getString(R.string.lb_media_player_error,
-          exception.type,
-          exception.rendererIndex));
     }
 
     @Override
     public void onLoadingChanged(boolean isLoading) {
+      // Do nothing.
     }
 
     @Override
     public void onTimelineChanged(Timeline timeline, Object manifest) {
-      getCallback().onDurationChanged(LeanbackPlayerAdapter.this);
-      getCallback().onCurrentPositionChanged(LeanbackPlayerAdapter.this);
-      getCallback().onBufferedPositionChanged(LeanbackPlayerAdapter.this);
+      Callback callback = getCallback();
+      callback.onDurationChanged(LeanbackPlayerAdapter.this);
+      callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
+      callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
     }
 
     @Override
     public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+      // Do nothing.
     }
 
     @Override
     public void onPositionDiscontinuity() {
-      getCallback().onCurrentPositionChanged(LeanbackPlayerAdapter.this);
-      getCallback().onBufferedPositionChanged(LeanbackPlayerAdapter.this);
+      Callback callback = getCallback();
+      callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
+      callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
     }
 
     @Override
     public void onPlaybackParametersChanged(PlaybackParameters params) {
+      // Do nothing.
     }
 
     @Override
     public void onRepeatModeChanged(int repeatMode) {
+      // Do nothing.
+    }
+
+    // SimpleExoplayerView.Callback implementation.
+
+    @Override
+    public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
+        float pixelWidthHeightRatio) {
+      getCallback().onVideoSizeChanged(LeanbackPlayerAdapter.this, width, height);
+    }
+
+    @Override
+    public void onRenderedFirstFrame() {
+      // Do nothing.
     }
+
   }
+
 }
 

From 4917929a3aa59b2a688994977fef8680464bff83 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 17 Aug 2017 14:19:41 -0700
Subject: [PATCH 118/421] Improve MediaSource/MediaPeriod documentation

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165628229
---
 .../android/exoplayer2/source/MediaPeriod.java     |  5 ++++-
 .../android/exoplayer2/source/MediaSource.java     | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 2 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 7a43dd7562f..514b96ae8d4 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
@@ -16,12 +16,15 @@
 package com.google.android.exoplayer2.source;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import java.io.IOException;
 
 /**
- * A source of a single period of media.
+ * Loads media corresponding to a {@link Timeline.Period}, and allows that media to be read. All
+ * methods are called on the player's internal playback thread, as described in the
+ * {@link ExoPlayer} Javadoc.
  */
 public interface MediaPeriod extends SequenceableLoader {
 
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 790620a80c6..11489cfbb80 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
@@ -23,7 +23,19 @@
 import java.io.IOException;
 
 /**
- * A source of media consisting of one or more {@link MediaPeriod}s.
+ * Defines and provides media to be played by an {@link 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 Listener#onSourceInfoRefreshed} on the {@link Listener}
+ *   passed to {@link #prepareSource(ExoPlayer, boolean, Listener)}.</li>
+ *   <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.</li>
+ * </ul>
+ * All methods are called on the player's internal playback thread, as described in the
+ * {@link ExoPlayer} Javadoc.
  */
 public interface MediaSource {
 

From 2470b39d9520618c59a8c857085120dd8da2ffee Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 17 Aug 2017 14:20:56 -0700
Subject: [PATCH 119/421] Split metadata and text outputs from their renderer
 classes

There will be non-ExoPlayer players that can output text
and metadata, so the outputs should be standalone. There
may also be ExoPlayer instances that use non-standard
text and metadata renderers, for which this change also
makes sense.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165628420
---
 .../android/exoplayer2/demo/EventLogger.java  | 11 ++---
 .../exoplayer2/DefaultRenderersFactory.java   | 15 +++---
 .../android/exoplayer2/RenderersFactory.java  |  8 ++--
 .../android/exoplayer2/SimpleExoPlayer.java   | 48 +++++++++----------
 .../exoplayer2/metadata/MetadataOutput.java   | 30 ++++++++++++
 .../exoplayer2/metadata/MetadataRenderer.java | 20 +++-----
 .../android/exoplayer2/text/TextOutput.java   | 32 +++++++++++++
 .../android/exoplayer2/text/TextRenderer.java | 23 ++++-----
 .../exoplayer2/ui/SimpleExoPlayerView.java    | 10 ++--
 .../android/exoplayer2/ui/SubtitleView.java   |  4 +-
 .../testutil/ExoPlayerTestRunner.java         |  8 ++--
 11 files changed, 128 insertions(+), 81 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 2ea4b5b7cfc..cbc3536ef7b 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -29,7 +29,7 @@
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.metadata.Metadata;
-import com.google.android.exoplayer2.metadata.MetadataRenderer;
+import com.google.android.exoplayer2.metadata.MetadataOutput;
 import com.google.android.exoplayer2.metadata.emsg.EventMessage;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.metadata.id3.CommentFrame;
@@ -55,10 +55,9 @@
 /**
  * Logs player events using {@link Log}.
  */
-/* package */ final class EventLogger implements Player.EventListener, AudioRendererEventListener,
-    VideoRendererEventListener, AdaptiveMediaSourceEventListener,
-    ExtractorMediaSource.EventListener, DefaultDrmSessionManager.EventListener,
-    MetadataRenderer.Output {
+/* package */ final class EventLogger implements Player.EventListener, MetadataOutput,
+    AudioRendererEventListener, VideoRendererEventListener, AdaptiveMediaSourceEventListener,
+    ExtractorMediaSource.EventListener, DefaultDrmSessionManager.EventListener {
 
   private static final String TAG = "EventLogger";
   private static final int MAX_TIMELINE_ITEM_LINES = 3;
@@ -205,7 +204,7 @@ public void onTracksChanged(TrackGroupArray ignored, TrackSelectionArray trackSe
     Log.d(TAG, "]");
   }
 
-  // MetadataRenderer.Output
+  // MetadataOutput
 
   @Override
   public void onMetadata(Metadata metadata) {
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 27852f0c156..2272306117d 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
@@ -28,7 +28,9 @@
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.mediacodec.MediaCodecSelector;
+import com.google.android.exoplayer2.metadata.MetadataOutput;
 import com.google.android.exoplayer2.metadata.MetadataRenderer;
+import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.text.TextRenderer;
 import com.google.android.exoplayer2.trackselection.TrackSelector;
 import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
@@ -137,8 +139,8 @@ public DefaultRenderersFactory(Context context,
   @Override
   public Renderer[] createRenderers(Handler eventHandler,
       VideoRendererEventListener videoRendererEventListener,
-      AudioRendererEventListener audioRendererEventListener, TextRenderer.Output textRendererOutput,
-      MetadataRenderer.Output metadataRendererOutput) {
+      AudioRendererEventListener audioRendererEventListener,
+      TextOutput textRendererOutput, MetadataOutput metadataRendererOutput) {
     ArrayList<Renderer> renderersList = new ArrayList<>();
     buildVideoRenderers(context, drmSessionManager, allowedVideoJoiningTimeMs,
         eventHandler, videoRendererEventListener, extensionRendererMode, renderersList);
@@ -283,8 +285,8 @@ protected void buildAudioRenderers(Context context,
    * @param extensionRendererMode The extension renderer mode.
    * @param out An array to which the built renderers should be appended.
    */
-  protected void buildTextRenderers(Context context, TextRenderer.Output output,
-      Looper outputLooper, @ExtensionRendererMode int extensionRendererMode,
+  protected void buildTextRenderers(Context context, TextOutput output, Looper outputLooper,
+      @ExtensionRendererMode int extensionRendererMode,
       ArrayList<Renderer> out) {
     out.add(new TextRenderer(output, outputLooper));
   }
@@ -299,9 +301,8 @@ protected void buildTextRenderers(Context context, TextRenderer.Output output,
    * @param extensionRendererMode The extension renderer mode.
    * @param out An array to which the built renderers should be appended.
    */
-  protected void buildMetadataRenderers(Context context, MetadataRenderer.Output output,
-      Looper outputLooper, @ExtensionRendererMode int extensionRendererMode,
-      ArrayList<Renderer> out) {
+  protected void buildMetadataRenderers(Context context, MetadataOutput output, Looper outputLooper,
+      @ExtensionRendererMode int extensionRendererMode, ArrayList<Renderer> out) {
     out.add(new MetadataRenderer(output, outputLooper));
   }
 
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 728cfa387ae..a08ba448a4d 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
@@ -17,8 +17,8 @@
 
 import android.os.Handler;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
-import com.google.android.exoplayer2.metadata.MetadataRenderer;
-import com.google.android.exoplayer2.text.TextRenderer;
+import com.google.android.exoplayer2.metadata.MetadataOutput;
+import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
 
 /**
@@ -38,7 +38,7 @@ public interface RenderersFactory {
    */
   Renderer[] createRenderers(Handler eventHandler,
       VideoRendererEventListener videoRendererEventListener,
-      AudioRendererEventListener audioRendererEventListener,
-      TextRenderer.Output textRendererOutput, MetadataRenderer.Output metadataRendererOutput);
+      AudioRendererEventListener audioRendererEventListener, TextOutput textRendererOutput,
+      MetadataOutput metadataRendererOutput);
 
 }
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 cc0791bf44b..d71c81f08fe 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
@@ -31,11 +31,11 @@
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.metadata.Metadata;
-import com.google.android.exoplayer2.metadata.MetadataRenderer;
+import com.google.android.exoplayer2.metadata.MetadataOutput;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.text.Cue;
-import com.google.android.exoplayer2.text.TextRenderer;
+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.util.Util;
@@ -89,8 +89,8 @@ void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
   private final ExoPlayer player;
   private final ComponentListener componentListener;
   private final CopyOnWriteArraySet<VideoListener> videoListeners;
-  private final CopyOnWriteArraySet<TextRenderer.Output> textOutputs;
-  private final CopyOnWriteArraySet<MetadataRenderer.Output> metadataOutputs;
+  private final CopyOnWriteArraySet<TextOutput> textOutputs;
+  private final CopyOnWriteArraySet<MetadataOutput> metadataOutputs;
   private final int videoRendererCount;
   private final int audioRendererCount;
 
@@ -491,7 +491,7 @@ public void clearVideoListener(VideoListener listener) {
    *
    * @param listener The output to register.
    */
-  public void addTextOutput(TextRenderer.Output listener) {
+  public void addTextOutput(TextOutput listener) {
     textOutputs.add(listener);
   }
 
@@ -500,7 +500,7 @@ public void addTextOutput(TextRenderer.Output listener) {
    *
    * @param listener The output to remove.
    */
-  public void removeTextOutput(TextRenderer.Output listener) {
+  public void removeTextOutput(TextOutput listener) {
     textOutputs.remove(listener);
   }
 
@@ -508,10 +508,10 @@ public void removeTextOutput(TextRenderer.Output listener) {
    * Sets an output to receive text events, removing all existing outputs.
    *
    * @param output The output.
-   * @deprecated Use {@link #addTextOutput(TextRenderer.Output)}.
+   * @deprecated Use {@link #addTextOutput(TextOutput)}.
    */
   @Deprecated
-  public void setTextOutput(TextRenderer.Output output) {
+  public void setTextOutput(TextOutput output) {
     textOutputs.clear();
     if (output != null) {
       addTextOutput(output);
@@ -519,13 +519,13 @@ public void setTextOutput(TextRenderer.Output output) {
   }
 
   /**
-   * Equivalent to {@link #removeTextOutput(TextRenderer.Output)}.
+   * Equivalent to {@link #removeTextOutput(TextOutput)}.
    *
    * @param output The output to clear.
-   * @deprecated Use {@link #removeTextOutput(TextRenderer.Output)}.
+   * @deprecated Use {@link #removeTextOutput(TextOutput)}.
    */
   @Deprecated
-  public void clearTextOutput(TextRenderer.Output output) {
+  public void clearTextOutput(TextOutput output) {
     removeTextOutput(output);
   }
 
@@ -534,7 +534,7 @@ public void clearTextOutput(TextRenderer.Output output) {
    *
    * @param listener The output to register.
    */
-  public void addMetadataOutput(MetadataRenderer.Output listener) {
+  public void addMetadataOutput(MetadataOutput listener) {
     metadataOutputs.add(listener);
   }
 
@@ -543,7 +543,7 @@ public void addMetadataOutput(MetadataRenderer.Output listener) {
    *
    * @param listener The output to remove.
    */
-  public void removeMetadataOutput(MetadataRenderer.Output listener) {
+  public void removeMetadataOutput(MetadataOutput listener) {
     metadataOutputs.remove(listener);
   }
 
@@ -551,10 +551,10 @@ public void removeMetadataOutput(MetadataRenderer.Output listener) {
    * Sets an output to receive metadata events, removing all existing outputs.
    *
    * @param output The output.
-   * @deprecated Use {@link #addMetadataOutput(MetadataRenderer.Output)}.
+   * @deprecated Use {@link #addMetadataOutput(MetadataOutput)}.
    */
   @Deprecated
-  public void setMetadataOutput(MetadataRenderer.Output output) {
+  public void setMetadataOutput(MetadataOutput output) {
     metadataOutputs.clear();
     if (output != null) {
       addMetadataOutput(output);
@@ -562,13 +562,13 @@ public void setMetadataOutput(MetadataRenderer.Output output) {
   }
 
   /**
-   * Equivalent to {@link #removeMetadataOutput(MetadataRenderer.Output)}.
+   * Equivalent to {@link #removeMetadataOutput(MetadataOutput)}.
    *
    * @param output The output to clear.
-   * @deprecated Use {@link #removeMetadataOutput(MetadataRenderer.Output)}.
+   * @deprecated Use {@link #removeMetadataOutput(MetadataOutput)}.
    */
   @Deprecated
-  public void clearMetadataOutput(MetadataRenderer.Output output) {
+  public void clearMetadataOutput(MetadataOutput output) {
     removeMetadataOutput(output);
   }
 
@@ -849,8 +849,8 @@ private void setVideoSurfaceInternal(Surface surface, boolean ownsSurface) {
   }
 
   private final class ComponentListener implements VideoRendererEventListener,
-      AudioRendererEventListener, TextRenderer.Output, MetadataRenderer.Output,
-      SurfaceHolder.Callback, TextureView.SurfaceTextureListener {
+      AudioRendererEventListener, TextOutput, MetadataOutput, SurfaceHolder.Callback,
+      TextureView.SurfaceTextureListener {
 
     // VideoRendererEventListener implementation
 
@@ -973,20 +973,20 @@ public void onAudioDisabled(DecoderCounters counters) {
       audioSessionId = C.AUDIO_SESSION_ID_UNSET;
     }
 
-    // TextRenderer.Output implementation
+    // TextOutput implementation
 
     @Override
     public void onCues(List<Cue> cues) {
-      for (TextRenderer.Output textOutput : textOutputs) {
+      for (TextOutput textOutput : textOutputs) {
         textOutput.onCues(cues);
       }
     }
 
-    // MetadataRenderer.Output implementation
+    // MetadataOutput implementation
 
     @Override
     public void onMetadata(Metadata metadata) {
-      for (MetadataRenderer.Output metadataOutput : metadataOutputs) {
+      for (MetadataOutput metadataOutput : metadataOutputs) {
         metadataOutput.onMetadata(metadata);
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
new file mode 100644
index 00000000000..b635cbc4b2d
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
@@ -0,0 +1,30 @@
+/*
+ * 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.metadata;
+
+/**
+ * Receives metadata output.
+ */
+public interface MetadataOutput {
+
+  /**
+   * Called when there is metadata associated with current playback time.
+   *
+   * @param metadata The metadata.
+   */
+  void onMetadata(Metadata metadata);
+
+}
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 7ff426e2df7..f46dd467c88 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
@@ -33,18 +33,10 @@
 public final class MetadataRenderer extends BaseRenderer implements Callback {
 
   /**
-   * Receives output from a {@link MetadataRenderer}.
+   * @deprecated Use {@link MetadataOutput}.
    */
-  public interface Output {
-
-    /**
-     * Called each time there is a metadata associated with current playback time.
-     *
-     * @param metadata The metadata.
-     */
-    void onMetadata(Metadata metadata);
-
-  }
+  @Deprecated
+  public interface Output extends MetadataOutput {}
 
   private static final int MSG_INVOKE_RENDERER = 0;
   // TODO: Holding multiple pending metadata objects is temporary mitigation against
@@ -53,7 +45,7 @@ public interface Output {
   private static final int MAX_PENDING_METADATA_COUNT = 5;
 
   private final MetadataDecoderFactory decoderFactory;
-  private final Output output;
+  private final MetadataOutput output;
   private final Handler outputHandler;
   private final FormatHolder formatHolder;
   private final MetadataInputBuffer buffer;
@@ -73,7 +65,7 @@ public interface Output {
    *     {@link android.app.Activity#getMainLooper()}. Null may be passed if the output should be
    *     called directly on the player's internal rendering thread.
    */
-  public MetadataRenderer(Output output, Looper outputLooper) {
+  public MetadataRenderer(MetadataOutput output, Looper outputLooper) {
     this(output, outputLooper, MetadataDecoderFactory.DEFAULT);
   }
 
@@ -86,7 +78,7 @@ public MetadataRenderer(Output output, Looper outputLooper) {
    *     called directly on the player's internal rendering thread.
    * @param decoderFactory A factory from which to obtain {@link MetadataDecoder} instances.
    */
-  public MetadataRenderer(Output output, Looper outputLooper,
+  public MetadataRenderer(MetadataOutput output, Looper outputLooper,
       MetadataDecoderFactory decoderFactory) {
     super(C.TRACK_TYPE_METADATA);
     this.output = Assertions.checkNotNull(output);
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
new file mode 100644
index 00000000000..5a08db94cbd
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
@@ -0,0 +1,32 @@
+/*
+ * 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.text;
+
+import java.util.List;
+
+/**
+ * Receives text output.
+ */
+public interface TextOutput {
+
+  /**
+   * Called when there is a change in the {@link Cue}s.
+   *
+   * @param cues The {@link Cue}s.
+   */
+  void onCues(List<Cue> cues);
+
+}
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 1820d43e750..8e1966305ee 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
@@ -37,23 +37,15 @@
  * <p>
  * {@link Subtitle}s are decoded from sample data using {@link SubtitleDecoder} instances obtained
  * from a {@link SubtitleDecoderFactory}. The actual rendering of the subtitle {@link Cue}s is
- * delegated to an {@link Output}.
+ * delegated to an {@link TextOutput}.
  */
 public final class TextRenderer extends BaseRenderer implements Callback {
 
   /**
-   * Receives output from a {@link TextRenderer}.
+   * @deprecated Use {@link TextOutput}.
    */
-  public interface Output {
-
-    /**
-     * Called each time there is a change in the {@link Cue}s.
-     *
-     * @param cues The {@link Cue}s.
-     */
-    void onCues(List<Cue> cues);
-
-  }
+  @Deprecated
+  public interface Output extends TextOutput {}
 
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({REPLACEMENT_STATE_NONE, REPLACEMENT_STATE_SIGNAL_END_OF_STREAM,
@@ -79,7 +71,7 @@ public interface Output {
   private static final int MSG_UPDATE_OUTPUT = 0;
 
   private final Handler outputHandler;
-  private final Output output;
+  private final TextOutput output;
   private final SubtitleDecoderFactory decoderFactory;
   private final FormatHolder formatHolder;
 
@@ -101,7 +93,7 @@ public interface Output {
    *     using {@link android.app.Activity#getMainLooper()}. Null may be passed if the output
    *     should be called directly on the player's internal rendering thread.
    */
-  public TextRenderer(Output output, Looper outputLooper) {
+  public TextRenderer(TextOutput output, Looper outputLooper) {
     this(output, outputLooper, SubtitleDecoderFactory.DEFAULT);
   }
 
@@ -114,7 +106,8 @@ public TextRenderer(Output output, Looper outputLooper) {
    *     should be called directly on the player's internal rendering thread.
    * @param decoderFactory A factory from which to obtain {@link SubtitleDecoder} instances.
    */
-  public TextRenderer(Output output, Looper outputLooper, SubtitleDecoderFactory decoderFactory) {
+  public TextRenderer(TextOutput output, Looper outputLooper,
+      SubtitleDecoderFactory decoderFactory) {
     super(C.TRACK_TYPE_TEXT);
     this.output = Assertions.checkNotNull(output);
     this.outputHandler = outputLooper == null ? null : new Handler(outputLooper, this);
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 b3dc3c72645..0d10e0fcf90 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
@@ -43,7 +43,7 @@
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.text.Cue;
-import com.google.android.exoplayer2.text.TextRenderer;
+import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
@@ -844,10 +844,10 @@ private static void setResizeModeRaw(AspectRatioFrameLayout aspectRatioFrame, in
     aspectRatioFrame.setResizeMode(resizeMode);
   }
 
-  private final class ComponentListener implements SimpleExoPlayer.VideoListener,
-      TextRenderer.Output, Player.EventListener {
+  private final class ComponentListener implements TextOutput, SimpleExoPlayer.VideoListener,
+      Player.EventListener {
 
-    // TextRenderer.Output implementation
+    // TextOutput implementation
 
     @Override
     public void onCues(List<Cue> cues) {
@@ -856,7 +856,7 @@ public void onCues(List<Cue> cues) {
       }
     }
 
-    // SimpleExoPlayer.VideoListener implementation
+    // SimpleExoPlayer.VideoInfoListener implementation
 
     @Override
     public void onVideoSizeChanged(int width, int height, int unappliedRotationDegrees,
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 3bcfcc3ef35..618f2fa3369 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
@@ -25,7 +25,7 @@
 import android.view.accessibility.CaptioningManager;
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.text.Cue;
-import com.google.android.exoplayer2.text.TextRenderer;
+import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.util.Util;
 import java.util.ArrayList;
 import java.util.List;
@@ -33,7 +33,7 @@
 /**
  * A view for displaying subtitle {@link Cue}s.
  */
-public final class SubtitleView extends View implements TextRenderer.Output {
+public final class SubtitleView extends View implements TextOutput {
 
   /**
    * The default fractional text size.
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 2bfef0b4ab1..f354ad6a769 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
@@ -29,12 +29,12 @@
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
-import com.google.android.exoplayer2.metadata.MetadataRenderer;
+import com.google.android.exoplayer2.metadata.MetadataOutput;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.testutil.ExoPlayerTestRunner.Builder.PlayerFactory;
 import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
-import com.google.android.exoplayer2.text.TextRenderer.Output;
+import com.google.android.exoplayer2.text.TextOutput;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
@@ -164,8 +164,8 @@ public ExoPlayerTestRunner build() {
           @Override
           public Renderer[] createRenderers(Handler eventHandler,
               VideoRendererEventListener videoRendererEventListener,
-              AudioRendererEventListener audioRendererEventListener, Output textRendererOutput,
-              MetadataRenderer.Output metadataRendererOutput) {
+              AudioRendererEventListener audioRendererEventListener, TextOutput textRendererOutput,
+              MetadataOutput metadataRendererOutput) {
             return renderers;
           }
         };

From 7e586c3a8fcf7d1967ee2d34eb17bf83aec2106f Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 9 Aug 2017 15:42:58 +0900
Subject: [PATCH 120/421] expose setPropertyByteArray, setPropertyString

export setPropertyByteArray, setPropertyString of DefaultDrmSessionManager for easy customization.
---
 .../exoplayer2/drm/OfflineLicenseHelper.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

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 741ad1f06f3..38bb982f606 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
@@ -210,6 +210,22 @@ public synchronized Pair<Long, Long> getLicenseDurationRemainingSec(byte[] offli
     }
     return licenseDurationRemainingSec;
   }
+  
+  public byte[] getPropertyByteArray(String key) {
+    return drmSessionManager.getPropertyByteArray(key);
+  }
+
+  public void setPropertyByteArray(String key, byte[] value) {
+    drmSessionManager.setPropertyByteArray(key, value);
+  }
+
+  public String getPropertyString(String key) {
+    return drmSessionManager.getPropertyString(key);
+  }
+
+  public void setPropertyString(String key, String value) {
+    drmSessionManager.setPropertyString(key, value);
+  }
 
   private byte[] blockingKeyRequest(@Mode int licenseMode, byte[] offlineLicenseKeySetId,
       DrmInitData drmInitData) throws DrmSessionException {

From 4fa307d6549a9a6126527f95aa72581ba241b2c5 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 17 Aug 2017 23:13:12 +0100
Subject: [PATCH 121/421] Minor style tweaks

---
 .../assets/subrip/typical_unexpected_end      | 10 ++++
 .../text/subrip/SubripDecoderTest.java        | 12 +++++
 .../exoplayer2/drm/OfflineLicenseHelper.java  | 48 ++++++++++++-------
 .../exoplayer2/extractor/mp4/AtomParsers.java | 18 +++----
 .../exoplayer2/text/subrip/SubripDecoder.java |  9 +++-
 5 files changed, 69 insertions(+), 28 deletions(-)
 create mode 100644 library/core/src/androidTest/assets/subrip/typical_unexpected_end

diff --git a/library/core/src/androidTest/assets/subrip/typical_unexpected_end b/library/core/src/androidTest/assets/subrip/typical_unexpected_end
new file mode 100644
index 00000000000..8e2949b8db2
--- /dev/null
+++ b/library/core/src/androidTest/assets/subrip/typical_unexpected_end
@@ -0,0 +1,10 @@
+1
+00:00:00,000 --> 00:00:01,234
+This is the first subtitle.
+
+2
+00:00:02,345 --> 00:00:03,456
+This is the second subtitle.
+Second subtitle with second line.
+
+3
\ No newline at end of file
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
index 167499fcdc8..744634edda5 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
@@ -31,6 +31,7 @@ public final class SubripDecoderTest extends InstrumentationTestCase {
   private static final String TYPICAL_MISSING_TIMECODE = "subrip/typical_missing_timecode";
   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 NO_END_TIMECODES_FILE = "subrip/no_end_timecodes";
 
   public void testDecodeEmpty() throws IOException {
@@ -107,6 +108,17 @@ public void testDecodeTypicalNegativeTimestamps() throws IOException {
     assertTypicalCue3(subtitle, 0);
   }
 
+  public void testDecodeTypicalUnexpectedEnd() throws IOException {
+    // Parsing should succeed, parsing the first and second cues only.
+    SubripDecoder decoder = new SubripDecoder();
+    byte[] bytes = TestUtil.getByteArray(getInstrumentation(), TYPICAL_UNEXPECTED_END);
+    SubripSubtitle subtitle = decoder.decode(bytes, bytes.length, false);
+
+    assertEquals(4, subtitle.getEventTimeCount());
+    assertTypicalCue1(subtitle, 0);
+    assertTypicalCue2(subtitle, 2);
+  }
+
   public void testDecodeNoEndTimecodes() throws IOException {
     SubripDecoder decoder = new SubripDecoder();
     byte[] bytes = TestUtil.getByteArray(getInstrumentation(), NO_END_TIMECODES_FILE);
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 38bb982f606..cafe41ed093 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
@@ -141,9 +141,32 @@ public void onDrmKeysRemoved() {
         optionalKeyRequestParameters, new Handler(handlerThread.getLooper()), eventListener);
   }
 
-  /** Releases the helper. Should be called when the helper is no longer required. */
-  public void release() {
-    handlerThread.quit();
+  /**
+   * @see DefaultDrmSessionManager#getPropertyByteArray
+   */
+  public synchronized byte[] getPropertyByteArray(String key) {
+    return drmSessionManager.getPropertyByteArray(key);
+  }
+
+  /**
+   * @see DefaultDrmSessionManager#setPropertyByteArray
+   */
+  public synchronized void setPropertyByteArray(String key, byte[] value) {
+    drmSessionManager.setPropertyByteArray(key, value);
+  }
+
+  /**
+   * @see DefaultDrmSessionManager#getPropertyString
+   */
+  public synchronized String getPropertyString(String key) {
+    return drmSessionManager.getPropertyString(key);
+  }
+
+  /**
+   * @see DefaultDrmSessionManager#setPropertyString
+   */
+  public synchronized void setPropertyString(String key, String value) {
+    drmSessionManager.setPropertyString(key, value);
   }
 
   /**
@@ -210,21 +233,12 @@ public synchronized Pair<Long, Long> getLicenseDurationRemainingSec(byte[] offli
     }
     return licenseDurationRemainingSec;
   }
-  
-  public byte[] getPropertyByteArray(String key) {
-    return drmSessionManager.getPropertyByteArray(key);
-  }
-
-  public void setPropertyByteArray(String key, byte[] value) {
-    drmSessionManager.setPropertyByteArray(key, value);
-  }
 
-  public String getPropertyString(String key) {
-    return drmSessionManager.getPropertyString(key);
-  }
-
-  public void setPropertyString(String key, String value) {
-    drmSessionManager.setPropertyString(key, value);
+  /**
+   * Releases the helper. Should be called when the helper is no longer required.
+   */
+  public void release() {
+    handlerThread.quit();
   }
 
   private byte[] blockingKeyRequest(@Mode int licenseMode, byte[] offlineLicenseKeySetId,
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 cc70804a296..450e0682e69 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
@@ -995,9 +995,10 @@ private static Pair<String, byte[]> parseEsdsFromParent(ParsableByteArray parent
     int objectTypeIndication = parent.readUnsignedByte();
     String mimeType;
     switch (objectTypeIndication) {
-      case 0x6B:
-        mimeType = MimeTypes.AUDIO_MPEG;
-        return Pair.create(mimeType, null);
+      case 0x60:
+      case 0x61:
+        mimeType = MimeTypes.VIDEO_MPEG2;
+        break;
       case 0x20:
         mimeType = MimeTypes.VIDEO_MP4V;
         break;
@@ -1007,6 +1008,9 @@ private static Pair<String, byte[]> parseEsdsFromParent(ParsableByteArray parent
       case 0x23:
         mimeType = MimeTypes.VIDEO_H265;
         break;
+      case 0x6B:
+        mimeType = MimeTypes.AUDIO_MPEG;
+        return Pair.create(mimeType, null);
       case 0x40:
       case 0x66:
       case 0x67:
@@ -1027,10 +1031,6 @@ private static Pair<String, byte[]> parseEsdsFromParent(ParsableByteArray parent
       case 0xAB:
         mimeType = MimeTypes.AUDIO_DTS_HD;
         return Pair.create(mimeType, null);
-      case 0x60: /* Visual 13818-2 Simple Profile */
-      case 0x61: /* Visual 13818-2 Main Profile */
-        mimeType = MimeTypes.VIDEO_MPEG2;
-        break;
       default:
         mimeType = null;
         break;
@@ -1038,8 +1038,8 @@ private static Pair<String, byte[]> parseEsdsFromParent(ParsableByteArray parent
 
     parent.skipBytes(12);
 
-    // Start of the AudioSpecificConfig.
-    parent.skipBytes(1); // AudioSpecificConfig tag
+    // Start of the DecoderSpecificInfo.
+    parent.skipBytes(1); // DecoderSpecificInfo tag
     int initializationDataSize = parseExpandableClassSize(parent);
     byte[] initializationData = new byte[initializationDataSize];
     parent.readBytes(initializationData, 0, initializationDataSize);
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 49ebe84d67b..6cce902e87c 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
@@ -69,8 +69,13 @@ protected SubripSubtitle decode(byte[] bytes, int length, boolean reset) {
       // Read and parse the timing line.
       boolean haveEndTimecode = false;
       currentLine = subripData.readLine();
-      Matcher matcher = currentLine == null ? null : SUBRIP_TIMING_LINE.matcher(currentLine);
-      if (matcher != null && matcher.matches()) {
+      if (currentLine == null) {
+        Log.w(TAG, "Unexpected end");
+        break;
+      }
+
+      Matcher matcher = SUBRIP_TIMING_LINE.matcher(currentLine);
+      if (matcher.matches()) {
         cueTimesUs.add(parseTimecode(matcher, 1));
         if (!TextUtils.isEmpty(matcher.group(6))) {
           haveEndTimecode = true;

From cc9a93d9d9f5369c6af158541a01ad32b2b30d4b Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 17 Aug 2017 23:18:58 +0100
Subject: [PATCH 122/421] Rm SS offline for now

---
 .../offline/SsDownloadAction.java             |  85 --------------
 .../smoothstreaming/offline/SsDownloader.java | 111 ------------------
 2 files changed, 196 deletions(-)
 delete mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
 delete mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java

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 29b6ad15164..00000000000
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
+++ /dev/null
@@ -1,85 +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 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.source.smoothstreaming.manifest.TrackKey;
-import com.google.android.exoplayer2.util.ClosedSource;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/** An action to download or remove downloaded SmoothStreaming streams. */
-@ClosedSource(reason = "Not ready yet")
-public final class SsDownloadAction extends SegmentDownloadAction<TrackKey> {
-
-  public static final Serializer SERIALIZER = new SegmentDownloadActionSerializer<TrackKey>() {
-
-    private static final String TYPE = "SsDownloadAction";
-
-    @Override
-    public String getType() {
-      return TYPE;
-    }
-
-    @Override
-    protected void writeKey(DataOutputStream output, TrackKey key) throws IOException {
-      output.writeInt(key.streamElementIndex);
-      output.writeInt(key.trackIndex);
-    }
-
-    @Override
-    protected TrackKey readKey(DataInputStream input) throws IOException {
-      return new TrackKey(input.readInt(), input.readInt());
-    }
-
-    @Override
-    protected TrackKey[] createKeyArray(int keyCount) {
-      return new TrackKey[keyCount];
-    }
-
-    @Override
-    protected DownloadAction createDownloadAction(Uri manifestUri, boolean removeAction,
-        TrackKey[] keys) {
-      return new SsDownloadAction(manifestUri, removeAction, keys);
-    }
-
-  };
-
-  /** @see SegmentDownloadAction#SegmentDownloadAction(Uri, boolean, Object[]) */
-  public SsDownloadAction(Uri manifestUri, boolean removeAction, TrackKey... keys) {
-    super(manifestUri, removeAction, keys);
-  }
-
-  @Override
-  public SsDownloader createDownloader(DownloaderConstructorHelper constructorHelper)
-      throws IOException {
-    SsDownloader downloader = new SsDownloader(manifestUri, constructorHelper);
-    if (!isRemoveAction()) {
-      downloader.selectRepresentations(keys);
-    }
-    return downloader;
-  }
-
-  @Override
-  public Serializer getSerializer() {
-    return SERIALIZER;
-  }
-
-}
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
deleted file mode 100644
index fe9c21d8551..00000000000
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
+++ /dev/null
@@ -1,111 +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 com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
-import com.google.android.exoplayer2.offline.SegmentDownloader;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
-import com.google.android.exoplayer2.source.smoothstreaming.manifest.TrackKey;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import com.google.android.exoplayer2.util.ClosedSource;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Helper class to download SmoothStreaming streams.
- *
- * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link
- * #getDownloadedBytes()}, this class isn't thread safe.
- *
- * <p>Example usage:
- *
- * <pre>
- * {@code
- * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor());
- * DefaultHttpDataSourceFactory factory = new DefaultHttpDataSourceFactory("ExoPlayer", null);
- * DownloaderConstructorHelper constructorHelper =
- *     new DownloaderConstructorHelper(cache, factory);
- * SsDownloader ssDownloader = new SsDownloader(manifestUrl, constructorHelper);
- * // Select the first track of the first stream element
- * ssDownloader.selectRepresentations(new TrackKey[] {new TrackKey(0, 0)});
- * ssDownloader.download(new ProgressListener() {
- *   @Override
- *   public void onDownloadProgress(Downloader downloader, float downloadPercentage,
- *       long downloadedBytes) {
- *     // Invoked periodically during the download.
- *   }
- * });
- * // Access downloaded data using CacheDataSource
- * CacheDataSource cacheDataSource =
- *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);}
- * </pre>
- */
-@ClosedSource(reason = "Not ready yet")
-public final class SsDownloader extends SegmentDownloader<SsManifest, TrackKey> {
-
-  /**
-   * @see SegmentDownloader#SegmentDownloader(Uri, DownloaderConstructorHelper)
-   */
-  public SsDownloader(Uri manifestUri, DownloaderConstructorHelper constructorHelper)  {
-    super(manifestUri, constructorHelper);
-  }
-
-  @Override
-  public SsManifest getManifest(DataSource dataSource, Uri uri) throws IOException {
-    DataSpec dataSpec = new DataSpec(uri,
-        DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH | DataSpec.FLAG_ALLOW_GZIP);
-    ParsingLoadable<SsManifest> loadable = new ParsingLoadable<>(dataSource, dataSpec,
-        C.DATA_TYPE_MANIFEST, new SsManifestParser());
-    loadable.load();
-    return loadable.getResult();
-  }
-
-  @Override
-  protected List<Segment> getAllSegments(DataSource dataSource, SsManifest manifest,
-      boolean allowIndexLoadErrors) throws InterruptedException, IOException {
-    ArrayList<Segment> segments = new ArrayList<>();
-    for (int i = 0; i < manifest.streamElements.length; i++) {
-      StreamElement streamElement = manifest.streamElements[i];
-      for (int j = 0; j < streamElement.formats.length; j++) {
-        segments.addAll(getSegments(dataSource, manifest, new TrackKey[] {new TrackKey(i, j)},
-            allowIndexLoadErrors));
-      }
-    }
-    return segments;
-  }
-
-  @Override
-  protected List<Segment> getSegments(DataSource dataSource, SsManifest manifest,
-      TrackKey[] keys, boolean allowIndexLoadErrors) throws InterruptedException, IOException {
-    ArrayList<Segment> segments = new ArrayList<>();
-    for (TrackKey key : keys) {
-      StreamElement streamElement = manifest.streamElements[key.streamElementIndex];
-      for (int i = 0; i < streamElement.chunkCount; i++) {
-        segments.add(new Segment(streamElement.getStartTimeUs(i),
-            new DataSpec(streamElement.buildRequestUri(key.trackIndex, i))));
-      }
-    }
-    return segments;
-  }
-
-}

From 1e4f89954825b74d4064b1bb13e35f6a3b9a6759 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 18 Aug 2017 06:30:21 -0700
Subject: [PATCH 123/421] Add support for the data URI scheme

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165699328
---
 .../upstream/DataSchemeDataSourceTest.java    | 90 +++++++++++++++++++
 .../java/com/google/android/exoplayer2/C.java |  4 +
 .../upstream/DataSchemeDataSource.java        | 88 ++++++++++++++++++
 .../upstream/DefaultDataSource.java           | 13 ++-
 4 files changed, 194 insertions(+), 1 deletion(-)
 create mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
new file mode 100644
index 00000000000..5ba9e18e7d9
--- /dev/null
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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;
+
+import android.net.Uri;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import java.io.IOException;
+import junit.framework.TestCase;
+
+/**
+ * Unit tests for {@link DataSchemeDataSource}.
+ */
+public final class DataSchemeDataSourceTest extends TestCase {
+
+  private DataSource schemeDataDataSource;
+
+  @Override
+  public void setUp() {
+    schemeDataDataSource = new DataSchemeDataSource();
+  }
+
+  public void testBase64Data() throws IOException {
+    DataSpec dataSpec = buildDataSpec("data:text/plain;base64,eyJwcm92aWRlciI6IndpZGV2aW5lX3Rlc3QiL"
+        + "CJjb250ZW50X2lkIjoiTWpBeE5WOTBaV0Z5Y3c9PSIsImtleV9pZHMiOlsiMDAwMDAwMDAwMDAwMDAwMDAwMDAwM"
+        + "DAwMDAwMDAwMDAiXX0=");
+    TestUtil.assertDataSourceContent(schemeDataDataSource, dataSpec,
+        ("{\"provider\":\"widevine_test\",\"content_id\":\"MjAxNV90ZWFycw==\",\"key_ids\":"
+        + "[\"00000000000000000000000000000000\"]}").getBytes());
+  }
+
+  public void testAsciiData() throws IOException {
+    TestUtil.assertDataSourceContent(schemeDataDataSource, buildDataSpec("data:,A%20brief%20note"),
+        "A brief note".getBytes());
+  }
+
+  public void testPartialReads() throws IOException {
+    byte[] buffer = new byte[18];
+    DataSpec dataSpec = buildDataSpec("data:,012345678901234567");
+    assertEquals(18, schemeDataDataSource.open(dataSpec));
+    assertEquals(9, schemeDataDataSource.read(buffer, 0, 9));
+    assertEquals(0, schemeDataDataSource.read(buffer, 3, 0));
+    assertEquals(9, schemeDataDataSource.read(buffer, 9, 15));
+    assertEquals(0, schemeDataDataSource.read(buffer, 1, 0));
+    assertEquals(C.RESULT_END_OF_INPUT, schemeDataDataSource.read(buffer, 1, 1));
+    assertEquals("012345678901234567", new String(buffer, 0, 18));
+  }
+
+  public void testIncorrectScheme() {
+    try {
+      schemeDataDataSource.open(buildDataSpec("http://www.google.com"));
+      fail();
+    } catch (IOException e) {
+      // Expected.
+    }
+  }
+
+  public void testMalformedData() {
+    try {
+      schemeDataDataSource.open(buildDataSpec("data:text/plain;base64,,This%20is%20Content"));
+      fail();
+    } catch (IOException e) {
+      // Expected.
+    }
+    try {
+      schemeDataDataSource.open(buildDataSpec("data:text/plain;base64,IncorrectPadding=="));
+      fail();
+    } catch (IOException e) {
+      // Expected.
+    }
+  }
+
+  private static DataSpec buildDataSpec(String uriString) {
+    return new DataSpec(Uri.parse(uriString));
+  }
+
+}
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 1cfcded1cb0..e25538a062a 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
@@ -73,6 +73,10 @@ private C() {}
    */
   public static final long NANOS_PER_SECOND = 1000000000L;
 
+  /**
+   * The name of the ASCII charset.
+   */
+  public static final String ASCII_NAME = "US-ASCII";
   /**
    * The name of the UTF-8 charset.
    */
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
new file mode 100644
index 00000000000..c5476258192
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
@@ -0,0 +1,88 @@
+/*
+ * 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;
+
+import android.net.Uri;
+import android.util.Base64;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ParserException;
+import java.io.IOException;
+import java.net.URLDecoder;
+
+/**
+ * A {@link DataSource} for reading data URLs, as defined by RFC 2397.
+ */
+public final class DataSchemeDataSource implements DataSource {
+
+  public static final String SCHEME_DATA = "data";
+
+  private DataSpec dataSpec;
+  private int bytesRead;
+  private byte[] data;
+
+  @Override
+  public long open(DataSpec dataSpec) throws IOException {
+    this.dataSpec = dataSpec;
+    Uri uri = dataSpec.uri;
+    String scheme = uri.getScheme();
+    if (!SCHEME_DATA.equals(scheme)) {
+      throw new ParserException("Unsupported scheme: " + scheme);
+    }
+    String[] uriParts = uri.getSchemeSpecificPart().split(",");
+    if (uriParts.length > 2) {
+      throw new ParserException("Unexpected URI format: " + uri);
+    }
+    String dataString = uriParts[1];
+    if (uriParts[0].contains(";base64")) {
+      try {
+        data = Base64.decode(dataString, 0);
+      } catch (IllegalArgumentException e) {
+        throw new ParserException("Error while parsing Base64 encoded string: " + dataString, e);
+      }
+    } else {
+      // TODO: Add support for other charsets.
+      data = URLDecoder.decode(dataString, C.ASCII_NAME).getBytes();
+    }
+    return data.length;
+  }
+
+  @Override
+  public int read(byte[] buffer, int offset, int readLength) {
+    if (readLength == 0) {
+      return 0;
+    }
+    int remainingBytes = data.length - bytesRead;
+    if (remainingBytes == 0) {
+      return C.RESULT_END_OF_INPUT;
+    }
+    readLength = Math.min(readLength, remainingBytes);
+    System.arraycopy(data, bytesRead, buffer, offset, readLength);
+    bytesRead += readLength;
+    return readLength;
+  }
+
+  @Override
+  public Uri getUri() {
+    return dataSpec != null ? dataSpec.uri : null;
+  }
+
+  @Override
+  public void close() throws IOException {
+    dataSpec = null;
+    data = null;
+  }
+
+}
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 cbb8ba92a59..853b40f73fa 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
@@ -34,10 +34,11 @@
  * <li>content: For fetching data from a content URI (e.g. content://authority/path/123).
  * <li>rtmp: For fetching data over RTMP. Only supported if the project using ExoPlayer has an
  *     explicit dependency on ExoPlayer's RTMP extension.</li>
+ * <li>data: For parsing data inlined in the URI as defined in RFC 2397.</li>
  * <li>http(s): For fetching data over HTTP and HTTPS (e.g. https://www.something.com/media.mp4), if
  *     constructed using {@link #DefaultDataSource(Context, TransferListener, String, boolean)}, or
  *     any other schemes supported by a base data source if constructed using
- *     {@link #DefaultDataSource(Context, TransferListener, DataSource)}.
+ *     {@link #DefaultDataSource(Context, TransferListener, DataSource)}.</li>
  * </ul>
  */
 public final class DefaultDataSource implements DataSource {
@@ -58,6 +59,7 @@ public final class DefaultDataSource implements DataSource {
   private DataSource assetDataSource;
   private DataSource contentDataSource;
   private DataSource rtmpDataSource;
+  private DataSource dataSchemeDataSource;
 
   private DataSource dataSource;
 
@@ -130,6 +132,8 @@ public long open(DataSpec dataSpec) throws IOException {
       dataSource = getContentDataSource();
     } else if (SCHEME_RTMP.equals(scheme)) {
       dataSource = getRtmpDataSource();
+    } else if (DataSchemeDataSource.SCHEME_DATA.equals(scheme)) {
+      dataSource = getDataSchemeDataSource();
     } else {
       dataSource = baseDataSource;
     }
@@ -202,4 +206,11 @@ private DataSource getRtmpDataSource() {
     return rtmpDataSource;
   }
 
+  private DataSource getDataSchemeDataSource() {
+    if (dataSchemeDataSource == null) {
+      dataSchemeDataSource = new DataSchemeDataSource();
+    }
+    return dataSchemeDataSource;
+  }
+
 }

From a1add8f9e69a824842b59cceb87947b67ef39469 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 18 Aug 2017 06:38:40 -0700
Subject: [PATCH 124/421] Fix downcasting in DownloadAction.Serializers

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165699826
---
 .../offline/ProgressiveDownloadActionTest.java    | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
index b172b7692af..ec45ea01c7d 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.offline;
 
 import android.test.InstrumentationTestCase;
-import com.google.android.exoplayer2.offline.DownloadAction.Serializer;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.DummyDataSource;
 import com.google.android.exoplayer2.upstream.cache.Cache;
@@ -101,24 +100,22 @@ public void testEquals() throws Exception {
 
   public void testSerializerGetType() throws Exception {
     ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
-    Serializer serializer = action.getSerializer();
-    assertNotNull(serializer.getType());
+    assertNotNull(action.getType());
   }
 
   public void testSerializerWriteRead() throws Exception {
-    doTestSerializationRoundtrip(new ProgressiveDownloadAction("uri1", null, false));
-    doTestSerializationRoundtrip(new ProgressiveDownloadAction("uri2", "key", true));
+    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri1", null, false));
+    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri2", "key", true));
   }
 
-  private void doTestSerializationRoundtrip(ProgressiveDownloadAction action1) throws IOException {
-    Serializer serializer = action1.getSerializer();
+  private void doTestSerializationRoundTrip(ProgressiveDownloadAction action1) throws IOException {
     ByteArrayOutputStream out = new ByteArrayOutputStream();
     DataOutputStream output = new DataOutputStream(out);
-    serializer.writeToStream(output, action1);
+    action1.writeToStream(output);
 
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 = serializer.readFromStream(input);
+    DownloadAction action2 = ProgressiveDownloadAction.DESERIALIZER.readFromStream(input);
 
     assertEquals(action1, action2);
   }

From 8e67837afec166c1a965a9f5d01815e2503ae828 Mon Sep 17 00:00:00 2001
From: mansfieldmark <mansfieldmark@google.com>
Date: Fri, 18 Aug 2017 09:46:31 -0700
Subject: [PATCH 125/421] Adding conservative @Nullable annotations to
 Exoplayer v2 Cache + CacheSpan

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165715928
---
 .../android/exoplayer2/upstream/cache/Cache.java       |  5 +++--
 .../android/exoplayer2/upstream/cache/CacheSpan.java   | 10 ++++++----
 2 files changed, 9 insertions(+), 6 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 86ff8101429..0265ef83eab 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,6 +15,7 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import android.support.annotation.Nullable;
 import java.io.File;
 import java.io.IOException;
 import java.util.NavigableSet;
@@ -104,7 +105,7 @@ public CacheException(IOException cause) {
    * @param key The key for which spans should be returned.
    * @return The spans for the key. May be null if there are no such spans.
    */
-  NavigableSet<CacheSpan> getCachedSpans(String key);
+  @Nullable NavigableSet<CacheSpan> getCachedSpans(String key);
 
   /**
    * Returns all keys in the cache.
@@ -151,7 +152,7 @@ public CacheException(IOException cause) {
    * @param position The position of the data being requested.
    * @return The {@link CacheSpan}. Or null if the cache entry is locked.
    */
-  CacheSpan startReadWriteNonBlocking(String key, long position) throws CacheException;
+  @Nullable CacheSpan startReadWriteNonBlocking(String key, long position) throws CacheException;
 
   /**
    * Obtains a cache file into which data can be written. Must only be called when holding a
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 97d55c5fe2a..2082740bb43 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
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
 import java.io.File;
 
@@ -43,7 +44,7 @@ public class CacheSpan implements Comparable<CacheSpan> {
   /**
    * The file corresponding to this {@link CacheSpan}, or null if {@link #isCached} is false.
    */
-  public final File file;
+  public final @Nullable File file;
   /**
    * The last access timestamp, or {@link C#TIME_UNSET} if {@link #isCached} is false.
    */
@@ -68,11 +69,12 @@ public CacheSpan(String key, long position, long length) {
    * @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 #isCached} is false.
+   * @param lastAccessTimestamp The last access 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, File file) {
+  public CacheSpan(
+      String key, long position, long length, long lastAccessTimestamp, @Nullable File file) {
     this.key = key;
     this.position = position;
     this.length = length;

From 9a9bb2192ca5b8115d8b1bb41fe1d92d585804ae Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 18 Aug 2017 13:57:53 -0700
Subject: [PATCH 126/421] Fix third_party settings.gradle for demo-cast

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165748557
---
 settings.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/settings.gradle b/settings.gradle
index 766d46bbaef..f67f0916504 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,8 +19,10 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 }
 
 include modulePrefix + 'demo'
+include modulePrefix + 'demo-cast'
 include modulePrefix + 'playbacktests'
 project(modulePrefix + 'demo').projectDir = new File(rootDir, 'demos/main')
+project(modulePrefix + 'demo-cast').projectDir = new File(rootDir, 'demos/cast')
 project(modulePrefix + 'playbacktests').projectDir = new File(rootDir, 'playbacktests')
 
 apply from: 'core_settings.gradle'

From cec0c52c8d336bd54277e342379b81e1cf05745c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 21 Aug 2017 00:47:34 -0700
Subject: [PATCH 127/421] Allow the app to specify extra ad markers

Issue: #3184

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165895259
---
 .../exoplayer2/ui/PlaybackControlView.java    | 38 ++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

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 d3ee9bbab06..a53e133562f 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
@@ -21,6 +21,7 @@
 import android.content.res.TypedArray;
 import android.graphics.drawable.Drawable;
 import android.os.SystemClock;
+import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -311,6 +312,8 @@ public boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode)
   private long hideAtMs;
   private long[] adGroupTimesMs;
   private boolean[] playedAdGroups;
+  private long[] extraAdGroupTimesMs;
+  private boolean[] extraPlayedAdGroups;
 
   private final Runnable updateProgressAction = new Runnable() {
     @Override
@@ -363,6 +366,8 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
     formatter = new Formatter(formatBuilder, Locale.getDefault());
     adGroupTimesMs = new long[0];
     playedAdGroups = new boolean[0];
+    extraAdGroupTimesMs = new long[0];
+    extraPlayedAdGroups = new boolean[0];
     componentListener = new ComponentListener();
     controlDispatcher = DEFAULT_CONTROL_DISPATCHER;
 
@@ -461,6 +466,29 @@ public void setShowMultiWindowTimeBar(boolean showMultiWindowTimeBar) {
     updateTimeBarMode();
   }
 
+  /**
+   * Sets the millisecond positions of extra ad markers relative to the start of the window (or
+   * timeline, if in multi-window mode) and whether each extra ad has been played or not. The
+   * markers are shown in addition to any ad markers for ads in the player's timeline.
+   *
+   * @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.
+   */
+  public void setExtraAdGroupMarkers(@Nullable long[] extraAdGroupTimesMs,
+      @Nullable boolean[] extraPlayedAdGroups) {
+    if (extraAdGroupTimesMs == null) {
+      this.extraAdGroupTimesMs = new long[0];
+      this.extraPlayedAdGroups = new boolean[0];
+    } else {
+      Assertions.checkArgument(extraAdGroupTimesMs.length == extraPlayedAdGroups.length);
+      this.extraAdGroupTimesMs = extraAdGroupTimesMs;
+      this.extraPlayedAdGroups = extraPlayedAdGroups;
+    }
+    updateProgress();
+  }
+
   /**
    * Sets the {@link VisibilityListener}.
    *
@@ -767,7 +795,15 @@ private void updateProgress() {
         bufferedPosition += player.getBufferedPosition();
       }
       if (timeBar != null) {
-        timeBar.setAdGroupTimesMs(adGroupTimesMs, playedAdGroups, adGroupCount);
+        int extraAdGroupCount = extraAdGroupTimesMs.length;
+        int totalAdGroupCount = adGroupCount + extraAdGroupCount;
+        if (totalAdGroupCount > adGroupTimesMs.length) {
+          adGroupTimesMs = Arrays.copyOf(adGroupTimesMs, totalAdGroupCount);
+          playedAdGroups = Arrays.copyOf(playedAdGroups, totalAdGroupCount);
+        }
+        System.arraycopy(extraAdGroupTimesMs, 0, adGroupTimesMs, adGroupCount, extraAdGroupCount);
+        System.arraycopy(extraPlayedAdGroups, 0, playedAdGroups, adGroupCount, extraAdGroupCount);
+        timeBar.setAdGroupTimesMs(adGroupTimesMs, playedAdGroups, totalAdGroupCount);
       }
     }
     if (durationView != null) {

From cb45a47da18f3c7867abc2b61a8b3f15f151bd89 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 21 Aug 2017 03:49:38 -0700
Subject: [PATCH 128/421] Remove isFirstWindow/isLastWindow from Timeline.

These methods are only used in one place, and offer duplicate
functionality to checking getNext(Previous)WindowIndex == C.INDEX_UNSET.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165910258
---
 .../google/android/exoplayer2/Timeline.java   | 24 -------------------
 .../exoplayer2/ui/PlaybackControlView.java    |  7 +++---
 2 files changed, 4 insertions(+), 27 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 414c0804ad2..7d4c1995eb2 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
@@ -593,30 +593,6 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
     }
   }
 
-  /**
-   * Returns whether the given window is the last window of the timeline depending on the
-   * {@code repeatMode}.
-   *
-   * @param windowIndex A window index.
-   * @param repeatMode A repeat mode.
-   * @return Whether the window of the given index is the last window of the timeline.
-   */
-  public final boolean isLastWindow(int windowIndex, @Player.RepeatMode int repeatMode) {
-    return getNextWindowIndex(windowIndex, repeatMode) == C.INDEX_UNSET;
-  }
-
-  /**
-   * Returns whether the given window is the first window of the timeline depending on the
-   * {@code repeatMode}.
-   *
-   * @param windowIndex A window index.
-   * @param repeatMode A repeat mode.
-   * @return Whether the window of the given index is the first window of the timeline.
-   */
-  public final boolean isFirstWindow(int windowIndex, @Player.RepeatMode int repeatMode) {
-    return getPreviousWindowIndex(windowIndex, repeatMode) == C.INDEX_UNSET;
-  }
-
   /**
    * Populates a {@link Window} with data for the window at the specified index. Does not populate
    * {@link Window#id}.
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 a53e133562f..54212eefdda 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
@@ -674,9 +674,10 @@ private void updateNavigation() {
       int windowIndex = player.getCurrentWindowIndex();
       timeline.getWindow(windowIndex, window);
       isSeekable = window.isSeekable;
-      enablePrevious = !timeline.isFirstWindow(windowIndex, player.getRepeatMode())
-          || isSeekable || !window.isDynamic;
-      enableNext = !timeline.isLastWindow(windowIndex, player.getRepeatMode()) || window.isDynamic;
+      enablePrevious = isSeekable || !window.isDynamic
+          || timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode()) != C.INDEX_UNSET;
+      enableNext = window.isDynamic
+          || timeline.getNextWindowIndex(windowIndex, player.getRepeatMode()) != C.INDEX_UNSET;
       if (player.isPlayingAd()) {
         // Always hide player controls during ads.
         hide();

From f1b3f3a177b144d86fcee3504927e9aac7b10596 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Aug 2017 06:31:41 -0700
Subject: [PATCH 129/421] Fix broken link + minor doc tweak

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165920927
---
 extensions/cronet/README.md | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/extensions/cronet/README.md b/extensions/cronet/README.md
index 37c031f35f5..66da7749784 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/exoplayer/upstream/HttpDataSource.html
+[HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
 [Cronet]: https://chromium.googlesource.com/chromium/src/+/master/components/cronet?autodive=0%2F%2F
 
 ## Build instructions ##
@@ -20,12 +20,9 @@ and enable the extension:
 1. Copy the content of the downloaded `libs` directory into the `jniLibs`
    directory of this extension
 
-* In your `settings.gradle` file, add the following line before the line that
-  applies `core_settings.gradle`:
-
-```gradle
-gradle.ext.exoplayerIncludeCronetExtension = true;
-```
+* In your `settings.gradle` file, add
+  `gradle.ext.exoplayerIncludeCronetExtension = true` before the line that
+  applies `core_settings.gradle`.
 
 [top level README]: https://github.com/google/ExoPlayer/blob/release-v2/README.md
 [here]: https://console.cloud.google.com/storage/browser/chromium-cronet/android

From f1a97317d9fb5c02c8427c990db456aba017086a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 21 Aug 2017 07:26:50 -0700
Subject: [PATCH 130/421] Handle size==0 in MP4 atoms

Issue: #3191

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=165925148
---
 .../mp4/sample_fragmented_zero_size_atom.mp4  | Bin 1903 -> 0 bytes
 .../mp4/FragmentedMp4ExtractorTest.java       |   6 ------
 .../exoplayer2/extractor/mp4/Atom.java        |   9 +++++++--
 .../extractor/mp4/FragmentedMp4Extractor.java |  14 ++++++++++++--
 .../extractor/mp4/Mp4Extractor.java           |  18 ++++++++++++++++--
 .../exoplayer2/extractor/mp4/Sniffer.java     |   9 ++++++++-
 6 files changed, 43 insertions(+), 13 deletions(-)
 delete mode 100644 library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4

diff --git a/library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4 b/library/core/src/androidTest/assets/mp4/sample_fragmented_zero_size_atom.mp4
deleted file mode 100644
index 3d3c63786ef7f40a9b4307fd17fcdc47f006f350..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1903
zcmb_cO-NKx6h3!;RP4t|4V9wCw3TEk7PhDcl$s#0h$JG&mv1H~=lSHlH$z4XsZ9h$
zl#3QcK~O}tX<>`XBKmKUB`u0t^dl4!Ve7)abMLizjTtSv%=gaEcka3Oo^$UIQ8elG
z_oZChA_@>opvlN~HClbmjYOfFmThN=C~alCO-LGZ-LDLy;3u|8$e&cF?VO=_za8@%
zGxY#ml_}eFnTiYy3=~rP6c4QO)^m&=xOaIyaxW#hz3?uGR2*x*A(`3j7^qMSPCv>q
zqTe!829&5}=ASpy!1=e|<2YK;ZKfTm;ge07iD{i>2W&fT^qT1e$B0@h)tiJ;p0#9B
z|CVY^#Vt0S1jq1Tes0D|N45UZ_4cHppLRW0HbMK3aHF8}@aL3{Pz#O}hsxkFBSN`-
z-%2hsar;|^NlT~RQPp0^p;xiC@W^fvAzF8W=3k`A!&RMv3c4pgJY9ANGa|0%$%g4%
zu-z`LvnYpsz-P0Hm@Yf#6IcGyT)q_f%@y)E`De<rW4Q&OiH);2cc^W)=DK#K*Pmt^
zY%|wf`lg#3aaD7tWB;YG!@9Bi@*2Anug}nlaz_dfIzTkkCYjX<SG|%TUdeL2-VkI(
zY$21uc`+7Yc*3Pc9ph90O>i0iL#rrmWfS|6E9yB?@>0CZ+)ml^JI`z9^PL&fGvME0
zC8Xpz)&6&db~#30A7A}nqb`+pJy<oDJ)7^(BGZtQW%A8NHo2;~zNw+U8814H|1N$~
z5i6<QGIWHAW?VJ)*LupoM)~oj&>Ix*GtuC%zF$S2!|g8)gIt1~TjX5?PgM8<M;s(7
zJBCV^C|kVbEQrJUoTuW3;)Cs)f2epdruYT-6(3r!`GcBA9M3P`p!t=G4`3}GVqEcM
z<vKrX-cMja(j+DnKj*6Ekw@}T&2LhC_>1Oi^!n#C56SBX@PEtm==&dPrb;1e7UF58
z+A*qX7T}uIli2!0`%7VSAmc2~fWHip0Zsxqueb)>1+Zr+Z$mx?SUv)d1FwPezykn1
z5U8&>1H1<g0ndP=0QN3U0X+9Q!2V0XBya)XJiLcn0D2IphFl9-1^EPc4vb)*#Q<5j
iV-T%Y(&77B=RwN*h9KrKrlqn_6Cp1UuAXCSU+Yh^T`VF1

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
index 76c13495c17..c9364aa6054 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/FragmentedMp4ExtractorTest.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor.mp4;
 
 import android.test.InstrumentationTestCase;
-import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
@@ -38,11 +37,6 @@ public void testSampleWithSeiPayloadParsing() throws Exception {
         "mp4/sample_fragmented_sei.mp4", getInstrumentation());
   }
 
-  public void testAtomWithZeroSize() throws Exception {
-    ExtractorAsserts.assertThrows(getExtractorFactory(), "mp4/sample_fragmented_zero_size_atom.mp4",
-        getInstrumentation(), ParserException.class);
-  }
-
   private static ExtractorFactory getExtractorFactory() {
     return getExtractorFactory(0);
   }
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 cc7e662336f..21d861af305 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
@@ -39,9 +39,14 @@
   public static final int LONG_HEADER_SIZE = 16;
 
   /**
-   * Value for the first 32 bits of atomSize when the atom size is actually a long value.
+   * Value for the size field in an atom that defines its size in the largesize field.
    */
-  public static final int LONG_SIZE_PREFIX = 1;
+  public static final int DEFINES_LARGE_SIZE = 1;
+
+  /**
+   * Value for the size field in an atom that extends to the end of the file.
+   */
+  public static final int EXTENDS_TO_END_SIZE = 0;
 
   public static final int TYPE_ftyp = Util.getIntegerCodeForString("ftyp");
   public static final int TYPE_avc1 = Util.getIntegerCodeForString("avc1");
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 6b2077ef762..c3f2a9fb38b 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
@@ -283,12 +283,22 @@ private boolean readAtomHeader(ExtractorInput input) throws IOException, Interru
       atomType = atomHeader.readInt();
     }
 
-    if (atomSize == Atom.LONG_SIZE_PREFIX) {
-      // Read the extended atom size.
+    if (atomSize == Atom.DEFINES_LARGE_SIZE) {
+      // Read the large size.
       int headerBytesRemaining = Atom.LONG_HEADER_SIZE - Atom.HEADER_SIZE;
       input.readFully(atomHeader.data, Atom.HEADER_SIZE, headerBytesRemaining);
       atomHeaderBytesRead += headerBytesRemaining;
       atomSize = atomHeader.readUnsignedLongToLong();
+    } else if (atomSize == Atom.EXTENDS_TO_END_SIZE) {
+      // The atom extends to the end of the file. Note that if the atom is within a container we can
+      // work out its size even if the input length is unknown.
+      long endPosition = input.getLength();
+      if (endPosition == C.LENGTH_UNSET && !containerAtoms.isEmpty()) {
+        endPosition = containerAtoms.peek().endPosition;
+      }
+      if (endPosition != C.LENGTH_UNSET) {
+        atomSize = endPosition - input.getPosition() + atomHeaderBytesRead;
+      }
     }
 
     if (atomSize < atomHeaderBytesRead) {
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 d0e770abdc1..d3fe9e0d058 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
@@ -205,12 +205,26 @@ private boolean readAtomHeader(ExtractorInput input) throws IOException, Interru
       atomType = atomHeader.readInt();
     }
 
-    if (atomSize == Atom.LONG_SIZE_PREFIX) {
-      // Read the extended atom size.
+    if (atomSize == Atom.DEFINES_LARGE_SIZE) {
+      // Read the large size.
       int headerBytesRemaining = Atom.LONG_HEADER_SIZE - Atom.HEADER_SIZE;
       input.readFully(atomHeader.data, Atom.HEADER_SIZE, headerBytesRemaining);
       atomHeaderBytesRead += headerBytesRemaining;
       atomSize = atomHeader.readUnsignedLongToLong();
+    } else if (atomSize == Atom.EXTENDS_TO_END_SIZE) {
+      // The atom extends to the end of the file. Note that if the atom is within a container we can
+      // work out its size even if the input length is unknown.
+      long endPosition = input.getLength();
+      if (endPosition == C.LENGTH_UNSET && !containerAtoms.isEmpty()) {
+        endPosition = containerAtoms.peek().endPosition;
+      }
+      if (endPosition != C.LENGTH_UNSET) {
+        atomSize = endPosition - input.getPosition() + atomHeaderBytesRead;
+      }
+    }
+
+    if (atomSize < atomHeaderBytesRead) {
+      throw new ParserException("Atom size less than header length (unsupported).");
     }
 
     if (shouldParseContainerAtom(atomType)) {
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 44d58249456..021c9de654f 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
@@ -104,11 +104,18 @@ private static boolean sniffInternal(ExtractorInput input, boolean fragmented)
       input.peekFully(buffer.data, 0, headerSize);
       long atomSize = buffer.readUnsignedInt();
       int atomType = buffer.readInt();
-      if (atomSize == Atom.LONG_SIZE_PREFIX) {
+      if (atomSize == Atom.DEFINES_LARGE_SIZE) {
+        // Read the large atom size.
         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();
+      } 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.getPosition() + headerSize;
+        }
       }
 
       if (atomSize < headerSize) {

From c1d7e5bf9d4efc6ef1f3d2814cfd8174052bad59 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 22 Aug 2017 03:49:50 -0700
Subject: [PATCH 131/421] Add set/getShuffleModeEnabled to Player interface.

And implement a basic version of the methods in all implementations.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166041342
---
 .../android/exoplayer2/ext/cast/CastPlayer.java    | 11 +++++++++++
 .../DynamicConcatenatingMediaSourceTest.java       | 10 ++++++++++
 .../google/android/exoplayer2/ExoPlayerImpl.java   | 14 ++++++++++++++
 .../java/com/google/android/exoplayer2/Player.java | 12 ++++++++++++
 .../google/android/exoplayer2/SimpleExoPlayer.java | 10 ++++++++++
 .../exoplayer2/testutil/FakeSimpleExoPlayer.java   | 10 ++++++++++
 6 files changed, 67 insertions(+)

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 ef84c04c04a..50ae7ea5baf 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
@@ -330,6 +330,17 @@ public void setRepeatMode(@RepeatMode int repeatMode) {
     }
   }
 
+  @Override
+  public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
+    // TODO: Support shuffle mode.
+  }
+
+  @Override
+  public boolean getShuffleModeEnabled() {
+    // TODO: Support shuffle mode.
+    return false;
+  }
+
   @Override
   public TrackSelectionArray getCurrentTrackSelections() {
     return currentTrackSelection;
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index f8636b99900..8d29a95d89c 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -396,6 +396,16 @@ public int getRepeatMode() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean getShuffleModeEnabled() {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public boolean isLoading() {
       throw new UnsupportedOperationException();
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 f22c08f585d..f112ee9473c 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
@@ -53,6 +53,7 @@
   private boolean tracksSelected;
   private boolean playWhenReady;
   private @RepeatMode int repeatMode;
+  private boolean shuffleModeEnabled;
   private int playbackState;
   private int pendingSeekAcks;
   private int pendingPrepareAcks;
@@ -87,6 +88,7 @@ public ExoPlayerImpl(Renderer[] renderers, TrackSelector trackSelector, LoadCont
     this.trackSelector = Assertions.checkNotNull(trackSelector);
     this.playWhenReady = false;
     this.repeatMode = Player.REPEAT_MODE_OFF;
+    this.shuffleModeEnabled = false;
     this.playbackState = Player.STATE_IDLE;
     this.listeners = new CopyOnWriteArraySet<>();
     emptyTrackSelections = new TrackSelectionArray(new TrackSelection[renderers.length]);
@@ -189,6 +191,18 @@ public void setRepeatMode(@RepeatMode int repeatMode) {
     return repeatMode;
   }
 
+  @Override
+  public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
+    if (this.shuffleModeEnabled != shuffleModeEnabled) {
+      this.shuffleModeEnabled = shuffleModeEnabled;
+    }
+  }
+
+  @Override
+  public boolean getShuffleModeEnabled() {
+    return shuffleModeEnabled;
+  }
+
   @Override
   public boolean isLoading() {
     return isLoading;
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 d2480c5b3a8..f11b107f130 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
@@ -219,6 +219,18 @@ interface EventListener {
    */
   @RepeatMode int getRepeatMode();
 
+  /**
+   * Sets whether shuffling of windows is enabled.
+   *
+   * @param shuffleModeEnabled Whether shuffling is enabled.
+   */
+  void setShuffleModeEnabled(boolean shuffleModeEnabled);
+
+  /**
+   * Returns whether shuffling of windows is enabled.
+   */
+  boolean getShuffleModeEnabled();
+
   /**
    * Whether the player is currently loading the source.
    *
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 d71c81f08fe..9fcc4d2128a 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
@@ -642,6 +642,16 @@ public void setRepeatMode(@RepeatMode int repeatMode) {
     player.setRepeatMode(repeatMode);
   }
 
+  @Override
+  public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
+    player.setShuffleModeEnabled(shuffleModeEnabled);
+  }
+
+  @Override
+  public boolean getShuffleModeEnabled() {
+    return player.getShuffleModeEnabled();
+  }
+
   @Override
   public boolean isLoading() {
     return player.isLoading();
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
index cf88d10bc85..7edaa6b13e9 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -154,6 +154,16 @@ public int getRepeatMode() {
       return Player.REPEAT_MODE_OFF;
     }
 
+    @Override
+    public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public boolean getShuffleModeEnabled() {
+      return false;
+    }
+
     @Override
     public boolean isLoading() {
       return isLoading;

From 52ec70dd80d79396ba7bcea16422bc0dc2111200 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 22 Aug 2017 05:46:00 -0700
Subject: [PATCH 132/421] Add support for KEYFORMAT and SAMPLE-AES (only
 parsing, not decryption)

Also add sample streams that use METHOD=SAMPLE-AES. Note that some of
the streams provide alternative EXT-X-KEY's. Support for alternative
decryption methods will be added in a later CL.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166048858
---
 .../exoplayer2/source/hls/HlsChunkSource.java |  3 ++-
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 27 +++++++++++--------
 .../source/hls/playlist/HlsMediaPlaylist.java | 19 ++++++++++---
 .../hls/playlist/HlsPlaylistParser.java       | 16 ++++++++---
 4 files changed, 45 insertions(+), 20 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 bca62ed2303..4fed33eee34 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
@@ -306,7 +306,8 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     out.chunk = new HlsMediaChunk(mediaDataSource, dataSpec, initDataSpec, selectedUrl,
         muxedCaptionFormats, trackSelection.getSelectionReason(), trackSelection.getSelectionData(),
         startTimeUs, startTimeUs + segment.durationUs, chunkMediaSequence, discontinuitySequence,
-        isTimestampMaster, timestampAdjuster, previous, encryptionKey, encryptionIv);
+        isTimestampMaster, timestampAdjuster, previous, segment.keyFormat, 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 29b7e4a6a87..e3e1bab48d6 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.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.MimeTypes;
@@ -116,16 +117,19 @@
    * @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 encryptionKey For AES encryption chunks, the encryption key.
-   * @param encryptionIv For AES encryption chunks, the encryption initialization vector.
+   * @param keyFormat A string describing the format for {@code keyData}, or null if the chunk is
+   *     not encrypted.
+   * @param keyData Data specifying how to obtain the keys to decrypt the chunk, or null if the
+   *     chunk is not encrypted.
+   * @param encryptionIv The AES initialization vector, or null if the chunk is not encrypted.
    */
   public HlsMediaChunk(DataSource dataSource, DataSpec dataSpec, DataSpec initDataSpec,
       HlsUrl hlsUrl, List<Format> muxedCaptionFormats, int trackSelectionReason,
       Object trackSelectionData, long startTimeUs, long endTimeUs, int chunkIndex,
       int discontinuitySequenceNumber, boolean isMasterTimestampSource,
-      TimestampAdjuster timestampAdjuster, HlsMediaChunk previousChunk, byte[] encryptionKey,
-      byte[] encryptionIv) {
-    super(buildDataSource(dataSource, encryptionKey, encryptionIv), dataSpec, hlsUrl.format,
+      TimestampAdjuster timestampAdjuster, HlsMediaChunk previousChunk, String keyFormat,
+      byte[] keyData, byte[] encryptionIv) {
+    super(buildDataSource(dataSource, keyFormat, keyData, encryptionIv), dataSpec, hlsUrl.format,
         trackSelectionReason, trackSelectionData, startTimeUs, endTimeUs, chunkIndex);
     this.discontinuitySequenceNumber = discontinuitySequenceNumber;
     this.initDataSpec = initDataSpec;
@@ -327,15 +331,16 @@ private long peekId3PrivTimestamp(ExtractorInput input) throws IOException, Inte
   // Internal factory methods.
 
   /**
-   * If the content is encrypted, returns an {@link Aes128DataSource} that wraps the original in
-   * order to decrypt the loaded data. Else returns the original.
+   * If the content is encrypted using the "identity" key format, returns an
+   * {@link Aes128DataSource} that wraps the original in order to decrypt the loaded data. Else
+   * returns the original.
    */
-  private static DataSource buildDataSource(DataSource dataSource, byte[] encryptionKey,
+  private static DataSource buildDataSource(DataSource dataSource, String keyFormat, byte[] keyData,
       byte[] encryptionIv) {
-    if (encryptionKey == null || encryptionIv == null) {
-      return dataSource;
+    if (HlsMediaPlaylist.KEYFORMAT_IDENTITY.equals(keyFormat)) {
+      return new Aes128DataSource(dataSource, keyData, encryptionIv);
     }
-    return new Aes128DataSource(dataSource, encryptionKey, encryptionIv);
+    return dataSource;
   }
 
   private Extractor createExtractor() {
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 db4f041be29..1b573f41c2d 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
@@ -53,6 +53,10 @@ public static final class Segment implements Comparable<Long> {
      * Whether the segment is encrypted, as defined by #EXT-X-KEY.
      */
     public final boolean isEncrypted;
+    /**
+     * The key format as defined by #EXT-X-KEY, or null if the segment is not encrypted.
+     */
+    public final String keyFormat;
     /**
      * The encryption key uri as defined by #EXT-X-KEY, or null if the segment is not encrypted.
      */
@@ -73,7 +77,7 @@ public static final class Segment implements Comparable<Long> {
     public final long byterangeLength;
 
     public Segment(String uri, long byterangeOffset, long byterangeLength) {
-      this(uri, 0, -1, C.TIME_UNSET, false, null, null, byterangeOffset, byterangeLength);
+      this(uri, 0, -1, C.TIME_UNSET, false, null, null, null, byterangeOffset, byterangeLength);
     }
 
     /**
@@ -82,19 +86,21 @@ public Segment(String uri, long byterangeOffset, long byterangeLength) {
      * @param relativeDiscontinuitySequence See {@link #relativeDiscontinuitySequence}.
      * @param relativeStartTimeUs See {@link #relativeStartTimeUs}.
      * @param isEncrypted See {@link #isEncrypted}.
+     * @param keyFormat See {@link #keyFormat}.
      * @param encryptionKeyUri See {@link #encryptionKeyUri}.
      * @param encryptionIV See {@link #encryptionIV}.
      * @param byterangeOffset See {@link #byterangeOffset}.
      * @param byterangeLength See {@link #byterangeLength}.
      */
     public Segment(String url, long durationUs, int relativeDiscontinuitySequence,
-        long relativeStartTimeUs, boolean isEncrypted, String encryptionKeyUri, String encryptionIV,
-        long byterangeOffset, long byterangeLength) {
+        long relativeStartTimeUs, boolean isEncrypted, String keyFormat, String encryptionKeyUri,
+        String encryptionIV, long byterangeOffset, long byterangeLength) {
       this.url = url;
       this.durationUs = durationUs;
       this.relativeDiscontinuitySequence = relativeDiscontinuitySequence;
       this.relativeStartTimeUs = relativeStartTimeUs;
       this.isEncrypted = isEncrypted;
+      this.keyFormat = keyFormat;
       this.encryptionKeyUri = encryptionKeyUri;
       this.encryptionIV = encryptionIV;
       this.byterangeOffset = byterangeOffset;
@@ -110,7 +116,12 @@ public int compareTo(@NonNull Long relativeStartTimeUs) {
   }
 
   /**
-   * Type of the playlist as defined by #EXT-X-PLAYLIST-TYPE.
+   * The identity key format, as defined by #EXT-X-KEY.
+   */
+  public static final String KEYFORMAT_IDENTITY = "identity";
+
+  /**
+   * Type of the playlist, as defined by #EXT-X-PLAYLIST-TYPE.
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({PLAYLIST_TYPE_UNKNOWN, PLAYLIST_TYPE_VOD, PLAYLIST_TYPE_EVENT})
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 c5d3302eca7..dc5fd96f352 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
@@ -69,7 +69,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static final String TYPE_CLOSED_CAPTIONS = "CLOSED-CAPTIONS";
 
   private static final String METHOD_NONE = "NONE";
-  private static final String METHOD_AES128 = "AES-128";
+  private static final String METHOD_AES_128 = "AES-128";
+  private static final String METHOD_SAMPLE_AES = "SAMPLE-AES";
 
   private static final String BOOLEAN_TRUE = "YES";
   private static final String BOOLEAN_FALSE = "NO";
@@ -97,7 +98,8 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static final Pattern REGEX_ATTR_BYTERANGE =
       Pattern.compile("BYTERANGE=\"(\\d+(?:@\\d+)?)\\b\"");
   private static final Pattern REGEX_METHOD = Pattern.compile("METHOD=(" + METHOD_NONE + "|"
-      + METHOD_AES128 + ")");
+      + METHOD_AES_128 + "|" + METHOD_SAMPLE_AES + ")");
+  private static final Pattern REGEX_KEYFORMAT = Pattern.compile("KEYFORMAT=\"(.+?)\"");
   private static final Pattern REGEX_URI = Pattern.compile("URI=\"(.+?)\"");
   private static final Pattern REGEX_IV = Pattern.compile("IV=([^,.*]+)");
   private static final Pattern REGEX_TYPE = Pattern.compile("TYPE=(" + TYPE_AUDIO + "|" + TYPE_VIDEO
@@ -314,6 +316,7 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
     int segmentMediaSequence = 0;
 
     boolean isEncrypted = false;
+    String keyFormat = null;
     String encryptionKeyUri = null;
     String encryptionIV = null;
 
@@ -360,11 +363,16 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
             (long) (parseDoubleAttr(line, REGEX_MEDIA_DURATION) * C.MICROS_PER_SECOND);
       } else if (line.startsWith(TAG_KEY)) {
         String method = parseStringAttr(line, REGEX_METHOD);
-        isEncrypted = METHOD_AES128.equals(method);
+        isEncrypted = METHOD_AES_128.equals(method) || METHOD_SAMPLE_AES.equals(method);
         if (isEncrypted) {
+          keyFormat = parseOptionalStringAttr(line, REGEX_KEYFORMAT);
+          if (keyFormat == null) {
+            keyFormat = HlsMediaPlaylist.KEYFORMAT_IDENTITY;
+          }
           encryptionKeyUri = parseStringAttr(line, REGEX_URI);
           encryptionIV = parseOptionalStringAttr(line, REGEX_IV);
         } else {
+          keyFormat = null;
           encryptionKeyUri = null;
           encryptionIV = null;
         }
@@ -400,7 +408,7 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
           segmentByteRangeOffset = 0;
         }
         segments.add(new Segment(line, segmentDurationUs, relativeDiscontinuitySequence,
-            segmentStartTimeUs, isEncrypted, encryptionKeyUri, segmentEncryptionIV,
+            segmentStartTimeUs, isEncrypted, keyFormat, encryptionKeyUri, segmentEncryptionIV,
             segmentByteRangeOffset, segmentByteRangeLength));
         segmentStartTimeUs += segmentDurationUs;
         segmentDurationUs = 0;

From b9a6a405391f8f7be1091cab1d791aa757996469 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 22 Aug 2017 07:27:27 -0700
Subject: [PATCH 133/421] Add listener callback for shuffle mode changes.

The listener implementations do not do anything yet.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166056933
---
 .../com/google/android/exoplayer2/demo/EventLogger.java    | 5 +++++
 .../com/google/android/exoplayer2/demo/PlayerActivity.java | 5 +++++
 .../android/exoplayer2/ext/flac/FlacPlaybackTest.java      | 5 +++++
 .../google/android/exoplayer2/ext/ima/ImaAdsLoader.java    | 5 +++++
 .../exoplayer2/ext/leanback/LeanbackPlayerAdapter.java     | 5 +++++
 .../exoplayer2/ext/mediasession/MediaSessionConnector.java | 5 +++++
 .../android/exoplayer2/ext/opus/OpusPlaybackTest.java      | 5 +++++
 .../google/android/exoplayer2/ext/vp9/VpxPlaybackTest.java | 5 +++++
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java  | 4 ++++
 .../main/java/com/google/android/exoplayer2/Player.java    | 7 +++++++
 .../google/android/exoplayer2/ui/DebugTextViewHelper.java  | 5 +++++
 .../google/android/exoplayer2/ui/PlaybackControlView.java  | 5 +++++
 .../google/android/exoplayer2/ui/SimpleExoPlayerView.java  | 5 +++++
 .../com/google/android/exoplayer2/testutil/Action.java     | 5 +++++
 .../google/android/exoplayer2/testutil/ExoHostedTest.java  | 5 +++++
 .../android/exoplayer2/testutil/ExoPlayerTestRunner.java   | 5 +++++
 16 files changed, 81 insertions(+)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index cbc3536ef7b..533306e0a23 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -99,6 +99,11 @@ public void onRepeatModeChanged(@Player.RepeatMode int repeatMode) {
     Log.d(TAG, "repeatMode [" + getRepeatModeString(repeatMode) + "]");
   }
 
+  @Override
+  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+    Log.d(TAG, "shuffleModeEnabled [" + shuffleModeEnabled + "]");
+  }
+
   @Override
   public void onPositionDiscontinuity() {
     Log.d(TAG, "positionDiscontinuity");
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 6416cd5aa27..6d733c9f974 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
@@ -501,6 +501,11 @@ public void onRepeatModeChanged(int repeatMode) {
     // Do nothing.
   }
 
+  @Override
+  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+    // Do nothing.
+  }
+
   @Override
   public void onPositionDiscontinuity() {
     if (inErrorState) {
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 1fa30bed9d0..1257b652eb5 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
@@ -132,6 +132,11 @@ public void onRepeatModeChanged(int repeatMode) {
       // Do nothing.
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // Do nothing.
+    }
+
     private void releasePlayerAndQuitLooper() {
       player.release();
       Looper.myLooper().quit();
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 9bfe33e9881..c27ef17b872 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
@@ -566,6 +566,11 @@ public void onRepeatModeChanged(int repeatMode) {
     // Do nothing.
   }
 
+  @Override
+  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+    // Do nothing.
+  }
+
   @Override
   public void onPlayerError(ExoPlaybackException error) {
     if (playingAd) {
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 26fd4e9c8f3..8a207bea8f8 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
@@ -271,6 +271,11 @@ public void onRepeatModeChanged(int repeatMode) {
       // Do nothing.
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // Do nothing.
+    }
+
     // SimpleExoplayerView.Callback implementation.
 
     @Override
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 419614347f0..84c164f76c9 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
@@ -619,6 +619,11 @@ public void onRepeatModeChanged(@Player.RepeatMode int repeatMode) {
       updateMediaSessionPlaybackState();
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // TODO: Support shuffle mode in MediaSessionConnector.
+    }
+
     @Override
     public void onPlayerError(ExoPlaybackException error) {
       playbackException = error;
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 4c576b2cc0b..6eeebaef4bb 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
@@ -132,6 +132,11 @@ public void onRepeatModeChanged(int repeatMode) {
       // Do nothing.
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // Do nothing.
+    }
+
     private void releasePlayerAndQuitLooper() {
       player.release();
       Looper.myLooper().quit();
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 0bc945174eb..50f4bf394d2 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
@@ -164,6 +164,11 @@ public void onRepeatModeChanged(int repeatMode) {
       // Do nothing.
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // Do nothing.
+    }
+
     private void releasePlayerAndQuitLooper() {
       player.release();
       Looper.myLooper().quit();
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 f112ee9473c..7530b2b948a 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
@@ -195,6 +195,9 @@ public void setRepeatMode(@RepeatMode int repeatMode) {
   public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
     if (this.shuffleModeEnabled != shuffleModeEnabled) {
       this.shuffleModeEnabled = shuffleModeEnabled;
+      for (Player.EventListener listener : listeners) {
+        listener.onShuffleModeEnabledChanged(shuffleModeEnabled);
+      }
     }
   }
 
@@ -527,3 +530,4 @@ public Object getCurrentManifest() {
   }
 
 }
+
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 f11b107f130..6eee9300188 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
@@ -94,6 +94,13 @@ interface EventListener {
      */
     void onRepeatModeChanged(@RepeatMode int repeatMode);
 
+    /**
+     * Called when the value of {@link #getShuffleModeEnabled()} changes.
+     *
+     * @param shuffleModeEnabled Whether shuffling of windows is enabled.
+     */
+    void onShuffleModeEnabledChanged(boolean shuffleModeEnabled);
+
     /**
      * Called when an error occurs. The playback state will transition to {@link #STATE_IDLE}
      * immediately after this method is called. The player instance can still be used, and
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 060780eda2f..be04ce2fe09 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
@@ -93,6 +93,11 @@ public void onRepeatModeChanged(int repeatMode) {
     // Do nothing.
   }
 
+  @Override
+  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+    // Do nothing.
+  }
+
   @Override
   public void onPositionDiscontinuity() {
     updateAndPost();
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 54212eefdda..3e6b5bf1584 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
@@ -1079,6 +1079,11 @@ public void onRepeatModeChanged(int repeatMode) {
       updateNavigation();
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // TODO: Update UI.
+    }
+
     @Override
     public void onPositionDiscontinuity() {
       updateNavigation();
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 0d10e0fcf90..bdbdf343315 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
@@ -896,6 +896,11 @@ public void onRepeatModeChanged(int repeatMode) {
       // Do nothing.
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // Do nothing.
+    }
+
     @Override
     public void onPlayerError(ExoPlaybackException e) {
       // Do nothing.
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 bbb694d6d61..ab1f448afd1 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
@@ -411,6 +411,11 @@ public void onRepeatModeChanged(@ExoPlayer.RepeatMode int repeatMode) {
 
     }
 
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+
+    }
+
     @Override
     public void onPlayerError(ExoPlaybackException error) {
 
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 77e197515b5..c039dd3283d 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
@@ -235,6 +235,11 @@ public void onRepeatModeChanged(int repeatMode) {
     // Do nothing.
   }
 
+  @Override
+  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+    // Do nothing.
+  }
+
   @Override
   public final void onPlayerError(ExoPlaybackException error) {
     playerWasPrepared = true;
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 f354ad6a769..2b5ea11d943 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
@@ -360,6 +360,11 @@ public void onRepeatModeChanged(@Player.RepeatMode int repeatMode) {
     // Do nothing.
   }
 
+  @Override
+  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+    // Do nothing.
+  }
+
   @Override
   public void onPlayerError(ExoPlaybackException error) {
     handleException(exception);

From 6a8c99d037a411f2b45aab0c23d468a5d0e801eb Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Sun, 16 Jul 2017 07:33:01 +0100
Subject: [PATCH 134/421] Support shuffle mode in MediaSessionConnector.

Changes to the player's shuffle mode are forwarded to the media session.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166057425
---
 .../ext/mediasession/MediaSessionConnector.java      | 12 +++++++++++-
 .../ext/mediasession/TimelineQueueNavigator.java     |  2 +-
 2 files changed, 12 insertions(+), 2 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 84c164f76c9..4dc1100c1e4 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
@@ -621,7 +621,9 @@ public void onRepeatModeChanged(@Player.RepeatMode int repeatMode) {
 
     @Override
     public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-      // TODO: Support shuffle mode in MediaSessionConnector.
+      mediaSession.setShuffleMode(shuffleModeEnabled ? PlaybackStateCompat.SHUFFLE_MODE_ALL
+          : PlaybackStateCompat.SHUFFLE_MODE_NONE);
+      updateMediaSessionPlaybackState();
     }
 
     @Override
@@ -805,6 +807,14 @@ public void onSetShuffleModeEnabled(boolean enabled) {
       }
     }
 
+    @Override
+    public void onSetShuffleMode(int shuffleMode) {
+      if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
+        queueNavigator.onSetShuffleModeEnabled(player,
+            shuffleMode != PlaybackStateCompat.SHUFFLE_MODE_NONE);
+      }
+    }
+
     @Override
     public void onAddQueueItem(MediaDescriptionCompat description) {
       if (queueEditor != null) {
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 521b4cd6e37..435d994dcc8 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
@@ -163,7 +163,7 @@ public void onSkipToNext(Player player) {
 
   @Override
   public void onSetShuffleModeEnabled(Player player, boolean enabled) {
-    // TODO: Implement this.
+    player.setShuffleModeEnabled(enabled);
   }
 
   private void publishFloatingQueueWindow(Player player) {

From f0bd40a5b69b0740a100480768481651ba252a5d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 22 Aug 2017 07:41:32 -0700
Subject: [PATCH 135/421] Use flavorDimensions for external demo app

- This is soon becoming mandatory.
- It also looks like future versions of com.android.tools.build
  are being distributed via Google's Maven repository.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166058299
---
 build.gradle            |  3 +++
 demos/main/build.gradle | 10 ++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index dbc8a41eb07..d5cc64baa16 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,9 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://maven.google.com"
+        }
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.3'
diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 029a44326eb..099741d167b 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -39,9 +39,15 @@ android {
         disable 'MissingTranslation'
     }
 
+    flavorDimensions "extensions"
+
     productFlavors {
-        noExtensions
-        withExtensions
+        noExtensions {
+            dimension "extensions"
+        }
+        withExtensions {
+            dimension "extensions"
+        }
     }
 }
 

From 5214bfa7b1ec229667ac841ff27040fb7ff19fc6 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 22 Aug 2017 08:00:09 -0700
Subject: [PATCH 136/421] Update ExoPlayerImplInternal with shuffle mode
 changes.

The shuffle mode is saved using a message on the playback thread.
After setting the shuffle mode, the same media period holder verification
as for repeat mode changes gets executed.

Note: the shuffle mode is not used yet to change the playback order.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166060231
---
 .../android/exoplayer2/ExoPlayerImpl.java     |  4 ++--
 .../exoplayer2/ExoPlayerImplInternal.java     | 24 ++++++++++++++++++-
 .../exoplayer2/MediaPeriodInfoSequence.java   | 12 ++++++++--
 3 files changed, 35 insertions(+), 5 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 7530b2b948a..0ce920a16fa 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
@@ -107,7 +107,7 @@ public void handleMessage(Message msg) {
     };
     playbackInfo = new ExoPlayerImplInternal.PlaybackInfo(0, 0);
     internalPlayer = new ExoPlayerImplInternal(renderers, trackSelector, loadControl, playWhenReady,
-        repeatMode, eventHandler, playbackInfo, this);
+        repeatMode, shuffleModeEnabled, eventHandler, playbackInfo, this);
   }
 
   @Override
@@ -195,6 +195,7 @@ public void setRepeatMode(@RepeatMode int repeatMode) {
   public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
     if (this.shuffleModeEnabled != shuffleModeEnabled) {
       this.shuffleModeEnabled = shuffleModeEnabled;
+      internalPlayer.setShuffleModeEnabled(shuffleModeEnabled);
       for (Player.EventListener listener : listeners) {
         listener.onShuffleModeEnabledChanged(shuffleModeEnabled);
       }
@@ -530,4 +531,3 @@ public Object getCurrentManifest() {
   }
 
 }
-
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 b8274126b59..67586cc07aa 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
@@ -128,6 +128,7 @@ public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
   private static final int MSG_TRACK_SELECTION_INVALIDATED = 10;
   private static final int MSG_CUSTOM = 11;
   private static final int MSG_SET_REPEAT_MODE = 12;
+  private static final int MSG_SET_SHUFFLE_ENABLED = 13;
 
   private static final int PREPARING_SOURCE_INTERVAL_MS = 10;
   private static final int RENDERING_INTERVAL_MS = 10;
@@ -173,6 +174,7 @@ public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
   private boolean isLoading;
   private int state;
   private @Player.RepeatMode int repeatMode;
+  private boolean shuffleModeEnabled;
   private int customMessagesSent;
   private int customMessagesProcessed;
   private long elapsedRealtimeUs;
@@ -189,12 +191,14 @@ public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
 
   public ExoPlayerImplInternal(Renderer[] renderers, TrackSelector trackSelector,
       LoadControl loadControl, boolean playWhenReady, @Player.RepeatMode int repeatMode,
-      Handler eventHandler, PlaybackInfo playbackInfo, ExoPlayer player) {
+      boolean shuffleModeEnabled, Handler eventHandler, PlaybackInfo playbackInfo,
+      ExoPlayer player) {
     this.renderers = renderers;
     this.trackSelector = trackSelector;
     this.loadControl = loadControl;
     this.playWhenReady = playWhenReady;
     this.repeatMode = repeatMode;
+    this.shuffleModeEnabled = shuffleModeEnabled;
     this.eventHandler = eventHandler;
     this.state = Player.STATE_IDLE;
     this.playbackInfo = playbackInfo;
@@ -234,6 +238,10 @@ public void setRepeatMode(@Player.RepeatMode int repeatMode) {
     handler.obtainMessage(MSG_SET_REPEAT_MODE, repeatMode, 0).sendToTarget();
   }
 
+  public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
+    handler.obtainMessage(MSG_SET_SHUFFLE_ENABLED, shuffleModeEnabled ? 1 : 0, 0).sendToTarget();
+  }
+
   public void seekTo(Timeline timeline, int windowIndex, long positionUs) {
     handler.obtainMessage(MSG_SEEK_TO, new SeekPosition(timeline, windowIndex, positionUs))
         .sendToTarget();
@@ -346,6 +354,10 @@ public boolean handleMessage(Message msg) {
           setRepeatModeInternal(msg.arg1);
           return true;
         }
+        case MSG_SET_SHUFFLE_ENABLED: {
+          setShuffleModeEnabledInternal(msg.arg1 != 0);
+          return true;
+        }
         case MSG_DO_SOME_WORK: {
           doSomeWork();
           return true;
@@ -457,7 +469,17 @@ private void setRepeatModeInternal(@Player.RepeatMode int repeatMode)
       throws ExoPlaybackException {
     this.repeatMode = repeatMode;
     mediaPeriodInfoSequence.setRepeatMode(repeatMode);
+    validateExistingPeriodHolders();
+  }
+
+  private void setShuffleModeEnabledInternal(boolean shuffleModeEnabled)
+      throws ExoPlaybackException {
+    this.shuffleModeEnabled = shuffleModeEnabled;
+    mediaPeriodInfoSequence.setShuffleModeEnabled(shuffleModeEnabled);
+    validateExistingPeriodHolders();
+  }
 
+  private void validateExistingPeriodHolders() throws ExoPlaybackException {
     // Find the last existing period holder that matches the new period order.
     MediaPeriodHolder lastValidPeriodHolder = playingPeriodHolder != null
         ? playingPeriodHolder : loadingPeriodHolder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
index 0e9c65421cc..9e8c2645c12 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
@@ -102,8 +102,8 @@ public MediaPeriodInfo copyWithStartPositionUs(long startPositionUs) {
   private final Timeline.Window window;
 
   private Timeline timeline;
-  @RepeatMode
-  private int repeatMode;
+  private @RepeatMode int repeatMode;
+  private boolean shuffleModeEnabled;
 
   /**
    * Creates a new media period info sequence.
@@ -129,6 +129,14 @@ public void setRepeatMode(@RepeatMode int repeatMode) {
     this.repeatMode = repeatMode;
   }
 
+  /**
+   * Sets whether shuffling is enabled. Call {@link #getUpdatedMediaPeriodInfo} to update period
+   * information taking into account the shuffle mode.
+   */
+  public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
+    this.shuffleModeEnabled = shuffleModeEnabled;
+  }
+
   /**
    * Returns the first {@link MediaPeriodInfo} to play, based on the specified playback position.
    */

From 50c485652cb0b52f593b8a4035dcd50e050747e1 Mon Sep 17 00:00:00 2001
From: Bei Yi <stellabei@gmail.com>
Date: Thu, 24 Aug 2017 14:31:33 -0700
Subject: [PATCH 137/421] Support aspect ratio fill mode for
 AspectRatioFrameLayout

---
 .../android/exoplayer2/ui/AspectRatioFrameLayout.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 2f04b8800d1..9b93b3a867e 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
@@ -32,7 +32,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    * Resize modes for {@link AspectRatioFrameLayout}.
    */
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_CROP})
+  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_ASPECT_FILL})
   public @interface ResizeMode {}
 
   /**
@@ -52,9 +52,9 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    */
   public static final int RESIZE_MODE_FILL = 3;
   /**
-   * The height or width is increased or decreased to crop and to obtain the desired aspect ratio.
+   * Either height or width is increased to obtain the desired aspect ratio.
    */
-  public static final int RESIZE_MODE_CROP = 4;
+  public static final int RESIZE_MODE_ASPECT_FILL = 4;
 
   /**
    * The {@link FrameLayout} will not resize itself if the fractional difference between its natural
@@ -145,7 +145,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       case RESIZE_MODE_FIXED_HEIGHT:
         width = (int) (height * videoAspectRatio);
         break;
-      case RESIZE_MODE_CROP:
+      case RESIZE_MODE_ASPECT_FILL:
         if (videoAspectRatio > viewAspectRatio) {
           width = (int) (height * videoAspectRatio);
         } else {

From b0848216786d6ebfd35c898286ebdd22e4aa5234 Mon Sep 17 00:00:00 2001
From: Bei Yi <stellabei@gmail.com>
Date: Thu, 24 Aug 2017 16:13:44 -0700
Subject: [PATCH 138/421] Support zoom mode for AspectRatioFrameLayout

---
 .../android/exoplayer2/ui/AspectRatioFrameLayout.java       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 9b93b3a867e..3367a46374b 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
@@ -32,7 +32,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    * Resize modes for {@link AspectRatioFrameLayout}.
    */
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_ASPECT_FILL})
+  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_ZOOM})
   public @interface ResizeMode {}
 
   /**
@@ -54,7 +54,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
   /**
    * Either height or width is increased to obtain the desired aspect ratio.
    */
-  public static final int RESIZE_MODE_ASPECT_FILL = 4;
+  public static final int RESIZE_MODE_ZOOM = 4;
 
   /**
    * The {@link FrameLayout} will not resize itself if the fractional difference between its natural
@@ -145,7 +145,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       case RESIZE_MODE_FIXED_HEIGHT:
         width = (int) (height * videoAspectRatio);
         break;
-      case RESIZE_MODE_ASPECT_FILL:
+      case RESIZE_MODE_ZOOM:
         if (videoAspectRatio > viewAspectRatio) {
           width = (int) (height * videoAspectRatio);
         } else {

From 10f1bd73961b972ec451076ed539ab7f189b1e62 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 01:08:08 -0700
Subject: [PATCH 139/421] Add shuffle mode parameter to Timeline interface
 methods.

This parameter is used by methods such as getNextWindowIndex
and getPreviousWindowIndex to determine the playback order.
Additionally, there are method to query the first and last
window index given the shuffle mode.

None of the timeline implementations nor the ExoPlayer
implementation supports shuffling so far.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166170229
---
 .../mediasession/TimelineQueueNavigator.java  |   4 +-
 .../exoplayer2/ExoPlayerImplInternal.java     |   7 +-
 .../exoplayer2/MediaPeriodInfoSequence.java   |   4 +-
 .../google/android/exoplayer2/Timeline.java   |  63 +++-
 .../exoplayer2/offline/DownloadException.java |  30 ++
 .../exoplayer2/offline/Downloader.java        |  94 +++++
 .../offline/DownloaderConstructorHelper.java  | 107 ++++++
 .../offline/ProgressiveDownloader.java        | 100 ++++++
 .../exoplayer2/offline/SegmentDownloader.java | 331 ++++++++++++++++++
 .../source/AbstractConcatenatedTimeline.java  |  12 +-
 .../source/ConcatenatingMediaSource.java      |  10 +-
 .../exoplayer2/source/ForwardingTimeline.java |  20 +-
 .../exoplayer2/source/LoopingMediaSource.java |  12 +-
 .../hls/offline/HlsDownloadTestData.java      |  80 +++++
 .../source/hls/offline/HlsDownloaderTest.java | 210 +++++++++++
 .../source/hls/offline/HlsDownloadAction.java |  83 +++++
 .../source/hls/offline/HlsDownloader.java     | 139 ++++++++
 .../offline/SsDownloadAction.java             |  86 +++++
 .../smoothstreaming/offline/SsDownloader.java | 111 ++++++
 .../exoplayer2/ui/PlaybackControlView.java    |  11 +-
 .../playbacktests/gts/DashDownloadTest.java   | 192 ++++++++++
 .../exoplayer2/testutil/TimelineAsserts.java  |  27 +-
 22 files changed, 1679 insertions(+), 54 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
 create mode 100644 library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
 create mode 100644 library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
 create mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java
 create mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
 create mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
 create mode 100644 library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
 create mode 100644 playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java

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 435d994dcc8..bd3f3f2820f 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
@@ -127,7 +127,7 @@ public void onSkipToPrevious(Player player) {
       return;
     }
     int previousWindowIndex = timeline.getPreviousWindowIndex(player.getCurrentWindowIndex(),
-        player.getRepeatMode());
+        player.getRepeatMode(), false);
     if (player.getCurrentPosition() > MAX_POSITION_FOR_SEEK_TO_PREVIOUS
         || previousWindowIndex == C.INDEX_UNSET) {
       player.seekTo(0);
@@ -155,7 +155,7 @@ public void onSkipToNext(Player player) {
       return;
     }
     int nextWindowIndex = timeline.getNextWindowIndex(player.getCurrentWindowIndex(),
-        player.getRepeatMode());
+        player.getRepeatMode(), false);
     if (nextWindowIndex != C.INDEX_UNSET) {
       player.seekTo(nextWindowIndex, C.TIME_UNSET);
     }
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 67586cc07aa..7035ed637e2 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
@@ -488,7 +488,7 @@ private void validateExistingPeriodHolders() throws ExoPlaybackException {
     }
     while (true) {
       int nextPeriodIndex = timeline.getNextPeriodIndex(lastValidPeriodHolder.info.id.periodIndex,
-          period, window, repeatMode);
+          period, window, repeatMode, false);
       while (lastValidPeriodHolder.next != null
           && !lastValidPeriodHolder.info.isLastInTimelinePeriod) {
         lastValidPeriodHolder = lastValidPeriodHolder.next;
@@ -1122,7 +1122,7 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
     while (periodHolder.next != null) {
       MediaPeriodHolder previousPeriodHolder = periodHolder;
       periodHolder = periodHolder.next;
-      periodIndex = timeline.getNextPeriodIndex(periodIndex, period, window, repeatMode);
+      periodIndex = timeline.getNextPeriodIndex(periodIndex, period, window, repeatMode, false);
       if (periodIndex != C.INDEX_UNSET
           && periodHolder.uid.equals(timeline.getPeriod(periodIndex, period, true).uid)) {
         // The holder is consistent with the new timeline. Update its index and continue.
@@ -1204,7 +1204,8 @@ private int resolveSubsequentPeriod(int oldPeriodIndex, Timeline oldTimeline,
     int newPeriodIndex = C.INDEX_UNSET;
     int maxIterations = oldTimeline.getPeriodCount();
     for (int i = 0; i < maxIterations && newPeriodIndex == C.INDEX_UNSET; i++) {
-      oldPeriodIndex = oldTimeline.getNextPeriodIndex(oldPeriodIndex, period, window, repeatMode);
+      oldPeriodIndex = oldTimeline.getNextPeriodIndex(oldPeriodIndex, period, window, repeatMode,
+          false);
       if (oldPeriodIndex == C.INDEX_UNSET) {
         // We've reached the end of the old timeline.
         break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
index 9e8c2645c12..d7821ed705a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
@@ -162,7 +162,7 @@ public MediaPeriodInfo getNextMediaPeriodInfo(MediaPeriodInfo currentMediaPeriod
     // timeline is updated, to avoid repeatedly checking the same timeline.
     if (currentMediaPeriodInfo.isLastInTimelinePeriod) {
       int nextPeriodIndex = timeline.getNextPeriodIndex(currentMediaPeriodInfo.id.periodIndex,
-          period, window, repeatMode);
+          period, window, repeatMode, false);
       if (nextPeriodIndex == C.INDEX_UNSET) {
         // We can't create a next period yet.
         return null;
@@ -353,7 +353,7 @@ private boolean isLastInPeriod(MediaPeriodId id, long endPositionUs) {
   private boolean isLastInTimeline(MediaPeriodId id, boolean isLastMediaPeriodInPeriod) {
     int windowIndex = timeline.getPeriod(id.periodIndex, period).windowIndex;
     return !timeline.getWindow(windowIndex, window).isDynamic
-        && timeline.isLastPeriod(id.periodIndex, period, window, repeatMode)
+        && timeline.isLastPeriod(id.periodIndex, period, window, repeatMode, false)
         && 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 7d4c1995eb2..8a1d7964eea 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
@@ -553,20 +553,24 @@ public final boolean isEmpty() {
 
   /**
    * Returns the index of the window after the window at index {@code windowIndex} depending on the
-   * {@code repeatMode}.
+   * {@code repeatMode} and whether shuffling is enabled.
    *
    * @param windowIndex Index of a window in the timeline.
    * @param repeatMode A repeat mode.
+   * @param shuffleModeEnabled Whether shuffling is enabled.
    * @return The index of the next window, or {@link C#INDEX_UNSET} if this is the last window.
    */
-  public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+  public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+      boolean shuffleModeEnabled) {
     switch (repeatMode) {
       case Player.REPEAT_MODE_OFF:
-        return windowIndex == getWindowCount() - 1 ? C.INDEX_UNSET : windowIndex + 1;
+        return windowIndex == getLastWindowIndex(shuffleModeEnabled)  ? C.INDEX_UNSET
+            : windowIndex + 1;
       case Player.REPEAT_MODE_ONE:
         return windowIndex;
       case Player.REPEAT_MODE_ALL:
-        return windowIndex == getWindowCount() - 1 ? 0 : windowIndex + 1;
+        return windowIndex == getLastWindowIndex(shuffleModeEnabled)
+            ? getFirstWindowIndex(shuffleModeEnabled) : windowIndex + 1;
       default:
         throw new IllegalStateException();
     }
@@ -574,25 +578,51 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
 
   /**
    * Returns the index of the window before the window at index {@code windowIndex} depending on the
-   * {@code repeatMode}.
+   * {@code repeatMode} and whether shuffling is enabled.
    *
    * @param windowIndex Index of a window in the timeline.
    * @param repeatMode A repeat mode.
+   * @param shuffleModeEnabled Whether shuffling is enabled.
    * @return The index of the previous window, or {@link C#INDEX_UNSET} if this is the first window.
    */
-  public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+  public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+      boolean shuffleModeEnabled) {
     switch (repeatMode) {
       case Player.REPEAT_MODE_OFF:
-        return windowIndex == 0 ? C.INDEX_UNSET : windowIndex - 1;
+        return windowIndex == getFirstWindowIndex(shuffleModeEnabled) ? C.INDEX_UNSET
+            : windowIndex - 1;
       case Player.REPEAT_MODE_ONE:
         return windowIndex;
       case Player.REPEAT_MODE_ALL:
-        return windowIndex == 0 ? getWindowCount() - 1 : windowIndex - 1;
+        return windowIndex == getFirstWindowIndex(shuffleModeEnabled)
+            ? getLastWindowIndex(shuffleModeEnabled) : windowIndex - 1;
       default:
         throw new IllegalStateException();
     }
   }
 
+  /**
+   * Returns the index of the last window in the playback order depending on whether shuffling is
+   * enabled.
+   *
+   * @param shuffleModeEnabled Whether shuffling is enabled.
+   * @return The index of the last window in the playback order.
+   */
+  public int getLastWindowIndex(boolean shuffleModeEnabled) {
+    return getWindowCount() - 1;
+  }
+
+  /**
+   * Returns the index of the first window in the playback order depending on whether shuffling is
+   * enabled.
+   *
+   * @param shuffleModeEnabled Whether shuffling is enabled.
+   * @return The index of the first window in the playback order.
+   */
+  public int getFirstWindowIndex(boolean shuffleModeEnabled) {
+    return 0;
+  }
+
   /**
    * Populates a {@link Window} with data for the window at the specified index. Does not populate
    * {@link Window#id}.
@@ -614,7 +644,7 @@ public final Window getWindow(int windowIndex, Window window) {
    *     null. The caller should pass false for efficiency reasons unless the field is required.
    * @return The populated {@link Window}, for convenience.
    */
-  public Window getWindow(int windowIndex, Window window, boolean setIds) {
+  public final Window getWindow(int windowIndex, Window window, boolean setIds) {
     return getWindow(windowIndex, window, setIds, 0);
   }
 
@@ -639,19 +669,20 @@ public abstract Window getWindow(int windowIndex, Window window, boolean setIds,
 
   /**
    * Returns the index of the period after the period at index {@code periodIndex} depending on the
-   * {@code repeatMode}.
+   * {@code repeatMode} and whether shuffling is enabled.
    *
    * @param periodIndex Index of a period in the timeline.
    * @param period A {@link Period} to be used internally. Must not be null.
    * @param window A {@link Window} to be used internally. Must not be null.
    * @param repeatMode A repeat mode.
+   * @param shuffleModeEnabled Whether shuffling is enabled.
    * @return The index of the next period, or {@link C#INDEX_UNSET} if this is the last period.
    */
   public final int getNextPeriodIndex(int periodIndex, Period period, Window window,
-      @Player.RepeatMode int repeatMode) {
+      @Player.RepeatMode int repeatMode, boolean shuffleModeEnabled) {
     int windowIndex = getPeriod(periodIndex, period).windowIndex;
     if (getWindow(windowIndex, window).lastPeriodIndex == periodIndex) {
-      int nextWindowIndex = getNextWindowIndex(windowIndex, repeatMode);
+      int nextWindowIndex = getNextWindowIndex(windowIndex, repeatMode, shuffleModeEnabled);
       if (nextWindowIndex == C.INDEX_UNSET) {
         return C.INDEX_UNSET;
       }
@@ -662,17 +693,19 @@ public final int getNextPeriodIndex(int periodIndex, Period period, Window windo
 
   /**
    * Returns whether the given period is the last period of the timeline depending on the
-   * {@code repeatMode}.
+   * {@code repeatMode} and whether shuffling is enabled.
    *
    * @param periodIndex A period index.
    * @param period A {@link Period} to be used internally. Must not be null.
    * @param window A {@link Window} to be used internally. Must not be null.
    * @param repeatMode A repeat mode.
+   * @param shuffleModeEnabled Whether shuffling is enabled.
    * @return Whether the period of the given index is the last period of the timeline.
    */
   public final boolean isLastPeriod(int periodIndex, Period period, Window window,
-      @Player.RepeatMode int repeatMode) {
-    return getNextPeriodIndex(periodIndex, period, window, repeatMode) == C.INDEX_UNSET;
+      @Player.RepeatMode int repeatMode, boolean shuffleModeEnabled) {
+    return getNextPeriodIndex(periodIndex, period, window, repeatMode, shuffleModeEnabled)
+        == C.INDEX_UNSET;
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
new file mode 100644
index 00000000000..239195892c4
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
@@ -0,0 +1,30 @@
+/*
+ * 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 com.google.android.exoplayer2.util.ClosedSource;
+import java.io.IOException;
+
+/** Thrown on an error during downloading. */
+@ClosedSource(reason = "Not ready yet")
+public final class DownloadException extends IOException {
+
+  /** @param message The message for the exception. */
+  public DownloadException(String message) {
+    super(message);
+  }
+
+}
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
new file mode 100644
index 00000000000..a130bb40528
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/Downloader.java
@@ -0,0 +1,94 @@
+/*
+ * 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.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.ClosedSource;
+import java.io.IOException;
+
+/**
+ * An interface for stream downloaders.
+ */
+@ClosedSource(reason = "Not ready yet")
+public interface Downloader {
+
+  /**
+   * Listener notified when download progresses.
+   * <p>
+   * No guarantees are made about the thread or threads on which the listener is called, but it is
+   * guaranteed that listener methods will be called in a serial fashion (i.e. one at a time) and in
+   * the same order as events occurred.
+   */
+  interface ProgressListener {
+    /**
+     * Called during the download. Calling intervals depend on the {@link Downloader}
+     * implementation.
+     *
+     * @param downloader The reporting instance.
+     * @param downloadPercentage The download percentage. This value can be an estimation.
+     * @param downloadedBytes Total number of downloaded bytes.
+     * @see #download(ProgressListener)
+     */
+    void onDownloadProgress(Downloader downloader, float downloadPercentage, long downloadedBytes);
+  }
+
+  /**
+   * Initializes the downloader.
+   *
+   * @throws DownloadException Thrown if the media cannot be downloaded.
+   * @throws InterruptedException If the thread has been interrupted.
+   * @throws IOException Thrown when there is an io error while reading from cache.
+   * @see #getDownloadedBytes()
+   * @see #getDownloadPercentage()
+   */
+  void init() throws InterruptedException, IOException;
+
+  /**
+   * Downloads the media.
+   *
+   * @param listener If not null, called during download.
+   * @throws DownloadException Thrown if the media cannot be downloaded.
+   * @throws InterruptedException If the thread has been interrupted.
+   * @throws IOException Thrown when there is an io error while downloading.
+   */
+  void download(@Nullable ProgressListener listener)
+      throws InterruptedException, IOException;
+
+  /**
+   * Removes all of the downloaded data of the media.
+   *
+   * @throws InterruptedException Thrown if the thread was interrupted.
+   */
+  void remove() throws InterruptedException;
+
+  /**
+   * Returns the total number of downloaded bytes, or {@link C#LENGTH_UNSET} if it hasn't been
+   * calculated yet.
+   *
+   * @see #init()
+   */
+  long getDownloadedBytes();
+
+  /**
+   * Returns the download percentage, or {@link Float#NaN} if it can't be calculated yet. This
+   * value can be an estimation.
+   *
+   * @see #init()
+   */
+  float getDownloadPercentage();
+
+}
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
new file mode 100644
index 00000000000..5f9a4d973aa
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloaderConstructorHelper.java
@@ -0,0 +1,107 @@
+/*
+ * 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.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.cache.Cache;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
+import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.PriorityTaskManager;
+
+/** A helper class that holds necessary parameters for {@link Downloader} construction. */
+@ClosedSource(reason = "Not ready yet")
+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;
+
+  /**
+   * @param cache Cache instance to be used to store downloaded data.
+   * @param upstreamDataSourceFactory A {@link Factory} for downloading data.
+   */
+  public DownloaderConstructorHelper(Cache cache, Factory upstreamDataSourceFactory) {
+    this(cache, upstreamDataSourceFactory, null, null, 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, null is passed to {@link Downloader} constructor.
+   * @param cacheWriteDataSinkFactory A {@link DataSink.Factory} for writing data to the cache. If
+   *     null, null is passed to {@link Downloader} constructor.
+   * @param priorityTaskManager If one is given then the download priority is set lower than
+   *     loading. If null, null is passed to {@link Downloader} constructor.
+   */
+  public DownloaderConstructorHelper(Cache cache, Factory upstreamDataSourceFactory,
+      @Nullable Factory cacheReadDataSourceFactory,
+      @Nullable DataSink.Factory cacheWriteDataSinkFactory,
+      @Nullable PriorityTaskManager priorityTaskManager) {
+    Assertions.checkNotNull(upstreamDataSourceFactory);
+    this.cache = cache;
+    this.upstreamDataSourceFactory = upstreamDataSourceFactory;
+    this.cacheReadDataSourceFactory = cacheReadDataSourceFactory;
+    this.cacheWriteDataSinkFactory = cacheWriteDataSinkFactory;
+    this.priorityTaskManager = priorityTaskManager;
+  }
+
+  /** Returns the {@link Cache} instance. */
+  public Cache getCache() {
+    return cache;
+  }
+
+  /** Returns a {@link PriorityTaskManager} instance.*/
+  public PriorityTaskManager getPriorityTaskManager() {
+    // Return a dummy PriorityTaskManager if none is provided. Create a new PriorityTaskManager
+    // each time so clients don't affect each other over the dummy PriorityTaskManager instance.
+    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);
+    }
+  }
+
+}
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
new file mode 100644
index 00000000000..c6bb3bc4326
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ProgressiveDownloader.java
@@ -0,0 +1,100 @@
+/*
+ * 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.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.CacheUtil;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
+import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.PriorityTaskManager;
+import java.io.IOException;
+
+/**
+ * A downloader for progressive media streams.
+ */
+@ClosedSource(reason = "Not ready yet")
+public final class ProgressiveDownloader implements Downloader {
+
+  private static final int BUFFER_SIZE_BYTES = 128 * 1024;
+
+  private final DataSpec dataSpec;
+  private final Cache cache;
+  private final CacheDataSource dataSource;
+  private final PriorityTaskManager priorityTaskManager;
+  private final CacheUtil.CachingCounters cachingCounters;
+
+  /**
+   * @param uri Uri of the data to be downloaded.
+   * @param customCacheKey A custom key that uniquely identifies the original stream. Used for cache
+   *     indexing. May be null.
+   * @param constructorHelper a {@link DownloaderConstructorHelper} instance.
+   */
+  public ProgressiveDownloader(
+      String uri, String customCacheKey, DownloaderConstructorHelper constructorHelper) {
+    this.dataSpec = new DataSpec(Uri.parse(uri), 0, C.LENGTH_UNSET, customCacheKey, 0);
+    this.cache = constructorHelper.getCache();
+    this.dataSource = constructorHelper.buildCacheDataSource(false);
+    this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
+    cachingCounters = new CachingCounters();
+  }
+
+  @Override
+  public void init() {
+    CacheUtil.getCached(dataSpec, cache, cachingCounters);
+  }
+
+  @Override
+  public void download(@Nullable ProgressListener listener) throws InterruptedException,
+      IOException {
+    priorityTaskManager.add(C.PRIORITY_DOWNLOAD);
+    try {
+      byte[] buffer = new byte[BUFFER_SIZE_BYTES];
+      CacheUtil.cache(dataSpec, cache, dataSource, buffer, priorityTaskManager, C.PRIORITY_DOWNLOAD,
+          cachingCounters, true);
+      // TODO: Work out how to call onDownloadProgress periodically during the download, or else
+      // get rid of ProgressListener and move to a model where the manager periodically polls
+      // Downloaders.
+      if (listener != null) {
+        listener.onDownloadProgress(this, 100, cachingCounters.contentLength);
+      }
+    } finally {
+      priorityTaskManager.remove(C.PRIORITY_DOWNLOAD);
+    }
+  }
+
+  @Override
+  public void remove() {
+    CacheUtil.remove(cache, CacheUtil.getKey(dataSpec));
+  }
+
+  @Override
+  public long getDownloadedBytes() {
+    return cachingCounters.totalCachedBytes();
+  }
+
+  @Override
+  public float getDownloadPercentage() {
+    long contentLength = cachingCounters.contentLength;
+    return contentLength == C.LENGTH_UNSET ? Float.NaN
+        : ((cachingCounters.totalCachedBytes() * 100f) / 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
new file mode 100644
index 00000000000..93e7c57470f
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/SegmentDownloader.java
@@ -0,0 +1,331 @@
+/*
+ * 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.NonNull;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+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.CacheUtil;
+import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
+import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.PriorityTaskManager;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Base class for multi segment stream downloaders.
+ *
+ * <p>All of the methods are blocking. Also they are not thread safe, except {@link
+ * #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link #getDownloadedBytes()}.
+ *
+ * @param <M> The type of the manifest object.
+ * @param <K> The type of the representation key object.
+ */
+@ClosedSource(reason = "Not ready yet")
+public abstract class SegmentDownloader<M, K> implements Downloader {
+
+  /** 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;
+
+    /** The {@link DataSpec} of the segment. */
+    public final DataSpec dataSpec;
+
+    /** Constructs a Segment. */
+    public Segment(long startTimeUs, DataSpec dataSpec) {
+      this.startTimeUs = startTimeUs;
+      this.dataSpec = dataSpec;
+    }
+
+    @Override
+    public int compareTo(@NonNull Segment other) {
+      long startOffsetDiff = startTimeUs - other.startTimeUs;
+      return startOffsetDiff == 0 ? 0 : ((startOffsetDiff < 0) ? -1 : 1);
+    }
+  }
+
+  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 M manifest;
+  private K[] keys;
+  private volatile int totalSegments;
+  private volatile int downloadedSegments;
+  private volatile long downloadedBytes;
+
+  /**
+   * @param manifestUri The {@link Uri} of the manifest to be downloaded.
+   * @param constructorHelper a {@link DownloaderConstructorHelper} instance.
+   */
+  public SegmentDownloader(Uri manifestUri, DownloaderConstructorHelper constructorHelper) {
+    this.manifestUri = manifestUri;
+    this.cache = constructorHelper.getCache();
+    this.dataSource = constructorHelper.buildCacheDataSource(false);
+    this.offlineDataSource = constructorHelper.buildCacheDataSource(true);
+    this.priorityTaskManager = constructorHelper.getPriorityTaskManager();
+    resetCounters();
+  }
+
+  /**
+   * Returns the manifest. Downloads and parses it if necessary.
+   *
+   * @return The manifest.
+   * @throws IOException If an error occurs reading data.
+   */
+  public final M getManifest() throws IOException {
+    return getManifestIfNeeded(false);
+  }
+
+  /**
+   * Selects multiple representations pointed to by the keys for downloading, checking status. Any
+   * previous selection is cleared. If keys are null or empty, all representations are downloaded.
+   */
+  public final void selectRepresentations(K[] keys) {
+    this.keys = keys != null ? keys.clone() : null;
+    resetCounters();
+  }
+
+  /**
+   * Initializes the total segments, downloaded segments and downloaded bytes counters for the
+   * selected representations.
+   *
+   * @throws IOException Thrown when there is an io error while reading from cache.
+   * @throws DownloadException Thrown if the media cannot be downloaded.
+   * @throws InterruptedException If the thread has been interrupted.
+   * @see #getTotalSegments()
+   * @see #getDownloadedSegments()
+   * @see #getDownloadedBytes()
+   */
+  @Override
+  public final void init() throws InterruptedException, IOException {
+    try {
+      getManifestIfNeeded(true);
+    } catch (IOException e) {
+      // Either the manifest file isn't available offline or not parsable.
+      return;
+    }
+    try {
+      initStatus(true);
+    } catch (IOException | InterruptedException e) {
+      resetCounters();
+      throw e;
+    }
+  }
+
+  /**
+   * Downloads the content for the selected representations in sync or resumes a previously stopped
+   * download.
+   *
+   * @param listener If not null, called during download.
+   * @throws IOException Thrown when there is an io error while downloading.
+   * @throws DownloadException Thrown if the media cannot be downloaded.
+   * @throws InterruptedException If the thread has been interrupted.
+   */
+  @Override
+  public final synchronized void download(@Nullable ProgressListener listener)
+      throws IOException, InterruptedException {
+    priorityTaskManager.add(C.PRIORITY_DOWNLOAD);
+    try {
+      getManifestIfNeeded(false);
+      List<Segment> segments = initStatus(false);
+      notifyListener(listener); // Initial notification.
+      Collections.sort(segments);
+      byte[] buffer = new byte[BUFFER_SIZE_BYTES];
+      CachingCounters cachingCounters = new CachingCounters();
+      for (int i = 0; i < segments.size(); i++) {
+        CacheUtil.cache(segments.get(i).dataSpec, cache, dataSource, buffer,
+            priorityTaskManager, C.PRIORITY_DOWNLOAD, cachingCounters, true);
+        downloadedBytes += cachingCounters.newlyCachedBytes;
+        downloadedSegments++;
+        notifyListener(listener);
+      }
+    } finally {
+      priorityTaskManager.remove(C.PRIORITY_DOWNLOAD);
+    }
+  }
+
+  /**
+   * Returns the total number of segments in the representations which are selected, or {@link
+   * C#LENGTH_UNSET} if it hasn't been calculated yet.
+   *
+   * @see #init()
+   */
+  public final int getTotalSegments() {
+    return totalSegments;
+  }
+
+  /**
+   * Returns the total number of downloaded segments in the representations which are selected, or
+   * {@link C#LENGTH_UNSET} if it hasn't been calculated yet.
+   *
+   * @see #init()
+   */
+  public final int getDownloadedSegments() {
+    return downloadedSegments;
+  }
+
+  /**
+   * Returns the total number of downloaded bytes in the representations which are selected, or
+   * {@link C#LENGTH_UNSET} if it hasn't been calculated yet.
+   *
+   * @see #init()
+   */
+  @Override
+  public final long getDownloadedBytes() {
+    return downloadedBytes;
+  }
+
+  @Override
+  public float getDownloadPercentage() {
+    // Take local snapshot of the volatile fields
+    int totalSegments = this.totalSegments;
+    int downloadedSegments = this.downloadedSegments;
+    if (totalSegments == C.LENGTH_UNSET || downloadedSegments == C.LENGTH_UNSET) {
+      return Float.NaN;
+    }
+    return totalSegments == 0 ? 100f : (downloadedSegments * 100f) / totalSegments;
+  }
+
+  @Override
+  public final void remove() throws InterruptedException {
+    try {
+      getManifestIfNeeded(true);
+    } catch (IOException e) {
+      // Either the manifest file isn't available offline, or it's not parsable. Continue anyway to
+      // reset the counters and attempt to remove the manifest file.
+    }
+    resetCounters();
+    if (manifest != null) {
+      List<Segment> segments = null;
+      try {
+        segments = getAllSegments(offlineDataSource, manifest, true);
+      } catch (IOException e) {
+        // Ignore exceptions. We do our best with what's available offline.
+      }
+      if (segments != null) {
+        for (int i = 0; i < segments.size(); i++) {
+          remove(segments.get(i).dataSpec.uri);
+        }
+      }
+      manifest = null;
+    }
+    remove(manifestUri);
+  }
+
+  /**
+   * Loads and parses the manifest.
+   *
+   * @param dataSource The {@link DataSource} through which to load.
+   * @param uri The manifest uri.
+   * @return The manifest.
+   * @throws IOException If an error occurs reading data.
+   */
+  protected abstract M getManifest(DataSource dataSource, Uri uri) throws IOException;
+
+  /**
+   * Returns a list of {@link Segment}s for given keys.
+   *
+   * @param dataSource The {@link DataSource} through which to load any required data.
+   * @param manifest The manifest containing the segments.
+   * @param keys The selected representation keys.
+   * @param allowIncompleteIndex 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.
+   * @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 A list of {@link Segment}s for given keys.
+   */
+  protected abstract List<Segment> getSegments(DataSource dataSource, M manifest, K[] keys,
+      boolean allowIncompleteIndex) throws InterruptedException, IOException;
+
+  /**
+   * Returns a list of all segments.
+   *
+   * @see #getSegments(DataSource, M, Object[], boolean)}.
+   */
+  protected abstract List<Segment> getAllSegments(DataSource dataSource, M manifest,
+      boolean allowPartialIndex) throws InterruptedException, IOException;
+
+  private void resetCounters() {
+    totalSegments = C.LENGTH_UNSET;
+    downloadedSegments = C.LENGTH_UNSET;
+    downloadedBytes = C.LENGTH_UNSET;
+  }
+
+  private void remove(Uri uri) {
+    CacheUtil.remove(cache, CacheUtil.generateKey(uri));
+  }
+
+  private void notifyListener(ProgressListener listener) {
+    if (listener != null) {
+      listener.onDownloadProgress(this, getDownloadPercentage(), downloadedBytes);
+    }
+  }
+
+  /**
+   * Initializes totalSegments, downloadedSegments and downloadedBytes for selected representations.
+   * If not offline then downloads missing metadata.
+   *
+   * @return A list of not fully downloaded segments.
+   */
+  private synchronized List<Segment> initStatus(boolean offline)
+      throws IOException, InterruptedException {
+    DataSource dataSource = getDataSource(offline);
+    List<Segment> segments = keys != null && keys.length > 0
+        ? getSegments(dataSource, manifest, keys, offline)
+        : getAllSegments(dataSource, manifest, offline);
+    CachingCounters cachingCounters = new CachingCounters();
+    totalSegments = segments.size();
+    downloadedSegments = 0;
+    downloadedBytes = 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);
+      }
+    }
+    return segments;
+  }
+
+  private M getManifestIfNeeded(boolean offline) throws IOException {
+    if (manifest == null) {
+      manifest = getManifest(getDataSource(offline), manifestUri);
+    }
+    return manifest;
+  }
+
+  private DataSource getDataSource(boolean offline) {
+    return offline ? offlineDataSource : dataSource;
+  }
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
index 42ac9386777..9c2be395761 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
@@ -32,12 +32,14 @@ public AbstractConcatenatedTimeline(int childCount) {
   }
 
   @Override
-  public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+  public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+      boolean shuffleModeEnabled) {
     int childIndex = getChildIndexByWindowIndex(windowIndex);
     int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
     int nextWindowIndexInChild = getTimelineByChildIndex(childIndex).getNextWindowIndex(
         windowIndex - firstWindowIndexInChild,
-        repeatMode == Player.REPEAT_MODE_ALL ? Player.REPEAT_MODE_OFF : repeatMode);
+        repeatMode == Player.REPEAT_MODE_ALL ? Player.REPEAT_MODE_OFF : repeatMode,
+        shuffleModeEnabled);
     if (nextWindowIndexInChild != C.INDEX_UNSET) {
       return firstWindowIndexInChild + nextWindowIndexInChild;
     } else {
@@ -53,12 +55,14 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
   }
 
   @Override
-  public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+  public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+      boolean shuffleModeEnabled) {
     int childIndex = getChildIndexByWindowIndex(windowIndex);
     int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
     int previousWindowIndexInChild = getTimelineByChildIndex(childIndex).getPreviousWindowIndex(
         windowIndex - firstWindowIndexInChild,
-        repeatMode == Player.REPEAT_MODE_ALL ? Player.REPEAT_MODE_OFF : repeatMode);
+        repeatMode == Player.REPEAT_MODE_ALL ? Player.REPEAT_MODE_OFF : repeatMode,
+        shuffleModeEnabled);
     if (previousWindowIndexInChild != C.INDEX_UNSET) {
       return firstWindowIndexInChild + previousWindowIndexInChild;
     } else {
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 5d2bbcc33ea..0f6f1b345d1 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
@@ -198,19 +198,21 @@ public int getPeriodCount() {
     }
 
     @Override
-    public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+    public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+        boolean shuffleModeEnabled) {
       if (isRepeatOneAtomic && repeatMode == Player.REPEAT_MODE_ONE) {
         repeatMode = Player.REPEAT_MODE_ALL;
       }
-      return super.getNextWindowIndex(windowIndex, repeatMode);
+      return super.getNextWindowIndex(windowIndex, repeatMode, shuffleModeEnabled);
     }
 
     @Override
-    public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
+    public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+        boolean shuffleModeEnabled) {
       if (isRepeatOneAtomic && repeatMode == Player.REPEAT_MODE_ONE) {
         repeatMode = Player.REPEAT_MODE_ALL;
       }
-      return super.getPreviousWindowIndex(windowIndex, repeatMode);
+      return super.getPreviousWindowIndex(windowIndex, repeatMode, shuffleModeEnabled);
     }
 
     @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
index 4203abbf397..cfa5cec387d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ForwardingTimeline.java
@@ -35,13 +35,25 @@ public int getWindowCount() {
   }
 
   @Override
-  public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-    return timeline.getNextWindowIndex(windowIndex, repeatMode);
+  public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+      boolean shuffleModeEnabled) {
+    return timeline.getNextWindowIndex(windowIndex, repeatMode, shuffleModeEnabled);
   }
 
   @Override
-  public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-    return timeline.getPreviousWindowIndex(windowIndex, repeatMode);
+  public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+      boolean shuffleModeEnabled) {
+    return timeline.getPreviousWindowIndex(windowIndex, repeatMode, shuffleModeEnabled);
+  }
+
+  @Override
+  public int getLastWindowIndex(boolean shuffleModeEnabled) {
+    return timeline.getLastWindowIndex(shuffleModeEnabled);
+  }
+
+  @Override
+  public int getFirstWindowIndex(boolean shuffleModeEnabled) {
+    return timeline.getFirstWindowIndex(shuffleModeEnabled);
   }
 
   @Override
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 1795fe8045a..1c9c1819147 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
@@ -167,14 +167,18 @@ public InfinitelyLoopingTimeline(Timeline timeline) {
     }
 
     @Override
-    public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-      int childNextWindowIndex = timeline.getNextWindowIndex(windowIndex, repeatMode);
+    public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+        boolean shuffleModeEnabled) {
+      int childNextWindowIndex = timeline.getNextWindowIndex(windowIndex, repeatMode,
+          shuffleModeEnabled);
       return childNextWindowIndex == C.INDEX_UNSET ? 0 : childNextWindowIndex;
     }
 
     @Override
-    public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode) {
-      int childPreviousWindowIndex = timeline.getPreviousWindowIndex(windowIndex, repeatMode);
+    public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
+        boolean shuffleModeEnabled) {
+      int childPreviousWindowIndex = timeline.getPreviousWindowIndex(windowIndex, repeatMode,
+          shuffleModeEnabled);
       return childPreviousWindowIndex == C.INDEX_UNSET ? getWindowCount() - 1
           : childPreviousWindowIndex;
     }
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
new file mode 100644
index 00000000000..133bf19dba4
--- /dev/null
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
@@ -0,0 +1,80 @@
+/*
+ * 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 com.google.android.exoplayer2.util.ClosedSource;
+
+/**
+ * Data for HLS downloading tests.
+ */
+@ClosedSource(reason = "Not ready yet")
+/* package */ interface HlsDownloadTestData {
+
+  String MASTER_PLAYLIST_URI = "test.m3u8";
+
+  String MEDIA_PLAYLIST_0_DIR = "gear0/";
+  String MEDIA_PLAYLIST_0_URI = MEDIA_PLAYLIST_0_DIR + "prog_index.m3u8";
+  String MEDIA_PLAYLIST_1_DIR = "gear1/";
+  String MEDIA_PLAYLIST_1_URI = MEDIA_PLAYLIST_1_DIR + "prog_index.m3u8";
+  String MEDIA_PLAYLIST_2_DIR = "gear2/";
+  String MEDIA_PLAYLIST_2_URI = MEDIA_PLAYLIST_2_DIR + "prog_index.m3u8";
+  String MEDIA_PLAYLIST_3_DIR = "gear3/";
+  String MEDIA_PLAYLIST_3_URI = MEDIA_PLAYLIST_3_DIR + "prog_index.m3u8";
+
+  byte[] MASTER_PLAYLIST_DATA =
+      ("#EXTM3U\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=232370,CODECS=\"mp4a.40.2, avc1.4d4015\"\n"
+          + MEDIA_PLAYLIST_1_URI + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=649879,CODECS=\"mp4a.40.2, avc1.4d401e\"\n"
+          + MEDIA_PLAYLIST_2_URI + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=991714,CODECS=\"mp4a.40.2, avc1.4d401e\"\n"
+          + MEDIA_PLAYLIST_3_URI + "\n"
+          + "#EXT-X-STREAM-INF:BANDWIDTH=41457,CODECS=\"mp4a.40.2\"\n"
+          + MEDIA_PLAYLIST_0_URI).getBytes();
+
+  byte[] MEDIA_PLAYLIST_DATA =
+      ("#EXTM3U\n"
+          + "#EXT-X-TARGETDURATION:10\n"
+          + "#EXT-X-VERSION:3\n"
+          + "#EXT-X-MEDIA-SEQUENCE:0\n"
+          + "#EXT-X-PLAYLIST-TYPE:VOD\n"
+          + "#EXTINF:9.97667,\n"
+          + "fileSequence0.ts\n"
+          + "#EXTINF:9.97667,\n"
+          + "fileSequence1.ts\n"
+          + "#EXTINF:9.97667,\n"
+          + "fileSequence2.ts\n"
+          + "#EXT-X-ENDLIST").getBytes();
+
+  String ENC_MEDIA_PLAYLIST_URI = "enc_index.m3u8";
+
+  byte[] ENC_MEDIA_PLAYLIST_DATA =
+      ("#EXTM3U\n"
+          + "#EXT-X-TARGETDURATION:10\n"
+          + "#EXT-X-VERSION:3\n"
+          + "#EXT-X-MEDIA-SEQUENCE:0\n"
+          + "#EXT-X-PLAYLIST-TYPE:VOD\n"
+          + "#EXT-X-KEY:METHOD=AES-128,URI=\"enc.key\"\n"
+          + "#EXTINF:9.97667,\n"
+          + "fileSequence0.ts\n"
+          + "#EXTINF:9.97667,\n"
+          + "fileSequence1.ts\n"
+          + "#EXT-X-KEY:METHOD=AES-128,URI=\"enc2.key\"\n"
+          + "#EXTINF:9.97667,\n"
+          + "fileSequence2.ts\n"
+          + "#EXT-X-ENDLIST").getBytes();
+
+}
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
new file mode 100644
index 00000000000..28afe450ebf
--- /dev/null
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -0,0 +1,210 @@
+/*
+ * 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 static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.ENC_MEDIA_PLAYLIST_DATA;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.ENC_MEDIA_PLAYLIST_URI;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MASTER_PLAYLIST_DATA;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MASTER_PLAYLIST_URI;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_0_DIR;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_0_URI;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_1_DIR;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_1_URI;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_2_DIR;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_2_URI;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_3_DIR;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_3_URI;
+import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_DATA;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedData;
+
+import android.net.Uri;
+import android.test.InstrumentationTestCase;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+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.cache.NoOpCacheEvictor;
+import com.google.android.exoplayer2.upstream.cache.SimpleCache;
+import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.Util;
+import java.io.File;
+
+/** Unit tests for {@link HlsDownloader}. */
+@ClosedSource(reason = "Not ready yet")
+public class HlsDownloaderTest extends InstrumentationTestCase {
+
+  private SimpleCache cache;
+  private File tempFolder;
+  private FakeDataSet fakeDataSet;
+  private HlsDownloader hlsDownloader;
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    tempFolder = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
+    cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
+
+    fakeDataSet = new FakeDataSet()
+        .setData(MASTER_PLAYLIST_URI, MASTER_PLAYLIST_DATA)
+        .setData(MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_DATA)
+        .setRandomData(MEDIA_PLAYLIST_1_DIR + "fileSequence0.ts", 10)
+        .setRandomData(MEDIA_PLAYLIST_1_DIR + "fileSequence1.ts", 11)
+        .setRandomData(MEDIA_PLAYLIST_1_DIR + "fileSequence2.ts", 12)
+        .setData(MEDIA_PLAYLIST_2_URI, MEDIA_PLAYLIST_DATA)
+        .setRandomData(MEDIA_PLAYLIST_2_DIR + "fileSequence0.ts", 13)
+        .setRandomData(MEDIA_PLAYLIST_2_DIR + "fileSequence1.ts", 14)
+        .setRandomData(MEDIA_PLAYLIST_2_DIR + "fileSequence2.ts", 15);
+    hlsDownloader = getHlsDownloader(MASTER_PLAYLIST_URI);
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    Util.recursiveDelete(tempFolder);
+    super.tearDown();
+  }
+
+  public void testDownloadManifest() throws Exception {
+    HlsMasterPlaylist manifest = hlsDownloader.getManifest();
+
+    assertNotNull(manifest);
+    assertCachedData(cache, fakeDataSet, MASTER_PLAYLIST_URI);
+  }
+
+  public void testSelectRepresentationsClearsPreviousSelection() throws Exception {
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI});
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_2_URI});
+    hlsDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet, MASTER_PLAYLIST_URI, MEDIA_PLAYLIST_2_URI,
+        MEDIA_PLAYLIST_2_DIR + "fileSequence0.ts",
+        MEDIA_PLAYLIST_2_DIR + "fileSequence1.ts",
+        MEDIA_PLAYLIST_2_DIR + "fileSequence2.ts");
+  }
+
+  public void testCounterMethods() throws Exception {
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI});
+    hlsDownloader.download(null);
+
+    assertEquals(4, hlsDownloader.getTotalSegments());
+    assertEquals(4, hlsDownloader.getDownloadedSegments());
+    assertEquals(MEDIA_PLAYLIST_DATA.length + 10 + 11 + 12, hlsDownloader.getDownloadedBytes());
+  }
+
+  public void testInitStatus() throws Exception {
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI});
+    hlsDownloader.download(null);
+
+    HlsDownloader newHlsDownloader =
+        getHlsDownloader(MASTER_PLAYLIST_URI);
+    newHlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI});
+    newHlsDownloader.init();
+
+    assertEquals(4, newHlsDownloader.getTotalSegments());
+    assertEquals(4, newHlsDownloader.getDownloadedSegments());
+    assertEquals(MEDIA_PLAYLIST_DATA.length + 10 + 11 + 12, newHlsDownloader.getDownloadedBytes());
+  }
+
+  public void testDownloadRepresentation() throws Exception {
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI});
+    hlsDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet, MASTER_PLAYLIST_URI, MEDIA_PLAYLIST_1_URI,
+        MEDIA_PLAYLIST_1_DIR + "fileSequence0.ts",
+        MEDIA_PLAYLIST_1_DIR + "fileSequence1.ts",
+        MEDIA_PLAYLIST_1_DIR + "fileSequence2.ts");
+  }
+
+  public void testDownloadMultipleRepresentations() throws Exception {
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_2_URI});
+    hlsDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  public void testDownloadAllRepresentations() throws Exception {
+    // Add data for the rest of the playlists
+    fakeDataSet.setData(MEDIA_PLAYLIST_0_URI, MEDIA_PLAYLIST_DATA)
+        .setRandomData(MEDIA_PLAYLIST_0_DIR + "fileSequence0.ts", 10)
+        .setRandomData(MEDIA_PLAYLIST_0_DIR + "fileSequence1.ts", 11)
+        .setRandomData(MEDIA_PLAYLIST_0_DIR + "fileSequence2.ts", 12)
+        .setData(MEDIA_PLAYLIST_3_URI, MEDIA_PLAYLIST_DATA)
+        .setRandomData(MEDIA_PLAYLIST_3_DIR + "fileSequence0.ts", 13)
+        .setRandomData(MEDIA_PLAYLIST_3_DIR + "fileSequence1.ts", 14)
+        .setRandomData(MEDIA_PLAYLIST_3_DIR + "fileSequence2.ts", 15);
+    hlsDownloader = getHlsDownloader(MASTER_PLAYLIST_URI);
+
+    // hlsDownloader.selectRepresentations() isn't called
+    hlsDownloader.download(null);
+    assertCachedData(cache, fakeDataSet);
+    hlsDownloader.remove();
+
+    // select something random
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI});
+    // clear selection
+    hlsDownloader.selectRepresentations(null);
+    hlsDownloader.download(null);
+    assertCachedData(cache, fakeDataSet);
+    hlsDownloader.remove();
+
+    hlsDownloader.selectRepresentations(new String[0]);
+    hlsDownloader.download(null);
+    assertCachedData(cache, fakeDataSet);
+    hlsDownloader.remove();
+  }
+
+  public void testRemoveAll() throws Exception {
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_2_URI});
+    hlsDownloader.download(null);
+    hlsDownloader.remove();
+
+    assertCacheEmpty(cache);
+  }
+
+  public void testDownloadMediaPlaylist() throws Exception {
+    hlsDownloader = getHlsDownloader(MEDIA_PLAYLIST_1_URI);
+    hlsDownloader.selectRepresentations(new String[] {MEDIA_PLAYLIST_1_URI});
+    hlsDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet, MEDIA_PLAYLIST_1_URI,
+        MEDIA_PLAYLIST_1_DIR + "fileSequence0.ts",
+        MEDIA_PLAYLIST_1_DIR + "fileSequence1.ts",
+        MEDIA_PLAYLIST_1_DIR + "fileSequence2.ts");
+  }
+
+  public void testDownloadEncMediaPlaylist() throws Exception {
+    fakeDataSet = new FakeDataSet()
+        .setData(ENC_MEDIA_PLAYLIST_URI, ENC_MEDIA_PLAYLIST_DATA)
+        .setRandomData("enc.key", 8)
+        .setRandomData("enc2.key", 9)
+        .setRandomData("fileSequence0.ts", 10)
+        .setRandomData("fileSequence1.ts", 11)
+        .setRandomData("fileSequence2.ts", 12);
+    hlsDownloader =
+        getHlsDownloader(ENC_MEDIA_PLAYLIST_URI);
+    hlsDownloader.selectRepresentations(new String[] {ENC_MEDIA_PLAYLIST_URI});
+    hlsDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  private HlsDownloader getHlsDownloader(String mediaPlaylistUri) {
+    Factory factory = new Factory(null).setFakeDataSet(fakeDataSet);
+    return new HlsDownloader(Uri.parse(mediaPlaylistUri),
+        new DownloaderConstructorHelper(cache, factory));
+  }
+
+}
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
new file mode 100644
index 00000000000..3c23e257961
--- /dev/null
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java
@@ -0,0 +1,83 @@
+/*
+ * 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 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.util.ClosedSource;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/** An action to download or remove downloaded HLS streams. */
+@ClosedSource(reason = "Not ready yet")
+public final class HlsDownloadAction extends SegmentDownloadAction<String> {
+
+  public static final Deserializer DESERIALIZER = new SegmentDownloadActionDeserializer<String>() {
+
+    @Override
+    public String getType() {
+      return TYPE;
+    }
+
+    @Override
+    protected String readKey(DataInputStream input) throws IOException {
+      return input.readUTF();
+    }
+
+    @Override
+    protected String[] createKeyArray(int keyCount) {
+      return new String[0];
+    }
+
+    @Override
+    protected DownloadAction createDownloadAction(Uri manifestUri, boolean removeAction,
+        String[] keys) {
+      return new HlsDownloadAction(manifestUri, removeAction, keys);
+    }
+
+  };
+
+  private static final String TYPE = "HlsDownloadAction";
+
+  /** @see SegmentDownloadAction#SegmentDownloadAction(Uri, boolean, Object[]) */
+  public HlsDownloadAction(Uri manifestUri, boolean removeAction, String... keys) {
+    super(manifestUri, removeAction, keys);
+  }
+
+  @Override
+  public String getType() {
+    return TYPE;
+  }
+
+  @Override
+  public HlsDownloader createDownloader(DownloaderConstructorHelper constructorHelper)
+      throws IOException {
+    HlsDownloader downloader = new HlsDownloader(manifestUri, constructorHelper);
+    if (!isRemoveAction()) {
+      downloader.selectRepresentations(keys);
+    }
+    return downloader;
+  }
+
+  @Override
+  protected void writeKey(DataOutputStream output, String key) throws IOException {
+    output.writeUTF(key);
+  }
+
+}
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
new file mode 100644
index 00000000000..488b85e78a1
--- /dev/null
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloader.java
@@ -0,0 +1,139 @@
+/*
+ * 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 com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.offline.SegmentDownloader;
+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;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.ParsingLoadable;
+import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.UriUtil;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+
+/**
+ * Helper class to download HLS streams.
+ *
+ * A subset of renditions can be downloaded by selecting them using {@link
+ * #selectRepresentations(Object[])}. As key, string form of the rendition's url is used. The urls
+ * can be absolute or relative to the master playlist url.
+ */
+@ClosedSource(reason = "Not ready yet")
+public final class HlsDownloader extends SegmentDownloader<HlsMasterPlaylist, String> {
+
+  /**
+   * @see SegmentDownloader#SegmentDownloader(Uri, DownloaderConstructorHelper)
+   */
+  public HlsDownloader(Uri manifestUri, DownloaderConstructorHelper constructorHelper)  {
+    super(manifestUri, constructorHelper);
+  }
+
+  @Override
+  protected HlsMasterPlaylist getManifest(DataSource dataSource, Uri uri) throws IOException {
+    HlsPlaylist hlsPlaylist = loadManifest(dataSource, uri);
+    if (hlsPlaylist instanceof HlsMasterPlaylist) {
+      return (HlsMasterPlaylist) hlsPlaylist;
+    } else {
+      return HlsMasterPlaylist.createSingleVariantMasterPlaylist(hlsPlaylist.baseUri);
+    }
+  }
+
+  @Override
+  protected List<Segment> getAllSegments(DataSource dataSource, HlsMasterPlaylist manifest,
+      boolean allowIndexLoadErrors) throws InterruptedException, IOException {
+    ArrayList<String> urls = new ArrayList<>();
+    extractUrls(manifest.variants, urls);
+    extractUrls(manifest.audios, urls);
+    extractUrls(manifest.subtitles, urls);
+    return getSegments(dataSource, manifest, urls.toArray(new String[urls.size()]),
+        allowIndexLoadErrors);
+  }
+
+  @Override
+  protected List<Segment> getSegments(DataSource dataSource, HlsMasterPlaylist manifest,
+      String[] keys, boolean allowIndexLoadErrors) throws InterruptedException, IOException {
+    HashSet<Uri> encryptionKeyUris = new HashSet<>();
+    ArrayList<Segment> segments = new ArrayList<>();
+    for (String playlistUrl : keys) {
+      HlsMediaPlaylist mediaPlaylist = null;
+      Uri uri = UriUtil.resolveToUri(manifest.baseUri, playlistUrl);
+      try {
+        mediaPlaylist = (HlsMediaPlaylist) loadManifest(dataSource, uri);
+      } catch (IOException e) {
+        if (!allowIndexLoadErrors) {
+          throw e;
+        }
+      }
+      segments.add(new Segment(mediaPlaylist != null ? mediaPlaylist.startTimeUs : Long.MIN_VALUE,
+          new DataSpec(uri)));
+      if (mediaPlaylist == null) {
+        continue;
+      }
+
+      HlsMediaPlaylist.Segment initSegment = mediaPlaylist.initializationSegment;
+      if (initSegment != null) {
+        addSegment(segments, mediaPlaylist, initSegment, encryptionKeyUris);
+      }
+
+      List<HlsMediaPlaylist.Segment> hlsSegments = mediaPlaylist.segments;
+      for (int i = 0; i < hlsSegments.size(); i++) {
+        addSegment(segments, mediaPlaylist, hlsSegments.get(i), encryptionKeyUris);
+      }
+    }
+    return segments;
+  }
+
+  private HlsPlaylist loadManifest(DataSource dataSource, Uri uri) throws IOException {
+    DataSpec dataSpec = new DataSpec(uri,
+        DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH | DataSpec.FLAG_ALLOW_GZIP);
+    ParsingLoadable<HlsPlaylist> loadable = new ParsingLoadable<>(dataSource, dataSpec,
+        C.DATA_TYPE_MANIFEST, new HlsPlaylistParser());
+    loadable.load();
+    return loadable.getResult();
+  }
+
+  private static void addSegment(ArrayList<Segment> segments, HlsMediaPlaylist mediaPlaylist,
+      HlsMediaPlaylist.Segment hlsSegment, HashSet<Uri> encryptionKeyUris)
+      throws IOException, InterruptedException {
+    long startTimeUs = mediaPlaylist.startTimeUs + hlsSegment.relativeStartTimeUs;
+    if (hlsSegment.isEncrypted) {
+      Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, hlsSegment.encryptionKeyUri);
+      if (encryptionKeyUris.add(keyUri)) {
+        segments.add(new Segment(startTimeUs, new DataSpec(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 extractUrls(List<HlsUrl> hlsUrls, ArrayList<String> urls) {
+    for (int i = 0; i < hlsUrls.size(); i++) {
+      urls.add(hlsUrls.get(i).url);
+    }
+  }
+
+}
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
new file mode 100644
index 00000000000..7478062ef84
--- /dev/null
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
@@ -0,0 +1,86 @@
+/*
+ * 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 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.source.smoothstreaming.manifest.TrackKey;
+import com.google.android.exoplayer2.util.ClosedSource;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+/** An action to download or remove downloaded SmoothStreaming streams. */
+@ClosedSource(reason = "Not ready yet")
+public final class SsDownloadAction extends SegmentDownloadAction<TrackKey> {
+
+  public static final Deserializer DESERIALIZER =
+      new SegmentDownloadActionDeserializer<TrackKey>() {
+
+    @Override
+    public String getType() {
+      return TYPE;
+    }
+
+    @Override
+    protected TrackKey readKey(DataInputStream input) throws IOException {
+      return new TrackKey(input.readInt(), input.readInt());
+    }
+
+    @Override
+    protected TrackKey[] createKeyArray(int keyCount) {
+      return new TrackKey[keyCount];
+    }
+
+    @Override
+    protected DownloadAction createDownloadAction(Uri manifestUri, boolean removeAction,
+        TrackKey[] keys) {
+      return new SsDownloadAction(manifestUri, removeAction, keys);
+    }
+
+  };
+
+  private static final String TYPE = "SsDownloadAction";
+
+  /** @see SegmentDownloadAction#SegmentDownloadAction(Uri, boolean, Object[]) */
+  public SsDownloadAction(Uri manifestUri, boolean removeAction, TrackKey... keys) {
+    super(manifestUri, removeAction, keys);
+  }
+
+  @Override
+  public String getType() {
+    return TYPE;
+  }
+
+  @Override
+  public SsDownloader createDownloader(DownloaderConstructorHelper constructorHelper)
+      throws IOException {
+    SsDownloader downloader = new SsDownloader(manifestUri, constructorHelper);
+    if (!isRemoveAction()) {
+      downloader.selectRepresentations(keys);
+    }
+    return downloader;
+  }
+
+  @Override
+  protected void writeKey(DataOutputStream output, TrackKey key) throws IOException {
+    output.writeInt(key.streamElementIndex);
+    output.writeInt(key.trackIndex);
+  }
+
+}
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
new file mode 100644
index 00000000000..fe9c21d8551
--- /dev/null
+++ b/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloader.java
@@ -0,0 +1,111 @@
+/*
+ * 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 com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.offline.SegmentDownloader;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifest.StreamElement;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.SsManifestParser;
+import com.google.android.exoplayer2.source.smoothstreaming.manifest.TrackKey;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.ParsingLoadable;
+import com.google.android.exoplayer2.util.ClosedSource;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helper class to download SmoothStreaming streams.
+ *
+ * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link
+ * #getDownloadedBytes()}, this class isn't thread safe.
+ *
+ * <p>Example usage:
+ *
+ * <pre>
+ * {@code
+ * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor());
+ * DefaultHttpDataSourceFactory factory = new DefaultHttpDataSourceFactory("ExoPlayer", null);
+ * DownloaderConstructorHelper constructorHelper =
+ *     new DownloaderConstructorHelper(cache, factory);
+ * SsDownloader ssDownloader = new SsDownloader(manifestUrl, constructorHelper);
+ * // Select the first track of the first stream element
+ * ssDownloader.selectRepresentations(new TrackKey[] {new TrackKey(0, 0)});
+ * ssDownloader.download(new ProgressListener() {
+ *   @Override
+ *   public void onDownloadProgress(Downloader downloader, float downloadPercentage,
+ *       long downloadedBytes) {
+ *     // Invoked periodically during the download.
+ *   }
+ * });
+ * // Access downloaded data using CacheDataSource
+ * CacheDataSource cacheDataSource =
+ *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);}
+ * </pre>
+ */
+@ClosedSource(reason = "Not ready yet")
+public final class SsDownloader extends SegmentDownloader<SsManifest, TrackKey> {
+
+  /**
+   * @see SegmentDownloader#SegmentDownloader(Uri, DownloaderConstructorHelper)
+   */
+  public SsDownloader(Uri manifestUri, DownloaderConstructorHelper constructorHelper)  {
+    super(manifestUri, constructorHelper);
+  }
+
+  @Override
+  public SsManifest getManifest(DataSource dataSource, Uri uri) throws IOException {
+    DataSpec dataSpec = new DataSpec(uri,
+        DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH | DataSpec.FLAG_ALLOW_GZIP);
+    ParsingLoadable<SsManifest> loadable = new ParsingLoadable<>(dataSource, dataSpec,
+        C.DATA_TYPE_MANIFEST, new SsManifestParser());
+    loadable.load();
+    return loadable.getResult();
+  }
+
+  @Override
+  protected List<Segment> getAllSegments(DataSource dataSource, SsManifest manifest,
+      boolean allowIndexLoadErrors) throws InterruptedException, IOException {
+    ArrayList<Segment> segments = new ArrayList<>();
+    for (int i = 0; i < manifest.streamElements.length; i++) {
+      StreamElement streamElement = manifest.streamElements[i];
+      for (int j = 0; j < streamElement.formats.length; j++) {
+        segments.addAll(getSegments(dataSource, manifest, new TrackKey[] {new TrackKey(i, j)},
+            allowIndexLoadErrors));
+      }
+    }
+    return segments;
+  }
+
+  @Override
+  protected List<Segment> getSegments(DataSource dataSource, SsManifest manifest,
+      TrackKey[] keys, boolean allowIndexLoadErrors) throws InterruptedException, IOException {
+    ArrayList<Segment> segments = new ArrayList<>();
+    for (TrackKey key : keys) {
+      StreamElement streamElement = manifest.streamElements[key.streamElementIndex];
+      for (int i = 0; i < streamElement.chunkCount; i++) {
+        segments.add(new Segment(streamElement.getStartTimeUs(i),
+            new DataSpec(streamElement.buildRequestUri(key.trackIndex, i))));
+      }
+    }
+    return segments;
+  }
+
+}
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 3e6b5bf1584..acb6e3e7cd8 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
@@ -675,9 +675,11 @@ private void updateNavigation() {
       timeline.getWindow(windowIndex, window);
       isSeekable = window.isSeekable;
       enablePrevious = isSeekable || !window.isDynamic
-          || timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode()) != C.INDEX_UNSET;
+          || timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode(), false)
+              != C.INDEX_UNSET;
       enableNext = window.isDynamic
-          || timeline.getNextWindowIndex(windowIndex, player.getRepeatMode()) != C.INDEX_UNSET;
+          || timeline.getNextWindowIndex(windowIndex, player.getRepeatMode(), false)
+              != C.INDEX_UNSET;
       if (player.isPlayingAd()) {
         // Always hide player controls during ads.
         hide();
@@ -861,7 +863,8 @@ private void previous() {
     }
     int windowIndex = player.getCurrentWindowIndex();
     timeline.getWindow(windowIndex, window);
-    int previousWindowIndex = timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode());
+    int previousWindowIndex = timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode(),
+        false);
     if (previousWindowIndex != C.INDEX_UNSET
         && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
         || (window.isDynamic && !window.isSeekable))) {
@@ -877,7 +880,7 @@ private void next() {
       return;
     }
     int windowIndex = player.getCurrentWindowIndex();
-    int nextWindowIndex = timeline.getNextWindowIndex(windowIndex, player.getRepeatMode());
+    int nextWindowIndex = timeline.getNextWindowIndex(windowIndex, player.getRepeatMode(), false);
     if (nextWindowIndex != C.INDEX_UNSET) {
       seekTo(nextWindowIndex, C.TIME_UNSET);
     } else if (timeline.getWindow(windowIndex, window, false).isDynamic) {
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
new file mode 100644
index 00000000000..706dd72166e
--- /dev/null
+++ b/playbacktests/src/androidTest/java/com/google/android/exoplayer2/playbacktests/gts/DashDownloadTest.java
@@ -0,0 +1,192 @@
+/*
+ * 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.playbacktests.gts;
+
+import android.net.Uri;
+import android.test.ActivityInstrumentationTestCase2;
+import com.google.android.exoplayer2.offline.Downloader;
+import com.google.android.exoplayer2.offline.Downloader.ProgressListener;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+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.Representation;
+import com.google.android.exoplayer2.source.dash.manifest.RepresentationKey;
+import com.google.android.exoplayer2.source.dash.offline.DashDownloader;
+import com.google.android.exoplayer2.testutil.HostActivity;
+import com.google.android.exoplayer2.upstream.DefaultHttpDataSourceFactory;
+import com.google.android.exoplayer2.upstream.DummyDataSource;
+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.ClosedSource;
+import com.google.android.exoplayer2.util.Util;
+import java.io.File;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Tests downloaded DASH playbacks.
+ */
+@ClosedSource(reason = "Not ready yet")
+public final class DashDownloadTest extends ActivityInstrumentationTestCase2<HostActivity> {
+
+  private static final String TAG = "DashDownloadTest";
+
+  private DashTestRunner testRunner;
+  private File tempFolder;
+  private SimpleCache cache;
+
+  public DashDownloadTest() {
+    super(HostActivity.class);
+  }
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+    testRunner = new DashTestRunner(TAG, getActivity(), getInstrumentation())
+        .setManifestUrl(DashTestData.H264_MANIFEST)
+        .setFullPlaybackNoSeeking(true)
+        .setCanIncludeAdditionalVideoFormats(false)
+        .setAudioVideoFormats(DashTestData.AAC_AUDIO_REPRESENTATION_ID,
+            DashTestData.H264_CDD_FIXED);
+    tempFolder = Util.createTempDirectory(getActivity(), "ExoPlayerTest");
+    cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    testRunner = null;
+    Util.recursiveDelete(tempFolder);
+    cache = null;
+    super.tearDown();
+  }
+
+  // Download tests
+
+  public void testDownload() throws Exception {
+    if (Util.SDK_INT < 16) {
+      return; // Pass.
+    }
+
+    // Download manifest only
+    createDashDownloader(false).getManifest();
+    long manifestLength = cache.getCacheSpace();
+
+    // Download representations
+    DashDownloader dashDownloader = downloadContent(false, Float.NaN);
+    assertEquals(cache.getCacheSpace() - manifestLength, dashDownloader.getDownloadedBytes());
+
+    testRunner.setStreamName("test_h264_fixed_download").
+        setDataSourceFactory(newOfflineCacheDataSourceFactory()).run();
+
+    dashDownloader.remove();
+
+    assertEquals("There should be no content left.", 0, cache.getKeys().size());
+    assertEquals("There should be no content left.", 0, cache.getCacheSpace());
+  }
+
+  public void testPartialDownload() throws Exception {
+    if (Util.SDK_INT < 16) {
+      return; // Pass.
+    }
+
+    // Just download the first half and manifest
+    downloadContent(false, 0.5f);
+
+    // Download the rest
+    DashDownloader dashDownloader = downloadContent(false, Float.NaN);
+    long downloadedBytes = dashDownloader.getDownloadedBytes();
+
+    // Make sure it doesn't download any data
+    dashDownloader = downloadContent(true, Float.NaN);
+    assertEquals(downloadedBytes, dashDownloader.getDownloadedBytes());
+
+    testRunner.setStreamName("test_h264_fixed_partial_download")
+        .setDataSourceFactory(newOfflineCacheDataSourceFactory()).run();
+  }
+
+  private DashDownloader downloadContent(boolean offline, float stopAt) throws Exception {
+    DashDownloader dashDownloader = createDashDownloader(offline);
+    DashManifest dashManifest = dashDownloader.getManifest();
+    try {
+      ArrayList<RepresentationKey> keys = new ArrayList<>();
+      for (int pIndex = 0; pIndex < dashManifest.getPeriodCount(); pIndex++) {
+        List<AdaptationSet> adaptationSets = dashManifest.getPeriod(pIndex).adaptationSets;
+        for (int aIndex = 0; aIndex < adaptationSets.size(); aIndex++) {
+          AdaptationSet adaptationSet = adaptationSets.get(aIndex);
+          List<Representation> representations = adaptationSet.representations;
+          for (int rIndex = 0; rIndex < representations.size(); rIndex++) {
+            String id = representations.get(rIndex).format.id;
+            if (DashTestData.AAC_AUDIO_REPRESENTATION_ID.equals(id)
+                || DashTestData.H264_CDD_FIXED.equals(id)) {
+              keys.add(new RepresentationKey(pIndex, aIndex, rIndex));
+            }
+          }
+        }
+        dashDownloader.selectRepresentations(keys.toArray(new RepresentationKey[keys.size()]));
+        TestProgressListener listener = new TestProgressListener(stopAt);
+        dashDownloader.download(listener);
+      }
+    } catch (InterruptedException e) {
+      // do nothing
+    } catch (IOException e) {
+      Throwable exception = e;
+      while (!(exception instanceof InterruptedIOException)) {
+        if (exception == null) {
+          throw e;
+        }
+        exception = exception.getCause();
+      }
+      // else do nothing
+    }
+    return dashDownloader;
+  }
+
+  private DashDownloader createDashDownloader(boolean offline) {
+    DownloaderConstructorHelper constructorHelper = new DownloaderConstructorHelper(cache,
+        offline ? DummyDataSource.FACTORY : new DefaultHttpDataSourceFactory("ExoPlayer", null));
+    return new DashDownloader(Uri.parse(DashTestData.H264_MANIFEST), constructorHelper);
+  }
+
+  private CacheDataSourceFactory newOfflineCacheDataSourceFactory() {
+    return new CacheDataSourceFactory(cache, DummyDataSource.FACTORY,
+        CacheDataSource.FLAG_BLOCK_ON_CACHE);
+  }
+
+  private static class TestProgressListener implements ProgressListener {
+
+    private float stopAt;
+
+    private TestProgressListener(float stopAt) {
+      this.stopAt = stopAt;
+    }
+
+    @Override
+    public void onDownloadProgress(Downloader downloader, float downloadPercentage,
+        long downloadedBytes) {
+      System.out.printf("onDownloadProgress downloadPercentage = [%g], downloadedData = [%d]%n",
+          downloadPercentage, downloadedBytes);
+      if (downloadPercentage >= stopAt) {
+        Thread.currentThread().interrupt();
+      }
+    }
+
+  }
+
+}
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
index 8357ce70c7f..36d72db48b5 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
@@ -74,7 +74,7 @@ public static void assertPreviousWindowIndices(Timeline timeline,
       @Player.RepeatMode int repeatMode, int... expectedPreviousWindowIndices) {
     for (int i = 0; i < timeline.getWindowCount(); i++) {
       assertEquals(expectedPreviousWindowIndices[i],
-          timeline.getPreviousWindowIndex(i, repeatMode));
+          timeline.getPreviousWindowIndex(i, repeatMode, false));
     }
   }
 
@@ -86,14 +86,14 @@ public static void assertNextWindowIndices(Timeline timeline, @Player.RepeatMode
       int... expectedNextWindowIndices) {
     for (int i = 0; i < timeline.getWindowCount(); i++) {
       assertEquals(expectedNextWindowIndices[i],
-          timeline.getNextWindowIndex(i, repeatMode));
+          timeline.getNextWindowIndex(i, repeatMode, false));
     }
   }
 
   /**
    * Asserts that period counts for each window are set correctly. Also asserts that
    * {@link Window#firstPeriodIndex} and {@link Window#lastPeriodIndex} are set correctly, and it
-   * asserts the correct behavior of {@link Timeline#getNextWindowIndex(int, int)}.
+   * asserts the correct behavior of {@link Timeline#getNextWindowIndex(int, int, boolean)}.
    */
   public static void assertPeriodCounts(Timeline timeline, int... expectedPeriodCounts) {
     int windowCount = timeline.getWindowCount();
@@ -119,16 +119,19 @@ public static void assertPeriodCounts(Timeline timeline, int... expectedPeriodCo
       }
       assertEquals(expectedWindowIndex, period.windowIndex);
       if (i < accumulatedPeriodCounts[expectedWindowIndex + 1] - 1) {
-        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_OFF));
-        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_ONE));
-        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_ALL));
+        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_OFF,
+            false));
+        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_ONE,
+            false));
+        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_ALL,
+            false));
       } else {
         int nextWindowOff = timeline.getNextWindowIndex(expectedWindowIndex,
-            Player.REPEAT_MODE_OFF);
+            Player.REPEAT_MODE_OFF, false);
         int nextWindowOne = timeline.getNextWindowIndex(expectedWindowIndex,
-            Player.REPEAT_MODE_ONE);
+            Player.REPEAT_MODE_ONE, false);
         int nextWindowAll = timeline.getNextWindowIndex(expectedWindowIndex,
-            Player.REPEAT_MODE_ALL);
+            Player.REPEAT_MODE_ALL, false);
         int nextPeriodOff = nextWindowOff == C.INDEX_UNSET ? C.INDEX_UNSET
             : accumulatedPeriodCounts[nextWindowOff];
         int nextPeriodOne = nextWindowOne == C.INDEX_UNSET ? C.INDEX_UNSET
@@ -136,11 +139,11 @@ public static void assertPeriodCounts(Timeline timeline, int... expectedPeriodCo
         int nextPeriodAll = nextWindowAll == C.INDEX_UNSET ? C.INDEX_UNSET
             : accumulatedPeriodCounts[nextWindowAll];
         assertEquals(nextPeriodOff, timeline.getNextPeriodIndex(i, period, window,
-            Player.REPEAT_MODE_OFF));
+            Player.REPEAT_MODE_OFF, false));
         assertEquals(nextPeriodOne, timeline.getNextPeriodIndex(i, period, window,
-            Player.REPEAT_MODE_ONE));
+            Player.REPEAT_MODE_ONE, false));
         assertEquals(nextPeriodAll, timeline.getNextPeriodIndex(i, period, window,
-            Player.REPEAT_MODE_ALL));
+            Player.REPEAT_MODE_ALL, false));
       }
     }
   }

From 2c8d5f846e4c0e01b772c46f9626954a836a9a47 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 03:27:40 -0700
Subject: [PATCH 140/421] Pass shuffle mode to timeline assertion helper
 methods.

This allows to test the expected behaviour of timeline with different shuffle modes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166181091
---
 .../android/exoplayer2/TimelineTest.java      | 26 ++++---
 .../source/ClippingMediaSourceTest.java       | 15 ++--
 .../source/ConcatenatingMediaSourceTest.java  | 76 ++++++++++---------
 .../DynamicConcatenatingMediaSourceTest.java  | 15 ++--
 .../source/LoopingMediaSourceTest.java        | 39 +++++-----
 .../exoplayer2/testutil/TimelineAsserts.java  | 55 +++++---------
 6 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/TimelineTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/TimelineTest.java
index d9ee27bd62e..f5c33843a18 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/TimelineTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/TimelineTest.java
@@ -33,23 +33,25 @@ public void testSinglePeriodTimeline() {
     Timeline timeline = new FakeTimeline(new TimelineWindowDefinition(1, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
   }
 
   public void testMultiPeriodTimeline() {
     Timeline timeline = new FakeTimeline(new TimelineWindowDefinition(5, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 5);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
   }
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
index 66b03374502..5e615dbc7f5 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
@@ -109,13 +109,14 @@ public void testWindowAndPeriodIndices() {
         TEST_PERIOD_DURATION_US - TEST_CLIP_AMOUNT_US);
     TimelineAsserts.assertWindowIds(clippedTimeline, 111);
     TimelineAsserts.assertPeriodCounts(clippedTimeline, 1);
-    TimelineAsserts.assertPreviousWindowIndices(
-        clippedTimeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertPreviousWindowIndices(clippedTimeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertPreviousWindowIndices(clippedTimeline, Player.REPEAT_MODE_ALL, 0);
-    TimelineAsserts.assertNextWindowIndices(clippedTimeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(clippedTimeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertNextWindowIndices(clippedTimeline, Player.REPEAT_MODE_ALL, 0);
+    TimelineAsserts.assertPreviousWindowIndices(clippedTimeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(clippedTimeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertPreviousWindowIndices(clippedTimeline, Player.REPEAT_MODE_ALL, false, 0);
+    TimelineAsserts.assertNextWindowIndices(clippedTimeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(clippedTimeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertNextWindowIndices(clippedTimeline, Player.REPEAT_MODE_ALL, false, 0);
   }
 
   /**
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index 3bf89f9bcc6..34f44b47f74 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -34,22 +34,26 @@ public void testSingleMediaSource() {
     Timeline timeline = getConcatenatedTimeline(false, createFakeTimeline(3, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 3);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
 
     timeline = getConcatenatedTimeline(true, createFakeTimeline(3, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 3);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
   }
 
   public void testMultipleMediaSources() {
@@ -58,24 +62,26 @@ public void testMultipleMediaSources() {
     Timeline timeline = getConcatenatedTimeline(false, timelines);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 3, 1, 3);
-    TimelineAsserts.assertPreviousWindowIndices(
-        timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 2, 0, 1);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, 1, 2, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
 
     timeline = getConcatenatedTimeline(true, timelines);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 3, 1, 3);
-    TimelineAsserts.assertPreviousWindowIndices(
-        timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 2, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 2, 0, 1);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, 1, 2, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 1, 2, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 2, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 1, 2, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
   }
 
   public void testNestedMediaSources() {
@@ -84,14 +90,16 @@ public void testNestedMediaSources() {
         getConcatenatedTimeline(true, createFakeTimeline(1, 333), createFakeTimeline(1, 444)));
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333, 444);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1, 1);
-    TimelineAsserts.assertPreviousWindowIndices(
-        timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET, 0, 1, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 3, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 3, 0, 1, 2);
-    TimelineAsserts.assertNextWindowIndices(
-        timeline, Player.REPEAT_MODE_OFF, 1, 2, 3, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 3, 2);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 1, 2, 3, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false,
+        0, 1, 3, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false,
+        3, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, 3, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 3, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 3, 0);
   }
 
   /**
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index 8d29a95d89c..35233febf5a 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -120,13 +120,14 @@ public void testPlaylistChangesAfterPreparation() throws InterruptedException {
     }
 
     // Assert correct next and previous indices behavior after some insertions and removals.
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, 1, 2, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 1, 2, 0);
-    TimelineAsserts.assertPreviousWindowIndices(
-        timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 2, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
 
     // Remove at front of queue.
     mediaSource.removeMediaSource(0);
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
index d2045c29a52..c32f5cb6249 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
@@ -42,30 +42,31 @@ public void testSingleLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, 1);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1);
-    TimelineAsserts.assertPreviousWindowIndices(
-        timeline, Player.REPEAT_MODE_OFF, C.INDEX_UNSET, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 2, 0, 1);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, 1, 2, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
   }
 
   public void testMultiLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, 3);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333, 111, 222, 333, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1, 1, 1, 1, 1, 1, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF,
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
         C.INDEX_UNSET, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE,
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false,
         0, 1, 2, 3, 4, 5, 6, 7, 8);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL,
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false,
         8, 0, 1, 2, 3, 4, 5, 6, 7);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF,
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
         1, 2, 3, 4, 5, 6, 7, 8, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE,
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false,
         0, 1, 2, 3, 4, 5, 6, 7, 8);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL,
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false,
         1, 2, 3, 4, 5, 6, 7, 8, 0);
   }
 
@@ -73,12 +74,12 @@ public void testInfiniteLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, Integer.MAX_VALUE);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, 2, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, 2, 0, 1);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, 1, 2, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, 0, 1, 2);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false, 2, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false, 1, 2, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
   }
 
   /**
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
index 36d72db48b5..74129a0e69b 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
@@ -67,26 +67,27 @@ public static void assertWindowIsDynamic(Timeline timeline, boolean... windowIsD
   }
 
   /**
-   * Asserts that previous window indices for each window are set correctly depending on the repeat
-   * mode.
+   * Asserts that previous window indices for each window depending on the repeat mode and the
+   * shuffle mode are equal to the given sequence.
    */
   public static void assertPreviousWindowIndices(Timeline timeline,
-      @Player.RepeatMode int repeatMode, int... expectedPreviousWindowIndices) {
+      @Player.RepeatMode int repeatMode, boolean shuffleModeEnabled,
+      int... expectedPreviousWindowIndices) {
     for (int i = 0; i < timeline.getWindowCount(); i++) {
       assertEquals(expectedPreviousWindowIndices[i],
-          timeline.getPreviousWindowIndex(i, repeatMode, false));
+          timeline.getPreviousWindowIndex(i, repeatMode, shuffleModeEnabled));
     }
   }
 
   /**
-   * Asserts that next window indices for each window are set correctly depending on the repeat
-   * mode.
+   * Asserts that next window indices for each window depending on the repeat mode and the
+   * shuffle mode are equal to the given sequence.
    */
   public static void assertNextWindowIndices(Timeline timeline, @Player.RepeatMode int repeatMode,
-      int... expectedNextWindowIndices) {
+      boolean shuffleModeEnabled, int... expectedNextWindowIndices) {
     for (int i = 0; i < timeline.getWindowCount(); i++) {
       assertEquals(expectedNextWindowIndices[i],
-          timeline.getNextWindowIndex(i, repeatMode, false));
+          timeline.getNextWindowIndex(i, repeatMode, shuffleModeEnabled));
     }
   }
 
@@ -118,34 +119,20 @@ public static void assertPeriodCounts(Timeline timeline, int... expectedPeriodCo
         expectedWindowIndex++;
       }
       assertEquals(expectedWindowIndex, period.windowIndex);
-      if (i < accumulatedPeriodCounts[expectedWindowIndex + 1] - 1) {
-        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_OFF,
-            false));
-        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_ONE,
-            false));
-        assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, Player.REPEAT_MODE_ALL,
-            false));
-      } else {
-        int nextWindowOff = timeline.getNextWindowIndex(expectedWindowIndex,
-            Player.REPEAT_MODE_OFF, false);
-        int nextWindowOne = timeline.getNextWindowIndex(expectedWindowIndex,
-            Player.REPEAT_MODE_ONE, false);
-        int nextWindowAll = timeline.getNextWindowIndex(expectedWindowIndex,
-            Player.REPEAT_MODE_ALL, false);
-        int nextPeriodOff = nextWindowOff == C.INDEX_UNSET ? C.INDEX_UNSET
-            : accumulatedPeriodCounts[nextWindowOff];
-        int nextPeriodOne = nextWindowOne == C.INDEX_UNSET ? C.INDEX_UNSET
-            : accumulatedPeriodCounts[nextWindowOne];
-        int nextPeriodAll = nextWindowAll == C.INDEX_UNSET ? C.INDEX_UNSET
-            : accumulatedPeriodCounts[nextWindowAll];
-        assertEquals(nextPeriodOff, timeline.getNextPeriodIndex(i, period, window,
-            Player.REPEAT_MODE_OFF, false));
-        assertEquals(nextPeriodOne, timeline.getNextPeriodIndex(i, period, window,
-            Player.REPEAT_MODE_ONE, false));
-        assertEquals(nextPeriodAll, timeline.getNextPeriodIndex(i, period, window,
-            Player.REPEAT_MODE_ALL, false));
+      for (@Player.RepeatMode int repeatMode
+          : new int[] { Player.REPEAT_MODE_OFF, Player.REPEAT_MODE_ONE, Player.REPEAT_MODE_ALL }) {
+        if (i < accumulatedPeriodCounts[expectedWindowIndex + 1] - 1) {
+          assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, repeatMode, false));
+        } else {
+          int nextWindow = timeline.getNextWindowIndex(expectedWindowIndex, repeatMode, false);
+          int nextPeriod = nextWindow == C.INDEX_UNSET ? C.INDEX_UNSET
+              : accumulatedPeriodCounts[nextWindow];
+          assertEquals(nextPeriod, timeline.getNextPeriodIndex(i, period, window, repeatMode,
+              false));
+        }
       }
     }
   }
 
 }
+

From bd81181892879b3ca0a573b669cfbce14015cd24 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 03:29:21 -0700
Subject: [PATCH 141/421] Add shortcut methods to query next or previous window
 index.

This functionality is most likely needed by UI modules which currently need
to obtain the timeline, the current repeat and shuffle modes and are only then
able to query the next/previous window index using this information.

Adding these methods simplifies these cumbersome requests.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166181202
---
 .../android/exoplayer2/ext/cast/CastPlayer.java    | 10 ++++++++++
 .../ext/mediasession/TimelineQueueNavigator.java   |  7 +++----
 .../DynamicConcatenatingMediaSourceTest.java       | 10 ++++++++++
 .../google/android/exoplayer2/ExoPlayerImpl.java   | 12 ++++++++++++
 .../java/com/google/android/exoplayer2/Player.java | 14 ++++++++++++++
 .../google/android/exoplayer2/SimpleExoPlayer.java | 10 ++++++++++
 .../android/exoplayer2/ui/PlaybackControlView.java | 13 +++++--------
 .../exoplayer2/testutil/FakeSimpleExoPlayer.java   | 10 ++++++++++
 8 files changed, 74 insertions(+), 12 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 50ae7ea5baf..e79fef74d5c 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
@@ -371,6 +371,16 @@ public int getCurrentWindowIndex() {
     return 0;
   }
 
+  @Override
+  public int getNextWindowIndex() {
+    return C.INDEX_UNSET;
+  }
+
+  @Override
+  public int getPreviousWindowIndex() {
+    return C.INDEX_UNSET;
+  }
+
   @Override
   public long getDuration() {
     return currentTimeline.isEmpty() ? C.TIME_UNSET
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 bd3f3f2820f..9d7ed75c839 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
@@ -126,8 +126,7 @@ public void onSkipToPrevious(Player player) {
     if (timeline.isEmpty()) {
       return;
     }
-    int previousWindowIndex = timeline.getPreviousWindowIndex(player.getCurrentWindowIndex(),
-        player.getRepeatMode(), false);
+    int previousWindowIndex = player.getPreviousWindowIndex();
     if (player.getCurrentPosition() > MAX_POSITION_FOR_SEEK_TO_PREVIOUS
         || previousWindowIndex == C.INDEX_UNSET) {
       player.seekTo(0);
@@ -154,8 +153,7 @@ public void onSkipToNext(Player player) {
     if (timeline.isEmpty()) {
       return;
     }
-    int nextWindowIndex = timeline.getNextWindowIndex(player.getCurrentWindowIndex(),
-        player.getRepeatMode(), false);
+    int nextWindowIndex = player.getNextWindowIndex();
     if (nextWindowIndex != C.INDEX_UNSET) {
       player.seekTo(nextWindowIndex, C.TIME_UNSET);
     }
@@ -186,3 +184,4 @@ private void publishFloatingQueueWindow(Player player) {
   }
 
 }
+
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index 35233febf5a..9cdb461d7b4 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -502,6 +502,16 @@ public int getCurrentWindowIndex() {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public int getNextWindowIndex() {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public int getPreviousWindowIndex() {
+      throw new UnsupportedOperationException();
+    }
+
     @Override
     public long getDuration() {
       throw new UnsupportedOperationException();
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 0ce920a16fa..7bf0cd5a028 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
@@ -317,6 +317,18 @@ public int getCurrentWindowIndex() {
     }
   }
 
+  @Override
+  public int getNextWindowIndex() {
+    return timeline.getNextWindowIndex(getCurrentWindowIndex(), getRepeatMode(),
+        getShuffleModeEnabled());
+  }
+
+  @Override
+  public int getPreviousWindowIndex() {
+    return timeline.getPreviousWindowIndex(getCurrentWindowIndex(), getRepeatMode(),
+        getShuffleModeEnabled());
+  }
+
   @Override
   public long getDuration() {
     if (timeline.isEmpty()) {
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 6eee9300188..ae2785f6f8e 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
@@ -363,6 +363,20 @@ interface EventListener {
    */
   int getCurrentWindowIndex();
 
+  /**
+   * Returns the index of the next timeline window to be played, which may depend on the current
+   * repeat mode and whether shuffle mode is enabled. Returns {@link C#INDEX_UNSET} if the window
+   * currently being played is the last window.
+   */
+  int getNextWindowIndex();
+
+  /**
+   * Returns the index of the previous timeline window to be played, which may depend on the current
+   * repeat mode and whether shuffle mode is enabled. Returns {@link C#INDEX_UNSET} if the window
+   * currently being played is the first window.
+   */
+  int getPreviousWindowIndex();
+
   /**
    * Returns the duration of the current window in milliseconds, or {@link C#TIME_UNSET} if the
    * duration is not known.
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 9fcc4d2128a..1c35adb9178 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
@@ -754,6 +754,16 @@ public int getCurrentWindowIndex() {
     return player.getCurrentWindowIndex();
   }
 
+  @Override
+  public int getNextWindowIndex() {
+    return player.getNextWindowIndex();
+  }
+
+  @Override
+  public int getPreviousWindowIndex() {
+    return player.getPreviousWindowIndex();
+  }
+
   @Override
   public long getDuration() {
     return player.getDuration();
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 acb6e3e7cd8..105dbc24952 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
@@ -675,11 +675,8 @@ private void updateNavigation() {
       timeline.getWindow(windowIndex, window);
       isSeekable = window.isSeekable;
       enablePrevious = isSeekable || !window.isDynamic
-          || timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode(), false)
-              != C.INDEX_UNSET;
-      enableNext = window.isDynamic
-          || timeline.getNextWindowIndex(windowIndex, player.getRepeatMode(), false)
-              != C.INDEX_UNSET;
+          || player.getPreviousWindowIndex() != C.INDEX_UNSET;
+      enableNext = window.isDynamic || player.getNextWindowIndex() != C.INDEX_UNSET;
       if (player.isPlayingAd()) {
         // Always hide player controls during ads.
         hide();
@@ -863,8 +860,7 @@ private void previous() {
     }
     int windowIndex = player.getCurrentWindowIndex();
     timeline.getWindow(windowIndex, window);
-    int previousWindowIndex = timeline.getPreviousWindowIndex(windowIndex, player.getRepeatMode(),
-        false);
+    int previousWindowIndex = player.getPreviousWindowIndex();
     if (previousWindowIndex != C.INDEX_UNSET
         && (player.getCurrentPosition() <= MAX_POSITION_FOR_SEEK_TO_PREVIOUS
         || (window.isDynamic && !window.isSeekable))) {
@@ -880,7 +876,7 @@ private void next() {
       return;
     }
     int windowIndex = player.getCurrentWindowIndex();
-    int nextWindowIndex = timeline.getNextWindowIndex(windowIndex, player.getRepeatMode(), false);
+    int nextWindowIndex = player.getNextWindowIndex();
     if (nextWindowIndex != C.INDEX_UNSET) {
       seekTo(nextWindowIndex, C.TIME_UNSET);
     } else if (timeline.getWindow(windowIndex, window, false).isDynamic) {
@@ -1146,3 +1142,4 @@ public void onClick(View view) {
   }
 
 }
+
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
index 7edaa6b13e9..67a83b84e13 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -250,6 +250,16 @@ public int getCurrentWindowIndex() {
       return 0;
     }
 
+    @Override
+    public int getNextWindowIndex() {
+      return C.INDEX_UNSET;
+    }
+
+    @Override
+    public int getPreviousWindowIndex() {
+      return C.INDEX_UNSET;
+    }
+
     @Override
     public long getDuration() {
       return C.usToMs(durationUs);

From 4883a9ba9a44479d02d4c280648a213bdb741e47 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 05:59:32 -0700
Subject: [PATCH 142/421] Add shuffle support to infinitely looping timeline.

In addition, let unit test assert window indices for both shuffle modes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166191069
---
 .../source/LoopingMediaSourceTest.java        | 64 +++++++++++--------
 .../exoplayer2/source/LoopingMediaSource.java |  5 +-
 2 files changed, 41 insertions(+), 28 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
index c32f5cb6249..52c313ed47a 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
@@ -42,44 +42,55 @@ public void testSingleLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, 1);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        C.INDEX_UNSET, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        1, 2, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
+    for (boolean shuffled : new boolean[] { false, true }) {
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET, 0, 1);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
+          0, 1, 2);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled,
+          2, 0, 1);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          1, 2, C.INDEX_UNSET);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0, 1, 2);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 1, 2, 0);
+    }
   }
 
   public void testMultiLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, 3);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333, 111, 222, 333, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1, 1, 1, 1, 1, 1, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        C.INDEX_UNSET, 0, 1, 2, 3, 4, 5, 6, 7, 8);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false,
-        0, 1, 2, 3, 4, 5, 6, 7, 8);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false,
-        8, 0, 1, 2, 3, 4, 5, 6, 7);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        1, 2, 3, 4, 5, 6, 7, 8, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false,
-        0, 1, 2, 3, 4, 5, 6, 7, 8);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false,
-        1, 2, 3, 4, 5, 6, 7, 8, 0);
+    for (boolean shuffled : new boolean[] { false, true }) {
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET, 0, 1, 2, 3, 4, 5, 6, 7, 8);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
+          0, 1, 2, 3, 4, 5, 6, 7, 8);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled,
+          8, 0, 1, 2, 3, 4, 5, 6, 7);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          1, 2, 3, 4, 5, 6, 7, 8, C.INDEX_UNSET);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
+          0, 1, 2, 3, 4, 5, 6, 7, 8);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled,
+          1, 2, 3, 4, 5, 6, 7, 8, 0);
+    }
   }
 
   public void testInfiniteLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, Integer.MAX_VALUE);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false, 2, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false, 1, 2, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
+    for (boolean shuffled : new boolean[] { false, true }) {
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          2, 0, 1);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
+          0, 1, 2);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled,
+          2, 0, 1);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled, 1, 2, 0);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0, 1, 2);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 1, 2, 0);
+    }
   }
 
   /**
@@ -93,3 +104,4 @@ private static Timeline getLoopingTimeline(Timeline timeline, int loopCount) {
   }
 
 }
+
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 1c9c1819147..28380e50b25 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
@@ -171,7 +171,8 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
         boolean shuffleModeEnabled) {
       int childNextWindowIndex = timeline.getNextWindowIndex(windowIndex, repeatMode,
           shuffleModeEnabled);
-      return childNextWindowIndex == C.INDEX_UNSET ? 0 : childNextWindowIndex;
+      return childNextWindowIndex == C.INDEX_UNSET ? getFirstWindowIndex(shuffleModeEnabled)
+          : childNextWindowIndex;
     }
 
     @Override
@@ -179,7 +180,7 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
         boolean shuffleModeEnabled) {
       int childPreviousWindowIndex = timeline.getPreviousWindowIndex(windowIndex, repeatMode,
           shuffleModeEnabled);
-      return childPreviousWindowIndex == C.INDEX_UNSET ? getWindowCount() - 1
+      return childPreviousWindowIndex == C.INDEX_UNSET ? getLastWindowIndex(shuffleModeEnabled)
           : childPreviousWindowIndex;
     }
 

From 9fd19d0e7c20818269c488e8fdd4d17d9528e5e0 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 06:00:51 -0700
Subject: [PATCH 143/421] Add shuffle logic to concatenated timelines.

The implementation in the abstract base class takes care to forward the queries
to the correct methods given the shuffle mode and a given shuffle order.

All concatenated timeline implementations use an unshuffled order so far. The
handling of the shuffle orders will follow in other changes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166191165
---
 .../source/AbstractConcatenatedTimeline.java  | 63 +++++++++++++------
 .../source/ConcatenatingMediaSource.java      |  3 +-
 .../DynamicConcatenatingMediaSource.java      |  3 +-
 .../exoplayer2/source/LoopingMediaSource.java |  3 +-
 4 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
index 9c2be395761..07813ff0468 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
@@ -26,9 +26,17 @@
 /* package */ abstract class AbstractConcatenatedTimeline extends Timeline {
 
   private final int childCount;
+  private final ShuffleOrder shuffleOrder;
 
-  public AbstractConcatenatedTimeline(int childCount) {
-    this.childCount = childCount;
+  /**
+   * Sets up a concatenated timeline with a shuffle order of child timelines.
+   *
+   * @param shuffleOrder A shuffle order of child timelines. The number of child timelines must
+   *     match the number of elements in the shuffle order.
+   */
+  public AbstractConcatenatedTimeline(ShuffleOrder shuffleOrder) {
+    this.shuffleOrder = shuffleOrder;
+    this.childCount = shuffleOrder.getLength();
   }
 
   @Override
@@ -42,16 +50,17 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
         shuffleModeEnabled);
     if (nextWindowIndexInChild != C.INDEX_UNSET) {
       return firstWindowIndexInChild + nextWindowIndexInChild;
-    } else {
-      int nextChildIndex = childIndex + 1;
-      if (nextChildIndex < childCount) {
-        return getFirstWindowIndexByChildIndex(nextChildIndex);
-      } else if (repeatMode == Player.REPEAT_MODE_ALL) {
-        return 0;
-      } else {
-        return C.INDEX_UNSET;
-      }
     }
+    int nextChildIndex = shuffleModeEnabled ? shuffleOrder.getNextIndex(childIndex)
+        : childIndex + 1;
+    if (nextChildIndex != C.INDEX_UNSET && nextChildIndex < childCount) {
+      return getFirstWindowIndexByChildIndex(nextChildIndex)
+          + getTimelineByChildIndex(nextChildIndex).getFirstWindowIndex(shuffleModeEnabled);
+    }
+    if (repeatMode == Player.REPEAT_MODE_ALL) {
+      return getFirstWindowIndex(shuffleModeEnabled);
+    }
+    return C.INDEX_UNSET;
   }
 
   @Override
@@ -65,15 +74,31 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
         shuffleModeEnabled);
     if (previousWindowIndexInChild != C.INDEX_UNSET) {
       return firstWindowIndexInChild + previousWindowIndexInChild;
-    } else {
-      if (firstWindowIndexInChild > 0) {
-        return firstWindowIndexInChild - 1;
-      } else if (repeatMode == Player.REPEAT_MODE_ALL) {
-        return getWindowCount() - 1;
-      } else {
-        return C.INDEX_UNSET;
-      }
     }
+    int previousChildIndex = shuffleModeEnabled ? shuffleOrder.getPreviousIndex(childIndex)
+        : childIndex - 1;
+    if (previousChildIndex != C.INDEX_UNSET && previousChildIndex >= 0) {
+      return getFirstWindowIndexByChildIndex(previousChildIndex)
+          + getTimelineByChildIndex(previousChildIndex).getLastWindowIndex(shuffleModeEnabled);
+    }
+    if (repeatMode == Player.REPEAT_MODE_ALL) {
+      return getLastWindowIndex(shuffleModeEnabled);
+    }
+    return C.INDEX_UNSET;
+  }
+
+  @Override
+  public int getLastWindowIndex(boolean shuffleModeEnabled) {
+    int lastChildIndex = shuffleModeEnabled ? shuffleOrder.getLastIndex() : childCount - 1;
+    return getFirstWindowIndexByChildIndex(lastChildIndex)
+        + getTimelineByChildIndex(lastChildIndex).getLastWindowIndex(shuffleModeEnabled);
+  }
+
+  @Override
+  public int getFirstWindowIndex(boolean shuffleModeEnabled) {
+    int firstChildIndex = shuffleModeEnabled ? shuffleOrder.getFirstIndex() : 0;
+    return getFirstWindowIndexByChildIndex(firstChildIndex)
+        + getTimelineByChildIndex(firstChildIndex).getFirstWindowIndex(shuffleModeEnabled);
   }
 
   @Override
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 0f6f1b345d1..f12e1c006f7 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
@@ -19,6 +19,7 @@
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
@@ -167,7 +168,7 @@ private static final class ConcatenatedTimeline extends AbstractConcatenatedTime
     private final boolean isRepeatOneAtomic;
 
     public ConcatenatedTimeline(Timeline[] timelines, boolean isRepeatOneAtomic) {
-      super(timelines.length);
+      super(new UnshuffledShuffleOrder(timelines.length));
       int[] sourcePeriodOffsets = new int[timelines.length];
       int[] sourceWindowOffsets = new int[timelines.length];
       long periodCount = 0;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index c2d2e5f11e4..02d4bad2bfe 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -23,6 +23,7 @@
 import com.google.android.exoplayer2.ExoPlayer.ExoPlayerComponent;
 import com.google.android.exoplayer2.ExoPlayer.ExoPlayerMessage;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
@@ -397,7 +398,7 @@ private static final class ConcatenatedTimeline extends AbstractConcatenatedTime
 
     public ConcatenatedTimeline(Collection<MediaSourceHolder> mediaSourceHolders, int windowCount,
         int periodCount) {
-      super(mediaSourceHolders.size());
+      super(new UnshuffledShuffleOrder(mediaSourceHolders.size()));
       this.windowCount = windowCount;
       this.periodCount = periodCount;
       int childCount = mediaSourceHolders.size();
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 28380e50b25..00e3c50506a 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
@@ -19,6 +19,7 @@
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
@@ -101,7 +102,7 @@ private static final class LoopingTimeline extends AbstractConcatenatedTimeline
     private final int loopCount;
 
     public LoopingTimeline(Timeline childTimeline, int loopCount) {
-      super(loopCount);
+      super(new UnshuffledShuffleOrder(loopCount));
       this.childTimeline = childTimeline;
       childPeriodCount = childTimeline.getPeriodCount();
       childWindowCount = childTimeline.getWindowCount();

From b27c25e88072007b39a7a3c283eed50c2d0efdcd Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 06:42:24 -0700
Subject: [PATCH 144/421] Add fake shuffle order.

This just implements a reverse order which is different from the original order but
still deterministic for simplified testing.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166194311
---
 .../exoplayer2/testutil/FakeShuffleOrder.java | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
new file mode 100644
index 00000000000..0664f470231
--- /dev/null
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeShuffleOrder.java
@@ -0,0 +1,68 @@
+/*
+ * 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.testutil;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.source.ShuffleOrder;
+
+/**
+ * Fake {@link ShuffleOrder} which returns a reverse order. This order is thus deterministic but
+ * different from the original order.
+ */
+public final class FakeShuffleOrder implements ShuffleOrder {
+
+  private final int length;
+
+  public FakeShuffleOrder(int length) {
+    this.length = length;
+  }
+
+  @Override
+  public int getLength() {
+    return length;
+  }
+
+  @Override
+  public int getNextIndex(int index) {
+    return index > 0 ? index - 1 : C.INDEX_UNSET;
+  }
+
+  @Override
+  public int getPreviousIndex(int index) {
+    return index < length - 1 ? index + 1 : C.INDEX_UNSET;
+  }
+
+  @Override
+  public int getLastIndex() {
+    return length > 0 ? 0 : C.INDEX_UNSET;
+  }
+
+  @Override
+  public int getFirstIndex() {
+    return length > 0 ? length - 1 : C.INDEX_UNSET;
+  }
+
+  @Override
+  public ShuffleOrder cloneAndInsert(int insertionIndex, int insertionCount) {
+    return new FakeShuffleOrder(length + insertionCount);
+  }
+
+  @Override
+  public ShuffleOrder cloneAndRemove(int removalIndex) {
+    return new FakeShuffleOrder(length - 1);
+  }
+
+}

From 8115e11489cff49dec9cd15c208bc65fc2dfea41 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 23 Aug 2017 06:53:11 -0700
Subject: [PATCH 145/421] Allow subclasses to customize the MediaFormat

Make getMediaFormat protected so that subclasses can set additional MediaFormat
keys. For example, if the decoder output needs to be read back via an
ImageReader as YUV data it is necessary to set KEY_COLOR_FORMAT to
COLOR_FormatYUV420Flexible.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166195211
---
 .../video/MediaCodecVideoRenderer.java        | 56 +++++++++++--------
 1 file changed, 34 insertions(+), 22 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 8fe3476351a..c11c415cd7e 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
@@ -737,28 +737,6 @@ private static boolean isBufferLate(long earlyUs) {
     return earlyUs < -30000;
   }
 
-  @SuppressLint("InlinedApi")
-  private static MediaFormat getMediaFormat(Format format, CodecMaxValues codecMaxValues,
-      boolean deviceNeedsAutoFrcWorkaround, int tunnelingAudioSessionId) {
-    MediaFormat frameworkMediaFormat = format.getFrameworkMediaFormatV16();
-    // Set the maximum adaptive video dimensions.
-    frameworkMediaFormat.setInteger(MediaFormat.KEY_MAX_WIDTH, codecMaxValues.width);
-    frameworkMediaFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, codecMaxValues.height);
-    // Set the maximum input size.
-    if (codecMaxValues.inputSize != Format.NO_VALUE) {
-      frameworkMediaFormat.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, codecMaxValues.inputSize);
-    }
-    // Set FRC workaround.
-    if (deviceNeedsAutoFrcWorkaround) {
-      frameworkMediaFormat.setInteger("auto-frc", 0);
-    }
-    // Configure tunneling if enabled.
-    if (tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET) {
-      configureTunnelingV21(frameworkMediaFormat, tunnelingAudioSessionId);
-    }
-    return frameworkMediaFormat;
-  }
-
   @TargetApi(23)
   private static void setOutputSurfaceV23(MediaCodec codec, Surface surface) {
     codec.setOutputSurface(surface);
@@ -814,6 +792,40 @@ protected CodecMaxValues getCodecMaxValues(MediaCodecInfo codecInfo, Format form
     return new CodecMaxValues(maxWidth, maxHeight, maxInputSize);
   }
 
+  /**
+   * Returns the framework {@link MediaFormat} that should be used to configure the decoder when
+   * playing media in the specified input format.
+   *
+   * @param format The format of input media.
+   * @param codecMaxValues The codec's maximum supported values.
+   * @param deviceNeedsAutoFrcWorkaround Whether the device is known to enable frame-rate conversion
+   *     logic that negatively impacts 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.
+   */
+  @SuppressLint("InlinedApi")
+  protected MediaFormat getMediaFormat(Format format, CodecMaxValues codecMaxValues,
+      boolean deviceNeedsAutoFrcWorkaround, int tunnelingAudioSessionId) {
+    MediaFormat frameworkMediaFormat = format.getFrameworkMediaFormatV16();
+    // Set the maximum adaptive video dimensions.
+    frameworkMediaFormat.setInteger(MediaFormat.KEY_MAX_WIDTH, codecMaxValues.width);
+    frameworkMediaFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, codecMaxValues.height);
+    // Set the maximum input size.
+    if (codecMaxValues.inputSize != Format.NO_VALUE) {
+      frameworkMediaFormat.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, codecMaxValues.inputSize);
+    }
+    // Set FRC workaround.
+    if (deviceNeedsAutoFrcWorkaround) {
+      frameworkMediaFormat.setInteger("auto-frc", 0);
+    }
+    // Configure tunneling if enabled.
+    if (tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET) {
+      configureTunnelingV21(frameworkMediaFormat, tunnelingAudioSessionId);
+    }
+    return frameworkMediaFormat;
+  }
+
   /**
    * Returns a maximum video size to use when configuring a codec for {@code format} in a way
    * that will allow possible adaptation to other compatible formats that are expected to have the

From e15633e9060d409996ff0f98e4bf274d052e821f Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 07:15:41 -0700
Subject: [PATCH 146/421] Add shuffle support to ConcatenatingMediaSource.

The media source is initialized with a DefaultShuffleOrder which can be changed at
any time. This shuffle order is then used within the corresponding timeline.

The isRepeatOneAtomic flag is extended to also suppress shuffling (now called
isAtomic only).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166197184
---
 .../source/ConcatenatingMediaSourceTest.java  | 86 +++++++++++++------
 .../source/ConcatenatingMediaSource.java      | 58 +++++++++----
 2 files changed, 103 insertions(+), 41 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index 34f44b47f74..fd0acf2ab33 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -19,6 +19,7 @@
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.testutil.FakeMediaSource;
+import com.google.android.exoplayer2.testutil.FakeShuffleOrder;
 import com.google.android.exoplayer2.testutil.FakeTimeline;
 import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -34,26 +35,30 @@ public void testSingleMediaSource() {
     Timeline timeline = getConcatenatedTimeline(false, createFakeTimeline(3, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 3);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        C.INDEX_UNSET);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
+    for (boolean shuffled : new boolean[] { false, true }) {
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 0);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 0);
+    }
 
     timeline = getConcatenatedTimeline(true, createFakeTimeline(3, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 3);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        C.INDEX_UNSET);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 0);
+    for (boolean shuffled : new boolean[] { false, true }) {
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 0);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 0);
+    }
   }
 
   public void testMultipleMediaSources() {
@@ -70,18 +75,36 @@ public void testMultipleMediaSources() {
         1, 2, C.INDEX_UNSET);
     TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
     TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 1, 2, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 2, 0, 1);
+    assertEquals(0, timeline.getFirstWindowIndex(false));
+    assertEquals(2, timeline.getLastWindowIndex(false));
+    assertEquals(2, timeline.getFirstWindowIndex(true));
+    assertEquals(0, timeline.getLastWindowIndex(true));
 
     timeline = getConcatenatedTimeline(true, timelines);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 3, 1, 3);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        C.INDEX_UNSET, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 2, 0, 1);
-    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
-        1, 2, C.INDEX_UNSET);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 1, 2, 0);
-    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
+    for (boolean shuffled : new boolean[] { false, true }) {
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET, 0, 1);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
+          2, 0, 1);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled,
+          2, 0, 1);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          1, 2, C.INDEX_UNSET);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 1, 2, 0);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 1, 2, 0);
+      assertEquals(0, timeline.getFirstWindowIndex(shuffled));
+      assertEquals(2, timeline.getLastWindowIndex(shuffled));
+    }
   }
 
   public void testNestedMediaSources() {
@@ -100,6 +123,16 @@ public void testNestedMediaSources() {
         1, 2, 3, C.INDEX_UNSET);
     TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 3, 2);
     TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 3, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        1, 3, C.INDEX_UNSET, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, true,
+        0, 1, 3, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, true,
+        1, 3, 0, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        C.INDEX_UNSET, 0, 3, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 3, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 2, 0, 3, 1);
   }
 
   /**
@@ -112,8 +145,9 @@ private static Timeline getConcatenatedTimeline(boolean isRepeatOneAtomic,
     for (int i = 0; i < timelines.length; i++) {
       mediaSources[i] = new FakeMediaSource(timelines[i], null);
     }
-    return TestUtil.extractTimelineFromMediaSource(
-        new ConcatenatingMediaSource(isRepeatOneAtomic, mediaSources));
+    ConcatenatingMediaSource mediaSource = new ConcatenatingMediaSource(isRepeatOneAtomic,
+        new FakeShuffleOrder(mediaSources.length), mediaSources);
+    return TestUtil.extractTimelineFromMediaSource(mediaSource);
   }
 
   private static FakeTimeline createFakeTimeline(int periodCount, int windowId) {
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 f12e1c006f7..0c7bcece688 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
@@ -19,7 +19,7 @@
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
+import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
@@ -39,10 +39,11 @@ public final class ConcatenatingMediaSource implements MediaSource {
   private final Object[] manifests;
   private final Map<MediaPeriod, Integer> sourceIndexByMediaPeriod;
   private final boolean[] duplicateFlags;
-  private final boolean isRepeatOneAtomic;
+  private final boolean isAtomic;
 
   private Listener listener;
   private ConcatenatedTimeline timeline;
+  private ShuffleOrder shuffleOrder;
 
   /**
    * @param mediaSources The {@link MediaSource}s to concatenate. It is valid for the same
@@ -53,17 +54,33 @@ public ConcatenatingMediaSource(MediaSource... mediaSources) {
   }
 
   /**
-   * @param isRepeatOneAtomic Whether the concatenated media source shall be treated as atomic
-   *     (i.e., repeated in its entirety) when repeat mode is set to {@code Player.REPEAT_MODE_ONE}.
+   * @param isAtomic Whether the concatenated media source shall be treated as atomic,
+   *     i.e., treated as a single item for repeating and shuffling.
    * @param mediaSources The {@link MediaSource}s to concatenate. It is valid for the same
    *     {@link MediaSource} instance to be present more than once in the array.
    */
-  public ConcatenatingMediaSource(boolean isRepeatOneAtomic, MediaSource... mediaSources) {
+  public ConcatenatingMediaSource(boolean isAtomic, MediaSource... mediaSources) {
+    this(isAtomic, new DefaultShuffleOrder(mediaSources.length), mediaSources);
+  }
+
+  /**
+   * @param isAtomic Whether the concatenated media source shall be treated as atomic,
+   *     i.e., treated as a single item for repeating and shuffling.
+   * @param shuffleOrder The {@link ShuffleOrder} to use when shuffling the child media sources. The
+   *     number of elements in the shuffle order must match the number of concatenated
+   *     {@link MediaSource}s.
+   * @param mediaSources The {@link MediaSource}s to concatenate. It is valid for the same
+   *     {@link MediaSource} instance to be present more than once in the array.
+   */
+  public ConcatenatingMediaSource(boolean isAtomic, ShuffleOrder shuffleOrder,
+      MediaSource... mediaSources) {
     for (MediaSource mediaSource : mediaSources) {
       Assertions.checkNotNull(mediaSource);
     }
+    Assertions.checkArgument(shuffleOrder.getLength() == mediaSources.length);
     this.mediaSources = mediaSources;
-    this.isRepeatOneAtomic = isRepeatOneAtomic;
+    this.isAtomic = isAtomic;
+    this.shuffleOrder = shuffleOrder;
     timelines = new Timeline[mediaSources.length];
     manifests = new Object[mediaSources.length];
     sourceIndexByMediaPeriod = new HashMap<>();
@@ -139,7 +156,7 @@ private void handleSourceInfoRefreshed(int sourceFirstIndex, Timeline sourceTime
         return;
       }
     }
-    timeline = new ConcatenatedTimeline(timelines.clone(), isRepeatOneAtomic);
+    timeline = new ConcatenatedTimeline(timelines.clone(), isAtomic, shuffleOrder);
     listener.onSourceInfoRefreshed(timeline, manifests.clone());
   }
 
@@ -165,10 +182,10 @@ private static final class ConcatenatedTimeline extends AbstractConcatenatedTime
     private final Timeline[] timelines;
     private final int[] sourcePeriodOffsets;
     private final int[] sourceWindowOffsets;
-    private final boolean isRepeatOneAtomic;
+    private final boolean isAtomic;
 
-    public ConcatenatedTimeline(Timeline[] timelines, boolean isRepeatOneAtomic) {
-      super(new UnshuffledShuffleOrder(timelines.length));
+    public ConcatenatedTimeline(Timeline[] timelines, boolean isAtomic, ShuffleOrder shuffleOrder) {
+      super(shuffleOrder);
       int[] sourcePeriodOffsets = new int[timelines.length];
       int[] sourceWindowOffsets = new int[timelines.length];
       long periodCount = 0;
@@ -185,7 +202,7 @@ public ConcatenatedTimeline(Timeline[] timelines, boolean isRepeatOneAtomic) {
       this.timelines = timelines;
       this.sourcePeriodOffsets = sourcePeriodOffsets;
       this.sourceWindowOffsets = sourceWindowOffsets;
-      this.isRepeatOneAtomic = isRepeatOneAtomic;
+      this.isAtomic = isAtomic;
     }
 
     @Override
@@ -201,19 +218,29 @@ public int getPeriodCount() {
     @Override
     public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
         boolean shuffleModeEnabled) {
-      if (isRepeatOneAtomic && repeatMode == Player.REPEAT_MODE_ONE) {
+      if (isAtomic && repeatMode == Player.REPEAT_MODE_ONE) {
         repeatMode = Player.REPEAT_MODE_ALL;
       }
-      return super.getNextWindowIndex(windowIndex, repeatMode, shuffleModeEnabled);
+      return super.getNextWindowIndex(windowIndex, repeatMode, !isAtomic && shuffleModeEnabled);
     }
 
     @Override
     public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
         boolean shuffleModeEnabled) {
-      if (isRepeatOneAtomic && repeatMode == Player.REPEAT_MODE_ONE) {
+      if (isAtomic && repeatMode == Player.REPEAT_MODE_ONE) {
         repeatMode = Player.REPEAT_MODE_ALL;
       }
-      return super.getPreviousWindowIndex(windowIndex, repeatMode, shuffleModeEnabled);
+      return super.getPreviousWindowIndex(windowIndex, repeatMode, !isAtomic && shuffleModeEnabled);
+    }
+
+    @Override
+    public int getLastWindowIndex(boolean shuffleModeEnabled) {
+      return super.getLastWindowIndex(!isAtomic && shuffleModeEnabled);
+    }
+
+    @Override
+    public int getFirstWindowIndex(boolean shuffleModeEnabled) {
+      return super.getFirstWindowIndex(!isAtomic && shuffleModeEnabled);
     }
 
     @Override
@@ -257,3 +284,4 @@ protected Object getChildUidByChildIndex(int childIndex) {
   }
 
 }
+

From f7eba77ee0378a0886ad9cb9d2b9ddeda8ed2285 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 07:30:29 -0700
Subject: [PATCH 147/421] Add shuffle support to dynamic concatenating media
 source.

The media source is initialized with a DefaultShuffleOrder which can be changed at
any time. Whenever the list of media source is changed, the shuffle order is adapted
accordingly (either on the app thread if the player is not prepared yet, or on the
player thread). The shuffle order is then used to construct the timeline.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166198488
---
 .../DynamicConcatenatingMediaSourceTest.java  | 27 ++++++++++++++--
 .../DynamicConcatenatingMediaSource.java      | 32 ++++++++++++++++---
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index 9cdb461d7b4..0e07e999788 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -27,6 +27,7 @@
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource.Listener;
 import com.google.android.exoplayer2.testutil.FakeMediaSource;
+import com.google.android.exoplayer2.testutil.FakeShuffleOrder;
 import com.google.android.exoplayer2.testutil.FakeTimeline;
 import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
 import com.google.android.exoplayer2.testutil.TimelineAsserts;
@@ -49,7 +50,8 @@ public final class DynamicConcatenatingMediaSourceTest extends TestCase {
   public void testPlaylistChangesAfterPreparation() throws InterruptedException {
     timeline = null;
     FakeMediaSource[] childSources = createMediaSources(7);
-    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource(
+        new FakeShuffleOrder(0));
     prepareAndListenToTimelineUpdates(mediaSource);
     waitForTimelineUpdate();
     TimelineAsserts.assertEmpty(timeline);
@@ -128,6 +130,18 @@ public void testPlaylistChangesAfterPreparation() throws InterruptedException {
         C.INDEX_UNSET, 0, 1);
     TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
     TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
+    assertEquals(0, timeline.getFirstWindowIndex(false));
+    assertEquals(timeline.getWindowCount() - 1, timeline.getLastWindowIndex(false));
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 2, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 1, 2, 0);
+    assertEquals(timeline.getWindowCount() - 1, timeline.getFirstWindowIndex(true));
+    assertEquals(0, timeline.getLastWindowIndex(true));
 
     // Remove at front of queue.
     mediaSource.removeMediaSource(0);
@@ -153,7 +167,8 @@ public void testPlaylistChangesAfterPreparation() throws InterruptedException {
   public void testPlaylistChangesBeforePreparation() throws InterruptedException {
     timeline = null;
     FakeMediaSource[] childSources = createMediaSources(4);
-    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource(
+        new FakeShuffleOrder(0));
     mediaSource.addMediaSource(childSources[0]);
     mediaSource.addMediaSource(childSources[1]);
     mediaSource.addMediaSource(0, childSources[2]);
@@ -168,6 +183,14 @@ public void testPlaylistChangesBeforePreparation() throws InterruptedException {
     assertNotNull(timeline);
     TimelineAsserts.assertPeriodCounts(timeline, 3, 4, 2);
     TimelineAsserts.assertWindowIds(timeline, 333, 444, 222);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        1, 2, C.INDEX_UNSET);
 
     mediaSource.releaseSource();
     for (int i = 1; i < 4; i++) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 02d4bad2bfe..3d0df7dcb32 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -23,7 +23,7 @@
 import com.google.android.exoplayer2.ExoPlayer.ExoPlayerComponent;
 import com.google.android.exoplayer2.ExoPlayer.ExoPlayerMessage;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
+import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.util.Assertions;
@@ -58,11 +58,26 @@ public final class DynamicConcatenatingMediaSource implements MediaSource, ExoPl
 
   private ExoPlayer player;
   private Listener listener;
+  private ShuffleOrder shuffleOrder;
   private boolean preventListenerNotification;
   private int windowCount;
   private int periodCount;
 
+  /**
+   * Creates a new dynamic concatenating media source.
+   */
   public DynamicConcatenatingMediaSource() {
+    this(new DefaultShuffleOrder(0));
+  }
+
+  /**
+   * Creates a new dynamic concatenating media source with a custom shuffle order.
+   *
+   * @param shuffleOrder The {@link ShuffleOrder} to use when shuffling the child media sources.
+   *     This shuffle order must be empty.
+   */
+  public DynamicConcatenatingMediaSource(ShuffleOrder shuffleOrder) {
+    this.shuffleOrder = shuffleOrder;
     this.mediaSourceByMediaPeriod = new IdentityHashMap<>();
     this.mediaSourcesPublic = new ArrayList<>();
     this.mediaSourceHolders = new ArrayList<>();
@@ -180,6 +195,7 @@ public synchronized void prepareSource(ExoPlayer player, boolean isTopLevelSourc
     this.player = player;
     this.listener = listener;
     preventListenerNotification = true;
+    shuffleOrder = shuffleOrder.cloneAndInsert(0, mediaSourcesPublic.size());
     addMediaSourcesInternal(0, mediaSourcesPublic);
     preventListenerNotification = false;
     maybeNotifyListener();
@@ -234,21 +250,26 @@ public void handleMessage(int messageType, Object message) throws ExoPlaybackExc
     switch (messageType) {
       case MSG_ADD: {
         Pair<Integer, MediaSource> messageData = (Pair<Integer, MediaSource>) message;
+        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.first, 1);
         addMediaSourceInternal(messageData.first, messageData.second);
         break;
       }
       case MSG_ADD_MULTIPLE: {
         Pair<Integer, Collection<MediaSource>> messageData =
             (Pair<Integer, Collection<MediaSource>>) message;
+        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.first, messageData.second.size());
         addMediaSourcesInternal(messageData.first, messageData.second);
         break;
       }
       case MSG_REMOVE: {
+        shuffleOrder = shuffleOrder.cloneAndRemove((Integer) message);
         removeMediaSourceInternal((Integer) message);
         break;
       }
       case MSG_MOVE: {
         Pair<Integer, Integer> messageData = (Pair<Integer, Integer>) message;
+        shuffleOrder = shuffleOrder.cloneAndRemove(messageData.first);
+        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.second, 1);
         moveMediaSourceInternal(messageData.first, messageData.second);
         break;
       }
@@ -262,8 +283,8 @@ public void handleMessage(int messageType, Object message) throws ExoPlaybackExc
 
   private void maybeNotifyListener() {
     if (!preventListenerNotification) {
-      listener.onSourceInfoRefreshed(
-          new ConcatenatedTimeline(mediaSourceHolders, windowCount, periodCount), null);
+      listener.onSourceInfoRefreshed(new ConcatenatedTimeline(mediaSourceHolders, windowCount,
+          periodCount, shuffleOrder), null);
     }
   }
 
@@ -397,8 +418,8 @@ private static final class ConcatenatedTimeline extends AbstractConcatenatedTime
     private final SparseIntArray childIndexByUid;
 
     public ConcatenatedTimeline(Collection<MediaSourceHolder> mediaSourceHolders, int windowCount,
-        int periodCount) {
-      super(new UnshuffledShuffleOrder(mediaSourceHolders.size()));
+        int periodCount, ShuffleOrder shuffleOrder) {
+      super(shuffleOrder);
       this.windowCount = windowCount;
       this.periodCount = periodCount;
       int childCount = mediaSourceHolders.size();
@@ -638,3 +659,4 @@ public void onPrepared(MediaPeriod mediaPeriod) {
   }
 
 }
+

From 1305b1155b73cc106c616bebd59ab8592b47acc2 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Wed, 23 Aug 2017 07:32:53 -0700
Subject: [PATCH 148/421] Migrate MediaSessionConnector to API 26 for shuffle
 mode.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166198698
---
 .../ext/mediasession/MediaSessionConnector.java        | 10 +++++-----
 .../ext/mediasession/TimelineQueueNavigator.java       |  4 ++--
 2 files changed, 7 insertions(+), 7 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 4dc1100c1e4..3a4a80733d9 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
@@ -232,9 +232,9 @@ public interface QueueNavigator {
      */
     void onSkipToNext(Player player);
     /**
-     * See {@link MediaSessionCompat.Callback#onSetShuffleModeEnabled(boolean)}.
+     * See {@link MediaSessionCompat.Callback#onSetShuffleMode(int)}.
      */
-    void onSetShuffleModeEnabled(Player player, boolean enabled);
+    void onSetShuffleMode(Player player, int shuffleMode);
   }
 
   /**
@@ -803,15 +803,15 @@ public void onPlayFromUri(Uri uri, Bundle extras) {
     @Override
     public void onSetShuffleModeEnabled(boolean enabled) {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
-        queueNavigator.onSetShuffleModeEnabled(player, enabled);
+        queueNavigator.onSetShuffleMode(player, enabled
+            ? PlaybackStateCompat.SHUFFLE_MODE_ALL : PlaybackStateCompat.SHUFFLE_MODE_NONE);
       }
     }
 
     @Override
     public void onSetShuffleMode(int shuffleMode) {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
-        queueNavigator.onSetShuffleModeEnabled(player,
-            shuffleMode != PlaybackStateCompat.SHUFFLE_MODE_NONE);
+        queueNavigator.onSetShuffleMode(player, shuffleMode);
       }
     }
 
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 9d7ed75c839..8c7d3be114b 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
@@ -160,8 +160,8 @@ public void onSkipToNext(Player player) {
   }
 
   @Override
-  public void onSetShuffleModeEnabled(Player player, boolean enabled) {
-    player.setShuffleModeEnabled(enabled);
+  public void onSetShuffleMode(Player player, int shuffleMode) {
+    player.setShuffleModeEnabled(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL);
   }
 
   private void publishFloatingQueueWindow(Player player) {

From eeebb3968b2491539aaacd310d9ebc276faddfb7 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 07:40:05 -0700
Subject: [PATCH 149/421] Implement shuffle mode logic in
 ExoPlayerImplInternal.

This is mostly connecting the already stored shuffleMode with the timeline queries
for the playback order.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166199330
---
 .../android/exoplayer2/ExoPlayerTest.java     | 25 +++++++++++++++
 .../exoplayer2/ExoPlayerImplInternal.java     | 31 ++++++++++++-------
 .../exoplayer2/MediaPeriodInfoSequence.java   |  4 +--
 .../android/exoplayer2/testutil/Action.java   | 23 ++++++++++++++
 .../exoplayer2/testutil/ActionSchedule.java   | 10 ++++++
 5 files changed, 79 insertions(+), 14 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
index bc72ebc0603..9f172dc8022 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2;
 
+import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -24,6 +25,7 @@
 import com.google.android.exoplayer2.testutil.FakeMediaClockRenderer;
 import com.google.android.exoplayer2.testutil.FakeMediaSource;
 import com.google.android.exoplayer2.testutil.FakeRenderer;
+import com.google.android.exoplayer2.testutil.FakeShuffleOrder;
 import com.google.android.exoplayer2.testutil.FakeTimeline;
 import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
 import java.util.concurrent.CountDownLatch;
@@ -234,4 +236,27 @@ public void testRepeatModeChanges() throws Exception {
     assertTrue(renderer.isEnded);
   }
 
+  public void testShuffleModeEnabledChanges() throws Exception {
+    Timeline fakeTimeline = new FakeTimeline(new TimelineWindowDefinition(true, false, 100000));
+    MediaSource[] fakeMediaSources = {
+        new FakeMediaSource(fakeTimeline, null, Builder.VIDEO_FORMAT),
+        new FakeMediaSource(fakeTimeline, null, Builder.VIDEO_FORMAT),
+        new FakeMediaSource(fakeTimeline, null, Builder.VIDEO_FORMAT)
+    };
+    ConcatenatingMediaSource mediaSource = new ConcatenatingMediaSource(false,
+        new FakeShuffleOrder(3), fakeMediaSources);
+    FakeRenderer renderer = new FakeRenderer(Builder.VIDEO_FORMAT);
+    ActionSchedule actionSchedule = new ActionSchedule.Builder("testShuffleModeEnabled")
+        .setRepeatMode(Player.REPEAT_MODE_ALL).waitForPositionDiscontinuity() // 0 -> 1
+        .setShuffleModeEnabled(true).waitForPositionDiscontinuity()           // 1 -> 0
+        .waitForPositionDiscontinuity().waitForPositionDiscontinuity()        // 0 -> 2 -> 1
+        .setShuffleModeEnabled(false).setRepeatMode(Player.REPEAT_MODE_OFF)   // 1 -> 2 -> end
+        .build();
+    ExoPlayerTestRunner testRunner = new ExoPlayerTestRunner.Builder()
+        .setMediaSource(mediaSource).setRenderers(renderer).setActionSchedule(actionSchedule)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    testRunner.assertPlayedPeriodIndices(0, 1, 0, 2, 1, 2);
+    assertTrue(renderer.isEnded);
+  }
+
 }
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 7035ed637e2..5d55652f616 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
@@ -488,7 +488,7 @@ private void validateExistingPeriodHolders() throws ExoPlaybackException {
     }
     while (true) {
       int nextPeriodIndex = timeline.getNextPeriodIndex(lastValidPeriodHolder.info.id.periodIndex,
-          period, window, repeatMode, false);
+          period, window, repeatMode, shuffleModeEnabled);
       while (lastValidPeriodHolder.next != null
           && !lastValidPeriodHolder.info.isLastInTimelinePeriod) {
         lastValidPeriodHolder = lastValidPeriodHolder.next;
@@ -686,13 +686,15 @@ private void seekToInternal(SeekPosition seekPosition) throws ExoPlaybackExcepti
 
     Pair<Integer, Long> periodPosition = resolveSeekPosition(seekPosition);
     if (periodPosition == null) {
+      int firstPeriodIndex = timeline.isEmpty() ? 0 : timeline.getWindow(
+          timeline.getFirstWindowIndex(shuffleModeEnabled), window).firstPeriodIndex;
       // 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.
-      playbackInfo = new PlaybackInfo(0, 0);
+      playbackInfo = new PlaybackInfo(firstPeriodIndex, 0);
       eventHandler.obtainMessage(MSG_SEEK_ACK, 1, 0, playbackInfo).sendToTarget();
-      // Set the internal position to (0,TIME_UNSET) so that a subsequent seek to (0,0) isn't
-      // ignored.
-      playbackInfo = new PlaybackInfo(0, C.TIME_UNSET);
+      // Set the internal position to (firstPeriodIndex,TIME_UNSET) so that a subsequent seek to
+      // (firstPeriodIndex,0) isn't ignored.
+      playbackInfo = new PlaybackInfo(firstPeriodIndex, C.TIME_UNSET);
       setState(Player.STATE_ENDED);
       // Reset, but retain the source so that it can still be used should a seek occur.
       resetInternal(false);
@@ -1029,7 +1031,8 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
         if (timeline.isEmpty()) {
           handleSourceInfoRefreshEndedPlayback(manifest);
         } else {
-          Pair<Integer, Long> defaultPosition = getPeriodPosition(0, C.TIME_UNSET);
+          Pair<Integer, Long> defaultPosition = getPeriodPosition(
+              timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
           int periodIndex = defaultPosition.first;
           long startPositionUs = defaultPosition.second;
           MediaPeriodId periodId = mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex,
@@ -1122,7 +1125,8 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
     while (periodHolder.next != null) {
       MediaPeriodHolder previousPeriodHolder = periodHolder;
       periodHolder = periodHolder.next;
-      periodIndex = timeline.getNextPeriodIndex(periodIndex, period, window, repeatMode, false);
+      periodIndex = timeline.getNextPeriodIndex(periodIndex, period, window, repeatMode,
+          shuffleModeEnabled);
       if (periodIndex != C.INDEX_UNSET
           && periodHolder.uid.equals(timeline.getPeriod(periodIndex, period, true).uid)) {
         // The holder is consistent with the new timeline. Update its index and continue.
@@ -1170,11 +1174,14 @@ private void handleSourceInfoRefreshEndedPlayback(Object manifest) {
 
   private void handleSourceInfoRefreshEndedPlayback(Object manifest,
       int processedInitialSeekCount) {
-    // Set the playback position to (0,0) for notifying the eventHandler.
-    playbackInfo = new PlaybackInfo(0, 0);
+    int firstPeriodIndex = timeline.isEmpty() ? 0 : timeline.getWindow(
+        timeline.getFirstWindowIndex(shuffleModeEnabled), window).firstPeriodIndex;
+    // Set the playback position to (firstPeriodIndex,0) for notifying the eventHandler.
+    playbackInfo = new PlaybackInfo(firstPeriodIndex, 0);
     notifySourceInfoRefresh(manifest, processedInitialSeekCount);
-    // Set the internal position to (0,TIME_UNSET) so that a subsequent seek to (0,0) isn't ignored.
-    playbackInfo = new PlaybackInfo(0, C.TIME_UNSET);
+    // Set the internal position to (firstPeriodIndex,TIME_UNSET) so that a subsequent seek to
+    // (firstPeriodIndex,0) isn't ignored.
+    playbackInfo = new PlaybackInfo(firstPeriodIndex, C.TIME_UNSET);
     setState(Player.STATE_ENDED);
     // Reset, but retain the source so that it can still be used should a seek occur.
     resetInternal(false);
@@ -1205,7 +1212,7 @@ private int resolveSubsequentPeriod(int oldPeriodIndex, Timeline oldTimeline,
     int maxIterations = oldTimeline.getPeriodCount();
     for (int i = 0; i < maxIterations && newPeriodIndex == C.INDEX_UNSET; i++) {
       oldPeriodIndex = oldTimeline.getNextPeriodIndex(oldPeriodIndex, period, window, repeatMode,
-          false);
+          shuffleModeEnabled);
       if (oldPeriodIndex == C.INDEX_UNSET) {
         // We've reached the end of the old timeline.
         break;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
index d7821ed705a..6fd0d48e574 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
@@ -162,7 +162,7 @@ public MediaPeriodInfo getNextMediaPeriodInfo(MediaPeriodInfo currentMediaPeriod
     // timeline is updated, to avoid repeatedly checking the same timeline.
     if (currentMediaPeriodInfo.isLastInTimelinePeriod) {
       int nextPeriodIndex = timeline.getNextPeriodIndex(currentMediaPeriodInfo.id.periodIndex,
-          period, window, repeatMode, false);
+          period, window, repeatMode, shuffleModeEnabled);
       if (nextPeriodIndex == C.INDEX_UNSET) {
         // We can't create a next period yet.
         return null;
@@ -353,7 +353,7 @@ private boolean isLastInPeriod(MediaPeriodId id, long endPositionUs) {
   private boolean isLastInTimeline(MediaPeriodId id, boolean isLastMediaPeriodInPeriod) {
     int windowIndex = timeline.getPeriod(id.periodIndex, period).windowIndex;
     return !timeline.getWindow(windowIndex, window).isDynamic
-        && timeline.isLastPeriod(id.periodIndex, period, window, repeatMode, false)
+        && timeline.isLastPeriod(id.periodIndex, period, window, repeatMode, shuffleModeEnabled)
         && isLastMediaPeriodInPeriod;
   }
 
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 ab1f448afd1..bc16e105da0 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
@@ -284,6 +284,29 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
 
   }
 
+  /**
+   * Calls {@link Player#setShuffleModeEnabled(boolean)}.
+   */
+  public static final class SetShuffleModeEnabled extends Action {
+
+    private final boolean shuffleModeEnabled;
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public SetShuffleModeEnabled(String tag, boolean shuffleModeEnabled) {
+      super(tag, "SetShuffleModeEnabled:" + shuffleModeEnabled);
+      this.shuffleModeEnabled = shuffleModeEnabled;
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      player.setShuffleModeEnabled(shuffleModeEnabled);
+    }
+
+  }
+
   /**
    * Waits for {@link Player.EventListener#onTimelineChanged(Timeline, Object)}.
    */
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 4392dd9d3f6..c9ae02c9570 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
@@ -30,6 +30,7 @@
 import com.google.android.exoplayer2.testutil.Action.SetPlayWhenReady;
 import com.google.android.exoplayer2.testutil.Action.SetRendererDisabled;
 import com.google.android.exoplayer2.testutil.Action.SetRepeatMode;
+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.WaitForPositionDiscontinuity;
@@ -217,6 +218,15 @@ public Builder setRepeatMode(@Player.RepeatMode int repeatMode) {
       return apply(new SetRepeatMode(tag, repeatMode));
     }
 
+    /**
+     * Schedules a shuffle setting action to be executed.
+     *
+     * @return The builder, for convenience.
+     */
+    public Builder setShuffleModeEnabled(boolean shuffleModeEnabled) {
+      return apply(new SetShuffleModeEnabled(tag, shuffleModeEnabled));
+    }
+
     /**
      * Schedules a delay until the timeline changed to a specified expected timeline.
      *

From aa712114c66b5e92d73d0529e1cbdb7242e9cd50 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 23 Aug 2017 09:04:29 -0700
Subject: [PATCH 150/421] Force stop hosted test after timeout.

When hosted tests run into a timeout, the outer test method stops.
However, the hosted test itself may continue running and needs to be
forced-stopped to ensure it does not block any resources needed by
subsequent test methods.

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

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 66b992e652f..54087c4461f 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
@@ -137,6 +137,12 @@ public void run() {
         fail(message);
       }
     } else {
+      runOnUiThread(new Runnable() {
+        @Override
+        public void run() {
+          hostedTest.forceStop();
+        }
+      });
       String message = "Test timed out after " + timeoutMs + " ms.";
       Log.e(TAG, message);
       if (failOnTimeout) {

From 57bad31e4c17883de178f7a743798c42b6c88dc4 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 24 Aug 2017 03:37:32 -0700
Subject: [PATCH 151/421] Update documentation with new demo app location

Plus a few misc doc fixes / adjustments

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166323135
---
 README.md                                        |  4 ++--
 .../com/google/android/exoplayer2/ExoPlayer.java |  6 ++++++
 .../source/DynamicConcatenatingMediaSource.java  | 16 ++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index c67fb09d73f..aff473c488a 100644
--- a/README.md
+++ b/README.md
@@ -71,12 +71,12 @@ individually.
 In addition to library modules, ExoPlayer has multiple extension modules that
 depend on external libraries to provide additional functionality. Some
 extensions are available from JCenter, whereas others must be built manaully.
-Browse the [extensions directory] and their individual READMEs for details.
+Browse the [extensions directory][] and their individual READMEs for details.
 
 More information on the library and extension modules that are available from
 JCenter can be found on [Bintray][].
 
-[extensions directory][]: https://github.com/google/ExoPlayer/tree/release-v2/extensions/
+[extensions directory]: https://github.com/google/ExoPlayer/tree/release-v2/extensions/
 [Bintray]: https://bintray.com/google/exoplayer
 
 ### Locally ###
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 b096b5ae12d..915a083657d 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
@@ -211,12 +211,18 @@ public ExoPlayerMessage(ExoPlayerComponent target, int messageType, Object messa
   /**
    * 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
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 3d0df7dcb32..9c1e7ec1ba6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -87,6 +87,9 @@ public DynamicConcatenatingMediaSource(ShuffleOrder shuffleOrder) {
 
   /**
    * Appends a {@link MediaSource} to the playlist.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
    *
    * @param mediaSource The {@link MediaSource} to be added to the list.
    */
@@ -96,6 +99,9 @@ public synchronized void addMediaSource(MediaSource mediaSource) {
 
   /**
    * Adds a {@link MediaSource} to the playlist.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
    *
    * @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()}.
@@ -112,6 +118,9 @@ public synchronized void addMediaSource(int index, MediaSource mediaSource) {
 
   /**
    * Appends multiple {@link MediaSource}s to the playlist.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
    *
    * @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.
@@ -122,6 +131,9 @@ public synchronized void addMediaSources(Collection<MediaSource> mediaSources) {
 
   /**
    * Adds multiple {@link MediaSource}s to the playlist.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
    *
    * @param index The index at which the new {@link MediaSource}s will be inserted. This index must
    *     be in the range of 0 &lt;= index &lt;= {@link #getSize()}.
@@ -142,6 +154,10 @@ public synchronized void addMediaSources(int index, Collection<MediaSource> medi
 
   /**
    * Removes a {@link MediaSource} from the playlist.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used, and so the instance being
+   * removed should not be re-added. If you want to move the instance use
+   * {@link #moveMediaSource(int, int)} 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()}.

From 6e03dcdfa1fa18a7865085186b7e33790489d46c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 24 Aug 2017 05:30:36 -0700
Subject: [PATCH 152/421] Add LocalMediaDrmCallback. Useful for providing local
 keys.

Issue: #3178

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166330215
---
 .../exoplayer2/drm/LocalMediaDrmCallback.java | 51 +++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java
new file mode 100644
index 00000000000..7b9aeca30ae
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/LocalMediaDrmCallback.java
@@ -0,0 +1,51 @@
+/*
+ * 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.drm;
+
+import com.google.android.exoplayer2.drm.ExoMediaDrm.KeyRequest;
+import com.google.android.exoplayer2.drm.ExoMediaDrm.ProvisionRequest;
+import com.google.android.exoplayer2.util.Assertions;
+import java.io.IOException;
+import java.util.UUID;
+
+/**
+ * A {@link MediaDrmCallback} that provides a fixed response to key requests. Provisioning is not
+ * supported. This implementation is primarily useful for providing locally stored keys to decrypt
+ * ClearKey protected content. It is not suitable for use with Widevine or PlayReady protected
+ * content.
+ */
+public final class LocalMediaDrmCallback implements MediaDrmCallback {
+
+  private final byte[] keyResponse;
+
+  /**
+   * @param keyResponse The fixed response for all key requests.
+   */
+  public LocalMediaDrmCallback(byte[] keyResponse) {
+    this.keyResponse = Assertions.checkNotNull(keyResponse);
+  }
+
+  @Override
+  public byte[] executeProvisionRequest(UUID uuid, ProvisionRequest request) throws IOException {
+    throw new UnsupportedOperationException();
+  }
+
+  @Override
+  public byte[] executeKeyRequest(UUID uuid, KeyRequest request) throws Exception {
+    return keyResponse;
+  }
+
+}

From 6907ffb2852d56556c5a4186d6d7cfb00d8d7553 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sun, 23 Jul 2017 09:55:50 +0100
Subject: [PATCH 153/421] Remove unnecessary view casts

findViewById is now defined using generics, which allows
the types to be inferred.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166355555
---
 .../android/exoplayer2/castdemo/MainActivity.java      |  6 +++---
 .../google/android/exoplayer2/demo/PlayerActivity.java |  8 ++++----
 .../android/exoplayer2/demo/SampleChooserActivity.java |  2 +-
 .../android/exoplayer2/ui/PlaybackControlView.java     |  8 ++++----
 .../android/exoplayer2/ui/SimpleExoPlayerView.java     | 10 +++++-----
 .../android/exoplayer2/testutil/HostActivity.java      |  2 +-
 6 files changed, 18 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 e1367858aa4..e1c7519a053 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,12 +49,12 @@ public void onCreate(Bundle savedInstanceState) {
 
     setContentView(R.layout.main_activity);
 
-    simpleExoPlayerView = (SimpleExoPlayerView) findViewById(R.id.player_view);
+    simpleExoPlayerView = findViewById(R.id.player_view);
     simpleExoPlayerView.requestFocus();
 
-    castControlView = (PlaybackControlView) findViewById(R.id.cast_control_view);
+    castControlView = findViewById(R.id.cast_control_view);
 
-    ListView sampleList = (ListView) findViewById(R.id.sample_list);
+    ListView sampleList = findViewById(R.id.sample_list);
     sampleList.setAdapter(new SampleListAdapter());
     sampleList.setOnItemClickListener(new SampleClickListener());
   }
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 6d733c9f974..b2750a93bbf 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
@@ -148,12 +148,12 @@ public void onCreate(Bundle savedInstanceState) {
     setContentView(R.layout.player_activity);
     View rootView = findViewById(R.id.root);
     rootView.setOnClickListener(this);
-    debugRootView = (LinearLayout) findViewById(R.id.controls_root);
-    debugTextView = (TextView) findViewById(R.id.debug_text_view);
-    retryButton = (Button) findViewById(R.id.retry_button);
+    debugRootView = findViewById(R.id.controls_root);
+    debugTextView = findViewById(R.id.debug_text_view);
+    retryButton = findViewById(R.id.retry_button);
     retryButton.setOnClickListener(this);
 
-    simpleExoPlayerView = (SimpleExoPlayerView) findViewById(R.id.player_view);
+    simpleExoPlayerView = findViewById(R.id.player_view);
     simpleExoPlayerView.setControllerVisibilityListener(this);
     simpleExoPlayerView.requestFocus();
   }
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 382c7835985..c0edb1d1b88 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
@@ -90,7 +90,7 @@ private void onSampleGroups(final List<SampleGroup> groups, boolean sawError) {
       Toast.makeText(getApplicationContext(), R.string.sample_list_load_error, Toast.LENGTH_LONG)
           .show();
     }
-    ExpandableListView sampleList = (ExpandableListView) findViewById(R.id.sample_list);
+    ExpandableListView sampleList = findViewById(R.id.sample_list);
     sampleList.setAdapter(new SampleAdapter(this, groups));
     sampleList.setOnChildClickListener(new OnChildClickListener() {
       @Override
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 105dbc24952..91308848f98 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
@@ -374,9 +374,9 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
     LayoutInflater.from(context).inflate(controllerLayoutId, this);
     setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
 
-    durationView = (TextView) findViewById(R.id.exo_duration);
-    positionView = (TextView) findViewById(R.id.exo_position);
-    timeBar = (TimeBar) findViewById(R.id.exo_progress);
+    durationView = findViewById(R.id.exo_duration);
+    positionView = findViewById(R.id.exo_position);
+    timeBar = findViewById(R.id.exo_progress);
     if (timeBar != null) {
       timeBar.setListener(componentListener);
     }
@@ -404,7 +404,7 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
     if (fastForwardButton != null) {
       fastForwardButton.setOnClickListener(componentListener);
     }
-    repeatToggleButton = (ImageView) findViewById(R.id.exo_repeat_toggle);
+    repeatToggleButton = findViewById(R.id.exo_repeat_toggle);
     if (repeatToggleButton != null) {
       repeatToggleButton.setOnClickListener(componentListener);
     }
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 bdbdf343315..0a531375c10 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
@@ -286,7 +286,7 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
     setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
 
     // Content frame.
-    contentFrame = (AspectRatioFrameLayout) findViewById(R.id.exo_content_frame);
+    contentFrame = findViewById(R.id.exo_content_frame);
     if (contentFrame != null) {
       setResizeModeRaw(contentFrame, resizeMode);
     }
@@ -307,24 +307,24 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
     }
 
     // Overlay frame layout.
-    overlayFrameLayout = (FrameLayout) findViewById(R.id.exo_overlay);
+    overlayFrameLayout = findViewById(R.id.exo_overlay);
 
     // Artwork view.
-    artworkView = (ImageView) findViewById(R.id.exo_artwork);
+    artworkView = findViewById(R.id.exo_artwork);
     this.useArtwork = useArtwork && artworkView != null;
     if (defaultArtworkId != 0) {
       defaultArtwork = BitmapFactory.decodeResource(context.getResources(), defaultArtworkId);
     }
 
     // Subtitle view.
-    subtitleView = (SubtitleView) findViewById(R.id.exo_subtitles);
+    subtitleView = findViewById(R.id.exo_subtitles);
     if (subtitleView != null) {
       subtitleView.setUserDefaultStyle();
       subtitleView.setUserDefaultTextSize();
     }
 
     // Playback control view.
-    PlaybackControlView customController = (PlaybackControlView) findViewById(R.id.exo_controller);
+    PlaybackControlView customController = findViewById(R.id.exo_controller);
     View controllerPlaceholder = findViewById(R.id.exo_controller_placeholder);
     if (customController != null) {
       this.controller = customController;
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 54087c4461f..299cb108157 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
@@ -159,7 +159,7 @@ public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     requestWindowFeature(Window.FEATURE_NO_TITLE);
     setContentView(getResources().getIdentifier("host_activity", "layout", getPackageName()));
-    surfaceView = (SurfaceView) findViewById(
+    surfaceView = findViewById(
         getResources().getIdentifier("surface_view", "id", getPackageName()));
     surfaceView.getHolder().addCallback(this);
   }

From 1b9c904dbae7009fcb448b0db3b2286289f14925 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 25 Aug 2017 02:52:35 -0700
Subject: [PATCH 154/421] Add UI for shuffle mode.

This includes an option to show and hide the shuffle mode button. When
pressing the button, the shuffle mode of the player is toggled.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166455759
---
 .../exoplayer2/ui/PlaybackControlView.java    | 73 ++++++++++++++++++-
 .../exoplayer2/ui/SimpleExoPlayerView.java    | 10 +++
 .../res/layout/exo_playback_control_view.xml  |  3 +
 library/ui/src/main/res/values/attrs.xml      |  2 +
 4 files changed, 87 insertions(+), 1 deletion(-)

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 91308848f98..f83bab57704 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
@@ -84,6 +84,12 @@
  *         <li>Default: {@link PlaybackControlView#DEFAULT_REPEAT_TOGGLE_MODES}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code show_shuffle_button}</b> - Whether the shuffle button is shown.
+ *       <ul>
+ *         <li>Corresponding method: {@link #setShowShuffleButton(boolean)}</li>
+ *         <li>Default: false</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code controller_layout_id}</b> - Specifies the id of the layout to be inflated. See
  *       below for more details.
  *       <ul>
@@ -136,6 +142,11 @@
  *         <li>Type: {@link View}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code exo_shuffle}</b> - The shuffle button.
+ *       <ul>
+ *         <li>Type: {@link View}</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code exo_position}</b> - Text view displaying the current playback position.
  *       <ul>
  *         <li>Type: {@link TextView}</li>
@@ -221,6 +232,15 @@ public interface ControlDispatcher {
      */
     boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode);
 
+    /**
+     * Dispatches a {@link Player#setShuffleModeEnabled(boolean)} operation.
+     *
+     * @param player The {@link Player} to which the operation should be dispatched.
+     * @param shuffleModeEnabled Whether shuffling is enabled.
+     * @return True if the operation was dispatched. False if suppressed.
+     */
+    boolean dispatchSetShuffleModeEnabled(Player player, boolean shuffleModeEnabled);
+
   }
 
   /**
@@ -247,6 +267,12 @@ public boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode)
       return true;
     }
 
+    @Override
+    public boolean dispatchSetShuffleModeEnabled(Player player, boolean shuffleModeEnabled) {
+      player.setShuffleModeEnabled(shuffleModeEnabled);
+      return true;
+    }
+
   };
 
   /**
@@ -282,6 +308,7 @@ public boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode)
   private final View fastForwardButton;
   private final View rewindButton;
   private final ImageView repeatToggleButton;
+  private final View shuffleButton;
   private final TextView durationView;
   private final TextView positionView;
   private final TimeBar timeBar;
@@ -309,6 +336,7 @@ public boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode)
   private int fastForwardMs;
   private int showTimeoutMs;
   private @RepeatModeUtil.RepeatToggleModes int repeatToggleModes;
+  private boolean showShuffleButton;
   private long hideAtMs;
   private long[] adGroupTimesMs;
   private boolean[] playedAdGroups;
@@ -345,6 +373,7 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
     fastForwardMs = DEFAULT_FAST_FORWARD_MS;
     showTimeoutMs = DEFAULT_SHOW_TIMEOUT_MS;
     repeatToggleModes = DEFAULT_REPEAT_TOGGLE_MODES;
+    showShuffleButton = false;
     if (attrs != null) {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs,
           R.styleable.PlaybackControlView, 0, 0);
@@ -356,6 +385,8 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
         controllerLayoutId = a.getResourceId(R.styleable.PlaybackControlView_controller_layout_id,
             controllerLayoutId);
         repeatToggleModes = getRepeatToggleModes(a, repeatToggleModes);
+        showShuffleButton = a.getBoolean(R.styleable.PlaybackControlView_show_shuffle_button,
+            showShuffleButton);
       } finally {
         a.recycle();
       }
@@ -408,6 +439,10 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
     if (repeatToggleButton != null) {
       repeatToggleButton.setOnClickListener(componentListener);
     }
+    shuffleButton = findViewById(R.id.exo_shuffle);
+    if (shuffleButton != null) {
+      shuffleButton.setOnClickListener(componentListener);
+    }
     Resources resources = context.getResources();
     repeatOffButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_off);
     repeatOneButtonDrawable = resources.getDrawable(R.drawable.exo_controls_repeat_one);
@@ -584,6 +619,23 @@ public void setRepeatToggleModes(@RepeatModeUtil.RepeatToggleModes int repeatTog
     }
   }
 
+  /**
+   * Returns whether the shuffle button is shown.
+   */
+  public boolean getShowShuffleButton() {
+    return showShuffleButton;
+  }
+
+  /**
+   * Sets whether the shuffle button is shown.
+   *
+   * @param showShuffleButton Whether the shuffle button is shown.
+   */
+  public void setShowShuffleButton(boolean showShuffleButton) {
+    this.showShuffleButton = showShuffleButton;
+    updateShuffleButton();
+  }
+
   /**
    * 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.
@@ -639,6 +691,7 @@ private void updateAll() {
     updatePlayPauseButton();
     updateNavigation();
     updateRepeatModeButton();
+    updateShuffleButton();
     updateProgress();
   }
 
@@ -721,6 +774,21 @@ private void updateRepeatModeButton() {
     repeatToggleButton.setVisibility(View.VISIBLE);
   }
 
+  private void updateShuffleButton() {
+    if (!isVisible() || !isAttachedToWindow || shuffleButton == null) {
+      return;
+    }
+    if (!showShuffleButton) {
+      shuffleButton.setVisibility(View.GONE);
+    } else if (player == null) {
+      setButtonEnabled(false, shuffleButton);
+    } else {
+      shuffleButton.setAlpha(player.getShuffleModeEnabled() ? 1f : 0.3f);
+      shuffleButton.setEnabled(true);
+      shuffleButton.setVisibility(View.VISIBLE);
+    }
+  }
+
   private void updateTimeBarMode() {
     if (player == null) {
       return;
@@ -1080,7 +1148,8 @@ public void onRepeatModeChanged(int repeatMode) {
 
     @Override
     public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-      // TODO: Update UI.
+      updateShuffleButton();
+      updateNavigation();
     }
 
     @Override
@@ -1134,6 +1203,8 @@ public void onClick(View view) {
         } else if (repeatToggleButton == view) {
           controlDispatcher.dispatchSetRepeatMode(player, RepeatModeUtil.getNextRepeatMode(
               player.getRepeatMode(), repeatToggleModes));
+        } else if (shuffleButton == view) {
+          controlDispatcher.dispatchSetShuffleModeEnabled(player, !player.getShuffleModeEnabled());
         }
       }
       hideAfterTimeout();
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 0a531375c10..a8926f9ecc2 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
@@ -655,6 +655,16 @@ public void setRepeatToggleModes(@RepeatModeUtil.RepeatToggleModes int repeatTog
     controller.setRepeatToggleModes(repeatToggleModes);
   }
 
+  /**
+   * Sets whether the shuffle button is shown.
+   *
+   * @param showShuffleButton Whether the shuffle button is shown.
+   */
+  public void setShowShuffleButton(boolean showShuffleButton) {
+    Assertions.checkState(controller != null);
+    controller.setShowShuffleButton(showShuffleButton);
+  }
+
   /**
    * Sets whether the time bar should show all windows, as opposed to just the current one.
    *
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 407329890dd..159844c2346 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
@@ -34,6 +34,9 @@
     <ImageButton android:id="@id/exo_rew"
       style="@style/ExoMediaButton.Rewind"/>
 
+    <ImageButton android:id="@id/exo_shuffle"
+      style="@style/ExoMediaButton.Shuffle"/>
+
     <ImageButton android:id="@id/exo_repeat_toggle"
       style="@style/ExoMediaButton"/>
 
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index d1f45228b1d..9b701d5ba51 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -39,6 +39,7 @@
     <flag name="one" value="1"/>
     <flag name="all" value="2"/>
   </attr>
+  <attr name="show_shuffle_button" format="boolean"/>
 
   <declare-styleable name="SimpleExoPlayerView">
     <attr name="use_artwork" format="boolean"/>
@@ -64,6 +65,7 @@
     <attr name="rewind_increment"/>
     <attr name="fastforward_increment"/>
     <attr name="repeat_toggle_modes"/>
+    <attr name="show_shuffle_button"/>
     <attr name="controller_layout_id"/>
   </declare-styleable>
 

From 01f481984437ce94bed16e71131d0ba084a2b70c Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Fri, 25 Aug 2017 07:43:15 -0700
Subject: [PATCH 155/421] Introduce MediaSessionConnector.CommandReceiver
 interface and add TimelineQueueEditor.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166475351
---
 .../DefaultPlaybackController.java            |  12 +
 .../mediasession/MediaSessionConnector.java   |  86 +++++--
 .../ext/mediasession/TimelineQueueEditor.java | 226 ++++++++++++++++++
 .../mediasession/TimelineQueueNavigator.java  |  14 ++
 4 files changed, 316 insertions(+), 22 deletions(-)
 create mode 100644 extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.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
index c3586b29e63..e01d6a48db4 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
@@ -15,6 +15,8 @@
  */
 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;
@@ -125,4 +127,14 @@ public void onStop(Player player) {
     player.stop();
   }
 
+  @Override
+  public String[] getCommands() {
+    return null;
+  }
+
+  @Override
+  public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+    // Do nothing.
+  }
+
 }
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 3a4a80733d9..a64f1637330 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,10 +79,24 @@ public final class MediaSessionConnector {
   private static final int EDITOR_MEDIA_SESSION_FLAGS = BASE_MEDIA_SESSION_FLAGS
       | MediaSessionCompat.FLAG_HANDLES_QUEUE_COMMANDS;
 
+  /**
+   * 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.
+     */
+    String[] getCommands();
+    /**
+     * See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}.
+     */
+    void onCommand(Player player, String command, Bundle extras, ResultReceiver cb);
+  }
+
   /**
    * Interface to which playback preparation actions are delegated.
    */
-  public interface PlaybackPreparer {
+  public interface PlaybackPreparer extends CommandReceiver {
 
     long ACTIONS = PlaybackStateCompat.ACTION_PREPARE
         | PlaybackStateCompat.ACTION_PREPARE_FROM_MEDIA_ID
@@ -121,16 +135,12 @@ public interface PlaybackPreparer {
      * See {@link MediaSessionCompat.Callback#onPrepareFromUri(Uri, Bundle)}.
      */
     void onPrepareFromUri(Uri uri, Bundle extras);
-    /**
-     * See {@link MediaSessionCompat.Callback#onCommand(String, Bundle, ResultReceiver)}.
-     */
-    void onCommand(String command, Bundle extras, ResultReceiver cb);
   }
 
   /**
    * Interface to which playback actions are delegated.
    */
-  public interface PlaybackController {
+  public interface PlaybackController extends CommandReceiver {
 
     long ACTIONS = PlaybackStateCompat.ACTION_PLAY_PAUSE | PlaybackStateCompat.ACTION_PLAY
         | PlaybackStateCompat.ACTION_PAUSE | PlaybackStateCompat.ACTION_SEEK_TO
@@ -178,7 +188,7 @@ public interface PlaybackController {
    * Handles queue navigation actions, and updates the media session queue by calling
    * {@code MediaSessionCompat.setQueue()}.
    */
-  public interface QueueNavigator {
+  public interface QueueNavigator extends CommandReceiver {
 
     long ACTIONS = PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM
         | PlaybackStateCompat.ACTION_SKIP_TO_NEXT | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
@@ -240,7 +250,7 @@ public interface QueueNavigator {
   /**
    * Handles media session queue edits.
    */
-  public interface QueueEditor {
+  public interface QueueEditor extends CommandReceiver {
 
     long ACTIONS = PlaybackStateCompat.ACTION_SET_RATING;
 
@@ -309,6 +319,7 @@ public interface CustomActionProvider {
   private final ExoPlayerEventListener exoPlayerEventListener;
   private final MediaSessionCallback mediaSessionCallback;
   private final PlaybackController playbackController;
+  private final Map<String, CommandReceiver> commandMap;
 
   private Player player;
   private CustomActionProvider[] customActionProviders;
@@ -328,7 +339,7 @@ public interface CustomActionProvider {
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
    */
   public MediaSessionConnector(MediaSessionCompat mediaSession) {
-    this(mediaSession, new DefaultPlaybackController());
+    this(mediaSession, null);
   }
 
   /**
@@ -350,7 +361,8 @@ public MediaSessionConnector(MediaSessionCompat mediaSession,
    * instances passed to {@link #setPlayer(Player, PlaybackPreparer, CustomActionProvider...)}.
    *
    * @param mediaSession The {@link MediaSessionCompat} to connect to.
-   * @param playbackController A {@link PlaybackController} for handling playback actions.
+   * @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. If
    *     {@code false}, you need to maintain the metadata of the media session yourself (provide at
    *     least the duration to allow clients to show a progress bar).
@@ -358,7 +370,8 @@ public MediaSessionConnector(MediaSessionCompat mediaSession,
   public MediaSessionConnector(MediaSessionCompat mediaSession,
       PlaybackController playbackController, boolean doMaintainMetadata) {
     this.mediaSession = mediaSession;
-    this.playbackController = playbackController;
+    this.playbackController = playbackController != null ? playbackController
+        : new DefaultPlaybackController();
     this.handler = new Handler(Looper.myLooper() != null ? Looper.myLooper()
         : Looper.getMainLooper());
     this.doMaintainMetadata = doMaintainMetadata;
@@ -367,6 +380,8 @@ public MediaSessionConnector(MediaSessionCompat mediaSession,
     mediaSessionCallback = new MediaSessionCallback();
     exoPlayerEventListener = new ExoPlayerEventListener();
     customActionMap = Collections.emptyMap();
+    commandMap = new HashMap<>();
+    registerCommandReceiver(playbackController);
   }
 
   /**
@@ -386,8 +401,12 @@ public void setPlayer(Player player, PlaybackPreparer playbackPreparer,
       this.player.removeListener(exoPlayerEventListener);
       mediaSession.setCallback(null);
     }
-    this.playbackPreparer = playbackPreparer;
+    unregisterCommandReceiver(this.playbackPreparer);
+
     this.player = player;
+    this.playbackPreparer = playbackPreparer;
+    registerCommandReceiver(playbackPreparer);
+
     this.customActionProviders = (player != null && customActionProviders != null)
         ? customActionProviders : new CustomActionProvider[0];
     if (player != null) {
@@ -416,7 +435,9 @@ public void setErrorMessageProvider(
    * @param queueNavigator The queue navigator.
    */
   public void setQueueNavigator(QueueNavigator queueNavigator) {
+    unregisterCommandReceiver(this.queueNavigator);
     this.queueNavigator = queueNavigator;
+    registerCommandReceiver(queueNavigator);
   }
 
   /**
@@ -425,11 +446,29 @@ public void setQueueNavigator(QueueNavigator queueNavigator) {
    * @param queueEditor The queue editor.
    */
   public void setQueueEditor(QueueEditor queueEditor) {
+    unregisterCommandReceiver(this.queueEditor);
     this.queueEditor = queueEditor;
+    registerCommandReceiver(queueEditor);
     mediaSession.setFlags(queueEditor == null ? BASE_MEDIA_SESSION_FLAGS
         : EDITOR_MEDIA_SESSION_FLAGS);
   }
 
+  private void registerCommandReceiver(CommandReceiver commandReceiver) {
+    if (commandReceiver != null && commandReceiver.getCommands() != null) {
+      for (String command : commandReceiver.getCommands()) {
+        commandMap.put(command, commandReceiver);
+      }
+    }
+  }
+
+  private void unregisterCommandReceiver(CommandReceiver commandReceiver) {
+    if (commandReceiver != null && commandReceiver.getCommands() != null) {
+      for (String command : commandReceiver.getCommands()) {
+        commandMap.remove(command);
+      }
+    }
+  }
+
   private void updateMediaSessionPlaybackState() {
     PlaybackStateCompat.Builder builder = new PlaybackStateCompat.Builder();
     if (player == null) {
@@ -473,11 +512,8 @@ private void updateMediaSessionPlaybackState() {
   }
 
   private long buildPlaybackActions() {
-    long actions = 0;
-    if (playbackController != null) {
-      actions |= (PlaybackController.ACTIONS & playbackController
-          .getSupportedPlaybackActions(player));
-    }
+    long actions = (PlaybackController.ACTIONS
+        & playbackController.getSupportedPlaybackActions(player));
     if (playbackPreparer != null) {
       actions |= (PlaybackPreparer.ACTIONS & playbackPreparer.getSupportedPrepareActions());
     }
@@ -562,7 +598,7 @@ private boolean canDispatchToPlaybackPreparer(long action) {
   }
 
   private boolean canDispatchToPlaybackController(long action) {
-    return playbackController != null && (playbackController.getSupportedPlaybackActions(player)
+    return (playbackController.getSupportedPlaybackActions(player)
         & PlaybackController.ACTIONS & action) != 0;
   }
 
@@ -583,10 +619,15 @@ private class ExoPlayerEventListener implements Player.EventListener {
 
     @Override
     public void onTimelineChanged(Timeline timeline, Object manifest) {
+      int windowCount = player.getCurrentTimeline().getWindowCount();
+      int windowIndex = player.getCurrentWindowIndex();
       if (queueNavigator != null) {
         queueNavigator.onTimelineChanged(player);
+        updateMediaSessionPlaybackState();
+      } else if (currentWindowCount != windowCount || currentWindowIndex != windowIndex) {
+        // active queue item and queue navigation actions may need to be updated
+        updateMediaSessionPlaybackState();
       }
-      int windowCount = player.getCurrentTimeline().getWindowCount();
       if (currentWindowCount != windowCount) {
         // active queue item and queue navigation actions may need to be updated
         updateMediaSessionPlaybackState();
@@ -638,8 +679,8 @@ public void onPositionDiscontinuity() {
         if (queueNavigator != null) {
           queueNavigator.onCurrentWindowIndexChanged(player);
         }
-        updateMediaSessionMetadata();
         currentWindowIndex = player.getCurrentWindowIndex();
+        updateMediaSessionMetadata();
       }
       updateMediaSessionPlaybackState();
     }
@@ -732,8 +773,9 @@ public void onCustomAction(@NonNull String action, @Nullable Bundle extras) {
 
     @Override
     public void onCommand(String command, Bundle extras, ResultReceiver cb) {
-      if (playbackPreparer != null) {
-        playbackPreparer.onCommand(command, extras, cb);
+      CommandReceiver commandReceiver = commandMap.get(command);
+      if (commandReceiver != null) {
+        commandReceiver.onCommand(player, command, extras, cb);
       }
     }
 
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
new file mode 100644
index 00000000000..65090a3c1cb
--- /dev/null
+++ b/extensions/mediasession/src/main/java/com/google/android/exoplayer2/ext/mediasession/TimelineQueueEditor.java
@@ -0,0 +1,226 @@
+/*
+ * 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.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.media.MediaDescriptionCompat;
+import android.support.v4.media.RatingCompat;
+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.Player;
+import com.google.android.exoplayer2.source.DynamicConcatenatingMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.util.Util;
+import java.util.List;
+
+/**
+ * A {@link MediaSessionConnector.QueueEditor} implementation based on the
+ * {@link DynamicConcatenatingMediaSource}.
+ * <p>
+ * This class implements the {@link MediaSessionConnector.CommandReceiver} interface and handles
+ * the {@link #COMMAND_MOVE_QUEUE_ITEM} to move a queue item instead of removing and inserting it.
+ * This allows to move the currently playing window without interrupting playback.
+ */
+public final class TimelineQueueEditor implements MediaSessionConnector.QueueEditor,
+    MediaSessionConnector.CommandReceiver {
+
+  public static final String COMMAND_MOVE_QUEUE_ITEM = "exo_move_window";
+  public static final String EXTRA_FROM_INDEX = "from_index";
+  public static final String EXTRA_TO_INDEX = "to_index";
+
+  /**
+   * Factory to create {@link MediaSource}s.
+   */
+  public interface MediaSourceFactory {
+    /**
+     * Creates a {@link MediaSource} for the given {@link MediaDescriptionCompat}.
+     *
+     * @param description The {@link MediaDescriptionCompat} to create a media source for.
+     * @return A {@link MediaSource} or {@code null} if no source can be created for the given
+     *     description.
+     */
+    @Nullable MediaSource createMediaSource(MediaDescriptionCompat description);
+  }
+
+  /**
+   * Adapter to get {@link MediaDescriptionCompat} of items in the queue and to notify the
+   * application about changes in the queue to sync the data structure backing the
+   * {@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}.
+     *
+     * @param position The position at which to add.
+     * @param description The {@link MediaDescriptionCompat} to be added.
+     */
+    void add(int position, MediaDescriptionCompat description);
+    /**
+     * Removes the item at the given {@code position}.
+     *
+     * @param position The position at which to remove the item.
+     */
+    void remove(int position);
+    /**
+     * Moves a queue item from position {@code from} to position {@code to}.
+     *
+     * @param from The position from which to remove the item.
+     * @param to The target position to which to move the item.
+     */
+    void move(int from, int to);
+  }
+
+  /**
+   * Used to evaluate whether two {@link MediaDescriptionCompat} are considered equal.
+   */
+  interface MediaDescriptionEqualityChecker {
+    /**
+     * Returns {@code true} whether the descriptions are considered equal.
+     *
+     * @param d1 The first {@link MediaDescriptionCompat}.
+     * @param d2 The second {@link MediaDescriptionCompat}.
+     * @return {@code true} if considered equal.
+     */
+    boolean equals(MediaDescriptionCompat d1, MediaDescriptionCompat d2);
+  }
+
+  /**
+   * Media description comparator comparing the media IDs. Media IDs are considered equals if both
+   * are {@code null}.
+   */
+  public static final class MediaIdEqualityChecker implements MediaDescriptionEqualityChecker {
+
+    @Override
+    public boolean equals(MediaDescriptionCompat d1, MediaDescriptionCompat d2) {
+      return Util.areEqual(d1.getMediaId(), d2.getMediaId());
+    }
+
+  }
+
+  private final MediaControllerCompat mediaController;
+  private final QueueDataAdapter queueDataAdapter;
+  private final MediaSourceFactory sourceFactory;
+  private final MediaDescriptionEqualityChecker equalityChecker;
+  private final DynamicConcatenatingMediaSource queueMediaSource;
+
+  /**
+   * Creates a new {@link TimelineQueueEditor} with a given mediaSourceFactory.
+   *
+   * @param mediaController A {@link MediaControllerCompat} to read the current queue.
+   * @param queueMediaSource The {@link DynamicConcatenatingMediaSource} to
+   *     manipulate.
+   * @param queueDataAdapter A {@link QueueDataAdapter} to change the backing data.
+   * @param sourceFactory The {@link MediaSourceFactory} to build media sources.
+   */
+  public TimelineQueueEditor(@NonNull MediaControllerCompat mediaController,
+      @NonNull DynamicConcatenatingMediaSource queueMediaSource,
+      @NonNull QueueDataAdapter queueDataAdapter, @NonNull MediaSourceFactory sourceFactory) {
+    this(mediaController, queueMediaSource, queueDataAdapter, sourceFactory,
+        new MediaIdEqualityChecker());
+  }
+
+  /**
+   * Creates a new {@link TimelineQueueEditor} with a given mediaSourceFactory.
+   *
+   * @param mediaController A {@link MediaControllerCompat} to read the current queue.
+   * @param queueMediaSource The {@link DynamicConcatenatingMediaSource} to
+   *     manipulate.
+   * @param queueDataAdapter A {@link QueueDataAdapter} to change the backing data.
+   * @param sourceFactory The {@link MediaSourceFactory} to build media sources.
+   * @param equalityChecker The {@link MediaDescriptionEqualityChecker} to match queue items.
+   */
+  public TimelineQueueEditor(@NonNull MediaControllerCompat mediaController,
+      @NonNull DynamicConcatenatingMediaSource queueMediaSource,
+      @NonNull QueueDataAdapter queueDataAdapter, @NonNull MediaSourceFactory sourceFactory,
+      @NonNull MediaDescriptionEqualityChecker equalityChecker) {
+    this.mediaController = mediaController;
+    this.queueMediaSource = queueMediaSource;
+    this.queueDataAdapter = queueDataAdapter;
+    this.sourceFactory = sourceFactory;
+    this.equalityChecker = equalityChecker;
+  }
+
+  @Override
+  public long getSupportedQueueEditorActions(@Nullable Player player) {
+    return 0;
+  }
+
+  @Override
+  public void onAddQueueItem(Player player, MediaDescriptionCompat description) {
+    onAddQueueItem(player, description, player.getCurrentTimeline().getWindowCount());
+  }
+
+  @Override
+  public void onAddQueueItem(Player player, MediaDescriptionCompat description, int index) {
+    MediaSource mediaSource = sourceFactory.createMediaSource(description);
+    if (mediaSource != null) {
+      queueDataAdapter.add(index, description);
+      queueMediaSource.addMediaSource(index, mediaSource);
+    }
+  }
+
+  @Override
+  public void onRemoveQueueItem(Player player, MediaDescriptionCompat description) {
+    List<MediaSessionCompat.QueueItem> queue = mediaController.getQueue();
+    for (int i = 0; i < queue.size(); i++) {
+      if (equalityChecker.equals(queue.get(i).getDescription(), description)) {
+        onRemoveQueueItemAt(player, i);
+        return;
+      }
+    }
+  }
+
+  @Override
+  public void onRemoveQueueItemAt(Player player, int index) {
+    queueDataAdapter.remove(index);
+    queueMediaSource.removeMediaSource(index);
+  }
+
+  @Override
+  public void onSetRating(Player player, RatingCompat rating) {
+    // Do nothing.
+  }
+
+  // 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) {
+    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);
+    }
+  }
+
+}
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 8c7d3be114b..777949863d4 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
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.ext.mediasession;
 
+import android.os.Bundle;
+import android.os.ResultReceiver;
 import android.support.annotation.Nullable;
 import android.support.v4.media.MediaDescriptionCompat;
 import android.support.v4.media.session.MediaSessionCompat;
@@ -164,6 +166,18 @@ public void onSetShuffleMode(Player player, int shuffleMode) {
     player.setShuffleModeEnabled(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL);
   }
 
+  // CommandReceiver implementation.
+
+  @Override
+  public String[] getCommands() {
+    return null;
+  }
+
+  @Override
+  public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) {
+    // Do nothing.
+  }
+
   private void publishFloatingQueueWindow(Player player) {
     if (player.getCurrentTimeline().isEmpty()) {
       mediaSession.setQueue(Collections.<MediaSessionCompat.QueueItem>emptyList());

From 30b31b56792664ebe181bc497282f075f6add1e5 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 25 Aug 2017 08:37:38 -0700
Subject: [PATCH 156/421] Support empty concatenations and empty timelines in
 concatenations.

Both cases were not supported so far. Added tests which all failed in the
previous code version and adapted the concatenated media sources to cope with
empty timelines and empty concatenations.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166480344
---
 .../source/ConcatenatingMediaSourceTest.java  |  67 ++++++++++-
 .../DynamicConcatenatingMediaSourceTest.java  | 110 +++++++++++++++++-
 .../source/LoopingMediaSourceTest.java        |  17 ++-
 .../google/android/exoplayer2/Timeline.java   |  10 +-
 .../source/AbstractConcatenatedTimeline.java  |  55 ++++++++-
 .../source/ConcatenatingMediaSource.java      |  26 +++--
 .../DynamicConcatenatingMediaSource.java      |  13 ++-
 .../exoplayer2/source/LoopingMediaSource.java |   6 +-
 .../exoplayer2/testutil/TimelineAsserts.java  |   7 +-
 9 files changed, 275 insertions(+), 36 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index fd0acf2ab33..53111e83ace 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -31,11 +31,24 @@
  */
 public final class ConcatenatingMediaSourceTest extends TestCase {
 
+  public void testEmptyConcatenation() {
+    for (boolean atomic : new boolean[] {false, true}) {
+      Timeline timeline = getConcatenatedTimeline(atomic);
+      TimelineAsserts.assertEmpty(timeline);
+
+      timeline = getConcatenatedTimeline(atomic, Timeline.EMPTY);
+      TimelineAsserts.assertEmpty(timeline);
+
+      timeline = getConcatenatedTimeline(atomic, Timeline.EMPTY, Timeline.EMPTY, Timeline.EMPTY);
+      TimelineAsserts.assertEmpty(timeline);
+    }
+  }
+
   public void testSingleMediaSource() {
     Timeline timeline = getConcatenatedTimeline(false, createFakeTimeline(3, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 3);
-    for (boolean shuffled : new boolean[] { false, true }) {
+    for (boolean shuffled : new boolean[] {false, true}) {
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
           C.INDEX_UNSET);
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0);
@@ -49,7 +62,7 @@ public void testSingleMediaSource() {
     timeline = getConcatenatedTimeline(true, createFakeTimeline(3, 111));
     TimelineAsserts.assertWindowIds(timeline, 111);
     TimelineAsserts.assertPeriodCounts(timeline, 3);
-    for (boolean shuffled : new boolean[] { false, true }) {
+    for (boolean shuffled : new boolean[] {false, true}) {
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
           C.INDEX_UNSET);
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 0);
@@ -91,7 +104,7 @@ public void testMultipleMediaSources() {
     timeline = getConcatenatedTimeline(true, timelines);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 3, 1, 3);
-    for (boolean shuffled : new boolean[] { false, true }) {
+    for (boolean shuffled : new boolean[] {false, true}) {
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
           C.INDEX_UNSET, 0, 1);
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
@@ -135,6 +148,54 @@ public void testNestedMediaSources() {
     TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 2, 0, 3, 1);
   }
 
+  public void testEmptyTimelineMediaSources() {
+    // Empty timelines in the front, back, and the middle (single and multiple in a row).
+    Timeline[] timelines = { Timeline.EMPTY, createFakeTimeline(1, 111), Timeline.EMPTY,
+        Timeline.EMPTY, createFakeTimeline(2, 222), Timeline.EMPTY, createFakeTimeline(3, 333),
+        Timeline.EMPTY };
+    Timeline timeline = getConcatenatedTimeline(false, timelines);
+    TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
+    TimelineAsserts.assertPeriodCounts(timeline, 1, 2, 3);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 1, 2, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 2, 0, 1);
+    assertEquals(0, timeline.getFirstWindowIndex(false));
+    assertEquals(2, timeline.getLastWindowIndex(false));
+    assertEquals(2, timeline.getFirstWindowIndex(true));
+    assertEquals(0, timeline.getLastWindowIndex(true));
+
+    timeline = getConcatenatedTimeline(true, timelines);
+    TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
+    TimelineAsserts.assertPeriodCounts(timeline, 1, 2, 3);
+    for (boolean shuffled : new boolean[] {false, true}) {
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          C.INDEX_UNSET, 0, 1);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
+          2, 0, 1);
+      TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled,
+          2, 0, 1);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
+          1, 2, C.INDEX_UNSET);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled, 1, 2, 0);
+      TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, shuffled, 1, 2, 0);
+      assertEquals(0, timeline.getFirstWindowIndex(shuffled));
+      assertEquals(2, timeline.getLastWindowIndex(shuffled));
+    }
+  }
+
   /**
    * Wraps the specified timelines in a {@link ConcatenatingMediaSource} and returns
    * the concatenated timeline.
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index 0e07e999788..86c03d1ce80 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
+import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Looper;
@@ -25,7 +26,10 @@
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
+import com.google.android.exoplayer2.source.MediaPeriod.Callback;
 import com.google.android.exoplayer2.source.MediaSource.Listener;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+import com.google.android.exoplayer2.testutil.FakeMediaPeriod;
 import com.google.android.exoplayer2.testutil.FakeMediaSource;
 import com.google.android.exoplayer2.testutil.FakeShuffleOrder;
 import com.google.android.exoplayer2.testutil.FakeTimeline;
@@ -53,13 +57,13 @@ public void testPlaylistChangesAfterPreparation() throws InterruptedException {
     DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource(
         new FakeShuffleOrder(0));
     prepareAndListenToTimelineUpdates(mediaSource);
+    assertNotNull(timeline);
     waitForTimelineUpdate();
     TimelineAsserts.assertEmpty(timeline);
 
     // Add first source.
     mediaSource.addMediaSource(childSources[0]);
     waitForTimelineUpdate();
-    assertNotNull(timeline);
     TimelineAsserts.assertPeriodCounts(timeline, 1);
     TimelineAsserts.assertWindowIds(timeline, 111);
 
@@ -143,6 +147,9 @@ public void testPlaylistChangesAfterPreparation() throws InterruptedException {
     assertEquals(timeline.getWindowCount() - 1, timeline.getFirstWindowIndex(true));
     assertEquals(0, timeline.getLastWindowIndex(true));
 
+    // Assert all periods can be prepared.
+    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
+
     // Remove at front of queue.
     mediaSource.removeMediaSource(0);
     waitForTimelineUpdate();
@@ -192,6 +199,7 @@ public void testPlaylistChangesBeforePreparation() throws InterruptedException {
     TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
         1, 2, C.INDEX_UNSET);
 
+    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
     mediaSource.releaseSource();
     for (int i = 1; i < 4; i++) {
       childSources[i].assertReleased();
@@ -225,8 +233,9 @@ public void testPlaylistWithLazyMediaSource() throws InterruptedException {
     TimelineAsserts.assertPeriodCounts(timeline, 1, 9);
     TimelineAsserts.assertWindowIds(timeline, 111, 999);
     TimelineAsserts.assertWindowIsDynamic(timeline, false, false);
+    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
 
-    //Add lazy sources after preparation
+    //Add lazy sources after preparation (and also try to prepare media period from lazy source).
     mediaSource.addMediaSource(1, lazySources[2]);
     waitForTimelineUpdate();
     mediaSource.addMediaSource(2, childSources[1]);
@@ -239,17 +248,90 @@ public void testPlaylistWithLazyMediaSource() throws InterruptedException {
     TimelineAsserts.assertWindowIds(timeline, null, 111, 222, 999);
     TimelineAsserts.assertWindowIsDynamic(timeline, true, false, false, false);
 
+    MediaPeriod lazyPeriod = mediaSource.createPeriod(new MediaPeriodId(0), null);
+    assertNotNull(lazyPeriod);
+    final ConditionVariable lazyPeriodPrepared = new ConditionVariable();
+    lazyPeriod.prepare(new Callback() {
+      @Override
+      public void onPrepared(MediaPeriod mediaPeriod) {
+        lazyPeriodPrepared.open();
+      }
+      @Override
+      public void onContinueLoadingRequested(MediaPeriod source) {}
+    }, 0);
+    assertFalse(lazyPeriodPrepared.block(1));
+    MediaPeriod secondLazyPeriod = mediaSource.createPeriod(new MediaPeriodId(0), null);
+    assertNotNull(secondLazyPeriod);
+    mediaSource.releasePeriod(secondLazyPeriod);
+
     lazySources[3].triggerTimelineUpdate(createFakeTimeline(7));
     waitForTimelineUpdate();
     TimelineAsserts.assertPeriodCounts(timeline, 8, 1, 2, 9);
     TimelineAsserts.assertWindowIds(timeline, 888, 111, 222, 999);
     TimelineAsserts.assertWindowIsDynamic(timeline, false, false, false, false);
+    assertTrue(lazyPeriodPrepared.block(TIMEOUT_MS));
+    mediaSource.releasePeriod(lazyPeriod);
 
     mediaSource.releaseSource();
     childSources[0].assertReleased();
     childSources[1].assertReleased();
   }
 
+  public void testEmptyTimelineMediaSource() throws InterruptedException {
+    timeline = null;
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource(
+        new FakeShuffleOrder(0));
+    prepareAndListenToTimelineUpdates(mediaSource);
+    assertNotNull(timeline);
+    waitForTimelineUpdate();
+    TimelineAsserts.assertEmpty(timeline);
+
+    mediaSource.addMediaSource(new FakeMediaSource(Timeline.EMPTY, null));
+    waitForTimelineUpdate();
+    TimelineAsserts.assertEmpty(timeline);
+
+    mediaSource.addMediaSources(Arrays.asList(new MediaSource[] {
+        new FakeMediaSource(Timeline.EMPTY, null), new FakeMediaSource(Timeline.EMPTY, null),
+        new FakeMediaSource(Timeline.EMPTY, null), new FakeMediaSource(Timeline.EMPTY, null),
+        new FakeMediaSource(Timeline.EMPTY, null), new FakeMediaSource(Timeline.EMPTY, null)
+    }));
+    waitForTimelineUpdate();
+    TimelineAsserts.assertEmpty(timeline);
+
+    // Insert non-empty media source to leave empty sources at the start, the end, and the middle
+    // (with single and multiple empty sources in a row).
+    MediaSource[] mediaSources = createMediaSources(3);
+    mediaSource.addMediaSource(1, mediaSources[0]);
+    waitForTimelineUpdate();
+    mediaSource.addMediaSource(4, mediaSources[1]);
+    waitForTimelineUpdate();
+    mediaSource.addMediaSource(6, mediaSources[2]);
+    waitForTimelineUpdate();
+    TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
+    TimelineAsserts.assertPeriodCounts(timeline, 1, 2, 3);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 2, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, false,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, false, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, false, 1, 2, 0);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        1, 2, C.INDEX_UNSET);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 1, 2, 0);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
+        C.INDEX_UNSET, 0, 1);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ONE, true, 0, 1, 2);
+    TimelineAsserts.assertNextWindowIndices(timeline, Player.REPEAT_MODE_ALL, true, 2, 0, 1);
+    assertEquals(0, timeline.getFirstWindowIndex(false));
+    assertEquals(2, timeline.getLastWindowIndex(false));
+    assertEquals(2, timeline.getFirstWindowIndex(true));
+    assertEquals(0, timeline.getLastWindowIndex(true));
+    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
+  }
+
   public void testIllegalArguments() {
     DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
     MediaSource validSource = new FakeMediaSource(createFakeTimeline(1), null);
@@ -325,6 +407,28 @@ private static FakeTimeline createFakeTimeline(int index) {
     return new FakeTimeline(new TimelineWindowDefinition(index + 1, (index + 1) * 111));
   }
 
+  private static void assertAllPeriodsCanBeCreatedPreparedAndReleased(MediaSource mediaSource,
+      int periodCount) {
+    for (int i = 0; i < periodCount; i++) {
+      MediaPeriod mediaPeriod = mediaSource.createPeriod(new MediaPeriodId(i), null);
+      assertNotNull(mediaPeriod);
+      final ConditionVariable mediaPeriodPrepared = new ConditionVariable();
+      mediaPeriod.prepare(new Callback() {
+        @Override
+        public void onPrepared(MediaPeriod mediaPeriod) {
+          mediaPeriodPrepared.open();
+        }
+        @Override
+        public void onContinueLoadingRequested(MediaPeriod source) {}
+      }, 0);
+      assertTrue(mediaPeriodPrepared.block(TIMEOUT_MS));
+      MediaPeriod secondMediaPeriod = mediaSource.createPeriod(new MediaPeriodId(i), null);
+      assertNotNull(secondMediaPeriod);
+      mediaSource.releasePeriod(secondMediaPeriod);
+      mediaSource.releasePeriod(mediaPeriod);
+    }
+  }
+
   private static class LazyMediaSource implements MediaSource {
 
     private Listener listener;
@@ -344,7 +448,7 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
 
     @Override
     public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
-      return null;
+      return new FakeMediaPeriod(TrackGroupArray.EMPTY);
     }
 
     @Override
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
index 52c313ed47a..2c8deb74b46 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/LoopingMediaSourceTest.java
@@ -42,7 +42,7 @@ public void testSingleLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, 1);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1);
-    for (boolean shuffled : new boolean[] { false, true }) {
+    for (boolean shuffled : new boolean[] {false, true}) {
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
           C.INDEX_UNSET, 0, 1);
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
@@ -60,7 +60,7 @@ public void testMultiLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, 3);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333, 111, 222, 333, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1, 1, 1, 1, 1, 1, 1);
-    for (boolean shuffled : new boolean[] { false, true }) {
+    for (boolean shuffled : new boolean[] {false, true}) {
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
           C.INDEX_UNSET, 0, 1, 2, 3, 4, 5, 6, 7, 8);
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
@@ -80,7 +80,7 @@ public void testInfiniteLoop() {
     Timeline timeline = getLoopingTimeline(multiWindowTimeline, Integer.MAX_VALUE);
     TimelineAsserts.assertWindowIds(timeline, 111, 222, 333);
     TimelineAsserts.assertPeriodCounts(timeline, 1, 1, 1);
-    for (boolean shuffled : new boolean[] { false, true }) {
+    for (boolean shuffled : new boolean[] {false, true}) {
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, shuffled,
           2, 0, 1);
       TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_ONE, shuffled,
@@ -93,6 +93,17 @@ public void testInfiniteLoop() {
     }
   }
 
+  public void testEmptyTimelineLoop() {
+    Timeline timeline = getLoopingTimeline(Timeline.EMPTY, 1);
+    TimelineAsserts.assertEmpty(timeline);
+
+    timeline = getLoopingTimeline(Timeline.EMPTY, 3);
+    TimelineAsserts.assertEmpty(timeline);
+
+    timeline = getLoopingTimeline(Timeline.EMPTY, Integer.MAX_VALUE);
+    TimelineAsserts.assertEmpty(timeline);
+  }
+
   /**
    * Wraps the specified timeline in a {@link LoopingMediaSource} and returns
    * the looping timeline.
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 8a1d7964eea..b83a99295a3 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
@@ -606,10 +606,11 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
    * enabled.
    *
    * @param shuffleModeEnabled Whether shuffling is enabled.
-   * @return The index of the last window in the playback order.
+   * @return The index of the last window in the playback order, or {@link C#INDEX_UNSET} if the
+   *     timeline is empty.
    */
   public int getLastWindowIndex(boolean shuffleModeEnabled) {
-    return getWindowCount() - 1;
+    return isEmpty() ? C.INDEX_UNSET : getWindowCount() - 1;
   }
 
   /**
@@ -617,10 +618,11 @@ public int getLastWindowIndex(boolean shuffleModeEnabled) {
    * enabled.
    *
    * @param shuffleModeEnabled Whether shuffling is enabled.
-   * @return The index of the first window in the playback order.
+   * @return The index of the first window in the playback order, or {@link C#INDEX_UNSET} if the
+   *     timeline is empty.
    */
   public int getFirstWindowIndex(boolean shuffleModeEnabled) {
-    return 0;
+    return isEmpty() ? C.INDEX_UNSET : 0;
   }
 
   /**
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
index 07813ff0468..35234753b09 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/AbstractConcatenatedTimeline.java
@@ -42,6 +42,7 @@ public AbstractConcatenatedTimeline(ShuffleOrder shuffleOrder) {
   @Override
   public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
       boolean shuffleModeEnabled) {
+    // Find next window within current child.
     int childIndex = getChildIndexByWindowIndex(windowIndex);
     int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
     int nextWindowIndexInChild = getTimelineByChildIndex(childIndex).getNextWindowIndex(
@@ -51,12 +52,16 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
     if (nextWindowIndexInChild != C.INDEX_UNSET) {
       return firstWindowIndexInChild + nextWindowIndexInChild;
     }
-    int nextChildIndex = shuffleModeEnabled ? shuffleOrder.getNextIndex(childIndex)
-        : childIndex + 1;
-    if (nextChildIndex != C.INDEX_UNSET && nextChildIndex < childCount) {
+    // If not found, find first window of next non-empty child.
+    int nextChildIndex = getNextChildIndex(childIndex, shuffleModeEnabled);
+    while (nextChildIndex != C.INDEX_UNSET && getTimelineByChildIndex(nextChildIndex).isEmpty()) {
+      nextChildIndex = getNextChildIndex(nextChildIndex, shuffleModeEnabled);
+    }
+    if (nextChildIndex != C.INDEX_UNSET) {
       return getFirstWindowIndexByChildIndex(nextChildIndex)
           + getTimelineByChildIndex(nextChildIndex).getFirstWindowIndex(shuffleModeEnabled);
     }
+    // If not found, this is the last window.
     if (repeatMode == Player.REPEAT_MODE_ALL) {
       return getFirstWindowIndex(shuffleModeEnabled);
     }
@@ -66,6 +71,7 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
   @Override
   public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode,
       boolean shuffleModeEnabled) {
+    // Find previous window within current child.
     int childIndex = getChildIndexByWindowIndex(windowIndex);
     int firstWindowIndexInChild = getFirstWindowIndexByChildIndex(childIndex);
     int previousWindowIndexInChild = getTimelineByChildIndex(childIndex).getPreviousWindowIndex(
@@ -75,12 +81,17 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
     if (previousWindowIndexInChild != C.INDEX_UNSET) {
       return firstWindowIndexInChild + previousWindowIndexInChild;
     }
-    int previousChildIndex = shuffleModeEnabled ? shuffleOrder.getPreviousIndex(childIndex)
-        : childIndex - 1;
-    if (previousChildIndex != C.INDEX_UNSET && previousChildIndex >= 0) {
+    // If not found, find last window of previous non-empty child.
+    int previousChildIndex = getPreviousChildIndex(childIndex, shuffleModeEnabled);
+    while (previousChildIndex != C.INDEX_UNSET
+        && getTimelineByChildIndex(previousChildIndex).isEmpty()) {
+      previousChildIndex = getPreviousChildIndex(previousChildIndex, shuffleModeEnabled);
+    }
+    if (previousChildIndex != C.INDEX_UNSET) {
       return getFirstWindowIndexByChildIndex(previousChildIndex)
           + getTimelineByChildIndex(previousChildIndex).getLastWindowIndex(shuffleModeEnabled);
     }
+    // If not found, this is the first window.
     if (repeatMode == Player.REPEAT_MODE_ALL) {
       return getLastWindowIndex(shuffleModeEnabled);
     }
@@ -89,14 +100,36 @@ public int getPreviousWindowIndex(int windowIndex, @Player.RepeatMode int repeat
 
   @Override
   public int getLastWindowIndex(boolean shuffleModeEnabled) {
+    if (childCount == 0) {
+      return C.INDEX_UNSET;
+    }
+    // Find last non-empty child.
     int lastChildIndex = shuffleModeEnabled ? shuffleOrder.getLastIndex() : childCount - 1;
+    while (getTimelineByChildIndex(lastChildIndex).isEmpty()) {
+      lastChildIndex = getPreviousChildIndex(lastChildIndex, shuffleModeEnabled);
+      if (lastChildIndex == C.INDEX_UNSET) {
+        // All children are empty.
+        return C.INDEX_UNSET;
+      }
+    }
     return getFirstWindowIndexByChildIndex(lastChildIndex)
         + getTimelineByChildIndex(lastChildIndex).getLastWindowIndex(shuffleModeEnabled);
   }
 
   @Override
   public int getFirstWindowIndex(boolean shuffleModeEnabled) {
+    if (childCount == 0) {
+      return C.INDEX_UNSET;
+    }
+    // Find first non-empty child.
     int firstChildIndex = shuffleModeEnabled ? shuffleOrder.getFirstIndex() : 0;
+    while (getTimelineByChildIndex(firstChildIndex).isEmpty()) {
+      firstChildIndex = getNextChildIndex(firstChildIndex, shuffleModeEnabled);
+      if (firstChildIndex == C.INDEX_UNSET) {
+        // All children are empty.
+        return C.INDEX_UNSET;
+      }
+    }
     return getFirstWindowIndexByChildIndex(firstChildIndex)
         + getTimelineByChildIndex(firstChildIndex).getFirstWindowIndex(shuffleModeEnabled);
   }
@@ -196,4 +229,14 @@ public final int getIndexOfPeriod(Object uid) {
    */
   protected abstract Object getChildUidByChildIndex(int childIndex);
 
+  private int getNextChildIndex(int childIndex, boolean shuffleModeEnabled) {
+    return shuffleModeEnabled ? shuffleOrder.getNextIndex(childIndex)
+        : childIndex < childCount - 1 ? childIndex + 1 : C.INDEX_UNSET;
+  }
+
+  private int getPreviousChildIndex(int childIndex, boolean shuffleModeEnabled) {
+    return shuffleModeEnabled ? shuffleOrder.getPreviousIndex(childIndex)
+        : childIndex > 0 ? childIndex - 1 : C.INDEX_UNSET;
+  }
+
 }
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 0c7bcece688..4cf3843ea13 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
@@ -90,15 +90,19 @@ public ConcatenatingMediaSource(boolean isAtomic, ShuffleOrder shuffleOrder,
   @Override
   public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
     this.listener = listener;
-    for (int i = 0; i < mediaSources.length; i++) {
-      if (!duplicateFlags[i]) {
-        final int index = i;
-        mediaSources[i].prepareSource(player, false, new Listener() {
-          @Override
-          public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
-            handleSourceInfoRefreshed(index, timeline, manifest);
-          }
-        });
+    if (mediaSources.length == 0) {
+      listener.onSourceInfoRefreshed(Timeline.EMPTY, null);
+    } else {
+      for (int i = 0; i < mediaSources.length; i++) {
+        if (!duplicateFlags[i]) {
+          final int index = i;
+          mediaSources[i].prepareSource(player, false, new Listener() {
+            @Override
+            public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+              handleSourceInfoRefreshed(index, timeline, manifest);
+            }
+          });
+        }
       }
     }
   }
@@ -245,12 +249,12 @@ public int getFirstWindowIndex(boolean shuffleModeEnabled) {
 
     @Override
     protected int getChildIndexByPeriodIndex(int periodIndex) {
-      return Util.binarySearchFloor(sourcePeriodOffsets, periodIndex, true, false) + 1;
+      return Util.binarySearchFloor(sourcePeriodOffsets, periodIndex + 1, false, false) + 1;
     }
 
     @Override
     protected int getChildIndexByWindowIndex(int windowIndex) {
-      return Util.binarySearchFloor(sourceWindowOffsets, windowIndex, true, false) + 1;
+      return Util.binarySearchFloor(sourceWindowOffsets, windowIndex + 1, false, false) + 1;
     }
 
     @Override
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 9c1e7ec1ba6..8614cf9c85e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -395,7 +395,14 @@ private void correctOffsets(int startIndex, int windowOffsetUpdate, int periodOf
   private int findMediaSourceHolderByPeriodIndex(int periodIndex) {
     query.firstPeriodIndexInChild = periodIndex;
     int index = Collections.binarySearch(mediaSourceHolders, query);
-    return index >= 0 ? index : -index - 2;
+    if (index < 0) {
+      return -index - 2;
+    }
+    while (index < mediaSourceHolders.size() - 1
+        && mediaSourceHolders.get(index + 1).firstPeriodIndexInChild == periodIndex) {
+      index++;
+    }
+    return index;
   }
 
   private static final class MediaSourceHolder implements Comparable<MediaSourceHolder> {
@@ -456,12 +463,12 @@ public ConcatenatedTimeline(Collection<MediaSourceHolder> mediaSourceHolders, in
 
     @Override
     protected int getChildIndexByPeriodIndex(int periodIndex) {
-      return Util.binarySearchFloor(firstPeriodInChildIndices, periodIndex, true, false);
+      return Util.binarySearchFloor(firstPeriodInChildIndices, periodIndex + 1, false, false);
     }
 
     @Override
     protected int getChildIndexByWindowIndex(int windowIndex) {
-      return Util.binarySearchFloor(firstWindowInChildIndices, windowIndex, true, false);
+      return Util.binarySearchFloor(firstWindowInChildIndices, windowIndex + 1, false, false);
     }
 
     @Override
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 00e3c50506a..b23b36dcf3c 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
@@ -107,8 +107,10 @@ public LoopingTimeline(Timeline childTimeline, int loopCount) {
       childPeriodCount = childTimeline.getPeriodCount();
       childWindowCount = childTimeline.getWindowCount();
       this.loopCount = loopCount;
-      Assertions.checkState(loopCount <= Integer.MAX_VALUE / childPeriodCount,
-          "LoopingMediaSource contains too many periods");
+      if (childPeriodCount > 0) {
+        Assertions.checkState(loopCount <= Integer.MAX_VALUE / childPeriodCount,
+            "LoopingMediaSource contains too many periods");
+      }
     }
 
     @Override
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
index 74129a0e69b..c61aac708cf 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
@@ -36,6 +36,10 @@ private TimelineAsserts() {}
   public static void assertEmpty(Timeline timeline) {
     assertWindowIds(timeline);
     assertPeriodCounts(timeline);
+    for (boolean shuffled : new boolean[] {false, true}) {
+      assertEquals(C.INDEX_UNSET, timeline.getFirstWindowIndex(shuffled));
+      assertEquals(C.INDEX_UNSET, timeline.getLastWindowIndex(shuffled));
+    }
   }
 
   /**
@@ -119,8 +123,9 @@ public static void assertPeriodCounts(Timeline timeline, int... expectedPeriodCo
         expectedWindowIndex++;
       }
       assertEquals(expectedWindowIndex, period.windowIndex);
+      assertEquals(i, timeline.getIndexOfPeriod(period.uid));
       for (@Player.RepeatMode int repeatMode
-          : new int[] { Player.REPEAT_MODE_OFF, Player.REPEAT_MODE_ONE, Player.REPEAT_MODE_ALL }) {
+          : new int[] {Player.REPEAT_MODE_OFF, Player.REPEAT_MODE_ONE, Player.REPEAT_MODE_ALL}) {
         if (i < accumulatedPeriodCounts[expectedWindowIndex + 1] - 1) {
           assertEquals(i + 1, timeline.getNextPeriodIndex(i, period, window, repeatMode, false));
         } else {

From cc58b515b773be93ba4572d5ac221cae856ee1ae Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 25 Aug 2017 09:35:10 -0700
Subject: [PATCH 157/421] Make Downloaders open source

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166486294
---
 .../google/android/exoplayer2/offline/DownloadException.java   | 2 --
 .../java/com/google/android/exoplayer2/offline/Downloader.java | 2 --
 .../exoplayer2/offline/DownloaderConstructorHelper.java        | 2 --
 .../android/exoplayer2/offline/ProgressiveDownloader.java      | 2 --
 .../google/android/exoplayer2/offline/SegmentDownloader.java   | 2 --
 .../exoplayer2/source/hls/offline/HlsDownloadTestData.java     | 3 ---
 .../exoplayer2/source/hls/offline/HlsDownloaderTest.java       | 2 --
 .../android/exoplayer2/source/hls/offline/HlsDownloader.java   | 2 --
 .../source/smoothstreaming/offline/SsDownloader.java           | 2 --
 .../android/exoplayer2/playbacktests/gts/DashDownloadTest.java | 2 --
 10 files changed, 21 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
index 239195892c4..730ce2d3e89 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
@@ -15,11 +15,9 @@
  */
 package com.google.android.exoplayer2.offline;
 
-import com.google.android.exoplayer2.util.ClosedSource;
 import java.io.IOException;
 
 /** Thrown on an error during downloading. */
-@ClosedSource(reason = "Not ready yet")
 public final class DownloadException extends IOException {
 
   /** @param message The message for the exception. */
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 a130bb40528..b8d9432c637 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
@@ -17,13 +17,11 @@
 
 import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.util.ClosedSource;
 import java.io.IOException;
 
 /**
  * An interface for stream downloaders.
  */
-@ClosedSource(reason = "Not ready yet")
 public interface Downloader {
 
   /**
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 5f9a4d973aa..9ef9366397f 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,11 +27,9 @@
 import com.google.android.exoplayer2.upstream.cache.CacheDataSink;
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.util.Assertions;
-import com.google.android.exoplayer2.util.ClosedSource;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 
 /** A helper class that holds necessary parameters for {@link Downloader} construction. */
-@ClosedSource(reason = "Not ready yet")
 public final class DownloaderConstructorHelper {
 
   private final Cache cache;
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 c6bb3bc4326..e5aa4294247 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,14 +23,12 @@
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
-import com.google.android.exoplayer2.util.ClosedSource;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import java.io.IOException;
 
 /**
  * A downloader for progressive media streams.
  */
-@ClosedSource(reason = "Not ready yet")
 public final class ProgressiveDownloader implements Downloader {
 
   private static final int BUFFER_SIZE_BYTES = 128 * 1024;
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 93e7c57470f..d81df90b813 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
@@ -25,7 +25,6 @@
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil;
 import com.google.android.exoplayer2.upstream.cache.CacheUtil.CachingCounters;
-import com.google.android.exoplayer2.util.ClosedSource;
 import com.google.android.exoplayer2.util.PriorityTaskManager;
 import java.io.IOException;
 import java.util.Collections;
@@ -40,7 +39,6 @@
  * @param <M> The type of the manifest object.
  * @param <K> The type of the representation key object.
  */
-@ClosedSource(reason = "Not ready yet")
 public abstract class SegmentDownloader<M, K> implements Downloader {
 
   /** Smallest unit of content to be downloaded. */
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
index 133bf19dba4..ec70fb12002 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java
@@ -15,12 +15,9 @@
  */
 package com.google.android.exoplayer2.source.hls.offline;
 
-import com.google.android.exoplayer2.util.ClosedSource;
-
 /**
  * Data for HLS downloading tests.
  */
-@ClosedSource(reason = "Not ready yet")
 /* package */ interface HlsDownloadTestData {
 
   String MASTER_PLAYLIST_URI = "test.m3u8";
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
index 28afe450ebf..ebf73ebfd79 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java
@@ -39,12 +39,10 @@
 import com.google.android.exoplayer2.testutil.FakeDataSource.Factory;
 import com.google.android.exoplayer2.upstream.cache.NoOpCacheEvictor;
 import com.google.android.exoplayer2.upstream.cache.SimpleCache;
-import com.google.android.exoplayer2.util.ClosedSource;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 
 /** Unit tests for {@link HlsDownloader}. */
-@ClosedSource(reason = "Not ready yet")
 public class HlsDownloaderTest extends InstrumentationTestCase {
 
   private SimpleCache cache;
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 488b85e78a1..ac8ec5ee5e9 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
@@ -27,7 +27,6 @@
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import com.google.android.exoplayer2.util.ClosedSource;
 import com.google.android.exoplayer2.util.UriUtil;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -41,7 +40,6 @@
  * #selectRepresentations(Object[])}. As key, string form of the rendition's url is used. The urls
  * can be absolute or relative to the master playlist url.
  */
-@ClosedSource(reason = "Not ready yet")
 public final class HlsDownloader extends SegmentDownloader<HlsMasterPlaylist, String> {
 
   /**
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 fe9c21d8551..21cacdc6f3e 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
@@ -26,7 +26,6 @@
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
-import com.google.android.exoplayer2.util.ClosedSource;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
@@ -60,7 +59,6 @@
  *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);}
  * </pre>
  */
-@ClosedSource(reason = "Not ready yet")
 public final class SsDownloader extends SegmentDownloader<SsManifest, TrackKey> {
 
   /**
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 706dd72166e..66884f3e5be 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
@@ -32,7 +32,6 @@
 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.ClosedSource;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
@@ -43,7 +42,6 @@
 /**
  * Tests downloaded DASH playbacks.
  */
-@ClosedSource(reason = "Not ready yet")
 public final class DashDownloadTest extends ActivityInstrumentationTestCase2<HostActivity> {
 
   private static final String TAG = "DashDownloadTest";

From ba6d208fe95b9c9eef431fdd6f6185794154e1a7 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 29 Aug 2017 02:15:08 -0700
Subject: [PATCH 158/421] Use Math.abs in Sonic.java

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

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
index ef7877ae1ef..5c5ac06da3a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
@@ -241,7 +241,7 @@ private int findPitchPeriodInRange(short[] samples, int position, int minPeriod,
       for (int i = 0; i < period; i++) {
         short sVal = samples[position + i];
         short pVal = samples[position + period + i];
-        diff += sVal >= pVal ? sVal - pVal : pVal - sVal;
+        diff += Math.abs(sVal - pVal);
       }
       // Note that the highest number of samples we add into diff will be less than 256, since we
       // skip samples. Thus, diff is a 24 bit number, and we can safely multiply by numSamples

From 3e762270062726a690be50d285474175c81ae91f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 07:17:24 -0700
Subject: [PATCH 159/421] Don't copy primary-track format to non-primary tracks

Copying non-primary-track formats to non-primary tracks
looks non-trivial (I tried; went down a dead-end), so
leaving that for now.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166843123
---
 .../source/chunk/BaseMediaChunkOutput.java    | 27 +++++++++++++++----
 .../source/chunk/ChunkExtractorWrapper.java   | 24 ++++++++++++-----
 .../source/chunk/ChunkSampleStream.java       | 10 ++-----
 3 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
index 9531aaf32e8..0b6c196d7cf 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
+import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.extractor.DummyTrackOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
@@ -32,12 +33,23 @@
   private final SampleQueue[] sampleQueues;
 
   /**
-   * @param trackTypes The track types of the individual track outputs.
-   * @param sampleQueues The individual sample queues.
+   * @param primaryTrackType The type of the primary track.
+   * @param primarySampleQueue The primary track sample queues.
+   * @param embeddedTrackTypes The types of any embedded tracks, or null.
+   * @param embeddedSampleQueues The track sample queues for any embedded tracks, or null.
    */
-  public BaseMediaChunkOutput(int[] trackTypes, SampleQueue[] sampleQueues) {
-    this.trackTypes = trackTypes;
-    this.sampleQueues = sampleQueues;
+  @SuppressWarnings("ConstantConditions")
+  public BaseMediaChunkOutput(int primaryTrackType, SampleQueue primarySampleQueue,
+      @Nullable int[] embeddedTrackTypes, @Nullable SampleQueue[] embeddedSampleQueues) {
+    int embeddedTrackCount = embeddedTrackTypes == null ? 0 : embeddedTrackTypes.length;
+    trackTypes = new int[1 + embeddedTrackCount];
+    sampleQueues = new SampleQueue[1 + embeddedTrackCount];
+    trackTypes[0] = primaryTrackType;
+    sampleQueues[0] = primarySampleQueue;
+    for (int i = 0; i < embeddedTrackCount; i++) {
+      trackTypes[i + 1] = embeddedTrackTypes[i];
+      sampleQueues[i + 1] = embeddedSampleQueues[i];
+    }
   }
 
   @Override
@@ -51,6 +63,11 @@ public TrackOutput track(int id, int type) {
     return new DummyTrackOutput();
   }
 
+  @Override
+  public boolean isPrimaryTrack(int type) {
+    return type == trackTypes[0];
+  }
+
   /**
    * Returns the current absolute write indices of the individual sample queues.
    */
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 07d1cce8cba..eda9ed3cf75 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
@@ -45,13 +45,22 @@ public interface TrackOutputProvider {
      * <p>
      * The same {@link TrackOutput} is returned if multiple calls are made with the same {@code id}.
      *
-     * @param id A track identifier.
-     * @param type The type of the track. Typically one of the
-     *     {@link com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
+     * @param id The track identifier.
+     * @param type The track type. Typically one of the {@link com.google.android.exoplayer2.C}
+     *     {@code TRACK_TYPE_*} constants.
      * @return The {@link TrackOutput} for the given track identifier.
      */
     TrackOutput track(int id, int type);
 
+    /**
+     * Returns whether the specified type corresponds to the primary track.
+     *
+     * @param type The track type. Typically one of the {@link com.google.android.exoplayer2.C}
+     *     {@code TRACK_TYPE_*} constants.
+     * @return Whether {@code type} corresponds to the primary track.
+     */
+    boolean isPrimaryTrack(int type);
+
   }
 
   public final Extractor extractor;
@@ -146,6 +155,7 @@ private static final class BindingTrackOutput implements TrackOutput {
     private final Format manifestFormat;
 
     public Format sampleFormat;
+    private boolean isPrimaryTrack;
     private TrackOutput trackOutput;
 
     public BindingTrackOutput(int id, int type, Format manifestFormat) {
@@ -159,17 +169,17 @@ public void bind(TrackOutputProvider trackOutputProvider) {
         trackOutput = new DummyTrackOutput();
         return;
       }
+      isPrimaryTrack = trackOutputProvider.isPrimaryTrack(type);
       trackOutput = trackOutputProvider.track(id, type);
-      if (trackOutput != null) {
+      if (sampleFormat != null) {
         trackOutput.format(sampleFormat);
       }
     }
 
     @Override
     public void format(Format format) {
-      // TODO: This should only happen for the primary track. Additional metadata/text tracks need
-      // to be copied with different manifest derived formats.
-      sampleFormat = format.copyWithManifestFormatInfo(manifestFormat);
+      // TODO: Non-primary tracks should be copied with data from their own manifest formats.
+      sampleFormat = isPrimaryTrack ? format.copyWithManifestFormatInfo(manifestFormat) : format;
       trackOutput.format(sampleFormat);
     }
 
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 f2609a0ffdd..e8586f72305 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
@@ -87,21 +87,15 @@ public ChunkSampleStream(int primaryTrackType, int[] embeddedTrackTypes, T chunk
     int embeddedTrackCount = embeddedTrackTypes == null ? 0 : embeddedTrackTypes.length;
     embeddedSampleQueues = new SampleQueue[embeddedTrackCount];
     embeddedTracksSelected = new boolean[embeddedTrackCount];
-    int[] trackTypes = new int[1 + embeddedTrackCount];
-    SampleQueue[] sampleQueues = new SampleQueue[1 + embeddedTrackCount];
 
     primarySampleQueue = new SampleQueue(allocator);
-    trackTypes[0] = primaryTrackType;
-    sampleQueues[0] = primarySampleQueue;
-
     for (int i = 0; i < embeddedTrackCount; i++) {
       SampleQueue sampleQueue = new SampleQueue(allocator);
       embeddedSampleQueues[i] = sampleQueue;
-      sampleQueues[i + 1] = sampleQueue;
-      trackTypes[i + 1] = embeddedTrackTypes[i];
     }
 
-    mediaChunkOutput = new BaseMediaChunkOutput(trackTypes, sampleQueues);
+    mediaChunkOutput = new BaseMediaChunkOutput(primaryTrackType, primarySampleQueue,
+        embeddedTrackTypes, embeddedSampleQueues);
     pendingResetPositionUs = positionUs;
     lastSeekPositionUs = positionUs;
   }

From f44e30c7543e63bb8aec54f27626d4c70e808c48 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 07:19:48 -0700
Subject: [PATCH 160/421] Fix mapping CLEARKEY_UUID to COMMON_PSSH_UUID

This mapping when we call into platform components also needs
to be applied when creating the MediaCrypto instance. The fix
is to stop propagating the UUID through all the createMediaCrypto
methods. This is unnecessary, since the eventual target already
knows its own UUID!

Issue: #3138

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166843372
---
 .../android/exoplayer2/drm/DefaultDrmSession.java     |  2 +-
 .../google/android/exoplayer2/drm/DrmInitData.java    |  2 +-
 .../google/android/exoplayer2/drm/ExoMediaDrm.java    |  4 +---
 .../android/exoplayer2/drm/FrameworkMediaDrm.java     | 11 +++++------
 4 files changed, 8 insertions(+), 11 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 cfb2cf9d8aa..b4dab7b9715 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
@@ -226,7 +226,7 @@ private boolean openInternal(boolean allowProvisioning) {
 
     try {
       sessionId = mediaDrm.openSession();
-      mediaCrypto = mediaDrm.createMediaCrypto(uuid, sessionId);
+      mediaCrypto = mediaDrm.createMediaCrypto(sessionId);
       state = STATE_OPENED;
       return true;
     } catch (NotProvisionedException e) {
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 9fa6547a00b..d814ece31da 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
@@ -60,7 +60,7 @@ private DrmInitData(boolean cloneSchemeDatas, SchemeData... schemeDatas) {
     if (cloneSchemeDatas) {
       schemeDatas = schemeDatas.clone();
     }
-    // Sorting ensures that universal scheme data(i.e. data that applies to all schemes) is matched
+    // 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);
     // Check for no duplicates.
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 3d765dbef51..63387f19e16 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
@@ -22,7 +22,6 @@
 import android.media.ResourceBusyException;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.UUID;
 
 /**
  * Used to obtain keys for decrypting protected media streams. See {@link android.media.MediaDrm}.
@@ -137,11 +136,10 @@ byte[] provideKeyResponse(byte[] scope, byte[] response)
   /**
    * @see android.media.MediaCrypto#MediaCrypto(UUID, byte[])
    *
-   * @param uuid The UUID of the crypto scheme.
    * @param initData Opaque initialization data specific to the crypto scheme.
    * @return An object extends {@link ExoMediaCrypto}, using opaque crypto scheme specific data.
    * @throws MediaCryptoException
    */
-  T createMediaCrypto(UUID uuid, byte[] initData) throws MediaCryptoException;
+  T createMediaCrypto(byte[] initData) throws MediaCryptoException;
 
 }
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 5d0cb038d45..d664cb69a95 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
@@ -37,6 +37,7 @@
 @TargetApi(18)
 public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto> {
 
+  private final UUID uuid;
   private final MediaDrm mediaDrm;
 
   /**
@@ -59,10 +60,9 @@ public static FrameworkMediaDrm newInstance(UUID uuid) throws UnsupportedDrmExce
   private FrameworkMediaDrm(UUID uuid) throws UnsupportedSchemeException {
     Assertions.checkNotNull(uuid);
     Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");
-    if (Util.SDK_INT < 27 && C.CLEARKEY_UUID.equals(uuid)) {
-      // ClearKey had to be accessed using the Common PSSH UUID prior to API level 27.
-      uuid = C.COMMON_PSSH_UUID;
-    }
+    // ClearKey had to be accessed using the Common PSSH UUID prior to API level 27.
+    uuid = Util.SDK_INT < 27 && C.CLEARKEY_UUID.equals(uuid) ? C.COMMON_PSSH_UUID : uuid;
+    this.uuid = uuid;
     this.mediaDrm = new MediaDrm(uuid);
   }
 
@@ -169,8 +169,7 @@ public void setPropertyByteArray(String propertyName, byte[] value) {
   }
 
   @Override
-  public FrameworkMediaCrypto createMediaCrypto(UUID uuid, byte[] initData)
-      throws MediaCryptoException {
+  public FrameworkMediaCrypto createMediaCrypto(byte[] initData) throws MediaCryptoException {
     // Work around a bug prior to Lollipop where L1 Widevine forced into L3 mode would still
     // indicate that it required secure video decoders [Internal ref: b/11428937].
     boolean forceAllowInsecureDecoderComponents = Util.SDK_INT < 21

From aafdd2267abd6c9191ef66e9cf109cc24e159e30 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 29 Aug 2017 08:16:11 -0700
Subject: [PATCH 161/421] Add media queue support to CastPlayer

Also workaround the non-repeatable queue and fix other minor issues.

Issue:#2283

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166848894
---
 .../exoplayer2/castdemo/CastDemoUtil.java     |   8 +-
 .../exoplayer2/castdemo/PlayerManager.java    |  32 +-
 .../src/main/res/layout/main_activity.xml     |   5 +-
 .../exoplayer2/ext/cast/CastPlayer.java       | 514 ++++++++++++------
 .../exoplayer2/ext/cast/CastTimeline.java     | 114 ++++
 .../DynamicConcatenatingMediaSource.java      |   2 +-
 6 files changed, 491 insertions(+), 184 deletions(-)
 create mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
index f819e54e50d..68c5904362b 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
@@ -52,17 +52,17 @@ public static final class Sample {
     /**
      * The mime type of the media sample, as required by {@link MediaInfo#setContentType}.
      */
-    public final String type;
+    public final String mimeType;
 
     /**
      * @param uri See {@link #uri}.
      * @param name See {@link #name}.
-     * @param type See {@link #type}.
+     * @param mimeType See {@link #mimeType}.
      */
-    public Sample(String uri, String name, String type) {
+    public Sample(String uri, String name, String mimeType) {
       this.uri = uri;
       this.name = name;
-      this.type = type;
+      this.mimeType = mimeType;
     }
 
     @Override
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 741df7eff18..8b461ec65cc 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
@@ -37,6 +37,9 @@
 import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 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;
 
 /**
@@ -95,12 +98,12 @@ public void setCurrentSample(CastDemoUtil.Sample currentSample, long positionMs,
       boolean playWhenReady) {
     this.currentSample = currentSample;
     if (playbackLocation == PLAYBACK_REMOTE) {
-        castPlayer.load(currentSample.name, currentSample.uri, currentSample.type, positionMs,
-            playWhenReady);
+      castPlayer.loadItem(buildMediaQueueItem(currentSample), positionMs);
+      castPlayer.setPlayWhenReady(playWhenReady);
     } else /* playbackLocation == PLAYBACK_LOCAL */ {
+      exoPlayer.prepare(buildMediaSource(currentSample), true, true);
       exoPlayer.setPlayWhenReady(playWhenReady);
       exoPlayer.seekTo(positionMs);
-      exoPlayer.prepare(buildMediaSource(currentSample), true, true);
     }
   }
 
@@ -143,9 +146,18 @@ public void onCastSessionUnavailable() {
 
   // Internal methods.
 
+  private static MediaQueueItem buildMediaQueueItem(CastDemoUtil.Sample sample) {
+    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();
+    return new MediaQueueItem.Builder(mediaInfo).build();
+  }
+
   private static MediaSource buildMediaSource(CastDemoUtil.Sample sample) {
     Uri uri = Uri.parse(sample.uri);
-    switch (sample.type) {
+    switch (sample.mimeType) {
       case CastDemoUtil.MIME_TYPE_SS:
         return new SsMediaSource(uri, DATA_SOURCE_FACTORY,
             new DefaultSsChunkSource.Factory(DATA_SOURCE_FACTORY), null, null);
@@ -158,7 +170,7 @@ private static MediaSource buildMediaSource(CastDemoUtil.Sample sample) {
         return new ExtractorMediaSource(uri, DATA_SOURCE_FACTORY, new DefaultExtractorsFactory(),
             null, null);
       default: {
-        throw new IllegalStateException("Unsupported type: " + sample.type);
+        throw new IllegalStateException("Unsupported type: " + sample.mimeType);
       }
     }
   }
@@ -177,14 +189,16 @@ private void setPlaybackLocation(int playbackLocation) {
       castControlView.show();
     }
 
-    long playbackPositionMs = 0;
-    boolean playWhenReady = true;
-    if (exoPlayer != null) {
+    long playbackPositionMs;
+    boolean playWhenReady;
+    if (this.playbackLocation == PLAYBACK_LOCAL) {
       playbackPositionMs = exoPlayer.getCurrentPosition();
       playWhenReady = exoPlayer.getPlayWhenReady();
-    } else if (this.playbackLocation == PLAYBACK_REMOTE) {
+      exoPlayer.stop();
+    } else /* this.playbackLocation == PLAYBACK_REMOTE */ {
       playbackPositionMs = castPlayer.getCurrentPosition();
       playWhenReady = castPlayer.getPlayWhenReady();
+      castPlayer.stop();
     }
 
     this.playbackLocation = playbackLocation;
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
index 7e39320e3bb..5d94931b64c 100644
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ b/demos/cast/src/main/res/layout/main_activity.xml
@@ -35,7 +35,8 @@
       android:id="@+id/cast_control_view"
       android:layout_width="match_parent"
       android:layout_height="0dp"
-      app:show_timeout="-1"
       android:layout_weight="2"
-      android:visibility="gone"/>
+      android:visibility="gone"
+      app:repeat_toggle_modes="all|one"
+      app:show_timeout="-1"/>
 </LinearLayout>
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 e79fef74d5c..234b8384f93 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
@@ -15,23 +15,24 @@
  */
 package com.google.android.exoplayer2.ext.cast;
 
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.SinglePeriodTimeline;
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.util.Assertions;
 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.MediaMetadata;
+import com.google.android.gms.cast.MediaQueueItem;
 import com.google.android.gms.cast.MediaStatus;
 import com.google.android.gms.cast.MediaTrack;
 import com.google.android.gms.cast.framework.CastContext;
@@ -41,6 +42,7 @@
 import com.google.android.gms.cast.framework.media.RemoteMediaClient;
 import com.google.android.gms.cast.framework.media.RemoteMediaClient.MediaChannelResult;
 import com.google.android.gms.common.api.CommonStatusCodes;
+import com.google.android.gms.common.api.PendingResult;
 import com.google.android.gms.common.api.ResultCallback;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArraySet;
@@ -48,19 +50,16 @@
 /**
  * {@link Player} implementation that communicates with a Cast receiver app.
  *
- * <p>Calls to the methods in this class depend on the availability of an underlying cast session.
- * If no session is available, method calls have no effect. To keep track of the underyling session,
+ * <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.
+ * implemented and attached to the player.</p>
  *
- * <p>Methods should be called on the application's main thread.
+ * <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>
  *
- * <p>Known issues:
- * <ul>
- *   <li>Part of the Cast API is not exposed through this interface. For instance, volume settings
- *   and track selection.</li>
- *   <li> Repeat mode is not working. See [internal: b/64137174].</li>
- * </ul>
+ * <p>Methods should be called on the application's main thread.</p>
  */
 public final class CastPlayer implements Player {
 
@@ -95,10 +94,12 @@ public interface SessionAvailabilityListener {
 
   private final CastContext castContext;
   private final Timeline.Window window;
+  private final Timeline.Period period;
+
+  private RemoteMediaClient remoteMediaClient;
 
   // Result callbacks.
   private final StatusListener statusListener;
-  private final RepeatModeResultCallback repeatModeResultCallback;
   private final SeekResultCallback seekResultCallback;
 
   // Listeners.
@@ -106,11 +107,15 @@ public interface SessionAvailabilityListener {
   private SessionAvailabilityListener sessionAvailabilityListener;
 
   // Internal state.
-  private RemoteMediaClient remoteMediaClient;
-  private Timeline currentTimeline;
+  private CastTimeline currentTimeline;
   private TrackGroupArray currentTrackGroups;
   private TrackSelectionArray currentTrackSelection;
+  private int playbackState;
+  private int repeatMode;
+  private int currentWindowIndex;
+  private boolean playWhenReady;
   private long lastReportedPositionMs;
+  private int pendingSeekWindowIndex;
   private long pendingSeekPositionMs;
 
   /**
@@ -119,41 +124,142 @@ public interface SessionAvailabilityListener {
   public CastPlayer(CastContext castContext) {
     this.castContext = castContext;
     window = new Timeline.Window();
+    period = new Timeline.Period();
     statusListener = new StatusListener();
-    repeatModeResultCallback = new RepeatModeResultCallback();
     seekResultCallback = new SeekResultCallback();
     listeners = new CopyOnWriteArraySet<>();
+
     SessionManager sessionManager = castContext.getSessionManager();
     sessionManager.addSessionManagerListener(statusListener, CastSession.class);
     CastSession session = sessionManager.getCurrentCastSession();
     remoteMediaClient = session != null ? session.getRemoteMediaClient() : null;
+
+    playbackState = STATE_IDLE;
+    repeatMode = REPEAT_MODE_OFF;
+    currentTimeline = CastTimeline.EMPTY_CAST_TIMELINE;
+    currentTrackGroups = EMPTY_TRACK_GROUP_ARRAY;
+    currentTrackSelection = EMPTY_TRACK_SELECTION_ARRAY;
+    pendingSeekWindowIndex = C.INDEX_UNSET;
     pendingSeekPositionMs = C.TIME_UNSET;
     updateInternalState();
   }
 
+  // Media Queue manipulation methods.
+
   /**
-   * Loads media into the receiver app.
+   * Loads a single item media queue. If no session is available, does nothing.
    *
-   * @param title The title of the media sample.
-   * @param url The url from which the media is obtained.
-   * @param contentMimeType The mime type of the content to play.
-   * @param positionMs The position at which the playback should start in milliseconds.
-   * @param playWhenReady Whether the player should start playback as soon as it is ready to do so.
+   * @param item The item to load.
+   * @param positionMs The position at which the playback should start in milliseconds relative to
+   *     the start of the item at {@code startIndex}.
+   * @return The Cast {@code PendingResult}, or null if no session is available.
    */
-  public void load(String title, String url, String contentMimeType, long positionMs,
-      boolean playWhenReady) {
-    lastReportedPositionMs = 0;
+  public PendingResult<MediaChannelResult> loadItem(MediaQueueItem item, long positionMs) {
+    return loadItems(new MediaQueueItem[] {item}, 0, positionMs, REPEAT_MODE_OFF);
+  }
+
+  /**
+   * Loads a media queue. If no session is available, does nothing.
+   *
+   * @param items The items to load.
+   * @param startIndex The index of the item at which playback should start.
+   * @param positionMs The position at which the playback should start in milliseconds relative to
+   *     the start of the item at {@code startIndex}.
+   * @param repeatMode The repeat mode for the created media queue.
+   * @return The Cast {@code PendingResult}, or null if no session is available.
+   */
+  public PendingResult<MediaChannelResult> loadItems(MediaQueueItem[] items, int startIndex,
+      long positionMs, @RepeatMode int repeatMode) {
     if (remoteMediaClient != null) {
-      MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
-      movieMetadata.putString(MediaMetadata.KEY_TITLE, title);
-      MediaInfo mediaInfo = new MediaInfo.Builder(url).setStreamType(MediaInfo.STREAM_TYPE_BUFFERED)
-          .setContentType(contentMimeType).setMetadata(movieMetadata).build();
-      remoteMediaClient.load(mediaInfo, playWhenReady, positionMs);
+      return remoteMediaClient.queueLoad(items, startIndex, getCastRepeatMode(repeatMode),
+          positionMs, null);
     }
+    return null;
   }
 
   /**
-   * Returns whether a cast session is available for playback.
+   * Appends a sequence of items to the media queue. If no media queue exists, does nothing.
+   *
+   * @param items The items to append.
+   * @return The Cast {@code PendingResult}, or null if no media queue exists.
+   */
+  public PendingResult<MediaChannelResult> addItems(MediaQueueItem... items) {
+    return addItems(MediaQueueItem.INVALID_ITEM_ID, items);
+  }
+
+  /**
+   * Inserts a sequence of items into the media queue. If no media queue or period with id
+   * {@code periodId} exist, does nothing.
+   *
+   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
+   *     that will follow immediately after the inserted items.
+   * @param items The items to insert.
+   * @return The Cast {@code PendingResult}, or null if no media queue or no period with id
+   *     {@code periodId} exist.
+   */
+  public PendingResult<MediaChannelResult> addItems(int periodId, MediaQueueItem... items) {
+    if (getMediaStatus() != null && (periodId == MediaQueueItem.INVALID_ITEM_ID
+        || currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET)) {
+      return remoteMediaClient.queueInsertItems(items, periodId, null);
+    }
+    return null;
+  }
+
+  /**
+   * Removes an item from the media queue. If no media queue or period with id {@code periodId}
+   * exist, does nothing.
+   *
+   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
+   *     to remove.
+   * @return The Cast {@code PendingResult}, or null if no media queue or no period with id
+   *     {@code periodId} exist.
+   */
+  public PendingResult<MediaChannelResult> removeItem(int periodId) {
+    if (getMediaStatus() != null && currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET) {
+      return remoteMediaClient.queueRemoveItem(periodId, null);
+    }
+    return null;
+  }
+
+  /**
+   * Moves an existing item within the media queue. If no media queue or period with id
+   * {@code periodId} exist, does nothing.
+   *
+   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
+   *     to move.
+   * @param newIndex The target index of the item in the media queue. Must be in the range
+   *     0 &lt;= index &lt; {@link Timeline#getPeriodCount()}, as provided by
+   *     {@link #getCurrentTimeline()}.
+   * @return The Cast {@code PendingResult}, or null if no media queue or no period with id
+   *     {@code periodId} exist.
+   */
+  public PendingResult<MediaChannelResult> moveItem(int periodId, int newIndex) {
+    Assertions.checkArgument(newIndex >= 0 && newIndex < currentTimeline.getPeriodCount());
+    if (getMediaStatus() != null && currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET) {
+      return remoteMediaClient.queueMoveItemToNewIndex(periodId, newIndex, null);
+    }
+    return null;
+  }
+
+  /**
+   * Returns the item that corresponds to the period with the given id, or null if no media queue or
+   * period with id {@code periodId} exist.
+   *
+   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
+   *     to get.
+   * @return The item that corresponds to the period with the given id, or null if no media queue or
+   *     period with id {@code periodId} exist.
+   */
+  public MediaQueueItem getItem(int periodId) {
+    MediaStatus mediaStatus = getMediaStatus();
+    return mediaStatus != null && currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET
+        ? mediaStatus.getItemById(periodId) : null;
+  }
+
+  // CastSession methods.
+
+  /**
+   * Returns whether a cast session is available.
    */
   public boolean isCastSessionAvailable() {
     return remoteMediaClient != null;
@@ -182,21 +288,7 @@ public void removeListener(EventListener listener) {
 
   @Override
   public int getPlaybackState() {
-    if (remoteMediaClient == null) {
-      return STATE_IDLE;
-    }
-    int receiverAppStatus = remoteMediaClient.getPlayerState();
-    switch (receiverAppStatus) {
-      case MediaStatus.PLAYER_STATE_BUFFERING:
-        return STATE_BUFFERING;
-      case MediaStatus.PLAYER_STATE_PLAYING:
-      case MediaStatus.PLAYER_STATE_PAUSED:
-        return STATE_READY;
-      case MediaStatus.PLAYER_STATE_IDLE:
-      case MediaStatus.PLAYER_STATE_UNKNOWN:
-      default:
-        return STATE_IDLE;
-    }
+    return playbackState;
   }
 
   @Override
@@ -213,7 +305,7 @@ public void setPlayWhenReady(boolean playWhenReady) {
 
   @Override
   public boolean getPlayWhenReady() {
-    return remoteMediaClient != null && !remoteMediaClient.isPaused();
+    return playWhenReady;
   }
 
   @Override
@@ -228,13 +320,20 @@ public void seekToDefaultPosition(int windowIndex) {
 
   @Override
   public void seekTo(long positionMs) {
-    seekTo(0, positionMs);
+    seekTo(getCurrentWindowIndex(), positionMs);
   }
 
   @Override
   public void seekTo(int windowIndex, long positionMs) {
-    if (remoteMediaClient != null) {
-      remoteMediaClient.seek(positionMs).setResultCallback(seekResultCallback);
+    MediaStatus mediaStatus = getMediaStatus();
+    if (mediaStatus != null) {
+      if (getCurrentWindowIndex() != windowIndex) {
+        remoteMediaClient.queueJumpToItem((int) currentTimeline.getPeriod(windowIndex, period).uid,
+            positionMs, null).setResultCallback(seekResultCallback);
+      } else {
+        remoteMediaClient.seek(positionMs).setResultCallback(seekResultCallback);
+      }
+      pendingSeekWindowIndex = windowIndex;
       pendingSeekPositionMs = positionMs;
       for (EventListener listener : listeners) {
         listener.onPositionDiscontinuity();
@@ -287,47 +386,13 @@ public int getRendererType(int index) {
   @Override
   public void setRepeatMode(@RepeatMode int repeatMode) {
     if (remoteMediaClient != null) {
-      int castRepeatMode;
-      switch (repeatMode) {
-        case REPEAT_MODE_ONE:
-          castRepeatMode = MediaStatus.REPEAT_MODE_REPEAT_SINGLE;
-          break;
-        case REPEAT_MODE_ALL:
-          castRepeatMode = MediaStatus.REPEAT_MODE_REPEAT_ALL;
-          break;
-        case REPEAT_MODE_OFF:
-          castRepeatMode = MediaStatus.REPEAT_MODE_REPEAT_OFF;
-          break;
-        default:
-          throw new IllegalArgumentException();
-      }
-      remoteMediaClient.queueSetRepeatMode(castRepeatMode, null)
-          .setResultCallback(repeatModeResultCallback);
+      remoteMediaClient.queueSetRepeatMode(getCastRepeatMode(repeatMode), null);
     }
   }
 
   @Override
   @RepeatMode public int getRepeatMode() {
-    if (remoteMediaClient == null) {
-      return REPEAT_MODE_OFF;
-    }
-    MediaStatus mediaStatus = getMediaStatus();
-    if (mediaStatus == null) {
-      // No media session active, yet.
-      return REPEAT_MODE_OFF;
-    }
-    int castRepeatMode = mediaStatus.getQueueRepeatMode();
-    switch (castRepeatMode) {
-      case MediaStatus.REPEAT_MODE_REPEAT_SINGLE:
-        return REPEAT_MODE_ONE;
-      case MediaStatus.REPEAT_MODE_REPEAT_ALL:
-      case MediaStatus.REPEAT_MODE_REPEAT_ALL_AND_SHUFFLE:
-          return REPEAT_MODE_ALL;
-      case MediaStatus.REPEAT_MODE_REPEAT_OFF:
-        return REPEAT_MODE_OFF;
-      default:
-        throw new IllegalStateException();
-    }
+    return repeatMode;
   }
 
   @Override
@@ -363,12 +428,12 @@ public Timeline getCurrentTimeline() {
 
   @Override
   public int getCurrentPeriodIndex() {
-    return 0;
+    return getCurrentWindowIndex();
   }
 
   @Override
   public int getCurrentWindowIndex() {
-    return 0;
+    return pendingSeekWindowIndex != C.INDEX_UNSET ? pendingSeekWindowIndex : currentWindowIndex;
   }
 
   @Override
@@ -384,14 +449,14 @@ public int getPreviousWindowIndex() {
   @Override
   public long getDuration() {
     return currentTimeline.isEmpty() ? C.TIME_UNSET
-        : currentTimeline.getWindow(0, window).getDurationMs();
+        : currentTimeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
   }
 
   @Override
   public long getCurrentPosition() {
-    return remoteMediaClient == null ? lastReportedPositionMs
-        : pendingSeekPositionMs != C.TIME_UNSET ? pendingSeekPositionMs
-        : remoteMediaClient.getApproximateStreamPosition();
+    return pendingSeekPositionMs != C.TIME_UNSET ? pendingSeekPositionMs
+        : remoteMediaClient != null ? remoteMediaClient.getApproximateStreamPosition()
+        : lastReportedPositionMs;
   }
 
   @Override
@@ -447,6 +512,121 @@ public long getContentPosition() {
 
   // Internal methods.
 
+  public void updateInternalState() {
+    if (remoteMediaClient == null) {
+      // There is no session. We leave the state of the player as it is now.
+      return;
+    }
+
+    int playbackState = fetchPlaybackState(remoteMediaClient);
+    boolean playWhenReady = !remoteMediaClient.isPaused();
+    if (this.playbackState != playbackState
+        || this.playWhenReady != playWhenReady) {
+      this.playbackState = playbackState;
+      this.playWhenReady = playWhenReady;
+      for (EventListener listener : listeners) {
+        listener.onPlayerStateChanged(this.playWhenReady, this.playbackState);
+      }
+    }
+    @RepeatMode int repeatMode = fetchRepeatMode(remoteMediaClient);
+    if (this.repeatMode != repeatMode) {
+      this.repeatMode = repeatMode;
+      for (EventListener listener : listeners) {
+        listener.onRepeatModeChanged(repeatMode);
+      }
+    }
+    int currentWindowIndex = fetchCurrentWindowIndex(getMediaStatus());
+    if (this.currentWindowIndex != currentWindowIndex) {
+      this.currentWindowIndex = currentWindowIndex;
+      for (EventListener listener : listeners) {
+        listener.onPositionDiscontinuity();
+      }
+    }
+    if (updateTracksAndSelections()) {
+      for (EventListener listener : listeners) {
+        listener.onTracksChanged(currentTrackGroups, currentTrackSelection);
+      }
+    }
+    maybeUpdateTimelineAndNotify();
+  }
+
+  private void maybeUpdateTimelineAndNotify() {
+    if (updateTimeline()) {
+      for (EventListener listener : listeners) {
+        listener.onTimelineChanged(currentTimeline, null);
+      }
+    }
+  }
+
+  /**
+   * Updates the current timeline and returns whether it has changed.
+   */
+  private boolean updateTimeline() {
+    MediaStatus mediaStatus = getMediaStatus();
+    if (mediaStatus == null) {
+      boolean hasChanged = currentTimeline != CastTimeline.EMPTY_CAST_TIMELINE;
+      currentTimeline = CastTimeline.EMPTY_CAST_TIMELINE;
+      return hasChanged;
+    }
+
+    List<MediaQueueItem> items = mediaStatus.getQueueItems();
+    if (!currentTimeline.represents(items)) {
+      currentTimeline = !items.isEmpty() ? new CastTimeline(mediaStatus.getQueueItems())
+          : CastTimeline.EMPTY_CAST_TIMELINE;
+      return true;
+    }
+    return false;
+  }
+
+  /**
+   * Updates the internal tracks and selection and returns whether they have changed.
+   */
+  private boolean updateTracksAndSelections() {
+    if (remoteMediaClient == null) {
+      // There is no session. We leave the state of the player as it is now.
+      return false;
+    }
+
+    MediaStatus mediaStatus = getMediaStatus();
+    MediaInfo mediaInfo = mediaStatus != null ? mediaStatus.getMediaInfo() : null;
+    List<MediaTrack> castMediaTracks = mediaInfo != null ? mediaInfo.getMediaTracks() : null;
+    if (castMediaTracks == null || castMediaTracks.isEmpty()) {
+      boolean hasChanged = currentTrackGroups != EMPTY_TRACK_GROUP_ARRAY;
+      currentTrackGroups = EMPTY_TRACK_GROUP_ARRAY;
+      currentTrackSelection = EMPTY_TRACK_SELECTION_ARRAY;
+      return hasChanged;
+    }
+    long[] activeTrackIds = mediaStatus.getActiveTrackIds();
+    if (activeTrackIds == null) {
+      activeTrackIds = EMPTY_TRACK_ID_ARRAY;
+    }
+
+    TrackGroup[] trackGroups = new TrackGroup[castMediaTracks.size()];
+    TrackSelection[] trackSelections = new TrackSelection[RENDERER_COUNT];
+    for (int i = 0; i < castMediaTracks.size(); i++) {
+      MediaTrack mediaTrack = castMediaTracks.get(i);
+      trackGroups[i] = new TrackGroup(CastUtils.mediaTrackToFormat(mediaTrack));
+
+      long id = mediaTrack.getId();
+      int trackType = MimeTypes.getTrackType(mediaTrack.getContentType());
+      int rendererIndex = getRendererIndexForTrackType(trackType);
+      if (isTrackActive(id, activeTrackIds) && rendererIndex != C.INDEX_UNSET
+          && trackSelections[rendererIndex] == null) {
+        trackSelections[rendererIndex] = new FixedTrackSelection(trackGroups[i], 0);
+      }
+    }
+    TrackGroupArray newTrackGroups = new TrackGroupArray(trackGroups);
+    TrackSelectionArray newTrackSelections = new TrackSelectionArray(trackSelections);
+
+    if (!newTrackGroups.equals(currentTrackGroups)
+        || !newTrackSelections.equals(currentTrackSelection)) {
+      currentTrackSelection = new TrackSelectionArray(trackSelections);
+      currentTrackGroups = new TrackGroupArray(trackGroups);
+      return true;
+    }
+    return false;
+  }
+
   private void setRemoteMediaClient(@Nullable RemoteMediaClient remoteMediaClient) {
     if (this.remoteMediaClient == remoteMediaClient) {
       // Do nothing.
@@ -463,6 +643,7 @@ private void setRemoteMediaClient(@Nullable RemoteMediaClient remoteMediaClient)
       }
       remoteMediaClient.addListener(statusListener);
       remoteMediaClient.addProgressListener(statusListener, PROGRESS_REPORT_PERIOD_MS);
+      updateInternalState();
     } else {
       if (sessionAvailabilityListener != null) {
         sessionAvailabilityListener.onCastSessionUnavailable();
@@ -474,50 +655,58 @@ private void setRemoteMediaClient(@Nullable RemoteMediaClient remoteMediaClient)
     return remoteMediaClient != null ? remoteMediaClient.getMediaStatus() : null;
   }
 
-  private @Nullable MediaInfo getMediaInfo() {
-    return remoteMediaClient != null ? remoteMediaClient.getMediaInfo() : null;
-  }
-
-  private void updateInternalState() {
-    currentTimeline = Timeline.EMPTY;
-    currentTrackGroups = EMPTY_TRACK_GROUP_ARRAY;
-    currentTrackSelection = EMPTY_TRACK_SELECTION_ARRAY;
-    MediaInfo mediaInfo = getMediaInfo();
-    if (mediaInfo == null) {
-      return;
+  /**
+   * Retrieves the playback state from {@code remoteMediaClient} and maps it into a {@link Player}
+   * state
+   */
+  private static int fetchPlaybackState(RemoteMediaClient remoteMediaClient) {
+    int receiverAppStatus = remoteMediaClient.getPlayerState();
+    switch (receiverAppStatus) {
+      case MediaStatus.PLAYER_STATE_BUFFERING:
+        return STATE_BUFFERING;
+      case MediaStatus.PLAYER_STATE_PLAYING:
+      case MediaStatus.PLAYER_STATE_PAUSED:
+        return STATE_READY;
+      case MediaStatus.PLAYER_STATE_IDLE:
+      case MediaStatus.PLAYER_STATE_UNKNOWN:
+      default:
+        return STATE_IDLE;
     }
-    long streamDurationMs = mediaInfo.getStreamDuration();
-    boolean isSeekable = streamDurationMs != MediaInfo.UNKNOWN_DURATION;
-    currentTimeline = new SinglePeriodTimeline(
-        isSeekable ? C.msToUs(streamDurationMs) : C.TIME_UNSET, isSeekable);
+  }
 
-    List<MediaTrack> tracks = mediaInfo.getMediaTracks();
-    if (tracks == null) {
-      return;
+  /**
+   * Retrieves the repeat mode from {@code remoteMediaClient} and maps it into a
+   * {@link Player.RepeatMode}.
+   */
+  @RepeatMode
+  private static int fetchRepeatMode(RemoteMediaClient remoteMediaClient) {
+    MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
+    if (mediaStatus == null) {
+      // No media session active, yet.
+      return REPEAT_MODE_OFF;
     }
-
-    MediaStatus mediaStatus = getMediaStatus();
-    long[] activeTrackIds = mediaStatus != null ? mediaStatus.getActiveTrackIds() : null;
-    if (activeTrackIds == null) {
-      activeTrackIds = EMPTY_TRACK_ID_ARRAY;
+    int castRepeatMode = mediaStatus.getQueueRepeatMode();
+    switch (castRepeatMode) {
+      case MediaStatus.REPEAT_MODE_REPEAT_SINGLE:
+        return REPEAT_MODE_ONE;
+      case MediaStatus.REPEAT_MODE_REPEAT_ALL:
+      case MediaStatus.REPEAT_MODE_REPEAT_ALL_AND_SHUFFLE:
+        return REPEAT_MODE_ALL;
+      case MediaStatus.REPEAT_MODE_REPEAT_OFF:
+        return REPEAT_MODE_OFF;
+      default:
+        throw new IllegalStateException();
     }
+  }
 
-    TrackGroup[] trackGroups = new TrackGroup[tracks.size()];
-    TrackSelection[] trackSelections = new TrackSelection[RENDERER_COUNT];
-    for (int i = 0; i < tracks.size(); i++) {
-      MediaTrack mediaTrack = tracks.get(i);
-      trackGroups[i] = new TrackGroup(CastUtils.mediaTrackToFormat(mediaTrack));
-
-      long id = mediaTrack.getId();
-      int trackType = MimeTypes.getTrackType(mediaTrack.getContentType());
-      int rendererIndex = getRendererIndexForTrackType(trackType);
-      if (isTrackActive(id, activeTrackIds) && rendererIndex != C.INDEX_UNSET
-          && trackSelections[rendererIndex] == null) {
-        trackSelections[rendererIndex] = new FixedTrackSelection(trackGroups[i], 0);
-      }
-    }
-    currentTrackSelection = new TrackSelectionArray(trackSelections);
-    currentTrackGroups = new TrackGroupArray(trackGroups);
+  /**
+   * Retrieves the current item index from {@code mediaStatus} and maps it into a window index. If
+   * there is no media session, returns 0.
+   */
+  private static int fetchCurrentWindowIndex(@Nullable MediaStatus mediaStatus) {
+    Integer currentItemId = mediaStatus != null
+        ? mediaStatus.getIndexById(mediaStatus.getCurrentItemId()) : null;
+    return currentItemId != null ? currentItemId : 0;
   }
 
   private static boolean isTrackActive(long id, long[] activeTrackIds) {
@@ -536,6 +725,19 @@ private static int getRendererIndexForTrackType(int trackType) {
         : C.INDEX_UNSET;
   }
 
+  private static int getCastRepeatMode(@RepeatMode int repeatMode) {
+    switch (repeatMode) {
+      case REPEAT_MODE_ONE:
+        return MediaStatus.REPEAT_MODE_REPEAT_SINGLE;
+      case REPEAT_MODE_ALL:
+        return MediaStatus.REPEAT_MODE_REPEAT_ALL;
+      case REPEAT_MODE_OFF:
+        return MediaStatus.REPEAT_MODE_REPEAT_OFF;
+      default:
+        throw new IllegalArgumentException();
+    }
+  }
+
   private final class StatusListener implements RemoteMediaClient.Listener,
       SessionManagerListener<CastSession>, RemoteMediaClient.ProgressListener {
 
@@ -550,24 +752,16 @@ public void onProgressUpdated(long progressMs, long unusedDurationMs) {
 
     @Override
     public void onStatusUpdated() {
-      boolean playWhenReady = getPlayWhenReady();
-      int playbackState = getPlaybackState();
-      for (EventListener listener : listeners) {
-        listener.onPlayerStateChanged(playWhenReady, playbackState);
-      }
+      updateInternalState();
     }
 
     @Override
-    public void onMetadataUpdated() {
-      updateInternalState();
-      for (EventListener listener : listeners) {
-        listener.onTracksChanged(currentTrackGroups, currentTrackSelection);
-        listener.onTimelineChanged(currentTimeline, null);
-      }
-    }
+    public void onMetadataUpdated() {}
 
     @Override
-    public void onQueueStatusUpdated() {}
+    public void onQueueStatusUpdated() {
+      maybeUpdateTimelineAndNotify();
+    }
 
     @Override
     public void onPreloadStatusUpdated() {}
@@ -632,36 +826,20 @@ public void onSessionResuming(CastSession castSession, String s) {
 
   // Result callbacks hooks.
 
-  private final class RepeatModeResultCallback implements ResultCallback<MediaChannelResult> {
-
-    @Override
-    public void onResult(MediaChannelResult result) {
-      int statusCode = result.getStatus().getStatusCode();
-      if (statusCode == CommonStatusCodes.SUCCESS) {
-        int repeatMode = getRepeatMode();
-        for (EventListener listener : listeners) {
-          listener.onRepeatModeChanged(repeatMode);
-        }
-      } else {
-        Log.e(TAG, "Set repeat mode failed. Error code " + statusCode + ": "
-            + CastUtils.getLogString(statusCode));
-      }
-    }
-
-  }
-
   private final class SeekResultCallback implements ResultCallback<MediaChannelResult> {
 
     @Override
-    public void onResult(MediaChannelResult result) {
+    public void onResult(@NonNull MediaChannelResult result) {
       int statusCode = result.getStatus().getStatusCode();
-      if (statusCode == CommonStatusCodes.SUCCESS) {
-        pendingSeekPositionMs = C.TIME_UNSET;
-      } else if (statusCode == CastStatusCodes.REPLACED) {
+      if (statusCode == CastStatusCodes.REPLACED) {
         // A seek was executed before this one completed. Do nothing.
       } else {
-        Log.e(TAG, "Seek failed. Error code " + statusCode + ": "
-            + CastUtils.getLogString(statusCode));
+        pendingSeekWindowIndex = C.INDEX_UNSET;
+        pendingSeekPositionMs = C.TIME_UNSET;
+        if (statusCode != CommonStatusCodes.SUCCESS) {
+          Log.e(TAG, "Seek failed. Error code " + statusCode + ": "
+              + CastUtils.getLogString(statusCode));
+        }
       }
     }
 
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
new file mode 100644
index 00000000000..39b57148b2e
--- /dev/null
+++ b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
@@ -0,0 +1,114 @@
+/*
+ * 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.cast;
+
+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.Collections;
+import java.util.List;
+
+/**
+ * A {@link Timeline} for Cast media queues.
+ */
+/* package */ final class CastTimeline extends Timeline {
+
+  public static final CastTimeline EMPTY_CAST_TIMELINE =
+      new CastTimeline(Collections.<MediaQueueItem>emptyList());
+
+  private final SparseIntArray idsToIndex;
+  private final int[] ids;
+  private final long[] durationsUs;
+  private final long[] defaultPositionsUs;
+
+  public CastTimeline(List<MediaQueueItem> items) {
+    int itemCount = items.size();
+    int index = 0;
+    idsToIndex = new SparseIntArray(itemCount);
+    ids = new int[itemCount];
+    durationsUs = new long[itemCount];
+    defaultPositionsUs = new long[itemCount];
+    for (MediaQueueItem item : items) {
+      int itemId = item.getItemId();
+      ids[index] = itemId;
+      idsToIndex.put(itemId, index);
+      durationsUs[index] = getStreamDurationUs(item.getMedia());
+      defaultPositionsUs[index] = (long) (item.getStartTime() * C.MICROS_PER_SECOND);
+      index++;
+    }
+  }
+
+  @Override
+  public int getWindowCount() {
+    return ids.length;
+  }
+
+  @Override
+  public Window getWindow(int windowIndex, Window window, boolean setIds,
+      long defaultPositionProjectionUs) {
+    long durationUs = durationsUs[windowIndex];
+    boolean isDynamic = durationUs == C.TIME_UNSET;
+    return window.set(ids[windowIndex], C.TIME_UNSET, C.TIME_UNSET, !isDynamic, isDynamic,
+        defaultPositionsUs[windowIndex], durationUs, windowIndex, windowIndex, 0);
+  }
+
+  @Override
+  public int getPeriodCount() {
+    return ids.length;
+  }
+
+  @Override
+  public Period getPeriod(int periodIndex, Period period, boolean setIds) {
+    int id = ids[periodIndex];
+    return period.set(id, id, periodIndex, durationsUs[periodIndex], 0);
+  }
+
+  @Override
+  public int getIndexOfPeriod(Object uid) {
+    return uid instanceof Integer ? idsToIndex.get((int) uid, C.INDEX_UNSET) : C.INDEX_UNSET;
+  }
+
+  /**
+   * Returns whether the timeline represents a given {@code MediaQueueItem} list.
+   *
+   * @param items The {@code MediaQueueItem} list.
+   * @return Whether the timeline represents {@code items}.
+   */
+  /* package */ boolean represents(List<MediaQueueItem> items) {
+    if (ids.length != items.size()) {
+      return false;
+    }
+    int index = 0;
+    for (MediaQueueItem item : items) {
+      if (ids[index] != item.getItemId()
+          || durationsUs[index] != getStreamDurationUs(item.getMedia())
+          || defaultPositionsUs[index] != (long) (item.getStartTime() * C.MICROS_PER_SECOND)) {
+        return false;
+      }
+      index++;
+    }
+    return true;
+  }
+
+  private static long getStreamDurationUs(MediaInfo mediaInfo) {
+    long durationMs = mediaInfo != null ? mediaInfo.getStreamDuration()
+        : MediaInfo.UNKNOWN_DURATION;
+    return durationMs != MediaInfo.UNKNOWN_DURATION ? C.msToUs(durationMs) : C.TIME_UNSET;
+  }
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 8614cf9c85e..36c674f81a3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -198,7 +198,7 @@ public synchronized int getSize() {
   /**
    * Returns the {@link MediaSource} at a specified index.
    *
-   * @param index A index in the range of 0 &lt;= index &lt;= {@link #getSize()}.
+   * @param index An index in the range of 0 &lt;= index &lt;= {@link #getSize()}.
    * @return The {@link MediaSource} at this index.
    */
   public synchronized MediaSource getMediaSource(int index) {

From b2c245281a59973def165e09e9961cd310f1ab8b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 08:22:30 -0700
Subject: [PATCH 162/421] Parse SchemeData from
 urn:mpeg:dash:mp4protection:2011 element

Issue: #3138

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166849631
---
 .../source/dash/manifest/DashManifestParser.java       | 10 ++++++++++
 1 file changed, 10 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 2e85f3a1ad9..2f4724c258a 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
@@ -347,6 +347,16 @@ protected SchemeData parseContentProtection(XmlPullParser xpp) throws XmlPullPar
     byte[] data = null;
     UUID uuid = null;
     boolean requiresSecureDecoder = false;
+
+    if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) {
+      String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
+      if (defaultKid != null) {
+        UUID keyId = UUID.fromString(defaultKid);
+        data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null);
+        uuid = C.COMMON_PSSH_UUID;
+      }
+    }
+
     do {
       xpp.next();
       if (data == null && XmlPullParserUtil.isStartTag(xpp, "cenc:pssh")

From 44dc3c3ab3ed599145fff5cf0986ee30880396fe Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 08:49:51 -0700
Subject: [PATCH 163/421] Make all renderers DRM aware

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166852758
---
 .../ext/ffmpeg/FfmpegAudioRenderer.java       | 16 ++++++---
 .../ext/flac/LibflacAudioRenderer.java        | 14 ++++++--
 .../ext/opus/LibopusAudioRenderer.java        | 13 +++++--
 .../ext/vp9/LibvpxVideoRenderer.java          |  8 +++--
 .../android/exoplayer2/BaseRenderer.java      | 24 +++++++++++++
 .../exoplayer2/RendererCapabilities.java      | 18 ++++++----
 .../audio/MediaCodecAudioRenderer.java        | 24 ++++++++++---
 .../audio/SimpleDecoderAudioRenderer.java     |  8 +++--
 .../mediacodec/MediaCodecRenderer.java        | 36 ++++---------------
 .../exoplayer2/metadata/MetadataRenderer.java |  6 +++-
 .../android/exoplayer2/text/TextRenderer.java | 10 ++++--
 .../video/MediaCodecVideoRenderer.java        | 10 ++++--
 12 files changed, 123 insertions(+), 64 deletions(-)

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 453a18476ee..ed8a5b0eac2 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
@@ -22,6 +22,7 @@
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.ExoMediaCrypto;
 import com.google.android.exoplayer2.util.MimeTypes;
 
@@ -58,13 +59,18 @@ public FfmpegAudioRenderer(Handler eventHandler, AudioRendererEventListener even
   }
 
   @Override
-  protected int supportsFormatInternal(Format format) {
-    if (!FfmpegLibrary.isAvailable()) {
+  protected int supportsFormatInternal(DrmSessionManager<ExoMediaCrypto> drmSessionManager,
+      Format format) {
+    String sampleMimeType = format.sampleMimeType;
+    if (!FfmpegLibrary.isAvailable() || !MimeTypes.isAudio(sampleMimeType)) {
       return FORMAT_UNSUPPORTED_TYPE;
+    } else if (!FfmpegLibrary.supportsFormat(sampleMimeType)) {
+      return FORMAT_UNSUPPORTED_SUBTYPE;
+    } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
+      return FORMAT_UNSUPPORTED_DRM;
+    } else {
+      return FORMAT_HANDLED;
     }
-    String mimeType = format.sampleMimeType;
-    return FfmpegLibrary.supportsFormat(mimeType) ? FORMAT_HANDLED
-        : MimeTypes.isAudio(mimeType) ? FORMAT_UNSUPPORTED_SUBTYPE : FORMAT_UNSUPPORTED_TYPE;
   }
 
   @Override
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 246cde9d2fe..dc376d2ea49 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
@@ -20,6 +20,7 @@
 import com.google.android.exoplayer2.audio.AudioProcessor;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.audio.SimpleDecoderAudioRenderer;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.ExoMediaCrypto;
 import com.google.android.exoplayer2.util.MimeTypes;
 
@@ -46,9 +47,16 @@ public LibflacAudioRenderer(Handler eventHandler, AudioRendererEventListener eve
   }
 
   @Override
-  protected int supportsFormatInternal(Format format) {
-    return FlacLibrary.isAvailable() && MimeTypes.AUDIO_FLAC.equalsIgnoreCase(format.sampleMimeType)
-        ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_TYPE;
+  protected int supportsFormatInternal(DrmSessionManager<ExoMediaCrypto> drmSessionManager,
+      Format format) {
+    if (!FlacLibrary.isAvailable()
+        || !MimeTypes.AUDIO_FLAC.equalsIgnoreCase(format.sampleMimeType)) {
+      return FORMAT_UNSUPPORTED_TYPE;
+    } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
+      return FORMAT_UNSUPPORTED_DRM;
+    } else {
+      return FORMAT_HANDLED;
+    }
   }
 
   @Override
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 730473ddadc..e4745d0c29c 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
@@ -71,9 +71,16 @@ public LibopusAudioRenderer(Handler eventHandler, AudioRendererEventListener eve
   }
 
   @Override
-  protected int supportsFormatInternal(Format format) {
-    return OpusLibrary.isAvailable() && MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)
-        ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_TYPE;
+  protected int supportsFormatInternal(DrmSessionManager<ExoMediaCrypto> drmSessionManager,
+      Format format) {
+    if (!OpusLibrary.isAvailable()
+        || !MimeTypes.AUDIO_OPUS.equalsIgnoreCase(format.sampleMimeType)) {
+      return FORMAT_UNSUPPORTED_TYPE;
+    } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
+      return FORMAT_UNSUPPORTED_DRM;
+    } else {
+      return FORMAT_HANDLED;
+    }
   }
 
   @Override
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 a947378de5d..100ca6f00f1 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
@@ -194,8 +194,12 @@ public LibvpxVideoRenderer(boolean scaleToFit, long allowedJoiningTimeMs,
 
   @Override
   public int supportsFormat(Format format) {
-    return VpxLibrary.isAvailable() && MimeTypes.VIDEO_VP9.equalsIgnoreCase(format.sampleMimeType)
-        ? (FORMAT_HANDLED | ADAPTIVE_SEAMLESS) : FORMAT_UNSUPPORTED_TYPE;
+    if (!VpxLibrary.isAvailable() || !MimeTypes.VIDEO_VP9.equalsIgnoreCase(format.sampleMimeType)) {
+      return FORMAT_UNSUPPORTED_TYPE;
+    } else if (!supportsFormatDrm(drmSessionManager, format.drmInitData)) {
+      return FORMAT_UNSUPPORTED_DRM;
+    }
+    return FORMAT_HANDLED | ADAPTIVE_SEAMLESS;
   }
 
   @Override
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 7f148379655..a4103787d1d 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,10 @@
  */
 package com.google.android.exoplayer2;
 
+import android.support.annotation.Nullable;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
+import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.source.SampleStream;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.MediaClock;
@@ -309,4 +312,25 @@ protected final boolean isSourceReady() {
     return readEndOfStream ? streamIsFinal : stream.isReady();
   }
 
+  /**
+   * Returns whether {@code drmSessionManager} supports the specified {@code drmInitData}, or true
+   * if {@code drmInitData} is null.
+   *
+   * @param drmSessionManager The drm session manager.
+   * @param drmInitData {@link DrmInitData} of the format to check for support.
+   * @return Whether {@code drmSessionManager} supports the specified {@code drmInitData}, or
+   *     true if {@code drmInitData} is null.
+   */
+  protected static boolean supportsFormatDrm(@Nullable DrmSessionManager<?> drmSessionManager,
+      @Nullable DrmInitData drmInitData) {
+    if (drmInitData == null) {
+      // Content is unencrypted.
+      return true;
+    } else if (drmSessionManager == null) {
+      // Content is encrypted, but no drm session manager is available.
+      return false;
+    }
+    return drmSessionManager.canAcquireSession(drmInitData);
+  }
+
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java b/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
index 3f1be20cfb1..de0d481386b 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/RendererCapabilities.java
@@ -34,7 +34,9 @@ public interface RendererCapabilities {
   int FORMAT_HANDLED = 0b100;
   /**
    * The {@link Renderer} is capable of rendering formats with the same mime type, but the
-   * properties of the format exceed the renderer's capability.
+   * properties of the format exceed the renderer's capabilities. There is a chance the renderer
+   * will be able to play the format in practice because some renderers report their capabilities
+   * conservatively, but the expected outcome is that playback will fail.
    * <p>
    * Example: The {@link Renderer} is capable of rendering H264 and the format's mime type is
    * {@link MimeTypes#VIDEO_H264}, but the format's resolution exceeds the maximum limit supported
@@ -42,12 +44,12 @@ public interface RendererCapabilities {
    */
   int FORMAT_EXCEEDS_CAPABILITIES = 0b011;
   /**
-   * The {@link Renderer} is capable of rendering formats with the same mime type, but the
-   * drm scheme used is not supported.
+   * The {@link Renderer} is capable of rendering formats with the same mime type, but is not
+   * capable of rendering the format because the format's drm protection is not supported.
    * <p>
    * Example: The {@link Renderer} is capable of rendering H264 and the format's mime type is
-   * {@link MimeTypes#VIDEO_H264}, but the format indicates cbcs encryption, which is not supported
-   * by the underlying content decryption module.
+   * {@link MimeTypes#VIDEO_H264}, but the format indicates PlayReady drm protection where-as the
+   * renderer only supports Widevine.
    */
   int FORMAT_UNSUPPORTED_DRM = 0b010;
   /**
@@ -121,9 +123,11 @@ public interface RendererCapabilities {
    * {@link #FORMAT_UNSUPPORTED_SUBTYPE} and {@link #FORMAT_UNSUPPORTED_TYPE}.</li>
    * <li>The level of support for adapting from the format to another format of the same mime type.
    * One of {@link #ADAPTIVE_SEAMLESS}, {@link #ADAPTIVE_NOT_SEAMLESS} and
-   * {@link #ADAPTIVE_NOT_SUPPORTED}.</li>
+   * {@link #ADAPTIVE_NOT_SUPPORTED}. Only set if the level of support for the format itself is
+   * {@link #FORMAT_HANDLED} or {@link #FORMAT_EXCEEDS_CAPABILITIES}.</li>
    * <li>The level of support for tunneling. One of {@link #TUNNELING_SUPPORTED} and
-   * {@link #TUNNELING_NOT_SUPPORTED}.</li>
+   * {@link #TUNNELING_NOT_SUPPORTED}. Only set if the level of support for the format itself is
+   * {@link #FORMAT_HANDLED} or {@link #FORMAT_EXCEEDS_CAPABILITIES}.</li>
    * </ul>
    * The individual properties can be retrieved by performing a bitwise AND with
    * {@link #FORMAT_SUPPORT_MASK}, {@link #ADAPTIVE_SUPPORT_MASK} and
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 e146238dccc..7f157e58669 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
@@ -27,6 +27,7 @@
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener.EventDispatcher;
+import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
@@ -138,19 +139,34 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
   }
 
   @Override
-  protected int supportsFormat(MediaCodecSelector mediaCodecSelector, Format format)
+  protected int supportsFormat(MediaCodecSelector mediaCodecSelector,
+      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager, Format format)
       throws DecoderQueryException {
     String mimeType = format.sampleMimeType;
     if (!MimeTypes.isAudio(mimeType)) {
       return FORMAT_UNSUPPORTED_TYPE;
     }
     int tunnelingSupport = Util.SDK_INT >= 21 ? TUNNELING_SUPPORTED : TUNNELING_NOT_SUPPORTED;
-    if (allowPassthrough(mimeType) && mediaCodecSelector.getPassthroughDecoderInfo() != null) {
+    boolean supportsFormatDrm = supportsFormatDrm(drmSessionManager, format.drmInitData);
+    if (supportsFormatDrm && allowPassthrough(mimeType)
+        && mediaCodecSelector.getPassthroughDecoderInfo() != null) {
       return ADAPTIVE_NOT_SEAMLESS | tunnelingSupport | FORMAT_HANDLED;
     }
-    MediaCodecInfo decoderInfo = mediaCodecSelector.getDecoderInfo(mimeType, false);
+    boolean requiresSecureDecryption = false;
+    DrmInitData drmInitData = format.drmInitData;
+    if (drmInitData != null) {
+      for (int i = 0; i < drmInitData.schemeDataCount; i++) {
+        requiresSecureDecryption |= drmInitData.get(i).requiresSecureDecryption;
+      }
+    }
+    MediaCodecInfo decoderInfo = mediaCodecSelector.getDecoderInfo(mimeType,
+        requiresSecureDecryption);
     if (decoderInfo == null) {
-      return FORMAT_UNSUPPORTED_SUBTYPE;
+      return requiresSecureDecryption && mediaCodecSelector.getDecoderInfo(mimeType, false) != null
+          ? FORMAT_UNSUPPORTED_DRM : FORMAT_UNSUPPORTED_SUBTYPE;
+    }
+    if (!supportsFormatDrm) {
+      return FORMAT_UNSUPPORTED_DRM;
     }
     // Note: We assume support for unknown sampleRate and channelCount.
     boolean decoderCapable = Util.SDK_INT < 21
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 c4a55eeb02f..012f06da39b 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
@@ -159,8 +159,8 @@ public MediaClock getMediaClock() {
 
   @Override
   public final int supportsFormat(Format format) {
-    int formatSupport = supportsFormatInternal(format);
-    if (formatSupport == FORMAT_UNSUPPORTED_TYPE || formatSupport == FORMAT_UNSUPPORTED_SUBTYPE) {
+    int formatSupport = supportsFormatInternal(drmSessionManager, format);
+    if (formatSupport <= FORMAT_UNSUPPORTED_DRM) {
       return formatSupport;
     }
     int tunnelingSupport = Util.SDK_INT >= 21 ? TUNNELING_SUPPORTED : TUNNELING_NOT_SUPPORTED;
@@ -171,10 +171,12 @@ public final int supportsFormat(Format format) {
    * Returns the {@link #FORMAT_SUPPORT_MASK} component of the return value for
    * {@link #supportsFormat(Format)}.
    *
+   * @param drmSessionManager The renderer's {@link DrmSessionManager}.
    * @param format The format.
    * @return The extent to which the renderer supports the format itself.
    */
-  protected abstract int supportsFormatInternal(Format format);
+  protected abstract int supportsFormatInternal(DrmSessionManager<ExoMediaCrypto> drmSessionManager,
+      Format format);
 
   @Override
   public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackException {
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 31c6a824ef5..d6725e373a2 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
@@ -32,7 +32,6 @@
 import com.google.android.exoplayer2.FormatHolder;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
-import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSession;
 import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
@@ -169,7 +168,8 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
   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 DecoderInputBuffer buffer;
   private final DecoderInputBuffer flagsOnlyBuffer;
@@ -247,14 +247,7 @@ public final int supportsMixedMimeTypeAdaptation() {
   @Override
   public final int supportsFormat(Format format) throws ExoPlaybackException {
     try {
-      int formatSupport = supportsFormat(mediaCodecSelector, format);
-      if ((formatSupport & FORMAT_SUPPORT_MASK) > FORMAT_UNSUPPORTED_DRM
-          && !isDrmSchemeSupported(drmSessionManager, format.drmInitData)) {
-        // The renderer advertises higher support than FORMAT_UNSUPPORTED_DRM but the DRM scheme is
-        // not supported. The format support is truncated to reflect this.
-        formatSupport = (formatSupport & ~FORMAT_SUPPORT_MASK) | FORMAT_UNSUPPORTED_DRM;
-      }
-      return formatSupport;
+      return supportsFormat(mediaCodecSelector, drmSessionManager, format);
     } catch (DecoderQueryException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
@@ -264,12 +257,14 @@ public final int supportsFormat(Format format) throws ExoPlaybackException {
    * Returns the extent to which the renderer is capable of supporting a given format.
    *
    * @param mediaCodecSelector The decoder selector.
+   * @param drmSessionManager The renderer's {@link DrmSessionManager}.
    * @param format The format.
    * @return The extent to which the renderer is capable of supporting the given format. See
    *     {@link #supportsFormat(Format)} for more detail.
    * @throws DecoderQueryException If there was an error querying decoders.
    */
-  protected abstract int supportsFormat(MediaCodecSelector mediaCodecSelector, Format format)
+  protected abstract int supportsFormat(MediaCodecSelector mediaCodecSelector,
+      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager, Format format)
       throws DecoderQueryException;
 
   /**
@@ -1083,25 +1078,6 @@ private boolean shouldSkipOutputBuffer(long presentationTimeUs) {
     return false;
   }
 
-  /**
-   * Returns whether the encryption scheme is supported, or true if {@code drmInitData} is null.
-   *
-   * @param drmSessionManager The drm session manager associated with the renderer.
-   * @param drmInitData {@link DrmInitData} of the format to check for support.
-   * @return Whether the encryption scheme is supported, or true if {@code drmInitData} is null.
-   */
-  private static boolean isDrmSchemeSupported(@Nullable DrmSessionManager drmSessionManager,
-      @Nullable DrmInitData drmInitData) {
-    if (drmInitData == null) {
-      // Content is unencrypted.
-      return true;
-    } else if (drmSessionManager == null) {
-      // Content is encrypted, but no drm session manager is available.
-      return false;
-    }
-    return drmSessionManager.canAcquireSession(drmInitData);
-  }
-
   /**
    * Returns whether the decoder is known to fail when flushed.
    * <p>
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 f46dd467c88..869e9306a5f 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
@@ -92,7 +92,11 @@ public MetadataRenderer(MetadataOutput output, Looper outputLooper,
 
   @Override
   public int supportsFormat(Format format) {
-    return decoderFactory.supportsFormat(format) ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_TYPE;
+    if (decoderFactory.supportsFormat(format)) {
+      return supportsFormatDrm(null, format.drmInitData) ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM;
+    } else {
+      return FORMAT_UNSUPPORTED_TYPE;
+    }
   }
 
   @Override
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 8e1966305ee..c3dc2383efc 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
@@ -117,9 +117,13 @@ public TextRenderer(TextOutput output, Looper outputLooper,
 
   @Override
   public int supportsFormat(Format format) {
-    return decoderFactory.supportsFormat(format) ? FORMAT_HANDLED
-        : (MimeTypes.isText(format.sampleMimeType) ? FORMAT_UNSUPPORTED_SUBTYPE
-        : FORMAT_UNSUPPORTED_TYPE);
+    if (decoderFactory.supportsFormat(format)) {
+      return supportsFormatDrm(null, format.drmInitData) ? FORMAT_HANDLED : FORMAT_UNSUPPORTED_DRM;
+    } else if (MimeTypes.isText(format.sampleMimeType)) {
+      return FORMAT_UNSUPPORTED_SUBTYPE;
+    } else {
+      return FORMAT_UNSUPPORTED_TYPE;
+    }
   }
 
   @Override
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 c11c415cd7e..f70d74e413b 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
@@ -186,7 +186,8 @@ public MediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSel
   }
 
   @Override
-  protected int supportsFormat(MediaCodecSelector mediaCodecSelector, Format format)
+  protected int supportsFormat(MediaCodecSelector mediaCodecSelector,
+      DrmSessionManager<FrameworkMediaCrypto> drmSessionManager, Format format)
       throws DecoderQueryException {
     String mimeType = format.sampleMimeType;
     if (!MimeTypes.isVideo(mimeType)) {
@@ -202,9 +203,12 @@ protected int supportsFormat(MediaCodecSelector mediaCodecSelector, Format forma
     MediaCodecInfo decoderInfo = mediaCodecSelector.getDecoderInfo(mimeType,
         requiresSecureDecryption);
     if (decoderInfo == null) {
-      return FORMAT_UNSUPPORTED_SUBTYPE;
+      return requiresSecureDecryption && mediaCodecSelector.getDecoderInfo(mimeType, false) != null
+          ? FORMAT_UNSUPPORTED_DRM : FORMAT_UNSUPPORTED_SUBTYPE;
+    }
+    if (!supportsFormatDrm(drmSessionManager, drmInitData)) {
+      return FORMAT_UNSUPPORTED_DRM;
     }
-
     boolean decoderCapable = decoderInfo.isCodecSupported(format.codecs);
     if (decoderCapable && format.width > 0 && format.height > 0) {
       if (Util.SDK_INT >= 21) {

From 55e928f75acb78107b1defb702e08aa6f3aa42e5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 08:50:17 -0700
Subject: [PATCH 164/421] Make LeanbackPlayerAdapter use a ControlDispatcher +
 Misc cleanup

1. Make LeanbackPlayerAdapter use a ControlDispatcher. This
   allows apps to suppress control events in some circumstances,
   and is in-line with our mobile controls.
2. Misc simplifications and cleanup to LeanbackPlayerAdapter.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166852816
---
 .../ext/leanback/LeanbackPlayerAdapter.java   | 126 ++++++++++--------
 .../android/exoplayer2/ControlDispatcher.java |  67 ++++++++++
 .../exoplayer2/DefaultControlDispatcher.java  |  50 +++++++
 .../exoplayer2/ui/PlaybackControlView.java    | 107 +++------------
 .../exoplayer2/ui/SimpleExoPlayerView.java    |   7 +-
 5 files changed, 215 insertions(+), 142 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java

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 8a207bea8f8..f5ef8b2ca4e 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,6 +17,7 @@
 
 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;
@@ -25,6 +26,8 @@
 import android.view.Surface;
 import android.view.SurfaceHolder;
 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;
@@ -48,13 +51,13 @@ public final class LeanbackPlayerAdapter extends PlayerAdapter {
   private final SimpleExoPlayer player;
   private final Handler handler;
   private final ComponentListener componentListener;
-  private final Runnable updatePlayerRunnable;
+  private final Runnable updateProgressRunnable;
 
+  private ControlDispatcher controlDispatcher;
   private ErrorMessageProvider<? super ExoPlaybackException> errorMessageProvider;
   private SurfaceHolderGlueHost surfaceHolderGlueHost;
-  private boolean initialized;
   private boolean hasSurface;
-  private boolean isBuffering;
+  private boolean lastNotifiedPreparedState;
 
   /**
    * Builds an instance. Note that the {@code PlayerAdapter} does not manage the lifecycle of the
@@ -70,7 +73,8 @@ public LeanbackPlayerAdapter(Context context, SimpleExoPlayer player, final int
     this.player = player;
     handler = new Handler();
     componentListener = new ComponentListener();
-    updatePlayerRunnable = new Runnable() {
+    controlDispatcher = new DefaultControlDispatcher();
+    updateProgressRunnable = new Runnable() {
       @Override
       public void run() {
         Callback callback = getCallback();
@@ -81,34 +85,15 @@ public void run() {
     };
   }
 
-  @Override
-  public void onAttachedToHost(PlaybackGlueHost host) {
-    if (host instanceof SurfaceHolderGlueHost) {
-      surfaceHolderGlueHost = ((SurfaceHolderGlueHost) host);
-      surfaceHolderGlueHost.setSurfaceHolderCallback(componentListener);
-    }
-    notifyListeners();
-    player.addListener(componentListener);
-    player.addVideoListener(componentListener);
-  }
-
-  private void notifyListeners() {
-    boolean oldIsPrepared = isPrepared();
-    int playbackState = player.getPlaybackState();
-    boolean isInitialized = playbackState != Player.STATE_IDLE;
-    isBuffering = playbackState == Player.STATE_BUFFERING;
-    boolean hasEnded = playbackState == Player.STATE_ENDED;
-
-    initialized = isInitialized;
-    Callback callback = getCallback();
-    if (oldIsPrepared != isPrepared()) {
-      callback.onPreparedStateChanged(this);
-    }
-    callback.onPlayStateChanged(this);
-    callback.onBufferingStateChanged(this, isBuffering || !initialized);
-    if (hasEnded) {
-      callback.onPlayCompleted(this);
-    }
+  /**
+   * Sets the {@link ControlDispatcher}.
+   *
+   * @param controlDispatcher The {@link ControlDispatcher}, or null to use
+   *     {@link DefaultControlDispatcher}.
+   */
+  public void setControlDispatcher(@Nullable ControlDispatcher controlDispatcher) {
+    this.controlDispatcher = controlDispatcher == null ? new DefaultControlDispatcher()
+        : controlDispatcher;
   }
 
   /**
@@ -121,6 +106,19 @@ public void setErrorMessageProvider(
     this.errorMessageProvider = errorMessageProvider;
   }
 
+  // PlayerAdapter implementation.
+
+  @Override
+  public void onAttachedToHost(PlaybackGlueHost host) {
+    if (host instanceof SurfaceHolderGlueHost) {
+      surfaceHolderGlueHost = ((SurfaceHolderGlueHost) host);
+      surfaceHolderGlueHost.setSurfaceHolderCallback(componentListener);
+    }
+    notifyStateChanged();
+    player.addListener(componentListener);
+    player.addVideoListener(componentListener);
+  }
+
   @Override
   public void onDetachedFromHost() {
     player.removeListener(componentListener);
@@ -129,56 +127,59 @@ public void onDetachedFromHost() {
       surfaceHolderGlueHost.setSurfaceHolderCallback(null);
       surfaceHolderGlueHost = null;
     }
-    initialized = false;
     hasSurface = false;
     Callback callback = getCallback();
     callback.onBufferingStateChanged(this, false);
     callback.onPlayStateChanged(this);
-    callback.onPreparedStateChanged(this);
+    maybeNotifyPreparedStateChanged(callback);
   }
 
   @Override
-  public void setProgressUpdatingEnabled(final boolean enabled) {
-    handler.removeCallbacks(updatePlayerRunnable);
+  public void setProgressUpdatingEnabled(boolean enabled) {
+    handler.removeCallbacks(updateProgressRunnable);
     if (enabled) {
-      handler.post(updatePlayerRunnable);
+      handler.post(updateProgressRunnable);
     }
   }
 
   @Override
   public boolean isPlaying() {
-    return initialized && player.getPlayWhenReady();
+    int playbackState = player.getPlaybackState();
+    return playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED
+        && player.getPlayWhenReady();
   }
 
   @Override
   public long getDuration() {
     long durationMs = player.getDuration();
-    return durationMs != C.TIME_UNSET ? durationMs : -1;
+    return durationMs == C.TIME_UNSET ? -1 : durationMs;
   }
 
   @Override
   public long getCurrentPosition() {
-    return initialized ? player.getCurrentPosition() : -1;
+    return player.getPlaybackState() == Player.STATE_IDLE ? -1 : player.getCurrentPosition();
   }
 
   @Override
   public void play() {
     if (player.getPlaybackState() == Player.STATE_ENDED) {
-      player.seekToDefaultPosition();
+      controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), C.TIME_UNSET);
+    }
+    if (controlDispatcher.dispatchSetPlayWhenReady(player, true)) {
+      getCallback().onPlayStateChanged(this);
     }
-    player.setPlayWhenReady(true);
-    getCallback().onPlayStateChanged(this);
   }
 
   @Override
   public void pause() {
-    player.setPlayWhenReady(false);
-    getCallback().onPlayStateChanged(this);
+    if (controlDispatcher.dispatchSetPlayWhenReady(player, false)) {
+      getCallback().onPlayStateChanged(this);
+    }
   }
 
   @Override
   public void seekTo(long positionMs) {
-    player.seekTo(positionMs);
+    controlDispatcher.dispatchSeekTo(player, player.getCurrentWindowIndex(), positionMs);
   }
 
   @Override
@@ -188,13 +189,35 @@ public long getBufferedPosition() {
 
   @Override
   public boolean isPrepared() {
-    return initialized && (surfaceHolderGlueHost == null || hasSurface);
+    return player.getPlaybackState() != Player.STATE_IDLE
+        && (surfaceHolderGlueHost == null || hasSurface);
   }
 
-  private void setVideoSurface(Surface surface) {
+  // Internal methods.
+
+  /* package */ void setVideoSurface(Surface surface) {
     hasSurface = surface != null;
     player.setVideoSurface(surface);
-    getCallback().onPreparedStateChanged(this);
+    maybeNotifyPreparedStateChanged(getCallback());
+  }
+
+  /* package */ void notifyStateChanged() {
+    int playbackState = player.getPlaybackState();
+    Callback callback = getCallback();
+    maybeNotifyPreparedStateChanged(callback);
+    callback.onPlayStateChanged(this);
+    callback.onBufferingStateChanged(this, playbackState == Player.STATE_BUFFERING);
+    if (playbackState == Player.STATE_ENDED) {
+      callback.onPlayCompleted(this);
+    }
+  }
+
+  private void maybeNotifyPreparedStateChanged(Callback callback) {
+    boolean isPrepared = isPrepared();
+    if (lastNotifiedPreparedState != isPrepared) {
+      lastNotifiedPreparedState = isPrepared;
+      callback.onPreparedStateChanged(this);
+    }
   }
 
   private final class ComponentListener implements Player.EventListener,
@@ -208,7 +231,7 @@ public void surfaceCreated(SurfaceHolder surfaceHolder) {
     }
 
     @Override
-    public void surfaceChanged(SurfaceHolder surfaceHolder, int i, int i1, int i2) {
+    public void surfaceChanged(SurfaceHolder surfaceHolder, int format, int width, int height) {
       // Do nothing.
     }
 
@@ -221,7 +244,7 @@ public void surfaceDestroyed(SurfaceHolder surfaceHolder) {
 
     @Override
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-      notifyListeners();
+      notifyStateChanged();
     }
 
     @Override
@@ -292,4 +315,3 @@ public void onRenderedFirstFrame() {
   }
 
 }
-
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java
new file mode 100644
index 00000000000..21c596e6d46
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ControlDispatcher.java
@@ -0,0 +1,67 @@
+/*
+ * 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;
+
+import com.google.android.exoplayer2.Player.RepeatMode;
+
+/**
+ * Dispatches operations to the {@link Player}.
+ * <p>
+ * Implementations may choose to suppress (e.g. prevent playback from resuming if audio focus is
+ * denied) or modify (e.g. change the seek position to prevent a user from seeking past a
+ * non-skippable advert) operations.
+ */
+public interface ControlDispatcher {
+
+  /**
+   * Dispatches a {@link Player#setPlayWhenReady(boolean)} operation.
+   *
+   * @param player The {@link Player} to which the operation should be dispatched.
+   * @param playWhenReady Whether playback should proceed when ready.
+   * @return True if the operation was dispatched. False if suppressed.
+   */
+  boolean dispatchSetPlayWhenReady(Player player, boolean playWhenReady);
+
+  /**
+   * Dispatches a {@link Player#seekTo(int, long)} operation.
+   *
+   * @param player The {@link Player} to which the operation should be dispatched.
+   * @param windowIndex The index of the window.
+   * @param positionMs The seek position in the specified window, or {@link C#TIME_UNSET} to seek to
+   *     the window's default position.
+   * @return True if the operation was dispatched. False if suppressed.
+   */
+  boolean dispatchSeekTo(Player player, int windowIndex, long positionMs);
+
+  /**
+   * Dispatches a {@link Player#setRepeatMode(int)} operation.
+   *
+   * @param player The {@link Player} to which the operation should be dispatched.
+   * @param repeatMode The repeat mode.
+   * @return True if the operation was dispatched. False if suppressed.
+   */
+  boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode);
+
+  /**
+   * Dispatches a {@link Player#setShuffleModeEnabled(boolean)} operation.
+   *
+   * @param player The {@link Player} to which the operation should be dispatched.
+   * @param shuffleModeEnabled Whether shuffling is enabled.
+   * @return True if the operation was dispatched. False if suppressed.
+   */
+  boolean dispatchSetShuffleModeEnabled(Player player, boolean shuffleModeEnabled);
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java b/library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java
new file mode 100644
index 00000000000..84711d752aa
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/DefaultControlDispatcher.java
@@ -0,0 +1,50 @@
+/*
+ * 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;
+
+import com.google.android.exoplayer2.Player.RepeatMode;
+
+/**
+ * Default {@link ControlDispatcher} that dispatches all operations to the player without
+ * modification.
+ */
+public class DefaultControlDispatcher implements ControlDispatcher {
+
+  @Override
+  public boolean dispatchSetPlayWhenReady(Player player, boolean playWhenReady) {
+    player.setPlayWhenReady(playWhenReady);
+    return true;
+  }
+
+  @Override
+  public boolean dispatchSeekTo(Player player, int windowIndex, long positionMs) {
+    player.seekTo(windowIndex, positionMs);
+    return true;
+  }
+
+  @Override
+  public boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode) {
+    player.setRepeatMode(repeatMode);
+    return true;
+  }
+
+  @Override
+  public boolean dispatchSetShuffleModeEnabled(Player player, boolean shuffleModeEnabled) {
+    player.setShuffleModeEnabled(shuffleModeEnabled);
+    return true;
+  }
+
+}
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 f83bab57704..c89feaebf57 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
@@ -34,7 +34,6 @@
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Player.RepeatMode;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
@@ -180,6 +179,12 @@ public class PlaybackControlView extends FrameLayout {
     ExoPlayerLibraryInfo.registerModule("goog.exo.ui");
   }
 
+  /**
+   * @deprecated Use {@link com.google.android.exoplayer2.ControlDispatcher}.
+   */
+  @Deprecated
+  public interface ControlDispatcher extends com.google.android.exoplayer2.ControlDispatcher {}
+
   /**
    * Listener to be notified about changes of the visibility of the UI control.
    */
@@ -194,86 +199,13 @@ public interface VisibilityListener {
 
   }
 
+  private static final class DefaultControlDispatcher
+      extends com.google.android.exoplayer2.DefaultControlDispatcher implements ControlDispatcher {}
   /**
-   * Dispatches operations to the {@link Player}.
-   * <p>
-   * Implementations may choose to suppress (e.g. prevent playback from resuming if audio focus is
-   * denied) or modify (e.g. change the seek position to prevent a user from seeking past a
-   * non-skippable advert) operations.
-   */
-  public interface ControlDispatcher {
-
-    /**
-     * Dispatches a {@link Player#setPlayWhenReady(boolean)} operation.
-     *
-     * @param player The {@link Player} to which the operation should be dispatched.
-     * @param playWhenReady Whether playback should proceed when ready.
-     * @return True if the operation was dispatched. False if suppressed.
-     */
-    boolean dispatchSetPlayWhenReady(Player player, boolean playWhenReady);
-
-    /**
-     * Dispatches a {@link Player#seekTo(int, long)} operation.
-     *
-     * @param player The {@link Player} to which the operation should be dispatched.
-     * @param windowIndex The index of the window.
-     * @param positionMs The seek position in the specified window, or {@link C#TIME_UNSET} to seek
-     *     to the window's default position.
-     * @return True if the operation was dispatched. False if suppressed.
-     */
-    boolean dispatchSeekTo(Player player, int windowIndex, long positionMs);
-
-    /**
-     * Dispatches a {@link Player#setRepeatMode(int)} operation.
-     *
-     * @param player The {@link Player} to which the operation should be dispatched.
-     * @param repeatMode The repeat mode.
-     * @return True if the operation was dispatched. False if suppressed.
-     */
-    boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode);
-
-    /**
-     * Dispatches a {@link Player#setShuffleModeEnabled(boolean)} operation.
-     *
-     * @param player The {@link Player} to which the operation should be dispatched.
-     * @param shuffleModeEnabled Whether shuffling is enabled.
-     * @return True if the operation was dispatched. False if suppressed.
-     */
-    boolean dispatchSetShuffleModeEnabled(Player player, boolean shuffleModeEnabled);
-
-  }
-
-  /**
-   * Default {@link ControlDispatcher} that dispatches operations to the player without
-   * modification.
+   * @deprecated Use {@link com.google.android.exoplayer2.DefaultControlDispatcher}.
    */
-  public static final ControlDispatcher DEFAULT_CONTROL_DISPATCHER = new ControlDispatcher() {
-
-    @Override
-    public boolean dispatchSetPlayWhenReady(Player player, boolean playWhenReady) {
-      player.setPlayWhenReady(playWhenReady);
-      return true;
-    }
-
-    @Override
-    public boolean dispatchSeekTo(Player player, int windowIndex, long positionMs) {
-      player.seekTo(windowIndex, positionMs);
-      return true;
-    }
-
-    @Override
-    public boolean dispatchSetRepeatMode(Player player, @RepeatMode int repeatMode) {
-      player.setRepeatMode(repeatMode);
-      return true;
-    }
-
-    @Override
-    public boolean dispatchSetShuffleModeEnabled(Player player, boolean shuffleModeEnabled) {
-      player.setShuffleModeEnabled(shuffleModeEnabled);
-      return true;
-    }
-
-  };
+  @Deprecated
+  public static final ControlDispatcher DEFAULT_CONTROL_DISPATCHER = new DefaultControlDispatcher();
 
   /**
    * The default fast forward increment, in milliseconds.
@@ -325,7 +257,7 @@ public boolean dispatchSetShuffleModeEnabled(Player player, boolean shuffleModeE
   private final String repeatAllButtonContentDescription;
 
   private Player player;
-  private ControlDispatcher controlDispatcher;
+  private com.google.android.exoplayer2.ControlDispatcher controlDispatcher;
   private VisibilityListener visibilityListener;
 
   private boolean isAttachedToWindow;
@@ -400,7 +332,7 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
     extraAdGroupTimesMs = new long[0];
     extraPlayedAdGroups = new boolean[0];
     componentListener = new ComponentListener();
-    controlDispatcher = DEFAULT_CONTROL_DISPATCHER;
+    controlDispatcher = new com.google.android.exoplayer2.DefaultControlDispatcher();
 
     LayoutInflater.from(context).inflate(controllerLayoutId, this);
     setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);
@@ -534,14 +466,15 @@ public void setVisibilityListener(VisibilityListener listener) {
   }
 
   /**
-   * Sets the {@link ControlDispatcher}.
+   * Sets the {@link com.google.android.exoplayer2.ControlDispatcher}.
    *
-   * @param controlDispatcher The {@link ControlDispatcher}, or null to use
-   *     {@link #DEFAULT_CONTROL_DISPATCHER}.
+   * @param controlDispatcher The {@link com.google.android.exoplayer2.ControlDispatcher}, or null
+   *     to use {@link com.google.android.exoplayer2.DefaultControlDispatcher}.
    */
-  public void setControlDispatcher(ControlDispatcher controlDispatcher) {
-    this.controlDispatcher = controlDispatcher == null ? DEFAULT_CONTROL_DISPATCHER
-        : controlDispatcher;
+  public void setControlDispatcher(
+      @Nullable com.google.android.exoplayer2.ControlDispatcher controlDispatcher) {
+    this.controlDispatcher = controlDispatcher == null
+        ? new com.google.android.exoplayer2.DefaultControlDispatcher() : controlDispatcher;
   }
 
   /**
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 a8926f9ecc2..5b6e11c5e4b 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
@@ -34,6 +34,8 @@
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 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.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
@@ -47,7 +49,6 @@
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
-import com.google.android.exoplayer2.ui.PlaybackControlView.ControlDispatcher;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 import com.google.android.exoplayer2.util.Util;
@@ -616,9 +617,9 @@ public void setControllerVisibilityListener(PlaybackControlView.VisibilityListen
    * Sets the {@link ControlDispatcher}.
    *
    * @param controlDispatcher The {@link ControlDispatcher}, or null to use
-   *     {@link PlaybackControlView#DEFAULT_CONTROL_DISPATCHER}.
+   *     {@link DefaultControlDispatcher}.
    */
-  public void setControlDispatcher(ControlDispatcher controlDispatcher) {
+  public void setControlDispatcher(@Nullable ControlDispatcher controlDispatcher) {
     Assertions.checkState(controller != null);
     controller.setControlDispatcher(controlDispatcher);
   }

From d9cd13ce746c496adb6c327cb749e74afcfe2f05 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 12:15:50 -0700
Subject: [PATCH 165/421] Automated rollback of changelist 166843123.

*** Reason for rollback ***

Doesn't work because trackOutputProvider can be null when extracting init data.

*** Original change description ***

Don't copy primary-track format to non-primary tracks

Copying non-primary-track formats to non-primary tracks
looks non-trivial (I tried; went down a dead-end), so
leaving that for now.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166883654
---
 .../source/chunk/BaseMediaChunkOutput.java    | 27 ++++---------------
 .../source/chunk/ChunkExtractorWrapper.java   | 24 +++++------------
 .../source/chunk/ChunkSampleStream.java       | 10 +++++--
 3 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
index 0b6c196d7cf..9531aaf32e8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/BaseMediaChunkOutput.java
@@ -15,7 +15,6 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
-import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.extractor.DummyTrackOutput;
 import com.google.android.exoplayer2.extractor.TrackOutput;
@@ -33,23 +32,12 @@
   private final SampleQueue[] sampleQueues;
 
   /**
-   * @param primaryTrackType The type of the primary track.
-   * @param primarySampleQueue The primary track sample queues.
-   * @param embeddedTrackTypes The types of any embedded tracks, or null.
-   * @param embeddedSampleQueues The track sample queues for any embedded tracks, or null.
+   * @param trackTypes The track types of the individual track outputs.
+   * @param sampleQueues The individual sample queues.
    */
-  @SuppressWarnings("ConstantConditions")
-  public BaseMediaChunkOutput(int primaryTrackType, SampleQueue primarySampleQueue,
-      @Nullable int[] embeddedTrackTypes, @Nullable SampleQueue[] embeddedSampleQueues) {
-    int embeddedTrackCount = embeddedTrackTypes == null ? 0 : embeddedTrackTypes.length;
-    trackTypes = new int[1 + embeddedTrackCount];
-    sampleQueues = new SampleQueue[1 + embeddedTrackCount];
-    trackTypes[0] = primaryTrackType;
-    sampleQueues[0] = primarySampleQueue;
-    for (int i = 0; i < embeddedTrackCount; i++) {
-      trackTypes[i + 1] = embeddedTrackTypes[i];
-      sampleQueues[i + 1] = embeddedSampleQueues[i];
-    }
+  public BaseMediaChunkOutput(int[] trackTypes, SampleQueue[] sampleQueues) {
+    this.trackTypes = trackTypes;
+    this.sampleQueues = sampleQueues;
   }
 
   @Override
@@ -63,11 +51,6 @@ public TrackOutput track(int id, int type) {
     return new DummyTrackOutput();
   }
 
-  @Override
-  public boolean isPrimaryTrack(int type) {
-    return type == trackTypes[0];
-  }
-
   /**
    * Returns the current absolute write indices of the individual sample queues.
    */
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 eda9ed3cf75..07d1cce8cba 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
@@ -45,22 +45,13 @@ public interface TrackOutputProvider {
      * <p>
      * The same {@link TrackOutput} is returned if multiple calls are made with the same {@code id}.
      *
-     * @param id The track identifier.
-     * @param type The track type. Typically one of the {@link com.google.android.exoplayer2.C}
-     *     {@code TRACK_TYPE_*} constants.
+     * @param id A track identifier.
+     * @param type The type of the track. Typically one of the
+     *     {@link com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
      * @return The {@link TrackOutput} for the given track identifier.
      */
     TrackOutput track(int id, int type);
 
-    /**
-     * Returns whether the specified type corresponds to the primary track.
-     *
-     * @param type The track type. Typically one of the {@link com.google.android.exoplayer2.C}
-     *     {@code TRACK_TYPE_*} constants.
-     * @return Whether {@code type} corresponds to the primary track.
-     */
-    boolean isPrimaryTrack(int type);
-
   }
 
   public final Extractor extractor;
@@ -155,7 +146,6 @@ private static final class BindingTrackOutput implements TrackOutput {
     private final Format manifestFormat;
 
     public Format sampleFormat;
-    private boolean isPrimaryTrack;
     private TrackOutput trackOutput;
 
     public BindingTrackOutput(int id, int type, Format manifestFormat) {
@@ -169,17 +159,17 @@ public void bind(TrackOutputProvider trackOutputProvider) {
         trackOutput = new DummyTrackOutput();
         return;
       }
-      isPrimaryTrack = trackOutputProvider.isPrimaryTrack(type);
       trackOutput = trackOutputProvider.track(id, type);
-      if (sampleFormat != null) {
+      if (trackOutput != null) {
         trackOutput.format(sampleFormat);
       }
     }
 
     @Override
     public void format(Format format) {
-      // TODO: Non-primary tracks should be copied with data from their own manifest formats.
-      sampleFormat = isPrimaryTrack ? format.copyWithManifestFormatInfo(manifestFormat) : format;
+      // TODO: This should only happen for the primary track. Additional metadata/text tracks need
+      // to be copied with different manifest derived formats.
+      sampleFormat = format.copyWithManifestFormatInfo(manifestFormat);
       trackOutput.format(sampleFormat);
     }
 
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 e8586f72305..f2609a0ffdd 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
@@ -87,15 +87,21 @@ public ChunkSampleStream(int primaryTrackType, int[] embeddedTrackTypes, T chunk
     int embeddedTrackCount = embeddedTrackTypes == null ? 0 : embeddedTrackTypes.length;
     embeddedSampleQueues = new SampleQueue[embeddedTrackCount];
     embeddedTracksSelected = new boolean[embeddedTrackCount];
+    int[] trackTypes = new int[1 + embeddedTrackCount];
+    SampleQueue[] sampleQueues = new SampleQueue[1 + embeddedTrackCount];
 
     primarySampleQueue = new SampleQueue(allocator);
+    trackTypes[0] = primaryTrackType;
+    sampleQueues[0] = primarySampleQueue;
+
     for (int i = 0; i < embeddedTrackCount; i++) {
       SampleQueue sampleQueue = new SampleQueue(allocator);
       embeddedSampleQueues[i] = sampleQueue;
+      sampleQueues[i + 1] = sampleQueue;
+      trackTypes[i + 1] = embeddedTrackTypes[i];
     }
 
-    mediaChunkOutput = new BaseMediaChunkOutput(primaryTrackType, primarySampleQueue,
-        embeddedTrackTypes, embeddedSampleQueues);
+    mediaChunkOutput = new BaseMediaChunkOutput(trackTypes, sampleQueues);
     pendingResetPositionUs = positionUs;
     lastSeekPositionUs = positionUs;
   }

From 5bed2bf5032a4e5bea36a30a667a795ed172798a Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 13:55:19 -0700
Subject: [PATCH 166/421] Don't copy primary-track format to non-primary tracks

This time plumbing the track type in from the other side.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166898172
---
 .../source/chunk/ChunkExtractorWrapper.java   | 35 +++++++++-------
 .../exoplayer2/source/dash/DashUtil.java      | 41 +++++++++++--------
 .../source/dash/DefaultDashChunkSource.java   | 10 ++---
 .../smoothstreaming/DefaultSsChunkSource.java |  2 +-
 4 files changed, 51 insertions(+), 37 deletions(-)

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 07d1cce8cba..17eb30dee98 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
@@ -29,9 +29,10 @@
 import java.io.IOException;
 
 /**
- * An {@link Extractor} wrapper for loading chunks containing a single track.
+ * An {@link Extractor} wrapper for loading chunks that contain a single primary track, and possibly
+ * additional embedded tracks.
  * <p>
- * The wrapper allows switching of the {@link TrackOutput} that receives parsed data.
+ * The wrapper allows switching of the {@link TrackOutput}s that receive parsed data.
  */
 public final class ChunkExtractorWrapper implements ExtractorOutput {
 
@@ -56,7 +57,8 @@ public interface TrackOutputProvider {
 
   public final Extractor extractor;
 
-  private final Format manifestFormat;
+  private final int primaryTrackType;
+  private final Format primaryTrackManifestFormat;
   private final SparseArray<BindingTrackOutput> bindingTrackOutputs;
 
   private boolean extractorInitialized;
@@ -66,12 +68,16 @@ public interface TrackOutputProvider {
 
   /**
    * @param extractor The extractor to wrap.
-   * @param manifestFormat A manifest defined {@link Format} whose data should be merged into any
-   *     sample {@link Format} output from the {@link Extractor}.
+   * @param primaryTrackType The type of the primary track. Typically one of the
+   *     {@link com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
+   * @param primaryTrackManifestFormat A manifest defined {@link Format} whose data should be merged
+   *     into any sample {@link Format} output from the {@link Extractor} for the primary track.
    */
-  public ChunkExtractorWrapper(Extractor extractor, Format manifestFormat) {
+  public ChunkExtractorWrapper(Extractor extractor, int primaryTrackType,
+      Format primaryTrackManifestFormat) {
     this.extractor = extractor;
-    this.manifestFormat = manifestFormat;
+    this.primaryTrackType = primaryTrackType;
+    this.primaryTrackManifestFormat = primaryTrackManifestFormat;
     bindingTrackOutputs = new SparseArray<>();
   }
 
@@ -90,8 +96,8 @@ public Format[] getSampleFormats() {
   }
 
   /**
-   * Initializes the extractor to output to the provided {@link TrackOutput}, and configures it to
-   * receive data from a new chunk.
+   * Initializes the wrapper to output to {@link TrackOutput}s provided by the specified
+   * {@link TrackOutputProvider}, and configures the extractor to receive data from a new chunk.
    *
    * @param trackOutputProvider The provider of {@link TrackOutput}s that will receive sample data.
    */
@@ -116,7 +122,9 @@ public TrackOutput track(int id, int type) {
     if (bindingTrackOutput == null) {
       // Assert that if we're seeing a new track we have not seen endTracks.
       Assertions.checkState(sampleFormats == null);
-      bindingTrackOutput = new BindingTrackOutput(id, type, manifestFormat);
+      // TODO: Manifest formats for embedded tracks should also be passed here.
+      bindingTrackOutput = new BindingTrackOutput(id, type,
+          type == primaryTrackType ? primaryTrackManifestFormat : null);
       bindingTrackOutput.bind(trackOutputProvider);
       bindingTrackOutputs.put(id, bindingTrackOutput);
     }
@@ -160,16 +168,15 @@ public void bind(TrackOutputProvider trackOutputProvider) {
         return;
       }
       trackOutput = trackOutputProvider.track(id, type);
-      if (trackOutput != null) {
+      if (sampleFormat != null) {
         trackOutput.format(sampleFormat);
       }
     }
 
     @Override
     public void format(Format format) {
-      // TODO: This should only happen for the primary track. Additional metadata/text tracks need
-      // to be copied with different manifest derived formats.
-      sampleFormat = format.copyWithManifestFormatInfo(manifestFormat);
+      sampleFormat = manifestFormat != null ? format.copyWithManifestFormatInfo(manifestFormat)
+          : format;
       trackOutput.format(sampleFormat);
     }
 
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 59fbfb18fe1..ed2f916b879 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
@@ -72,9 +72,11 @@ public static DashManifest loadManifest(DataSource dataSource, Uri uri)
    */
   public static DrmInitData loadDrmInitData(DataSource dataSource, Period period)
       throws IOException, InterruptedException {
-    Representation representation = getFirstRepresentation(period, C.TRACK_TYPE_VIDEO);
+    int primaryTrackType = C.TRACK_TYPE_VIDEO;
+    Representation representation = getFirstRepresentation(period, primaryTrackType);
     if (representation == null) {
-      representation = getFirstRepresentation(period, C.TRACK_TYPE_AUDIO);
+      primaryTrackType = C.TRACK_TYPE_AUDIO;
+      representation = getFirstRepresentation(period, primaryTrackType);
       if (representation == null) {
         return null;
       }
@@ -85,7 +87,7 @@ public static DrmInitData loadDrmInitData(DataSource dataSource, Period period)
       // as per DASH IF Interoperability Recommendations V3.0, 7.5.3.
       return drmInitData;
     }
-    Format sampleFormat = DashUtil.loadSampleFormat(dataSource, representation);
+    Format sampleFormat = DashUtil.loadSampleFormat(dataSource, primaryTrackType, representation);
     return sampleFormat == null ? null : sampleFormat.drmInitData;
   }
 
@@ -93,15 +95,17 @@ public static DrmInitData loadDrmInitData(DataSource dataSource, Period period)
    * Loads initialization data for the {@code representation} and returns the sample {@link Format}.
    *
    * @param dataSource The source from which the data should be loaded.
+   * @param trackType The type of the representation. Typically one of the
+   *     {@link com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
    * @param representation The representation which initialization chunk belongs to.
    * @return the sample {@link Format} of the given representation.
    * @throws IOException Thrown when there is an error while loading.
    * @throws InterruptedException Thrown if the thread was interrupted.
    */
-  public static Format loadSampleFormat(DataSource dataSource, Representation representation)
-      throws IOException, InterruptedException {
-    ChunkExtractorWrapper extractorWrapper = loadInitializationData(dataSource, representation,
-        false);
+  public static Format loadSampleFormat(DataSource dataSource, int trackType,
+      Representation representation) throws IOException, InterruptedException {
+    ChunkExtractorWrapper extractorWrapper = loadInitializationData(dataSource, trackType,
+        representation, false);
     return extractorWrapper == null ? null : extractorWrapper.getSampleFormats()[0];
   }
 
@@ -110,16 +114,18 @@ public static Format loadSampleFormat(DataSource dataSource, Representation repr
    * ChunkIndex}.
    *
    * @param dataSource The source from which the data should be loaded.
+   * @param trackType The type of the representation. Typically one of the
+   *     {@link com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
    * @param representation The representation which initialization chunk belongs to.
    * @return The {@link ChunkIndex} of the given representation, or null if no initialization or
    *     index data exists.
    * @throws IOException Thrown when there is an error while loading.
    * @throws InterruptedException Thrown if the thread was interrupted.
    */
-  public static ChunkIndex loadChunkIndex(DataSource dataSource, Representation representation)
-      throws IOException, InterruptedException {
-    ChunkExtractorWrapper extractorWrapper = loadInitializationData(dataSource, representation,
-        true);
+  public static ChunkIndex loadChunkIndex(DataSource dataSource, int trackType,
+      Representation representation) throws IOException, InterruptedException {
+    ChunkExtractorWrapper extractorWrapper = loadInitializationData(dataSource, trackType,
+        representation, true);
     return extractorWrapper == null ? null : (ChunkIndex) extractorWrapper.getSeekMap();
   }
 
@@ -128,6 +134,8 @@ public static ChunkIndex loadChunkIndex(DataSource dataSource, Representation re
    * returns a {@link ChunkExtractorWrapper} which contains the output.
    *
    * @param dataSource The source from which the data should be loaded.
+   * @param trackType The type of the representation. Typically one of the
+   *     {@link com.google.android.exoplayer2.C} {@code TRACK_TYPE_*} constants.
    * @param representation The representation which initialization chunk belongs to.
    * @param loadIndex Whether to load index data too.
    * @return A {@link ChunkExtractorWrapper} for the {@code representation}, or null if no
@@ -135,14 +143,13 @@ public static ChunkIndex loadChunkIndex(DataSource dataSource, Representation re
    * @throws IOException Thrown when there is an error while loading.
    * @throws InterruptedException Thrown if the thread was interrupted.
    */
-  private static ChunkExtractorWrapper loadInitializationData(DataSource dataSource,
-      Representation representation, boolean loadIndex)
-      throws IOException, InterruptedException {
+  private static ChunkExtractorWrapper loadInitializationData(DataSource dataSource, int trackType,
+      Representation representation, boolean loadIndex) throws IOException, InterruptedException {
     RangedUri initializationUri = representation.getInitializationUri();
     if (initializationUri == null) {
       return null;
     }
-    ChunkExtractorWrapper extractorWrapper = newWrappedExtractor(representation.format);
+    ChunkExtractorWrapper extractorWrapper = newWrappedExtractor(trackType, representation.format);
     RangedUri requestUri;
     if (loadIndex) {
       RangedUri indexUri = representation.getIndexUri();
@@ -174,12 +181,12 @@ private static void loadInitializationData(DataSource dataSource,
     initializationChunk.load();
   }
 
-  private static ChunkExtractorWrapper newWrappedExtractor(Format format) {
+  private static ChunkExtractorWrapper newWrappedExtractor(int trackType, Format format) {
     String mimeType = format.containerMimeType;
     boolean isWebm = mimeType.startsWith(MimeTypes.VIDEO_WEBM)
         || mimeType.startsWith(MimeTypes.AUDIO_WEBM);
     Extractor extractor = isWebm ? new MatroskaExtractor() : new FragmentedMp4Extractor();
-    return new ChunkExtractorWrapper(extractor, format);
+    return new ChunkExtractorWrapper(extractor, trackType, format);
   }
 
   private static Representation getFirstRepresentation(Period period, int type) {
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 dd62d47621d..c6c1461001c 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
@@ -134,8 +134,8 @@ public DefaultDashChunkSource(LoaderErrorThrower manifestLoaderErrorThrower,
     representationHolders = new RepresentationHolder[trackSelection.length()];
     for (int i = 0; i < representationHolders.length; i++) {
       Representation representation = representations.get(trackSelection.getIndexInTrackGroup(i));
-      representationHolders[i] = new RepresentationHolder(periodDurationUs, representation,
-          enableEventMessageTrack, enableCea608Track);
+      representationHolders[i] = new RepresentationHolder(periodDurationUs, trackType,
+          representation, enableEventMessageTrack, enableCea608Track);
     }
   }
 
@@ -390,8 +390,8 @@ protected static final class RepresentationHolder {
     private long periodDurationUs;
     private int segmentNumShift;
 
-    /* package */ RepresentationHolder(long periodDurationUs, Representation representation,
-        boolean enableEventMessageTrack, boolean enableCea608Track) {
+    /* package */ RepresentationHolder(long periodDurationUs, int trackType,
+        Representation representation, boolean enableEventMessageTrack, boolean enableCea608Track) {
       this.periodDurationUs = periodDurationUs;
       this.representation = representation;
       String containerMimeType = representation.format.containerMimeType;
@@ -415,7 +415,7 @@ protected static final class RepresentationHolder {
         }
         // Prefer drmInitData obtained from the manifest over drmInitData obtained from the stream,
         // as per DASH IF Interoperability Recommendations V3.0, 7.5.3.
-        extractorWrapper = new ChunkExtractorWrapper(extractor, representation.format);
+        extractorWrapper = new ChunkExtractorWrapper(extractor, trackType, representation.format);
       }
       segmentIndex = representation.getIndex();
     }
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 f2e4c572981..10695279899 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
@@ -102,7 +102,7 @@ public DefaultSsChunkSource(LoaderErrorThrower manifestLoaderErrorThrower, SsMan
       FragmentedMp4Extractor extractor = new FragmentedMp4Extractor(
           FragmentedMp4Extractor.FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME
           | FragmentedMp4Extractor.FLAG_WORKAROUND_IGNORE_TFDT_BOX, null, track);
-      extractorWrappers[i] = new ChunkExtractorWrapper(extractor, format);
+      extractorWrappers[i] = new ChunkExtractorWrapper(extractor, streamElement.type, format);
     }
   }
 

From b0df6dce9823e11c45c881abf31ac8cb9a9ba92f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 15:38:04 -0700
Subject: [PATCH 167/421] Fix moe config

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166914821
---
 .../ProgressiveDownloadActionTest.java        | 123 ------
 .../dash/offline/DashDownloadTestData.java    | 102 +++++
 .../dash/offline/DashDownloaderTest.java      | 406 ++++++++++++++++++
 .../source/dash/offline/DashDownloader.java   | 173 ++++++++
 .../source/hls/offline/HlsDownloadAction.java |  83 ----
 .../offline/SsDownloadAction.java             |  86 ----
 6 files changed, 681 insertions(+), 292 deletions(-)
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
 create mode 100644 library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
 create mode 100644 library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
 create mode 100644 library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.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

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
deleted file mode 100644
index ec45ea01c7d..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
+++ /dev/null
@@ -1,123 +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.test.InstrumentationTestCase;
-import com.google.android.exoplayer2.testutil.TestUtil;
-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 org.mockito.Mockito;
-
-/**
- * Unit tests for {@link ProgressiveDownloadAction}.
- */
-public class ProgressiveDownloadActionTest extends InstrumentationTestCase {
-
-  public void testDownloadActionIsNotRemoveAction() throws Exception {
-    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
-    assertFalse(action.isRemoveAction());
-  }
-
-  public void testRemoveActionIsRemoveAction() throws Exception {
-    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
-    assertTrue(action2.isRemoveAction());
-  }
-
-  public void testCreateDownloader() throws Exception {
-    TestUtil.setUpMockito(this);
-    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
-    DownloaderConstructorHelper constructorHelper = new DownloaderConstructorHelper(
-        Mockito.mock(Cache.class), DummyDataSource.FACTORY);
-    assertNotNull(action.createDownloader(constructorHelper));
-  }
-
-  public void testSameUriCacheKeyDifferentAction_IsSameMedia() throws Exception {
-    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, false);
-    assertTrue(action1.isSameMedia(action2));
-  }
-
-  public void testNullCacheKeyDifferentUriAction_IsNotSameMedia() throws Exception {
-    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri2", null, true);
-    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, false);
-    assertFalse(action3.isSameMedia(action4));
-  }
-
-  public void testSameCacheKeyDifferentUriAction_IsSameMedia() throws Exception {
-    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri2", "key", true);
-    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", "key", false);
-    assertTrue(action5.isSameMedia(action6));
-  }
-
-  public void testSameUriDifferentCacheKeyAction_IsNotSameMedia() throws Exception {
-    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
-    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", false);
-    assertFalse(action7.isSameMedia(action8));
-  }
-
-  public void testEquals() throws Exception {
-    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
-    assertTrue(action1.equals(action1));
-
-    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri", null, true);
-    assertTrue(action2.equals(action3));
-
-    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri", null, false);
-    assertFalse(action4.equals(action5));
-
-    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
-    assertFalse(action6.equals(action7));
-
-    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", true);
-    ProgressiveDownloadAction action9 = new ProgressiveDownloadAction("uri", "key", true);
-    assertFalse(action8.equals(action9));
-
-    ProgressiveDownloadAction action10 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action11 = new ProgressiveDownloadAction("uri2", null, true);
-    assertFalse(action10.equals(action11));
-  }
-
-  public void testSerializerGetType() throws Exception {
-    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
-    assertNotNull(action.getType());
-  }
-
-  public void testSerializerWriteRead() throws Exception {
-    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri1", null, false));
-    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri2", "key", true));
-  }
-
-  private void doTestSerializationRoundTrip(ProgressiveDownloadAction action1) throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    action1.writeToStream(output);
-
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 = ProgressiveDownloadAction.DESERIALIZER.readFromStream(input);
-
-    assertEquals(action1, action2);
-  }
-
-}
diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
new file mode 100644
index 00000000000..220adfb3c50
--- /dev/null
+++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
@@ -0,0 +1,102 @@
+/*
+ * 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 com.google.android.exoplayer2.util.ClosedSource;
+
+/**
+ * Data for DASH downloading tests.
+ */
+@ClosedSource(reason = "Not ready yet")
+/* package */ interface DashDownloadTestData {
+
+  Uri TEST_MPD_URI = Uri.parse("test.mpd");
+
+  byte[] TEST_MPD =
+      ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+          + "<MPD xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" type=\"static\" "
+          + "    mediaPresentationDuration=\"PT31S\">\n"
+          + "    <Period duration=\"PT16S\" >\n"
+          + "        <AdaptationSet>\n"
+          + "            <SegmentList>\n"
+          + "                <SegmentTimeline>\n"
+          + "                    <S d=\"5\" />\n"
+          + "                    <S d=\"5\" />\n"
+          + "                    <S d=\"5\" />\n"
+          + "                </SegmentTimeline>\n"
+          + "            </SegmentList>\n"
+          + "            <Representation>\n"
+          + "                <SegmentList>\n"
+          // Bounded range data
+          + "                    <Initialization range=\"0-9\" sourceURL=\"audio_init_data\" />\n"
+          // Unbounded range data
+          + "                    <SegmentURL media=\"audio_segment_1\" />\n"
+          + "                    <SegmentURL media=\"audio_segment_2\" />\n"
+          + "                    <SegmentURL media=\"audio_segment_3\" />\n"
+          + "                </SegmentList>\n"
+          + "            </Representation>\n"
+          + "        </AdaptationSet>\n"
+          + "        <AdaptationSet>\n"
+          // This segment list has a 1 second offset to make sure the progressive download order
+          + "            <SegmentList>\n"
+          + "                <SegmentTimeline>\n"
+          + "                    <S t=\"1\" d=\"5\" />\n" // 1s offset
+          + "                    <S d=\"5\" />\n"
+          + "                    <S d=\"5\" />\n"
+          + "                </SegmentTimeline>\n"
+          + "            </SegmentList>\n"
+          + "            <Representation>\n"
+          + "                <SegmentList>\n"
+          + "                    <SegmentURL media=\"text_segment_1\" />\n"
+          + "                    <SegmentURL media=\"text_segment_2\" />\n"
+          + "                    <SegmentURL media=\"text_segment_3\" />\n"
+          + "                </SegmentList>\n"
+          + "            </Representation>\n"
+          + "        </AdaptationSet>\n"
+          + "    </Period>\n"
+          + "    <Period>\n"
+          + "        <SegmentList>\n"
+          + "            <SegmentTimeline>\n"
+          + "                <S d=\"5\" />\n"
+          + "                <S d=\"5\" />\n"
+          + "                <S d=\"5\" />\n"
+          + "            </SegmentTimeline>\n"
+          + "        </SegmentList>\n"
+          + "        <AdaptationSet>\n"
+          + "            <Representation>\n"
+          + "                <SegmentList>\n"
+          + "                    <SegmentURL media=\"period_2_segment_1\" />\n"
+          + "                    <SegmentURL media=\"period_2_segment_2\" />\n"
+          + "                    <SegmentURL media=\"period_2_segment_3\" />\n"
+          + "                </SegmentList>\n"
+          + "            </Representation>\n"
+          + "        </AdaptationSet>\n"
+          + "    </Period>\n"
+          + "</MPD>").getBytes();
+
+  byte[] TEST_MPD_NO_INDEX =
+      ("<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
+          + "<MPD xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" type=\"dynamic\">\n"
+          + "    <Period start=\"PT6462826.784S\" >\n"
+          + "        <AdaptationSet>\n"
+          + "            <Representation>\n"
+          + "                <SegmentBase indexRange='0-10'/>\n"
+          + "            </Representation>\n"
+          + "        </AdaptationSet>\n"
+          + "    </Period>\n"
+          + "</MPD>").getBytes();
+}
diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
new file mode 100644
index 00000000000..f5e00d2cec4
--- /dev/null
+++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -0,0 +1,406 @@
+/*
+ * 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.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_MPD;
+import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_MPD_NO_INDEX;
+import static com.google.android.exoplayer2.source.dash.offline.DashDownloadTestData.TEST_MPD_URI;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedData;
+import static com.google.android.exoplayer2.testutil.CacheAsserts.assertDataCached;
+
+import android.test.InstrumentationTestCase;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.offline.DownloadException;
+import com.google.android.exoplayer2.offline.Downloader.ProgressListener;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
+import com.google.android.exoplayer2.source.dash.manifest.RepresentationKey;
+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.cache.NoOpCacheEvictor;
+import com.google.android.exoplayer2.upstream.cache.SimpleCache;
+import com.google.android.exoplayer2.util.Util;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import org.mockito.InOrder;
+import org.mockito.Mockito;
+
+/**
+ * Unit tests for {@link DashDownloader}.
+ */
+public class DashDownloaderTest extends InstrumentationTestCase {
+
+  private SimpleCache cache;
+  private File tempFolder;
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    TestUtil.setUpMockito(this);
+    tempFolder = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
+    cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
+  }
+
+  @Override
+  public void tearDown() throws Exception {
+    Util.recursiveDelete(tempFolder);
+    super.tearDown();
+  }
+
+  public void testGetManifest() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    DashManifest manifest = dashDownloader.getManifest();
+
+    assertNotNull(manifest);
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  public void testDownloadManifestFailure() throws Exception {
+    byte[] testMpdFirstPart = Arrays.copyOf(TEST_MPD, 10);
+    byte[] testMpdSecondPart = Arrays.copyOfRange(TEST_MPD, 10, TEST_MPD.length);
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .newData(TEST_MPD_URI)
+        .appendReadData(testMpdFirstPart)
+        .appendReadError(new IOException())
+        .appendReadData(testMpdSecondPart)
+        .endData();
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    // fails on the first try
+    try {
+      dashDownloader.getManifest();
+      fail();
+    } catch (IOException e) {
+      // ignore
+    }
+    assertDataCached(cache, TEST_MPD_URI, testMpdFirstPart);
+
+    // on the second try it downloads the rest of the data
+    DashManifest manifest = dashDownloader.getManifest();
+
+    assertNotNull(manifest);
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  public void testDownloadRepresentation() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    dashDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  public void testDownloadRepresentationInSmallParts() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .newData("audio_segment_1")
+        .appendReadData(TestUtil.buildTestData(10))
+        .appendReadData(TestUtil.buildTestData(10))
+        .appendReadData(TestUtil.buildTestData(10))
+        .endData()
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    dashDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  public void testDownloadRepresentations() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6)
+        .setRandomData("text_segment_1", 1)
+        .setRandomData("text_segment_2", 2)
+        .setRandomData("text_segment_3", 3);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    dashDownloader.selectRepresentations(
+        new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
+    dashDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  public void testDownloadAllRepresentations() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6)
+        .setRandomData("text_segment_1", 1)
+        .setRandomData("text_segment_2", 2)
+        .setRandomData("text_segment_3", 3)
+        .setRandomData("period_2_segment_1", 1)
+        .setRandomData("period_2_segment_2", 2)
+        .setRandomData("period_2_segment_3", 3);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    // dashDownloader.selectRepresentations() isn't called
+    dashDownloader.download(null);
+    assertCachedData(cache, fakeDataSet);
+    dashDownloader.remove();
+
+    // select something random
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    // clear selection
+    dashDownloader.selectRepresentations(null);
+    dashDownloader.download(null);
+    assertCachedData(cache, fakeDataSet);
+    dashDownloader.remove();
+
+    dashDownloader.selectRepresentations(new RepresentationKey[0]);
+    dashDownloader.download(null);
+    assertCachedData(cache, fakeDataSet);
+    dashDownloader.remove();
+  }
+
+  public void testProgressiveDownload() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6)
+        .setRandomData("text_segment_1", 1)
+        .setRandomData("text_segment_2", 2)
+        .setRandomData("text_segment_3", 3);
+    FakeDataSource fakeDataSource = new FakeDataSource(fakeDataSet);
+    Factory factory = Mockito.mock(Factory.class);
+    Mockito.when(factory.createDataSource()).thenReturn(fakeDataSource);
+    DashDownloader dashDownloader = new DashDownloader(TEST_MPD_URI,
+        new DownloaderConstructorHelper(cache, factory));
+
+    dashDownloader.selectRepresentations(
+        new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
+    dashDownloader.download(null);
+
+    DataSpec[] openedDataSpecs = fakeDataSource.getAndClearOpenedDataSpecs();
+    assertEquals(8, openedDataSpecs.length);
+    assertEquals(TEST_MPD_URI, openedDataSpecs[0].uri);
+    assertEquals("audio_init_data", openedDataSpecs[1].uri.getPath());
+    assertEquals("audio_segment_1", openedDataSpecs[2].uri.getPath());
+    assertEquals("text_segment_1", openedDataSpecs[3].uri.getPath());
+    assertEquals("audio_segment_2", openedDataSpecs[4].uri.getPath());
+    assertEquals("text_segment_2", openedDataSpecs[5].uri.getPath());
+    assertEquals("audio_segment_3", openedDataSpecs[6].uri.getPath());
+    assertEquals("text_segment_3", openedDataSpecs[7].uri.getPath());
+  }
+
+  public void testProgressiveDownloadSeparatePeriods() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6)
+        .setRandomData("period_2_segment_1", 1)
+        .setRandomData("period_2_segment_2", 2)
+        .setRandomData("period_2_segment_3", 3);
+    FakeDataSource fakeDataSource = new FakeDataSource(fakeDataSet);
+    Factory factory = Mockito.mock(Factory.class);
+    Mockito.when(factory.createDataSource()).thenReturn(fakeDataSource);
+    DashDownloader dashDownloader = new DashDownloader(TEST_MPD_URI,
+        new DownloaderConstructorHelper(cache, factory));
+
+    dashDownloader.selectRepresentations(
+        new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(1, 0, 0)});
+    dashDownloader.download(null);
+
+    DataSpec[] openedDataSpecs = fakeDataSource.getAndClearOpenedDataSpecs();
+    assertEquals(8, openedDataSpecs.length);
+    assertEquals(TEST_MPD_URI, openedDataSpecs[0].uri);
+    assertEquals("audio_init_data", openedDataSpecs[1].uri.getPath());
+    assertEquals("audio_segment_1", openedDataSpecs[2].uri.getPath());
+    assertEquals("audio_segment_2", openedDataSpecs[3].uri.getPath());
+    assertEquals("audio_segment_3", openedDataSpecs[4].uri.getPath());
+    assertEquals("period_2_segment_1", openedDataSpecs[5].uri.getPath());
+    assertEquals("period_2_segment_2", openedDataSpecs[6].uri.getPath());
+    assertEquals("period_2_segment_3", openedDataSpecs[7].uri.getPath());
+  }
+
+  public void testDownloadRepresentationFailure() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .newData("audio_segment_2")
+        .appendReadData(TestUtil.buildTestData(2))
+        .appendReadError(new IOException())
+        .appendReadData(TestUtil.buildTestData(3))
+        .endData()
+        .setRandomData("audio_segment_3", 6);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    // downloadRepresentations fails on the first try
+    try {
+      dashDownloader.download(null);
+      fail();
+    } catch (IOException e) {
+      // ignore
+    }
+    dashDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  public void testCounters() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .newData("audio_segment_2")
+        .appendReadData(TestUtil.buildTestData(2))
+        .appendReadError(new IOException())
+        .appendReadData(TestUtil.buildTestData(3))
+        .endData()
+        .setRandomData("audio_segment_3", 6);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    assertCounters(dashDownloader, C.LENGTH_UNSET, C.LENGTH_UNSET, C.LENGTH_UNSET);
+
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    dashDownloader.init();
+    assertCounters(dashDownloader, C.LENGTH_UNSET, C.LENGTH_UNSET, C.LENGTH_UNSET);
+
+    // downloadRepresentations fails after downloading init data, segment 1 and 2 bytes in segment 2
+    try {
+      dashDownloader.download(null);
+      fail();
+    } catch (IOException e) {
+      // ignore
+    }
+    dashDownloader.init();
+    assertCounters(dashDownloader, 4, 2, 10 + 4 + 2);
+
+    dashDownloader.download(null);
+
+    assertCounters(dashDownloader, 4, 4, 10 + 4 + 5 + 6);
+  }
+
+  public void testListener() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    ProgressListener mockListener = Mockito.mock(ProgressListener.class);
+    dashDownloader.download(mockListener);
+    InOrder inOrder = Mockito.inOrder(mockListener);
+    inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 0.0f, 0);
+    inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 25.0f, 10);
+    inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 50.0f, 14);
+    inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 75.0f, 19);
+    inOrder.verify(mockListener).onDownloadProgress(dashDownloader, 100.0f, 25);
+    inOrder.verifyNoMoreInteractions();
+  }
+
+  public void testRemoveAll() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6)
+        .setRandomData("text_segment_1", 1)
+        .setRandomData("text_segment_2", 2)
+        .setRandomData("text_segment_3", 3);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+    dashDownloader.selectRepresentations(
+        new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
+    dashDownloader.download(null);
+
+    dashDownloader.remove();
+
+    assertCacheEmpty(cache);
+  }
+
+  public void testRepresentationWithoutIndex() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD_NO_INDEX)
+        .setRandomData("test_segment_1", 4);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    dashDownloader.init();
+    try {
+      dashDownloader.download(null);
+      fail();
+    } catch (DownloadException e) {
+      // expected exception.
+    }
+    dashDownloader.remove();
+
+    assertCacheEmpty(cache);
+  }
+
+  public void testSelectRepresentationsClearsPreviousSelection() throws Exception {
+    FakeDataSet fakeDataSet = new FakeDataSet()
+        .setData(TEST_MPD_URI, TEST_MPD)
+        .setRandomData("audio_init_data", 10)
+        .setRandomData("audio_segment_1", 4)
+        .setRandomData("audio_segment_2", 5)
+        .setRandomData("audio_segment_3", 6);
+    DashDownloader dashDownloader = getDashDownloader(fakeDataSet);
+
+    dashDownloader.selectRepresentations(
+        new RepresentationKey[] {new RepresentationKey(0, 0, 0), new RepresentationKey(0, 1, 0)});
+    dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+    dashDownloader.download(null);
+
+    assertCachedData(cache, fakeDataSet);
+  }
+
+  private DashDownloader getDashDownloader(FakeDataSet fakeDataSet) {
+    Factory factory = new Factory(null).setFakeDataSet(fakeDataSet);
+    return new DashDownloader(TEST_MPD_URI, new DownloaderConstructorHelper(cache, factory));
+  }
+
+  private static void assertCounters(DashDownloader dashDownloader, int totalSegments,
+      int downloadedSegments, int downloadedBytes) {
+    assertEquals(totalSegments, dashDownloader.getTotalSegments());
+    assertEquals(downloadedSegments, dashDownloader.getDownloadedSegments());
+    assertEquals(downloadedBytes, dashDownloader.getDownloadedBytes());
+  }
+
+}
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
new file mode 100644
index 00000000000..558adca7bde
--- /dev/null
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/offline/DashDownloader.java
@@ -0,0 +1,173 @@
+/*
+ * 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 com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.extractor.ChunkIndex;
+import com.google.android.exoplayer2.offline.DownloadException;
+import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.offline.SegmentDownloader;
+import com.google.android.exoplayer2.source.dash.DashSegmentIndex;
+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.Period;
+import com.google.android.exoplayer2.source.dash.manifest.RangedUri;
+import com.google.android.exoplayer2.source.dash.manifest.Representation;
+import com.google.android.exoplayer2.source.dash.manifest.RepresentationKey;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Helper class to download DASH streams.
+ *
+ * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link
+ * #getDownloadedBytes()}, this class isn't thread safe.
+ *
+ * <p>Example usage:
+ *
+ * <pre>
+ * {@code
+ * SimpleCache cache = new SimpleCache(downloadFolder, new NoOpCacheEvictor());
+ * DefaultHttpDataSourceFactory factory = new DefaultHttpDataSourceFactory("ExoPlayer", null);
+ * DownloaderConstructorHelper constructorHelper =
+ *     new DownloaderConstructorHelper(cache, factory);
+ * DashDownloader dashDownloader = new DashDownloader(manifestUrl, constructorHelper);
+ * // Select the first representation of the first adaptation set of the first period
+ * dashDownloader.selectRepresentations(new RepresentationKey[] {new RepresentationKey(0, 0, 0)});
+ * dashDownloader.download(new ProgressListener() {
+ *   @Override
+ *   public void onDownloadProgress(Downloader downloader, float downloadPercentage,
+ *       long downloadedBytes) {
+ *     // Invoked periodically during the download.
+ *   }
+ * });
+ * // Access downloaded data using CacheDataSource
+ * CacheDataSource cacheDataSource =
+ *     new CacheDataSource(cache, factory.createDataSource(), CacheDataSource.FLAG_BLOCK_ON_CACHE);}
+ * </pre>
+ */
+public final class DashDownloader extends SegmentDownloader<DashManifest, RepresentationKey> {
+
+  /**
+   * @see SegmentDownloader#SegmentDownloader(Uri, DownloaderConstructorHelper)
+   */
+  public DashDownloader(Uri manifestUri, DownloaderConstructorHelper constructorHelper)  {
+    super(manifestUri, constructorHelper);
+  }
+
+  @Override
+  public DashManifest getManifest(DataSource dataSource, Uri uri) throws IOException {
+    return DashUtil.loadManifest(dataSource, uri);
+  }
+
+  @Override
+  protected List<Segment> getAllSegments(DataSource dataSource, DashManifest manifest,
+      boolean allowIndexLoadErrors) throws InterruptedException, IOException {
+    ArrayList<Segment> segments = new ArrayList<>();
+    for (int periodIndex = 0; periodIndex < manifest.getPeriodCount(); periodIndex++) {
+      List<AdaptationSet> adaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
+      for (int adaptationIndex = 0; adaptationIndex < adaptationSets.size(); adaptationIndex++) {
+        AdaptationSet adaptationSet = adaptationSets.get(adaptationIndex);
+        RepresentationKey[] keys = new RepresentationKey[adaptationSet.representations.size()];
+        for (int i = 0; i < keys.length; i++) {
+          keys[i] = new RepresentationKey(periodIndex, adaptationIndex, i);
+        }
+        segments.addAll(getSegments(dataSource, manifest, keys, allowIndexLoadErrors));
+      }
+    }
+    return segments;
+  }
+
+  @Override
+  protected List<Segment> getSegments(DataSource dataSource, DashManifest manifest,
+      RepresentationKey[] keys, boolean allowIndexLoadErrors)
+      throws InterruptedException, IOException {
+    ArrayList<Segment> segments = new ArrayList<>();
+    for (RepresentationKey key : keys) {
+      DashSegmentIndex index;
+      try {
+        index = getSegmentIndex(dataSource, manifest, key);
+        if (index == null) {
+          // Loading succeeded but there was no index. This is always a failure.
+          throw new DownloadException("No index for representation: " + key);
+        }
+      } catch (IOException e) {
+        if (allowIndexLoadErrors) {
+          // Loading failed, but load errors are allowed. Advance to the next key.
+          continue;
+        } else {
+          throw e;
+        }
+      }
+
+      int segmentCount = index.getSegmentCount(C.TIME_UNSET);
+      if (segmentCount == DashSegmentIndex.INDEX_UNBOUNDED) {
+        throw new DownloadException("Unbounded index for representation: " + key);
+      }
+
+      Period period = manifest.getPeriod(key.periodIndex);
+      Representation representation = period.adaptationSets.get(key.adaptationSetIndex)
+          .representations.get(key.representationIndex);
+      long startUs = C.msToUs(period.startMs);
+      String baseUrl = representation.baseUrl;
+      RangedUri initializationUri = representation.getInitializationUri();
+      if (initializationUri != null) {
+        addSegment(segments, startUs, baseUrl, initializationUri);
+      }
+      RangedUri indexUri = representation.getIndexUri();
+      if (indexUri != null) {
+        addSegment(segments, startUs, baseUrl, indexUri);
+      }
+
+      int firstSegmentNum = index.getFirstSegmentNum();
+      int lastSegmentNum = firstSegmentNum + segmentCount - 1;
+      for (int j = firstSegmentNum; j <= lastSegmentNum; j++) {
+        addSegment(segments, startUs + index.getTimeUs(j), baseUrl, index.getSegmentUrl(j));
+      }
+    }
+    return segments;
+  }
+
+  /**
+   * Returns DashSegmentIndex for given representation.
+   */
+  private DashSegmentIndex getSegmentIndex(DataSource dataSource, DashManifest manifest,
+      RepresentationKey key) throws IOException, InterruptedException {
+    AdaptationSet adaptationSet = manifest.getPeriod(key.periodIndex).adaptationSets.get(
+        key.adaptationSetIndex);
+    Representation representation = adaptationSet.representations.get(key.representationIndex);
+    DashSegmentIndex index = representation.getIndex();
+    if (index != null) {
+      return index;
+    }
+    ChunkIndex seekMap = DashUtil.loadChunkIndex(dataSource, adaptationSet.type, representation);
+    return seekMap == null ? null : new DashWrappingSegmentIndex(seekMap);
+  }
+
+  private static void addSegment(ArrayList<Segment> segments, long startTimeUs, String baseUrl,
+      RangedUri rangedUri) {
+    DataSpec dataSpec = new DataSpec(rangedUri.resolveUri(baseUrl), rangedUri.start,
+        rangedUri.length, null);
+    segments.add(new Segment(startTimeUs, dataSpec));
+  }
+
+}
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 3c23e257961..00000000000
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java
+++ /dev/null
@@ -1,83 +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 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.util.ClosedSource;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/** An action to download or remove downloaded HLS streams. */
-@ClosedSource(reason = "Not ready yet")
-public final class HlsDownloadAction extends SegmentDownloadAction<String> {
-
-  public static final Deserializer DESERIALIZER = new SegmentDownloadActionDeserializer<String>() {
-
-    @Override
-    public String getType() {
-      return TYPE;
-    }
-
-    @Override
-    protected String readKey(DataInputStream input) throws IOException {
-      return input.readUTF();
-    }
-
-    @Override
-    protected String[] createKeyArray(int keyCount) {
-      return new String[0];
-    }
-
-    @Override
-    protected DownloadAction createDownloadAction(Uri manifestUri, boolean removeAction,
-        String[] keys) {
-      return new HlsDownloadAction(manifestUri, removeAction, keys);
-    }
-
-  };
-
-  private static final String TYPE = "HlsDownloadAction";
-
-  /** @see SegmentDownloadAction#SegmentDownloadAction(Uri, boolean, Object[]) */
-  public HlsDownloadAction(Uri manifestUri, boolean removeAction, String... keys) {
-    super(manifestUri, removeAction, keys);
-  }
-
-  @Override
-  public String getType() {
-    return TYPE;
-  }
-
-  @Override
-  public HlsDownloader createDownloader(DownloaderConstructorHelper constructorHelper)
-      throws IOException {
-    HlsDownloader downloader = new HlsDownloader(manifestUri, constructorHelper);
-    if (!isRemoveAction()) {
-      downloader.selectRepresentations(keys);
-    }
-    return downloader;
-  }
-
-  @Override
-  protected void writeKey(DataOutputStream output, String key) throws IOException {
-    output.writeUTF(key);
-  }
-
-}
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 7478062ef84..00000000000
--- a/library/smoothstreaming/src/main/java/com/google/android/exoplayer2/source/smoothstreaming/offline/SsDownloadAction.java
+++ /dev/null
@@ -1,86 +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 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.source.smoothstreaming.manifest.TrackKey;
-import com.google.android.exoplayer2.util.ClosedSource;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-
-/** An action to download or remove downloaded SmoothStreaming streams. */
-@ClosedSource(reason = "Not ready yet")
-public final class SsDownloadAction extends SegmentDownloadAction<TrackKey> {
-
-  public static final Deserializer DESERIALIZER =
-      new SegmentDownloadActionDeserializer<TrackKey>() {
-
-    @Override
-    public String getType() {
-      return TYPE;
-    }
-
-    @Override
-    protected TrackKey readKey(DataInputStream input) throws IOException {
-      return new TrackKey(input.readInt(), input.readInt());
-    }
-
-    @Override
-    protected TrackKey[] createKeyArray(int keyCount) {
-      return new TrackKey[keyCount];
-    }
-
-    @Override
-    protected DownloadAction createDownloadAction(Uri manifestUri, boolean removeAction,
-        TrackKey[] keys) {
-      return new SsDownloadAction(manifestUri, removeAction, keys);
-    }
-
-  };
-
-  private static final String TYPE = "SsDownloadAction";
-
-  /** @see SegmentDownloadAction#SegmentDownloadAction(Uri, boolean, Object[]) */
-  public SsDownloadAction(Uri manifestUri, boolean removeAction, TrackKey... keys) {
-    super(manifestUri, removeAction, keys);
-  }
-
-  @Override
-  public String getType() {
-    return TYPE;
-  }
-
-  @Override
-  public SsDownloader createDownloader(DownloaderConstructorHelper constructorHelper)
-      throws IOException {
-    SsDownloader downloader = new SsDownloader(manifestUri, constructorHelper);
-    if (!isRemoveAction()) {
-      downloader.selectRepresentations(keys);
-    }
-    return downloader;
-  }
-
-  @Override
-  protected void writeKey(DataOutputStream output, TrackKey key) throws IOException {
-    output.writeInt(key.streamElementIndex);
-    output.writeInt(key.trackIndex);
-  }
-
-}

From 6bf0b7f3de32b34cc58786474a302198cc18e421 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 29 Aug 2017 15:51:36 -0700
Subject: [PATCH 168/421] Fix moe config II

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166916769
---
 .../exoplayer2/source/dash/offline/DashDownloadTestData.java    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
index 220adfb3c50..50752c8a72d 100644
--- a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
+++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloadTestData.java
@@ -16,12 +16,10 @@
 package com.google.android.exoplayer2.source.dash.offline;
 
 import android.net.Uri;
-import com.google.android.exoplayer2.util.ClosedSource;
 
 /**
  * Data for DASH downloading tests.
  */
-@ClosedSource(reason = "Not ready yet")
 /* package */ interface DashDownloadTestData {
 
   Uri TEST_MPD_URI = Uri.parse("test.mpd");

From 49c2926e45b2d9ee4fc41dd834074c61c80e2c76 Mon Sep 17 00:00:00 2001
From: Shyri Villar <igs.villar@gmail.com>
Date: Wed, 30 Aug 2017 16:25:50 +0200
Subject: [PATCH 169/421] Add support for new codecs parameter string

---
 .../java/com/google/android/exoplayer2/util/MimeTypes.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 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 2d4a1ec96fb..1c8bb62a756 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
@@ -184,9 +184,9 @@ public static String getMediaMimeType(String codec) {
       return MimeTypes.VIDEO_H264;
     } else if (codec.startsWith("hev1") || codec.startsWith("hvc1")) {
       return MimeTypes.VIDEO_H265;
-    } else if (codec.startsWith("vp9")) {
+    } else if (codec.startsWith("vp9") || codec.startsWith("vp09")) {
       return MimeTypes.VIDEO_VP9;
-    } else if (codec.startsWith("vp8")) {
+    } else if (codec.startsWith("vp8") || codec.startsWith("vp08")) {
       return MimeTypes.VIDEO_VP8;
     } else if (codec.startsWith("mp4a")) {
       return MimeTypes.AUDIO_AAC;

From 0c7f11606f0eaf3660511d4a478fc80de4c2e63d Mon Sep 17 00:00:00 2001
From: Danny Brain <me@danielbrain.com>
Date: Thu, 31 Aug 2017 14:31:18 +1000
Subject: [PATCH 170/421] #3215 Additional secure DummySurface device
 exclusions

---
 .../android/exoplayer2/video/DummySurface.java       | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 a1820ed7a11..8551f2541da 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
@@ -43,6 +43,7 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.SurfaceTexture;
 import android.graphics.SurfaceTexture.OnFrameAvailableListener;
 import android.opengl.EGL14;
@@ -152,9 +153,16 @@ private static void assertApiLevel17OrHigher() {
    *
    * @param context Any {@link Context}.
    */
-  @SuppressWarnings("unused") // Context may be needed in the future for better targeting.
+  @SuppressWarnings("unused")
   private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) {
-    return Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER);
+    return (Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER))
+            || (Util.SDK_INT >= 24 && Util.SDK_INT < 26
+              && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager()));
+  }
+
+  @TargetApi(24)
+  private static boolean hasVrModeHighPerformanceSystemFeatureV24(PackageManager packageManager) {
+    return packageManager.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
   }
 
   private static class DummySurfaceThread extends HandlerThread implements OnFrameAvailableListener,

From 049d41db2a4a697e23a39271a9a2758c8bd90fbd Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 30 Aug 2017 07:03:41 -0700
Subject: [PATCH 171/421] Add license notes for extensions with non-Google
 dependencies

Issue: #3197

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=166988657
---
 extensions/ffmpeg/README.md | 8 ++++++++
 extensions/flac/README.md   | 8 ++++++++
 extensions/okhttp/README.md | 8 ++++++++
 extensions/opus/README.md   | 8 ++++++++
 extensions/rtmp/README.md   | 8 ++++++++
 extensions/vp9/README.md    | 8 ++++++++
 6 files changed, 48 insertions(+)

diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md
index 57b637d1e26..b29c836887d 100644
--- a/extensions/ffmpeg/README.md
+++ b/extensions/ffmpeg/README.md
@@ -3,6 +3,14 @@
 The FFmpeg extension provides `FfmpegAudioRenderer`, which uses FFmpeg for
 decoding and can render audio encoded in a variety of formats.
 
+## License note ##
+
+Please note that whilst the code in this repository is licensed under
+[Apache 2.0][], using this extension also requires building and including one or
+more external libraries as described below. These are licensed separately.
+
+[Apache 2.0]: https://github.com/google/ExoPlayer/blob/release-v2/LICENSE
+
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index 113b41a93de..cd0f2efe470 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -3,6 +3,14 @@
 The Flac extension provides `FlacExtractor` and `LibflacAudioRenderer`, which
 use libFLAC (the Flac decoding library) to extract and decode FLAC audio.
 
+## License note ##
+
+Please note that whilst the code in this repository is licensed under
+[Apache 2.0][], using this extension also requires building and including one or
+more external libraries as described below. These are licensed separately.
+
+[Apache 2.0]: https://github.com/google/ExoPlayer/blob/release-v2/LICENSE
+
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
diff --git a/extensions/okhttp/README.md b/extensions/okhttp/README.md
index f84d0c35f26..e40535d4e8a 100644
--- a/extensions/okhttp/README.md
+++ b/extensions/okhttp/README.md
@@ -6,6 +6,14 @@ The OkHttp extension is an [HttpDataSource][] implementation using Square's
 [HttpDataSource]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/upstream/HttpDataSource.html
 [OkHttp]: https://square.github.io/okhttp/
 
+## License note ##
+
+Please note that whilst the code in this repository is licensed under
+[Apache 2.0][], using this extension requires depending on OkHttp, which is
+licensed separately.
+
+[Apache 2.0]: https://github.com/google/ExoPlayer/blob/release-v2/LICENSE
+
 ## Getting the extension ##
 
 The easiest way to use the extension is to add it as a gradle dependency:
diff --git a/extensions/opus/README.md b/extensions/opus/README.md
index d766e8c9c40..15c3e5413d3 100644
--- a/extensions/opus/README.md
+++ b/extensions/opus/README.md
@@ -3,6 +3,14 @@
 The Opus extension provides `LibopusAudioRenderer`, which uses libopus (the Opus
 decoding library) to decode Opus audio.
 
+## License note ##
+
+Please note that whilst the code in this repository is licensed under
+[Apache 2.0][], using this extension also requires building and including one or
+more external libraries as described below. These are licensed separately.
+
+[Apache 2.0]: https://github.com/google/ExoPlayer/blob/release-v2/LICENSE
+
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on
diff --git a/extensions/rtmp/README.md b/extensions/rtmp/README.md
index 7e6bc0d641a..fb822b83267 100644
--- a/extensions/rtmp/README.md
+++ b/extensions/rtmp/README.md
@@ -7,6 +7,14 @@ streams using [LibRtmp Client for Android][].
 [RTMP]: https://en.wikipedia.org/wiki/Real-Time_Messaging_Protocol
 [LibRtmp Client for Android]: https://github.com/ant-media/LibRtmp-Client-for-Android
 
+## License note ##
+
+Please note that whilst the code in this repository is licensed under
+[Apache 2.0][], using this extension requires depending on LibRtmp Client for
+Android, which is licensed separately.
+
+[Apache 2.0]: https://github.com/google/ExoPlayer/blob/release-v2/LICENSE
+
 ## Getting the extension ##
 
 The easiest way to use the extension is to add it as a gradle dependency:
diff --git a/extensions/vp9/README.md b/extensions/vp9/README.md
index 7bce4a2a256..941b413c090 100644
--- a/extensions/vp9/README.md
+++ b/extensions/vp9/README.md
@@ -3,6 +3,14 @@
 The VP9 extension provides `LibvpxVideoRenderer`, which uses libvpx (the VPx
 decoding library) to decode VP9 video.
 
+## License note ##
+
+Please note that whilst the code in this repository is licensed under
+[Apache 2.0][], using this extension also requires building and including one or
+more external libraries as described below. These are licensed separately.
+
+[Apache 2.0]: https://github.com/google/ExoPlayer/blob/release-v2/LICENSE
+
 ## Build instructions ##
 
 To use this extension you need to clone the ExoPlayer repository and depend on

From e80a93d7990db645707f579df58cb380abb1edd4 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 30 Aug 2017 10:20:37 -0700
Subject: [PATCH 172/421] Use UTF-8 everywhere

UTF-8 is the default charset on Android so this should be a no-op change, but
makes the code portable (in case it runs on another platform).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167011583
---
 .../com/google/android/exoplayer2/util/ParsableByteArray.java  | 3 ++-
 .../src/main/java/com/google/android/exoplayer2/util/Util.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

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 2a907e59557..70cb584085d 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,6 +15,7 @@
  */
 package com.google.android.exoplayer2.util;
 
+import com.google.android.exoplayer2.C;
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 
@@ -428,7 +429,7 @@ public double readDouble() {
    * @return The string encoded by the bytes.
    */
   public String readString(int length) {
-    return readString(length, Charset.defaultCharset());
+    return readString(length, Charset.forName(C.UTF8_NAME));
   }
 
   /**
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 b958a54244c..519919f129c 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
@@ -253,7 +253,7 @@ public static String normalizeLanguageCode(String language) {
    * @return The code points encoding using UTF-8.
    */
   public static byte[] getUtf8Bytes(String value) {
-    return value.getBytes(Charset.defaultCharset()); // UTF-8 is the default on Android.
+    return value.getBytes(Charset.forName(C.UTF8_NAME));
   }
 
   /**

From 84c13ccbf3daf7814099137f2cfa27957893c664 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Wed, 30 Aug 2017 10:32:47 -0700
Subject: [PATCH 173/421] Support setRepeatMode (and move shuffle action to
 PlaybackController)

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167013507
---
 .../DefaultPlaybackController.java            | 53 ++++++++++---
 .../mediasession/MediaSessionConnector.java   | 79 +++++++++++--------
 .../RepeatModeActionProvider.java             | 10 +--
 .../mediasession/TimelineQueueNavigator.java  |  5 --
 4 files changed, 93 insertions(+), 54 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 e01d6a48db4..95ebcde095f 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
@@ -21,6 +21,7 @@
 
 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}.
@@ -40,33 +41,37 @@ public class DefaultPlaybackController implements MediaSessionConnector.Playback
 
   private static final long BASE_ACTIONS = PlaybackStateCompat.ACTION_PLAY_PAUSE
       | PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PAUSE
-      | PlaybackStateCompat.ACTION_STOP;
+      | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED
+      | PlaybackStateCompat.ACTION_SET_REPEAT_MODE;
 
   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)}.
+   * Equivalent to {@code DefaultPlaybackController(DefaultPlaybackController.DEFAULT_REWIND_MS,
+   *     DefaultPlaybackController.DEFAULT_FAST_FORWARD_MS,
+   *     MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES)}.
    */
   public DefaultPlaybackController() {
-    this(DEFAULT_REWIND_MS, DEFAULT_FAST_FORWARD_MS);
+    this(DEFAULT_REWIND_MS, DEFAULT_FAST_FORWARD_MS,
+        MediaSessionConnector.DEFAULT_REPEAT_TOGGLE_MODES);
   }
 
   /**
    * 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
-   *     value will cause the fast forward action to be removed.
+   * @param repeatToggleModes The available repeatToggleModes.
    */
-  public DefaultPlaybackController(long rewindIncrementMs, long fastForwardIncrementMs) {
+  public DefaultPlaybackController(long rewindIncrementMs, long fastForwardIncrementMs,
+      @RepeatModeUtil.RepeatToggleModes int repeatToggleModes) {
     this.rewindIncrementMs = rewindIncrementMs;
     this.fastForwardIncrementMs = fastForwardIncrementMs;
+    this.repeatToggleModes = repeatToggleModes;
   }
 
   @Override
@@ -127,6 +132,36 @@ public void onStop(Player player) {
     player.stop();
   }
 
+  @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 repeatMode) {
+    int selectedExoPlayerRepeatMode = player.getRepeatMode();
+    switch (repeatMode) {
+      case PlaybackStateCompat.REPEAT_MODE_ALL:
+      case PlaybackStateCompat.REPEAT_MODE_GROUP:
+        if ((repeatToggleModes & RepeatModeUtil.REPEAT_TOGGLE_MODE_ALL) != 0) {
+          selectedExoPlayerRepeatMode = Player.REPEAT_MODE_ALL;
+        }
+        break;
+      case PlaybackStateCompat.REPEAT_MODE_ONE:
+        if ((repeatToggleModes & RepeatModeUtil.REPEAT_TOGGLE_MODE_ONE) != 0) {
+          selectedExoPlayerRepeatMode = Player.REPEAT_MODE_ONE;
+        }
+        break;
+      default:
+        selectedExoPlayerRepeatMode = Player.REPEAT_MODE_OFF;
+        break;
+    }
+    player.setRepeatMode(selectedExoPlayerRepeatMode);
+  }
+
+  // CommandReceiver implementation.
+
   @Override
   public String[] getCommands() {
     return null;
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 a64f1637330..4c7ad123f32 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,6 +39,8 @@
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
+import com.google.android.exoplayer2.util.RepeatModeUtil;
+
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -73,6 +75,13 @@ 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
       | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS;
@@ -145,14 +154,17 @@ 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_STOP | PlaybackStateCompat.ACTION_SET_REPEAT_MODE
+        | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED;
 
     /**
      * 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} and {@link PlaybackStateCompat#ACTION_STOP}.
+     * {@link PlaybackStateCompat#ACTION_REWIND}, {@link PlaybackStateCompat#ACTION_STOP},
+     * {@link PlaybackStateCompat#ACTION_SET_REPEAT_MODE} and
+     * {@link PlaybackStateCompat#ACTION_SET_SHUFFLE_MODE_ENABLED}.
      *
      * @param player The player.
      * @return The bitmask of the supported media actions.
@@ -182,6 +194,14 @@ public interface PlaybackController extends CommandReceiver {
      * 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);
   }
 
   /**
@@ -191,15 +211,13 @@ public interface PlaybackController extends CommandReceiver {
   public interface QueueNavigator extends CommandReceiver {
 
     long ACTIONS = PlaybackStateCompat.ACTION_SKIP_TO_QUEUE_ITEM
-        | PlaybackStateCompat.ACTION_SKIP_TO_NEXT | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
-        | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED;
+        | PlaybackStateCompat.ACTION_SKIP_TO_NEXT | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS;
 
     /**
      * Returns the actions which are supported by the navigator. The supported actions must be a
      * bitmask combined out of {@link PlaybackStateCompat#ACTION_SKIP_TO_QUEUE_ITEM},
      * {@link PlaybackStateCompat#ACTION_SKIP_TO_NEXT},
-     * {@link PlaybackStateCompat#ACTION_SKIP_TO_PREVIOUS},
-     * {@link PlaybackStateCompat#ACTION_SET_SHUFFLE_MODE_ENABLED}.
+     * {@link PlaybackStateCompat#ACTION_SKIP_TO_PREVIOUS}.
      *
      * @param player The {@link Player}.
      * @return The bitmask of the supported media actions.
@@ -241,10 +259,6 @@ public interface QueueNavigator extends CommandReceiver {
      * See {@link MediaSessionCompat.Callback#onSkipToNext()}.
      */
     void onSkipToNext(Player player);
-    /**
-     * See {@link MediaSessionCompat.Callback#onSetShuffleMode(int)}.
-     */
-    void onSetShuffleMode(Player player, int shuffleMode);
   }
 
   /**
@@ -429,8 +443,7 @@ public void setErrorMessageProvider(
 
   /**
    * Sets the {@link QueueNavigator} to handle queue navigation actions {@code ACTION_SKIP_TO_NEXT},
-   * {@code ACTION_SKIP_TO_PREVIOUS}, {@code ACTION_SKIP_TO_QUEUE_ITEM} and
-   * {@code ACTION_SET_SHUFFLE_MODE_ENABLED}.
+   * {@code ACTION_SKIP_TO_PREVIOUS} and {@code ACTION_SKIP_TO_QUEUE_ITEM}.
    *
    * @param queueNavigator The queue navigator.
    */
@@ -736,6 +749,28 @@ public void onStop() {
       }
     }
 
+    @Override
+    public void onSetShuffleModeEnabled(boolean enabled) {
+      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
+        playbackController.onSetShuffleMode(player, enabled
+            ? PlaybackStateCompat.SHUFFLE_MODE_ALL : PlaybackStateCompat.SHUFFLE_MODE_NONE);
+      }
+    }
+
+    @Override
+    public void onSetShuffleMode(int shuffleMode) {
+      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
+        playbackController.onSetShuffleMode(player, shuffleMode);
+      }
+    }
+
+    @Override
+    public void onSetRepeatMode(int repeatMode) {
+      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_REPEAT_MODE)) {
+        playbackController.onSetRepeatMode(player, repeatMode);
+      }
+    }
+
     @Override
     public void onSkipToNext() {
       if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SKIP_TO_NEXT)) {
@@ -757,11 +792,6 @@ public void onSkipToQueueItem(long id) {
       }
     }
 
-    @Override
-    public void onSetRepeatMode(int repeatMode) {
-      // implemented as custom action
-    }
-
     @Override
     public void onCustomAction(@NonNull String action, @Nullable Bundle extras) {
       Map<String, CustomActionProvider> actionMap = customActionMap;
@@ -842,21 +872,6 @@ public void onPlayFromUri(Uri uri, Bundle extras) {
       }
     }
 
-    @Override
-    public void onSetShuffleModeEnabled(boolean enabled) {
-      if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
-        queueNavigator.onSetShuffleMode(player, enabled
-            ? PlaybackStateCompat.SHUFFLE_MODE_ALL : PlaybackStateCompat.SHUFFLE_MODE_NONE);
-      }
-    }
-
-    @Override
-    public void onSetShuffleMode(int shuffleMode) {
-      if (canDispatchToQueueNavigator(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
-        queueNavigator.onSetShuffleMode(player, shuffleMode);
-      }
-    }
-
     @Override
     public void onAddQueueItem(MediaDescriptionCompat description) {
       if (queueEditor != null) {
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 db0190de0f3..b4cb3c73d01 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
@@ -25,12 +25,6 @@
  */
 public final class RepeatModeActionProvider implements MediaSessionConnector.CustomActionProvider {
 
-  /**
-   * The default repeat toggle modes.
-   */
-  public static final @RepeatModeUtil.RepeatToggleModes 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;
@@ -44,13 +38,13 @@ public final class RepeatModeActionProvider implements MediaSessionConnector.Cus
    * Creates a new instance.
    * <p>
    * Equivalent to {@code RepeatModeActionProvider(context, player,
-   *     RepeatModeActionProvider.DEFAULT_REPEAT_TOGGLE_MODES)}.
+   *     MediaSessionConnector.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);
+    this(context, player, MediaSessionConnector.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 777949863d4..0484c0b6417 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
@@ -161,11 +161,6 @@ public void onSkipToNext(Player player) {
     }
   }
 
-  @Override
-  public void onSetShuffleMode(Player player, int shuffleMode) {
-    player.setShuffleModeEnabled(shuffleMode == PlaybackStateCompat.SHUFFLE_MODE_ALL);
-  }
-
   // CommandReceiver implementation.
 
   @Override

From 0b78837f35f54acc3ef41f5ceeb3b634df1cd142 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 30 Aug 2017 10:51:37 -0700
Subject: [PATCH 174/421] Fix ContentDataSource bytesRemaining calculation

The bytesRemaining didn't always take into account any skipped bytes, which
meant that reaching the end of the file was not correctly detected in read().

Issue: #3216

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167016672
---
 .../upstream/ContentDataSourceTest.java       | 27 +++++++++++++++++++
 .../upstream/ContentDataSource.java           | 10 ++++---
 .../android/exoplayer2/testutil/TestUtil.java |  2 +-
 3 files changed, 34 insertions(+), 5 deletions(-)

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 834e7e1374f..2b70c83ca5f 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
@@ -23,9 +23,12 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.test.InstrumentationTestCase;
+import android.test.MoreAsserts;
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.util.Arrays;
 
 /**
  * Unit tests for {@link ContentDataSource}.
@@ -35,6 +38,9 @@ public final class ContentDataSourceTest extends InstrumentationTestCase {
   private static final String AUTHORITY = "com.google.android.exoplayer2.core.test";
   private static final String DATA_PATH = "binary/1024_incrementing_bytes.mp3";
 
+  private static final int TEST_DATA_OFFSET = 1;
+  private static final int TEST_DATA_LENGTH = 1023;
+
   public void testReadValidUri() throws Exception {
     ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
     Uri contentUri = new Uri.Builder()
@@ -64,6 +70,27 @@ public void testReadInvalidUri() throws Exception {
     }
   }
 
+  public void testReadFromOffsetToEndOfInput() throws Exception {
+    ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
+    Uri contentUri = new Uri.Builder()
+        .scheme(ContentResolver.SCHEME_CONTENT)
+        .authority(AUTHORITY)
+        .path(DATA_PATH).build();
+    try {
+      DataSpec dataSpec = new DataSpec(contentUri, TEST_DATA_OFFSET, C.LENGTH_UNSET, null);
+      long length = dataSource.open(dataSpec);
+      assertEquals(TEST_DATA_LENGTH, length);
+      byte[] expectedData = Arrays.copyOfRange(
+          TestUtil.getByteArray(getInstrumentation(), DATA_PATH), TEST_DATA_OFFSET,
+          TEST_DATA_OFFSET + TEST_DATA_LENGTH);
+      byte[] readData = TestUtil.readToEnd(dataSource);
+      MoreAsserts.assertEquals(expectedData, readData);
+      assertEquals(C.RESULT_END_OF_INPUT, dataSource.read(new byte[1], 0, 1));
+    } finally {
+      dataSource.close();
+    }
+  }
+
   /**
    * A {@link ContentProvider} for the test.
    */
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 d118b913782..c37599eccc4 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
@@ -76,8 +76,8 @@ public long open(DataSpec dataSpec) throws ContentDataSourceException {
         throw new FileNotFoundException("Could not open file descriptor for: " + uri);
       }
       inputStream = new FileInputStream(assetFileDescriptor.getFileDescriptor());
-      long assertStartOffset = assetFileDescriptor.getStartOffset();
-      long skipped = inputStream.skip(assertStartOffset + dataSpec.position) - assertStartOffset;
+      long assetStartOffset = assetFileDescriptor.getStartOffset();
+      long skipped = inputStream.skip(assetStartOffset + dataSpec.position) - assetStartOffset;
       if (skipped != dataSpec.position) {
         // We expect the skip to be satisfied in full. If it isn't then we're probably trying to
         // skip beyond the end of the data.
@@ -86,8 +86,8 @@ public long open(DataSpec dataSpec) throws ContentDataSourceException {
       if (dataSpec.length != C.LENGTH_UNSET) {
         bytesRemaining = dataSpec.length;
       } else {
-        bytesRemaining = assetFileDescriptor.getLength();
-        if (bytesRemaining == AssetFileDescriptor.UNKNOWN_LENGTH) {
+        long assetFileDescriptorLength = assetFileDescriptor.getLength();
+        if (assetFileDescriptorLength == AssetFileDescriptor.UNKNOWN_LENGTH) {
           // The asset must extend to the end of the file.
           bytesRemaining = inputStream.available();
           if (bytesRemaining == 0) {
@@ -96,6 +96,8 @@ public long open(DataSpec dataSpec) throws ContentDataSourceException {
             // case, so treat as unbounded.
             bytesRemaining = C.LENGTH_UNSET;
           }
+        } else {
+          bytesRemaining = assetFileDescriptorLength - skipped;
         }
       }
     } catch (IOException e) {
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 5819a4b711b..2e59b33c0b6 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
@@ -181,7 +181,7 @@ public static void assertDataSourceContent(DataSource dataSource, DataSpec dataS
       byte[] expectedData) throws IOException {
     try {
       long length = dataSource.open(dataSpec);
-      Assert.assertEquals(length, expectedData.length);
+      Assert.assertEquals(expectedData.length, length);
       byte[] readData = TestUtil.readToEnd(dataSource);
       MoreAsserts.assertEquals(expectedData, readData);
     } finally {

From 6bd0ba887c70e500724b4fc87d40db74f8d0c019 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 31 Aug 2017 04:13:13 -0700
Subject: [PATCH 175/421] Allow more aggressive switching for HLS with
 independent segments

We currently switch without downloading overlapping segments, but
we do not actually switch more aggressively. This change fixes
this. Note there's an implicit assumption made that if one media
playlist declares independent segments, the others will too. This
is almost certainly true in practice, and if it's not the penalty
isn't too bad (the player may try and switch to a higher quality
variant one segment's worth of buffer too soon).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167120992
---
 .../exoplayer2/source/hls/HlsChunkSource.java       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 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 4fed33eee34..d0161d839c8 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
@@ -92,6 +92,7 @@ public void clear() {
   private byte[] scratchSpace;
   private IOException fatalError;
   private HlsUrl expectedPlaylistUrl;
+  private boolean independentSegments;
 
   private Uri encryptionKeyUri;
   private byte[] encryptionKey;
@@ -206,10 +207,11 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     int oldVariantIndex = previous == null ? C.INDEX_UNSET
         : trackGroup.indexOf(previous.trackFormat);
     expectedPlaylistUrl = null;
-    // Use start time of the previous chunk rather than its end time because switching format will
-    // require downloading overlapping segments.
-    long bufferedDurationUs = previous == null ? 0
-        : Math.max(0, previous.startTimeUs - playbackPositionUs);
+    // Unless segments are known to be independent, switching variant will require downloading
+    // overlapping segments. Hence we use the start time of the previous chunk rather than its end
+    // time for this case.
+    long bufferedDurationUs = previous == null ? 0 : Math.max(0,
+        (independentSegments ? previous.endTimeUs : previous.startTimeUs) - playbackPositionUs);
 
     // Select the variant.
     trackSelection.updateSelectedTrack(bufferedDurationUs);
@@ -224,12 +226,13 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
       return;
     }
     HlsMediaPlaylist mediaPlaylist = playlistTracker.getPlaylistSnapshot(selectedUrl);
+    independentSegments = mediaPlaylist.hasIndependentSegmentsTag;
 
     // Select the chunk.
     int chunkMediaSequence;
     if (previous == null || switchingVariant) {
       long targetPositionUs = previous == null ? playbackPositionUs
-          : mediaPlaylist.hasIndependentSegmentsTag ? previous.endTimeUs : previous.startTimeUs;
+          : independentSegments ? previous.endTimeUs : previous.startTimeUs;
       if (!mediaPlaylist.hasEndTag && targetPositionUs >= mediaPlaylist.getEndTimeUs()) {
         // If the playlist is too old to contain the chunk, we need to refresh it.
         chunkMediaSequence = mediaPlaylist.mediaSequence + mediaPlaylist.segments.size();

From f15ce81c4763e2a4e6c606c9aeb8d24024b86440 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 31 Aug 2017 09:33:55 -0700
Subject: [PATCH 176/421] Move some unit tests to use Robolectric

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167148146
---
 constants.gradle                              |   3 +
 library/core/build.gradle                     |   7 +
 .../com/google/android/exoplayer2/CTest.java  |  35 --
 .../google/android/exoplayer2/FormatTest.java | 151 ------
 .../exoplayer2/util/AtomicFileTest.java       |  85 ---
 .../exoplayer2/util/ColorParserTest.java      |  98 ----
 .../exoplayer2/util/NalUnitUtilTest.java      | 206 --------
 .../exoplayer2/util/ParsableBitArrayTest.java | 177 -------
 .../util/ParsableByteArrayTest.java           | 492 ------------------
 .../util/ParsableNalUnitBitArrayTest.java     | 114 ----
 .../ReusableBufferedOutputStreamTest.java     |  46 --
 .../android/exoplayer2/util/UriUtilTest.java  |  98 ----
 .../android/exoplayer2/util/UtilTest.java     | 179 -------
 13 files changed, 10 insertions(+), 1681 deletions(-)
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/CTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java

diff --git a/constants.gradle b/constants.gradle
index 4107faab4c5..dcec53efbaf 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -25,6 +25,9 @@ project.ext {
     playServicesLibraryVersion = '11.0.2'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
+    junitVersion = '4.12'
+    truthVersion = '0.35'
+    robolectricVersion = '3.4.2'
     releaseVersion = 'r2.5.1'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
diff --git a/library/core/build.gradle b/library/core/build.gradle
index ecad1e58b52..d50834efd54 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -28,6 +28,9 @@ android {
         androidTest {
             java.srcDirs += "../../testutils/src/main/java/"
         }
+        test {
+            java.srcDirs += "../../testutils/src/main/java/"
+        }
     }
 
     buildTypes {
@@ -44,6 +47,10 @@ dependencies {
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion
+    testCompile 'com.google.truth:truth:' + truthVersion
+    testCompile 'junit:junit:' + junitVersion
+    testCompile 'org.mockito:mockito-core:' + mockitoVersion
+    testCompile 'org.robolectric:robolectric:' + robolectricVersion
 }
 
 ext {
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/CTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/CTest.java
deleted file mode 100644
index ddcdc4ac8af..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/CTest.java
+++ /dev/null
@@ -1,35 +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;
-
-import android.annotation.SuppressLint;
-import android.media.MediaCodec;
-import junit.framework.TestCase;
-
-/**
- * Unit test for {@link C}.
- */
-public class CTest extends TestCase {
-
-  @SuppressLint("InlinedApi")
-  public static void testConstants() {
-    // Sanity check that constant values match those defined by the platform.
-    assertEquals(MediaCodec.BUFFER_FLAG_KEY_FRAME, C.BUFFER_FLAG_KEY_FRAME);
-    assertEquals(MediaCodec.BUFFER_FLAG_END_OF_STREAM, C.BUFFER_FLAG_END_OF_STREAM);
-    assertEquals(MediaCodec.CRYPTO_MODE_AES_CTR, C.CRYPTO_MODE_AES_CTR);
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java
deleted file mode 100644
index bdea08638be..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/FormatTest.java
+++ /dev/null
@@ -1,151 +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;
-
-import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
-import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
-import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.media.MediaFormat;
-import android.os.Parcel;
-import com.google.android.exoplayer2.drm.DrmInitData;
-import com.google.android.exoplayer2.metadata.Metadata;
-import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
-import com.google.android.exoplayer2.testutil.TestUtil;
-import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
-import com.google.android.exoplayer2.video.ColorInfo;
-import java.nio.ByteBuffer;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import junit.framework.TestCase;
-
-/**
- * Unit test for {@link Format}.
- */
-public final class FormatTest extends TestCase {
-
-  private static final List<byte[]> INIT_DATA;
-  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);
-  }
-
-  public void testParcelable() {
-    DrmInitData.SchemeData DRM_DATA_1 = new DrmInitData.SchemeData(WIDEVINE_UUID, "cenc", VIDEO_MP4,
-        TestUtil.buildTestData(128, 1 /* data seed */));
-    DrmInitData.SchemeData DRM_DATA_2 = new DrmInitData.SchemeData(C.UUID_NIL, null, VIDEO_WEBM,
-        TestUtil.buildTestData(128, 1 /* data seed */));
-    DrmInitData drmInitData = new DrmInitData(DRM_DATA_1, DRM_DATA_2);
-    byte[] projectionData = new byte[] {1, 2, 3};
-    Metadata metadata = new Metadata(
-        new TextInformationFrame("id1", "description1", "value1"),
-        new TextInformationFrame("id2", "description2", "value2"));
-    ColorInfo colorInfo =  new ColorInfo(C.COLOR_SPACE_BT709,
-        C.COLOR_RANGE_LIMITED, C.COLOR_TRANSFER_SDR, new byte[] {1, 2, 3, 4, 5, 6, 7});
-
-    Format formatToParcel = new Format("id", MimeTypes.VIDEO_MP4, MimeTypes.VIDEO_H264, null,
-        1024, 2048, 1920, 1080, 24, 90, 2, projectionData, C.STEREO_MODE_TOP_BOTTOM, colorInfo, 6,
-        44100, C.ENCODING_PCM_24BIT, 1001, 1002, 0, "und", Format.NO_VALUE,
-        Format.OFFSET_SAMPLE_RELATIVE, INIT_DATA, drmInitData, metadata);
-
-    Parcel parcel = Parcel.obtain();
-    formatToParcel.writeToParcel(parcel, 0);
-    parcel.setDataPosition(0);
-
-    Format formatFromParcel = Format.CREATOR.createFromParcel(parcel);
-    assertEquals(formatToParcel, formatFromParcel);
-
-    parcel.recycle();
-  }
-
-  public void testConversionToFrameworkMediaFormat() {
-    if (Util.SDK_INT < 16) {
-      // Test doesn't apply.
-      return;
-    }
-
-    testConversionToFrameworkMediaFormatV16(Format.createVideoSampleFormat(null, "video/xyz", null,
-        5000, 102400, 1280, 720, 30, INIT_DATA, null));
-    testConversionToFrameworkMediaFormatV16(Format.createVideoSampleFormat(null, "video/xyz", null,
-        5000, Format.NO_VALUE, 1280, 720, 30, null, null));
-    testConversionToFrameworkMediaFormatV16(Format.createAudioSampleFormat(null, "audio/xyz", null,
-        500, 128, 5, 44100, INIT_DATA, null, 0, null));
-    testConversionToFrameworkMediaFormatV16(Format.createAudioSampleFormat(null, "audio/xyz", null,
-        500, Format.NO_VALUE, 5, 44100, null, null, 0, null));
-    testConversionToFrameworkMediaFormatV16(Format.createTextSampleFormat(null, "text/xyz", 0,
-        "eng"));
-    testConversionToFrameworkMediaFormatV16(Format.createTextSampleFormat(null, "text/xyz", 0,
-        null));
-  }
-
-  @SuppressLint("InlinedApi")
-  @TargetApi(16)
-  private static void testConversionToFrameworkMediaFormatV16(Format in) {
-    MediaFormat out = in.getFrameworkMediaFormatV16();
-    assertEquals(in.sampleMimeType, out.getString(MediaFormat.KEY_MIME));
-    assertOptionalV16(out, MediaFormat.KEY_LANGUAGE, in.language);
-    assertOptionalV16(out, MediaFormat.KEY_MAX_INPUT_SIZE, in.maxInputSize);
-    assertOptionalV16(out, MediaFormat.KEY_WIDTH, in.width);
-    assertOptionalV16(out, MediaFormat.KEY_HEIGHT, in.height);
-    assertOptionalV16(out, MediaFormat.KEY_CHANNEL_COUNT, in.channelCount);
-    assertOptionalV16(out, MediaFormat.KEY_SAMPLE_RATE, in.sampleRate);
-    assertOptionalV16(out, MediaFormat.KEY_FRAME_RATE, in.frameRate);
-
-    for (int i = 0; i < in.initializationData.size(); i++) {
-      byte[] originalData = in.initializationData.get(i);
-      ByteBuffer frameworkBuffer = out.getByteBuffer("csd-" + i);
-      byte[] frameworkData = Arrays.copyOf(frameworkBuffer.array(), frameworkBuffer.limit());
-      assertTrue(Arrays.equals(originalData, frameworkData));
-    }
-  }
-
-  @TargetApi(16)
-  private static void assertOptionalV16(MediaFormat format, String key, String value) {
-    if (value == null) {
-      assertFalse(format.containsKey(key));
-    } else {
-      assertEquals(value, format.getString(key));
-    }
-  }
-
-  @TargetApi(16)
-  private static void assertOptionalV16(MediaFormat format, String key, int value) {
-    if (value == Format.NO_VALUE) {
-      assertFalse(format.containsKey(key));
-    } else {
-      assertEquals(value, format.getInteger(key));
-    }
-  }
-
-  @TargetApi(16)
-  private static void assertOptionalV16(MediaFormat format, String key, float value) {
-    if (value == Format.NO_VALUE) {
-      assertFalse(format.containsKey(key));
-    } else {
-      assertEquals(value, format.getFloat(key));
-    }
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java
deleted file mode 100644
index b4f1d502931..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/AtomicFileTest.java
+++ /dev/null
@@ -1,85 +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.util;
-
-import android.test.InstrumentationTestCase;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-
-/**
- * Tests {@link AtomicFile}.
- */
-public class AtomicFileTest extends InstrumentationTestCase {
-
-  private File tempFolder;
-  private File file;
-  private AtomicFile atomicFile;
-
-  @Override
-  public void setUp() throws Exception {
-    tempFolder = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
-    file = new File(tempFolder, "atomicFile");
-    atomicFile = new AtomicFile(file);
-  }
-
-  @Override
-  protected void tearDown() throws Exception {
-    Util.recursiveDelete(tempFolder);
-  }
-
-  public void testDelete() throws Exception {
-    assertTrue(file.createNewFile());
-    atomicFile.delete();
-    assertFalse(file.exists());
-  }
-
-  public void testWriteRead() throws Exception {
-    OutputStream output = atomicFile.startWrite();
-    output.write(5);
-    atomicFile.endWrite(output);
-    output.close();
-
-    assertRead();
-
-    output = atomicFile.startWrite();
-    output.write(5);
-    output.write(6);
-    output.close();
-
-    assertRead();
-
-    output = atomicFile.startWrite();
-    output.write(6);
-
-    assertRead();
-    output.close();
-
-    output = atomicFile.startWrite();
-
-    assertRead();
-    output.close();
-  }
-
-  private void assertRead() throws IOException {
-    InputStream input = atomicFile.openRead();
-    assertEquals(5, input.read());
-    assertEquals(-1, input.read());
-    input.close();
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java
deleted file mode 100644
index 641b58b0cee..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ColorParserTest.java
+++ /dev/null
@@ -1,98 +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.util;
-
-import android.graphics.Color;
-import android.test.InstrumentationTestCase;
-
-/**
- * Unit test for <code>ColorParser</code>.
- */
-public class ColorParserTest extends InstrumentationTestCase {
-
-  // Negative tests.
-
-  public void testParseUnknownColor() {
-    try {
-      ColorParser.parseTtmlColor("colorOfAnElectron");
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-  }
-
-  public void testParseNull() {
-    try {
-      ColorParser.parseTtmlColor(null);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-  }
-
-  public void testParseEmpty() {
-    try {
-      ColorParser.parseTtmlColor("");
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-  }
-
-  public void testRgbColorParsingRgbValuesNegative() {
-    try {
-      ColorParser.parseTtmlColor("rgb(-4, 55, 209)");
-      fail();
-    } catch (IllegalArgumentException e) {
-      // expected
-    }
-  }
-
-  // Positive tests.
-
-  public void testHexCodeParsing() {
-    assertEquals(Color.WHITE, ColorParser.parseTtmlColor("#FFFFFF"));
-    assertEquals(Color.WHITE, ColorParser.parseTtmlColor("#FFFFFFFF"));
-    assertEquals(Color.parseColor("#FF123456"), ColorParser.parseTtmlColor("#123456"));
-    // Hex colors in ColorParser are RGBA, where-as {@link Color#parseColor} takes ARGB.
-    assertEquals(Color.parseColor("#00FFFFFF"), ColorParser.parseTtmlColor("#FFFFFF00"));
-    assertEquals(Color.parseColor("#78123456"), ColorParser.parseTtmlColor("#12345678"));
-  }
-
-  public void testRgbColorParsing() {
-    assertEquals(Color.WHITE, ColorParser.parseTtmlColor("rgb(255,255,255)"));
-    // Spaces are ignored.
-    assertEquals(Color.WHITE, ColorParser.parseTtmlColor("   rgb (      255, 255, 255)"));
-  }
-
-  public void testRgbColorParsingRgbValuesOutOfBounds() {
-    int outOfBounds = ColorParser.parseTtmlColor("rgb(999, 999, 999)");
-    int color = Color.rgb(999, 999, 999);
-    // Behave like the framework does.
-    assertEquals(color, outOfBounds);
-  }
-
-  public void testRgbaColorParsing() {
-    assertEquals(Color.WHITE, ColorParser.parseTtmlColor("rgba(255,255,255,255)"));
-    assertEquals(Color.argb(255, 255, 255, 255),
-        ColorParser.parseTtmlColor("rgba(255,255,255,255)"));
-    assertEquals(Color.BLACK, ColorParser.parseTtmlColor("rgba(0, 0, 0, 255)"));
-    assertEquals(Color.argb(0, 0, 0, 255), ColorParser.parseTtmlColor("rgba(0, 0, 255, 0)"));
-    assertEquals(Color.RED, ColorParser.parseTtmlColor("rgba(255, 0, 0, 255)"));
-    assertEquals(Color.argb(0, 255, 0, 255), ColorParser.parseTtmlColor("rgba(255, 0, 255, 0)"));
-    assertEquals(Color.argb(205, 255, 0, 0), ColorParser.parseTtmlColor("rgba(255, 0, 0, 205)"));
-  }
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
deleted file mode 100644
index 286013e83ae..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
+++ /dev/null
@@ -1,206 +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.util;
-
-import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray;
-
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link NalUnitUtil}.
- */
-public class NalUnitUtilTest extends TestCase {
-
-  private static final int TEST_PARTIAL_NAL_POSITION = 4;
-  private static final int TEST_NAL_POSITION = 10;
-  private static final byte[] SPS_TEST_DATA = createByteArray(0x00, 0x00, 0x01, 0x67, 0x4D, 0x40,
-      0x16, 0xEC, 0xA0, 0x50, 0x17, 0xFC, 0xB8, 0x08, 0x80, 0x00, 0x00, 0x03, 0x00, 0x80, 0x00,
-      0x00, 0x0F, 0x47, 0x8B, 0x16, 0xCB);
-  private static final int SPS_TEST_DATA_OFFSET = 3;
-
-  public void testFindNalUnit() {
-    byte[] data = buildTestData();
-
-    // Should find NAL unit.
-    int result = NalUnitUtil.findNalUnit(data, 0, data.length, null);
-    assertEquals(TEST_NAL_POSITION, result);
-    // Should find NAL unit whose prefix ends one byte before the limit.
-    result = NalUnitUtil.findNalUnit(data, 0, TEST_NAL_POSITION + 4, null);
-    assertEquals(TEST_NAL_POSITION, result);
-    // Shouldn't find NAL unit whose prefix ends at the limit (since the limit is exclusive).
-    result = NalUnitUtil.findNalUnit(data, 0, TEST_NAL_POSITION + 3, null);
-    assertEquals(TEST_NAL_POSITION + 3, result);
-    // Should find NAL unit whose prefix starts at the offset.
-    result = NalUnitUtil.findNalUnit(data, TEST_NAL_POSITION, data.length, null);
-    assertEquals(TEST_NAL_POSITION, result);
-    // Shouldn't find NAL unit whose prefix starts one byte past the offset.
-    result = NalUnitUtil.findNalUnit(data, TEST_NAL_POSITION + 1, data.length, null);
-    assertEquals(data.length, result);
-  }
-
-  public void testFindNalUnitWithPrefix() {
-    byte[] data = buildTestData();
-
-    // First byte of NAL unit in data1, rest in data2.
-    boolean[] prefixFlags = new boolean[3];
-    byte[] data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 1);
-    byte[] data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 1, data.length);
-    int result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
-    assertEquals(data1.length, result);
-    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
-    assertEquals(-1, result);
-    assertPrefixFlagsCleared(prefixFlags);
-
-    // First three bytes of NAL unit in data1, rest in data2.
-    prefixFlags = new boolean[3];
-    data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 3);
-    data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 3, data.length);
-    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
-    assertEquals(data1.length, result);
-    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
-    assertEquals(-3, result);
-    assertPrefixFlagsCleared(prefixFlags);
-
-    // First byte of NAL unit in data1, second byte in data2, rest in data3.
-    prefixFlags = new boolean[3];
-    data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 1);
-    data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 1, TEST_NAL_POSITION + 2);
-    byte[] data3 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 2, data.length);
-    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
-    assertEquals(data1.length, result);
-    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
-    assertEquals(data2.length, result);
-    result = NalUnitUtil.findNalUnit(data3, 0, data3.length, prefixFlags);
-    assertEquals(-2, result);
-    assertPrefixFlagsCleared(prefixFlags);
-
-    // NAL unit split with one byte in four arrays.
-    prefixFlags = new boolean[3];
-    data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 1);
-    data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 1, TEST_NAL_POSITION + 2);
-    data3 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 2, TEST_NAL_POSITION + 3);
-    byte[] data4 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 2, data.length);
-    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
-    assertEquals(data1.length, result);
-    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
-    assertEquals(data2.length, result);
-    result = NalUnitUtil.findNalUnit(data3, 0, data3.length, prefixFlags);
-    assertEquals(data3.length, result);
-    result = NalUnitUtil.findNalUnit(data4, 0, data4.length, prefixFlags);
-    assertEquals(-3, result);
-    assertPrefixFlagsCleared(prefixFlags);
-
-    // NAL unit entirely in data2. data1 ends with partial prefix.
-    prefixFlags = new boolean[3];
-    data1 = Arrays.copyOfRange(data, 0, TEST_PARTIAL_NAL_POSITION + 2);
-    data2 = Arrays.copyOfRange(data, TEST_PARTIAL_NAL_POSITION + 2, data.length);
-    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
-    assertEquals(data1.length, result);
-    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
-    assertEquals(4, result);
-    assertPrefixFlagsCleared(prefixFlags);
-  }
-
-  public void testParseSpsNalUnit() {
-    NalUnitUtil.SpsData data = NalUnitUtil.parseSpsNalUnit(SPS_TEST_DATA, SPS_TEST_DATA_OFFSET,
-        SPS_TEST_DATA.length);
-    assertEquals(640, data.width);
-    assertEquals(360, data.height);
-    assertFalse(data.deltaPicOrderAlwaysZeroFlag);
-    assertTrue(data.frameMbsOnlyFlag);
-    assertEquals(4, data.frameNumLength);
-    assertEquals(6, data.picOrderCntLsbLength);
-    assertEquals(0, data.seqParameterSetId);
-    assertEquals(1.0f, data.pixelWidthAspectRatio);
-    assertEquals(0, data.picOrderCountType);
-    assertFalse(data.separateColorPlaneFlag);
-  }
-
-  public void testUnescapeDoesNotModifyBuffersWithoutStartCodes() {
-    assertUnescapeDoesNotModify("");
-    assertUnescapeDoesNotModify("0000");
-    assertUnescapeDoesNotModify("172BF38A3C");
-    assertUnescapeDoesNotModify("000004");
-  }
-
-  public void testUnescapeModifiesBuffersWithStartCodes() {
-    assertUnescapeMatchesExpected("00000301", "000001");
-    assertUnescapeMatchesExpected("0000030200000300", "000002000000");
-  }
-
-  public void testDiscardToSps() {
-    assertDiscardToSpsMatchesExpected("", "");
-    assertDiscardToSpsMatchesExpected("00", "");
-    assertDiscardToSpsMatchesExpected("FFFF000001", "");
-    assertDiscardToSpsMatchesExpected("00000001", "");
-    assertDiscardToSpsMatchesExpected("00000001FF67", "");
-    assertDiscardToSpsMatchesExpected("00000001000167", "");
-    assertDiscardToSpsMatchesExpected("0000000167", "0000000167");
-    assertDiscardToSpsMatchesExpected("0000000167FF", "0000000167FF");
-    assertDiscardToSpsMatchesExpected("0000000167FF", "0000000167FF");
-    assertDiscardToSpsMatchesExpected("0000000167FF000000016700", "0000000167FF000000016700");
-    assertDiscardToSpsMatchesExpected("000000000167FF", "0000000167FF");
-    assertDiscardToSpsMatchesExpected("0001670000000167FF", "0000000167FF");
-    assertDiscardToSpsMatchesExpected("FF00000001660000000167FF", "0000000167FF");
-  }
-
-  private static byte[] buildTestData() {
-    byte[] data = new byte[20];
-    for (int i = 0; i < data.length; i++) {
-      data[i] = (byte) 0xFF;
-    }
-    // Insert an incomplete NAL unit start code.
-    data[TEST_PARTIAL_NAL_POSITION] = 0;
-    data[TEST_PARTIAL_NAL_POSITION + 1] = 0;
-    // Insert a complete NAL unit start code.
-    data[TEST_NAL_POSITION] = 0;
-    data[TEST_NAL_POSITION + 1] = 0;
-    data[TEST_NAL_POSITION + 2] = 1;
-    data[TEST_NAL_POSITION + 3] = 5;
-    return data;
-  }
-
-  private static void assertPrefixFlagsCleared(boolean[] flags) {
-    assertEquals(false, flags[0] || flags[1] || flags[2]);
-  }
-
-  private static void assertUnescapeDoesNotModify(String input) {
-    assertUnescapeMatchesExpected(input, input);
-  }
-
-  private static void assertUnescapeMatchesExpected(String input, String expectedOutput) {
-    byte[] bitstream = Util.getBytesFromHexString(input);
-    byte[] expectedOutputBitstream = Util.getBytesFromHexString(expectedOutput);
-    int count = NalUnitUtil.unescapeStream(bitstream, bitstream.length);
-    assertEquals(expectedOutputBitstream.length, count);
-    byte[] outputBitstream = new byte[count];
-    System.arraycopy(bitstream, 0, outputBitstream, 0, count);
-    assertTrue(Arrays.equals(expectedOutputBitstream, outputBitstream));
-  }
-
-  private static void assertDiscardToSpsMatchesExpected(String input, String expectedOutput) {
-    byte[] bitstream = Util.getBytesFromHexString(input);
-    byte[] expectedOutputBitstream = Util.getBytesFromHexString(expectedOutput);
-    ByteBuffer buffer = ByteBuffer.wrap(bitstream);
-    buffer.position(buffer.limit());
-    NalUnitUtil.discardToSps(buffer);
-    assertTrue(Arrays.equals(expectedOutputBitstream,
-        Arrays.copyOf(buffer.array(), buffer.position())));
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
deleted file mode 100644
index d7b2b36740d..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
+++ /dev/null
@@ -1,177 +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.util;
-
-import android.test.MoreAsserts;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link ParsableBitArray}.
- */
-public final class ParsableBitArrayTest extends TestCase {
-
-  private static final byte[] TEST_DATA = new byte[] {0x3C, (byte) 0xD2, (byte) 0x5F, (byte) 0x01,
-      (byte) 0xFF, (byte) 0x14, (byte) 0x60, (byte) 0x99};
-
-  private ParsableBitArray testArray;
-
-  @Override
-  public void setUp() {
-    testArray = new ParsableBitArray(TEST_DATA);
-  }
-
-  public void testReadAllBytes() {
-    byte[] bytesRead = new byte[TEST_DATA.length];
-    testArray.readBytes(bytesRead, 0, TEST_DATA.length);
-    MoreAsserts.assertEquals(TEST_DATA, bytesRead);
-    assertEquals(TEST_DATA.length * 8, testArray.getPosition());
-    assertEquals(TEST_DATA.length, testArray.getBytePosition());
-  }
-
-  public void testReadBit() {
-    assertReadBitsToEnd(0);
-  }
-
-  public void testReadBits() {
-    assertEquals(getTestDataBits(0, 5), testArray.readBits(5));
-    assertEquals(getTestDataBits(5, 0), testArray.readBits(0));
-    assertEquals(getTestDataBits(5, 3), testArray.readBits(3));
-    assertEquals(getTestDataBits(8, 16), testArray.readBits(16));
-    assertEquals(getTestDataBits(24, 3), testArray.readBits(3));
-    assertEquals(getTestDataBits(27, 18), testArray.readBits(18));
-    assertEquals(getTestDataBits(45, 5), testArray.readBits(5));
-    assertEquals(getTestDataBits(50, 14), testArray.readBits(14));
-  }
-
-  public void testReadBitsToByteArray() {
-    byte[] result = new byte[TEST_DATA.length];
-    // Test read within byte boundaries.
-    testArray.readBits(result, 0, 6);
-    assertEquals(TEST_DATA[0] & 0xFC, result[0]);
-    // Test read across byte boundaries.
-    testArray.readBits(result, 0, 8);
-    assertEquals(((TEST_DATA[0] & 0x03) << 6) | ((TEST_DATA[1] & 0xFC) >> 2), result[0]);
-    // Test reading across multiple bytes.
-    testArray.readBits(result, 1, 50);
-    for (int i = 1; i < 7; i++) {
-      assertEquals((byte) (((TEST_DATA[i] & 0x03) << 6) | ((TEST_DATA[i + 1] & 0xFC) >> 2)),
-          result[i]);
-    }
-    assertEquals((byte) (TEST_DATA[7] & 0x03) << 6, result[7]);
-    assertEquals(0, testArray.bitsLeft());
-    // Test read last buffer byte across input data bytes.
-    testArray.setPosition(31);
-    result[3] = 0;
-    testArray.readBits(result, 3, 3);
-    assertEquals((byte) 0xE0, result[3]);
-    // Test read bits in the middle of a input data byte.
-    result[0] = 0;
-    assertEquals(34, testArray.getPosition());
-    testArray.readBits(result, 0, 3);
-    assertEquals((byte) 0xE0, result[0]);
-    // Test read 0 bits.
-    testArray.setPosition(32);
-    result[1] = 0;
-    testArray.readBits(result, 1, 0);
-    assertEquals(0, result[1]);
-    // Test reading a number of bits divisible by 8.
-    testArray.setPosition(0);
-    testArray.readBits(result, 0, 16);
-    assertEquals(TEST_DATA[0], result[0]);
-    assertEquals(TEST_DATA[1], result[1]);
-    // Test least significant bits are unmodified.
-    result[1] = (byte) 0xFF;
-    testArray.readBits(result, 0, 9);
-    assertEquals(0x5F, result[0]);
-    assertEquals(0x7F, result[1]);
-  }
-
-  public void testRead32BitsByteAligned() {
-    assertEquals(getTestDataBits(0, 32), testArray.readBits(32));
-    assertEquals(getTestDataBits(32, 32), testArray.readBits(32));
-  }
-
-  public void testRead32BitsNonByteAligned() {
-    assertEquals(getTestDataBits(0, 5), testArray.readBits(5));
-    assertEquals(getTestDataBits(5, 32), testArray.readBits(32));
-  }
-
-  public void testSkipBytes() {
-    testArray.skipBytes(2);
-    assertReadBitsToEnd(16);
-  }
-
-  public void testSkipBitsByteAligned() {
-    testArray.skipBits(16);
-    assertReadBitsToEnd(16);
-  }
-
-  public void testSkipBitsNonByteAligned() {
-    testArray.skipBits(5);
-    assertReadBitsToEnd(5);
-  }
-
-  public void testSetPositionByteAligned() {
-    testArray.setPosition(16);
-    assertReadBitsToEnd(16);
-  }
-
-  public void testSetPositionNonByteAligned() {
-    testArray.setPosition(5);
-    assertReadBitsToEnd(5);
-  }
-
-  public void testByteAlignFromNonByteAligned() {
-    testArray.setPosition(11);
-    testArray.byteAlign();
-    assertEquals(2, testArray.getBytePosition());
-    assertEquals(16, testArray.getPosition());
-    assertReadBitsToEnd(16);
-  }
-
-  public void testByteAlignFromByteAligned() {
-    testArray.setPosition(16);
-    testArray.byteAlign(); // Should be a no-op.
-    assertEquals(2, testArray.getBytePosition());
-    assertEquals(16, testArray.getPosition());
-    assertReadBitsToEnd(16);
-  }
-
-  private void assertReadBitsToEnd(int expectedStartPosition) {
-    int position = testArray.getPosition();
-    assertEquals(expectedStartPosition, position);
-    for (int i = position; i < TEST_DATA.length * 8; i++) {
-      assertEquals(getTestDataBit(i), testArray.readBit());
-      assertEquals(i + 1, testArray.getPosition());
-    }
-  }
-
-  private static int getTestDataBits(int bitPosition, int length) {
-    int result = 0;
-    for (int i = 0; i < length; i++) {
-      result = result << 1;
-      if (getTestDataBit(bitPosition++)) {
-        result |= 0x1;
-      }
-    }
-    return result;
-  }
-
-  private static boolean getTestDataBit(int bitPosition) {
-    return (TEST_DATA[bitPosition / 8] & (0x80 >>> (bitPosition % 8))) != 0;
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
deleted file mode 100644
index 324d668c7a1..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
+++ /dev/null
@@ -1,492 +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.util;
-
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.util.Arrays;
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link ParsableByteArray}.
- */
-public class ParsableByteArrayTest extends TestCase {
-
-  private static final byte[] TEST_DATA =
-      new byte[] {0x0F, (byte) 0xFF, (byte) 0x42, (byte) 0x0F, 0x00, 0x00, 0x00, 0x00};
-
-  private static ParsableByteArray getTestDataArray() {
-    ParsableByteArray testArray = new ParsableByteArray(TEST_DATA.length);
-    System.arraycopy(TEST_DATA, 0, testArray.data, 0, TEST_DATA.length);
-    return testArray;
-  }
-
-  public void testReadShort() {
-    testReadShort((short) -1);
-    testReadShort((short) 0);
-    testReadShort((short) 1);
-    testReadShort(Short.MIN_VALUE);
-    testReadShort(Short.MAX_VALUE);
-  }
-
-  private static void testReadShort(short testValue) {
-    ParsableByteArray testArray = new ParsableByteArray(
-        ByteBuffer.allocate(4).putShort(testValue).array());
-    int readValue = testArray.readShort();
-
-    // Assert that the value we read was the value we wrote.
-    assertEquals(testValue, readValue);
-    // And that the position advanced as expected.
-    assertEquals(2, testArray.getPosition());
-
-    // And that skipping back and reading gives the same results.
-    testArray.skipBytes(-2);
-    readValue = testArray.readShort();
-    assertEquals(testValue, readValue);
-    assertEquals(2, testArray.getPosition());
-  }
-
-  public void testReadInt() {
-    testReadInt(0);
-    testReadInt(1);
-    testReadInt(-1);
-    testReadInt(Integer.MIN_VALUE);
-    testReadInt(Integer.MAX_VALUE);
-  }
-
-  private static void testReadInt(int testValue) {
-    ParsableByteArray testArray = new ParsableByteArray(
-        ByteBuffer.allocate(4).putInt(testValue).array());
-    int readValue = testArray.readInt();
-
-    // Assert that the value we read was the value we wrote.
-    assertEquals(testValue, readValue);
-    // And that the position advanced as expected.
-    assertEquals(4, testArray.getPosition());
-
-    // And that skipping back and reading gives the same results.
-    testArray.skipBytes(-4);
-    readValue = testArray.readInt();
-    assertEquals(testValue, readValue);
-    assertEquals(4, testArray.getPosition());
-  }
-
-  public void testReadUnsignedInt() {
-    testReadUnsignedInt(0);
-    testReadUnsignedInt(1);
-    testReadUnsignedInt(Integer.MAX_VALUE);
-    testReadUnsignedInt(Integer.MAX_VALUE + 1L);
-    testReadUnsignedInt(0xFFFFFFFFL);
-  }
-
-  private static void testReadUnsignedInt(long testValue) {
-    ParsableByteArray testArray = new ParsableByteArray(
-        Arrays.copyOfRange(ByteBuffer.allocate(8).putLong(testValue).array(), 4, 8));
-    long readValue = testArray.readUnsignedInt();
-
-    // Assert that the value we read was the value we wrote.
-    assertEquals(testValue, readValue);
-    // And that the position advanced as expected.
-    assertEquals(4, testArray.getPosition());
-
-    // And that skipping back and reading gives the same results.
-    testArray.skipBytes(-4);
-    readValue = testArray.readUnsignedInt();
-    assertEquals(testValue, readValue);
-    assertEquals(4, testArray.getPosition());
-  }
-
-  public void testReadUnsignedIntToInt() {
-    testReadUnsignedIntToInt(0);
-    testReadUnsignedIntToInt(1);
-    testReadUnsignedIntToInt(Integer.MAX_VALUE);
-    try {
-      testReadUnsignedIntToInt(-1);
-      fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
-    try {
-      testReadUnsignedIntToInt(Integer.MIN_VALUE);
-      fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
-  }
-
-  private static void testReadUnsignedIntToInt(int testValue) {
-    ParsableByteArray testArray = new ParsableByteArray(
-        ByteBuffer.allocate(4).putInt(testValue).array());
-    int readValue = testArray.readUnsignedIntToInt();
-
-    // Assert that the value we read was the value we wrote.
-    assertEquals(testValue, readValue);
-    // And that the position advanced as expected.
-    assertEquals(4, testArray.getPosition());
-
-    // And that skipping back and reading gives the same results.
-    testArray.skipBytes(-4);
-    readValue = testArray.readUnsignedIntToInt();
-    assertEquals(testValue, readValue);
-    assertEquals(4, testArray.getPosition());
-  }
-
-  public void testReadUnsignedLongToLong() {
-    testReadUnsignedLongToLong(0);
-    testReadUnsignedLongToLong(1);
-    testReadUnsignedLongToLong(Long.MAX_VALUE);
-    try {
-      testReadUnsignedLongToLong(-1);
-      fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
-    try {
-      testReadUnsignedLongToLong(Long.MIN_VALUE);
-      fail();
-    } catch (IllegalStateException e) {
-      // Expected.
-    }
-  }
-
-  private static void testReadUnsignedLongToLong(long testValue) {
-    ParsableByteArray testArray = new ParsableByteArray(
-        ByteBuffer.allocate(8).putLong(testValue).array());
-    long readValue = testArray.readUnsignedLongToLong();
-
-    // Assert that the value we read was the value we wrote.
-    assertEquals(testValue, readValue);
-    // And that the position advanced as expected.
-    assertEquals(8, testArray.getPosition());
-
-    // And that skipping back and reading gives the same results.
-    testArray.skipBytes(-8);
-    readValue = testArray.readUnsignedLongToLong();
-    assertEquals(testValue, readValue);
-    assertEquals(8, testArray.getPosition());
-  }
-
-  public void testReadLong() {
-    testReadLong(0);
-    testReadLong(1);
-    testReadLong(-1);
-    testReadLong(Long.MIN_VALUE);
-    testReadLong(Long.MAX_VALUE);
-  }
-
-  private static void testReadLong(long testValue) {
-    ParsableByteArray testArray = new ParsableByteArray(
-        ByteBuffer.allocate(8).putLong(testValue).array());
-    long readValue = testArray.readLong();
-
-    // Assert that the value we read was the value we wrote.
-    assertEquals(testValue, readValue);
-    // And that the position advanced as expected.
-    assertEquals(8, testArray.getPosition());
-
-    // And that skipping back and reading gives the same results.
-    testArray.skipBytes(-8);
-    readValue = testArray.readLong();
-    assertEquals(testValue, readValue);
-    assertEquals(8, testArray.getPosition());
-  }
-
-  public void testReadingMovesPosition() {
-    ParsableByteArray parsableByteArray = getTestDataArray();
-
-    // Given an array at the start
-    assertEquals(0, parsableByteArray.getPosition());
-    // When reading an integer, the position advances
-    parsableByteArray.readUnsignedInt();
-    assertEquals(4, parsableByteArray.getPosition());
-  }
-
-  public void testOutOfBoundsThrows() {
-    ParsableByteArray parsableByteArray = getTestDataArray();
-
-    // Given an array at the end
-    parsableByteArray.readUnsignedLongToLong();
-    assertEquals(TEST_DATA.length, parsableByteArray.getPosition());
-    // Then reading more data throws.
-    try {
-      parsableByteArray.readUnsignedInt();
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  public void testModificationsAffectParsableArray() {
-    ParsableByteArray parsableByteArray = getTestDataArray();
-
-    // When modifying the wrapped byte array
-    byte[] data = parsableByteArray.data;
-    long readValue = parsableByteArray.readUnsignedInt();
-    data[0] = (byte) (TEST_DATA[0] + 1);
-    parsableByteArray.setPosition(0);
-    // Then the parsed value changes.
-    assertFalse(parsableByteArray.readUnsignedInt() == readValue);
-  }
-
-  public void testReadingUnsignedLongWithMsbSetThrows() {
-    ParsableByteArray parsableByteArray = getTestDataArray();
-
-    // Given an array with the most-significant bit set on the top byte
-    byte[] data = parsableByteArray.data;
-    data[0] = (byte) 0x80;
-    // Then reading an unsigned long throws.
-    try {
-      parsableByteArray.readUnsignedLongToLong();
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  public void testReadUnsignedFixedPoint1616() {
-    ParsableByteArray parsableByteArray = getTestDataArray();
-
-    // When reading the integer part of a 16.16 fixed point value
-    int value = parsableByteArray.readUnsignedFixedPoint1616();
-    // Then the read value is equal to the array elements interpreted as a short.
-    assertEquals((0xFF & TEST_DATA[0]) << 8 | (TEST_DATA[1] & 0xFF), value);
-    assertEquals(4, parsableByteArray.getPosition());
-  }
-
-  public void testReadingBytesReturnsCopy() {
-    ParsableByteArray parsableByteArray = getTestDataArray();
-
-    // When reading all the bytes back
-    int length = parsableByteArray.limit();
-    assertEquals(TEST_DATA.length, length);
-    byte[] copy = new byte[length];
-    parsableByteArray.readBytes(copy, 0, length);
-    // Then the array elements are the same.
-    assertTrue(Arrays.equals(parsableByteArray.data, copy));
-  }
-
-  public void testReadLittleEndianLong() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
-        0x01, 0x00, 0x00, 0x00,
-        0x00, 0x00, 0x00, (byte) 0xFF
-    });
-    assertEquals(0xFF00000000000001L, byteArray.readLittleEndianLong());
-    assertEquals(8, byteArray.getPosition());
-  }
-
-  public void testReadLittleEndianUnsignedInt() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
-        0x10, 0x00, 0x00, (byte) 0xFF
-    });
-    assertEquals(0xFF000010L, byteArray.readLittleEndianUnsignedInt());
-    assertEquals(4, byteArray.getPosition());
-  }
-
-  public void testReadLittleEndianInt() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
-        0x01, 0x00, 0x00, (byte) 0xFF
-    });
-    assertEquals(0xFF000001, byteArray.readLittleEndianInt());
-    assertEquals(4, byteArray.getPosition());
-  }
-
-  public void testReadLittleEndianUnsignedInt24() {
-    byte[] data = { 0x01, 0x02, (byte) 0xFF };
-    ParsableByteArray byteArray = new ParsableByteArray(data);
-    assertEquals(0xFF0201, byteArray.readLittleEndianUnsignedInt24());
-    assertEquals(3, byteArray.getPosition());
-  }
-
-  public void testReadLittleEndianUnsignedShort() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
-        0x01, (byte) 0xFF, 0x02, (byte) 0xFF
-    });
-    assertEquals(0xFF01, byteArray.readLittleEndianUnsignedShort());
-    assertEquals(2, byteArray.getPosition());
-    assertEquals(0xFF02, byteArray.readLittleEndianUnsignedShort());
-    assertEquals(4, byteArray.getPosition());
-  }
-
-  public void testReadLittleEndianShort() {
-    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
-        0x01, (byte) 0xFF, 0x02, (byte) 0xFF
-    });
-    assertEquals((short) 0xFF01, byteArray.readLittleEndianShort());
-    assertEquals(2, byteArray.getPosition());
-    assertEquals((short) 0xFF02, byteArray.readLittleEndianShort());
-    assertEquals(4, byteArray.getPosition());
-  }
-
-  public void testReadString() {
-    byte[] data = {
-        (byte) 0xC3, (byte) 0xA4, (byte) 0x20,
-        (byte) 0xC3, (byte) 0xB6, (byte) 0x20,
-        (byte) 0xC2, (byte) 0xAE, (byte) 0x20,
-        (byte) 0xCF, (byte) 0x80, (byte) 0x20,
-        (byte) 0xE2, (byte) 0x88, (byte) 0x9A, (byte) 0x20,
-        (byte) 0xC2, (byte) 0xB1, (byte) 0x20,
-        (byte) 0xE8, (byte) 0xB0, (byte) 0xA2, (byte) 0x20,
-    };
-    ParsableByteArray byteArray = new ParsableByteArray(data);
-    assertEquals("ä ö ® π √ ± 谢 ", byteArray.readString(data.length));
-    assertEquals(data.length, byteArray.getPosition());
-  }
-
-  public void testReadAsciiString() {
-    byte[] data = new byte[] {'t', 'e', 's', 't'};
-    ParsableByteArray testArray = new ParsableByteArray(data);
-    assertEquals("test", testArray.readString(data.length, Charset.forName("US-ASCII")));
-    assertEquals(data.length, testArray.getPosition());
-  }
-
-  public void testReadStringOutOfBoundsDoesNotMovePosition() {
-    byte[] data = {
-        (byte) 0xC3, (byte) 0xA4, (byte) 0x20
-    };
-    ParsableByteArray byteArray = new ParsableByteArray(data);
-    try {
-      byteArray.readString(data.length + 1);
-      fail();
-    } catch (StringIndexOutOfBoundsException e) {
-      assertEquals(0, byteArray.getPosition());
-    }
-  }
-
-  public void testReadEmptyString() {
-    byte[] bytes = new byte[0];
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertNull(parser.readLine());
-  }
-
-  public void testReadNullTerminatedStringWithLengths() {
-    byte[] bytes = new byte[] {
-        'f', 'o', 'o', 0, 'b', 'a', 'r', 0
-    };
-    // Test with lengths that match NUL byte positions.
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readNullTerminatedString(4));
-    assertEquals(4, parser.getPosition());
-    assertEquals("bar", parser.readNullTerminatedString(4));
-    assertEquals(8, parser.getPosition());
-    assertNull(parser.readNullTerminatedString());
-    // Test with lengths that do not match NUL byte positions.
-    parser = new ParsableByteArray(bytes);
-    assertEquals("fo", parser.readNullTerminatedString(2));
-    assertEquals(2, parser.getPosition());
-    assertEquals("o", parser.readNullTerminatedString(2));
-    assertEquals(4, parser.getPosition());
-    assertEquals("bar", parser.readNullTerminatedString(3));
-    assertEquals(7, parser.getPosition());
-    assertEquals("", parser.readNullTerminatedString(1));
-    assertEquals(8, parser.getPosition());
-    assertNull(parser.readNullTerminatedString());
-    // Test with limit at NUL
-    parser = new ParsableByteArray(bytes, 4);
-    assertEquals("foo", parser.readNullTerminatedString(4));
-    assertEquals(4, parser.getPosition());
-    assertNull(parser.readNullTerminatedString());
-    // Test with limit before NUL
-    parser = new ParsableByteArray(bytes, 3);
-    assertEquals("foo", parser.readNullTerminatedString(3));
-    assertEquals(3, parser.getPosition());
-    assertNull(parser.readNullTerminatedString());
-  }
-
-  public void testReadNullTerminatedString() {
-    byte[] bytes = new byte[] {
-        'f', 'o', 'o', 0, 'b', 'a', 'r', 0
-    };
-    // Test normal case.
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readNullTerminatedString());
-    assertEquals(4, parser.getPosition());
-    assertEquals("bar", parser.readNullTerminatedString());
-    assertEquals(8, parser.getPosition());
-    assertNull(parser.readNullTerminatedString());
-    // Test with limit at NUL.
-    parser = new ParsableByteArray(bytes, 4);
-    assertEquals("foo", parser.readNullTerminatedString());
-    assertEquals(4, parser.getPosition());
-    assertNull(parser.readNullTerminatedString());
-    // Test with limit before NUL.
-    parser = new ParsableByteArray(bytes, 3);
-    assertEquals("foo", parser.readNullTerminatedString());
-    assertEquals(3, parser.getPosition());
-    assertNull(parser.readNullTerminatedString());
-  }
-
-  public void testReadNullTerminatedStringWithoutEndingNull() {
-    byte[] bytes = new byte[] {
-        'f', 'o', 'o', 0, 'b', 'a', 'r'
-    };
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readNullTerminatedString());
-    assertEquals("bar", parser.readNullTerminatedString());
-    assertNull(parser.readNullTerminatedString());
-  }
-
-  public void testReadSingleLineWithoutEndingTrail() {
-    byte[] bytes = new byte[] {
-      'f', 'o', 'o'
-    };
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readLine());
-    assertNull(parser.readLine());
-  }
-
-  public void testReadSingleLineWithEndingLf() {
-    byte[] bytes = new byte[] {
-      'f', 'o', 'o', '\n'
-    };
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readLine());
-    assertNull(parser.readLine());
-  }
-
-  public void testReadTwoLinesWithCrFollowedByLf() {
-    byte[] bytes = new byte[] {
-      'f', 'o', 'o', '\r', '\n', 'b', 'a', 'r'
-    };
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readLine());
-    assertEquals("bar", parser.readLine());
-    assertNull(parser.readLine());
-  }
-
-  public void testReadThreeLinesWithEmptyLine() {
-    byte[] bytes = new byte[] {
-      'f', 'o', 'o', '\r', '\n', '\r', 'b', 'a', 'r'
-    };
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readLine());
-    assertEquals("", parser.readLine());
-    assertEquals("bar", parser.readLine());
-    assertNull(parser.readLine());
-  }
-
-  public void testReadFourLinesWithLfFollowedByCr() {
-    byte[] bytes = new byte[] {
-      'f', 'o', 'o', '\n', '\r', '\r', 'b', 'a', 'r', '\r', '\n'
-    };
-    ParsableByteArray parser = new ParsableByteArray(bytes);
-    assertEquals("foo", parser.readLine());
-    assertEquals("", parser.readLine());
-    assertEquals("", parser.readLine());
-    assertEquals("bar", parser.readLine());
-    assertNull(parser.readLine());
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
deleted file mode 100644
index 294d3d352a2..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
+++ /dev/null
@@ -1,114 +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.util;
-
-import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray;
-
-import junit.framework.TestCase;
-
-/**
- * Tests for {@link ParsableNalUnitBitArray}.
- */
-public final class ParsableNalUnitBitArrayTest extends TestCase {
-
-  private static final byte[] NO_ESCAPING_TEST_DATA = createByteArray(0, 3, 0, 1, 3, 0, 0);
-  private static final byte[] ALL_ESCAPING_TEST_DATA = createByteArray(0, 0, 3, 0, 0, 3, 0, 0, 3);
-  private static final byte[] MIX_TEST_DATA = createByteArray(255, 0, 0, 3, 255, 0, 0, 127);
-
-  public void testReadNoEscaping() {
-    ParsableNalUnitBitArray array =
-        new ParsableNalUnitBitArray(NO_ESCAPING_TEST_DATA, 0, NO_ESCAPING_TEST_DATA.length);
-    assertEquals(0x000300, array.readBits(24));
-    assertEquals(0, array.readBits(7));
-    assertTrue(array.readBit());
-    assertEquals(0x030000, array.readBits(24));
-    assertFalse(array.canReadBits(1));
-    assertFalse(array.canReadBits(8));
-  }
-
-  public void testReadNoEscapingTruncated() {
-    ParsableNalUnitBitArray array = new ParsableNalUnitBitArray(NO_ESCAPING_TEST_DATA, 0, 4);
-    assertTrue(array.canReadBits(32));
-    array.skipBits(32);
-    assertFalse(array.canReadBits(1));
-    try {
-      array.readBit();
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  public void testReadAllEscaping() {
-    ParsableNalUnitBitArray array =
-        new ParsableNalUnitBitArray(ALL_ESCAPING_TEST_DATA, 0, ALL_ESCAPING_TEST_DATA.length);
-    assertTrue(array.canReadBits(48));
-    assertFalse(array.canReadBits(49));
-    assertEquals(0, array.readBits(15));
-    assertFalse(array.readBit());
-    assertEquals(0, array.readBits(17));
-    assertEquals(0, array.readBits(15));
-  }
-
-  public void testReadMix() {
-    ParsableNalUnitBitArray array =
-        new ParsableNalUnitBitArray(MIX_TEST_DATA, 0, MIX_TEST_DATA.length);
-    assertTrue(array.canReadBits(56));
-    assertFalse(array.canReadBits(57));
-    assertEquals(127, array.readBits(7));
-    assertEquals(2, array.readBits(2));
-    assertEquals(3, array.readBits(17));
-    assertEquals(126, array.readBits(7));
-    assertEquals(127, array.readBits(23));
-    assertFalse(array.canReadBits(1));
-  }
-
-  public void testReadExpGolomb() {
-    ParsableNalUnitBitArray array = new ParsableNalUnitBitArray(createByteArray(0x9E), 0, 1);
-    assertTrue(array.canReadExpGolombCodedNum());
-    assertEquals(0, array.readUnsignedExpGolombCodedInt());
-    assertEquals(6, array.readUnsignedExpGolombCodedInt());
-    assertEquals(0, array.readUnsignedExpGolombCodedInt());
-    assertFalse(array.canReadExpGolombCodedNum());
-    try {
-      array.readUnsignedExpGolombCodedInt();
-      fail();
-    } catch (Exception e) {
-      // Expected.
-    }
-  }
-
-  public void testReadExpGolombWithEscaping() {
-    ParsableNalUnitBitArray array =
-        new ParsableNalUnitBitArray(createByteArray(0, 0, 3, 128, 0), 0, 5);
-    assertFalse(array.canReadExpGolombCodedNum());
-    array.skipBit();
-    assertTrue(array.canReadExpGolombCodedNum());
-    assertEquals(32767, array.readUnsignedExpGolombCodedInt());
-    assertFalse(array.canReadBits(1));
-  }
-
-  public void testReset() {
-    ParsableNalUnitBitArray array = new ParsableNalUnitBitArray(createByteArray(0, 0), 0, 2);
-    assertFalse(array.canReadExpGolombCodedNum());
-    assertTrue(array.canReadBits(16));
-    assertFalse(array.canReadBits(17));
-    array.reset(createByteArray(0, 0, 3, 0), 0, 4);
-    assertTrue(array.canReadBits(24));
-    assertFalse(array.canReadBits(25));
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
deleted file mode 100644
index beb9e448535..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
+++ /dev/null
@@ -1,46 +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.util;
-
-import android.test.MoreAsserts;
-import java.io.ByteArrayOutputStream;
-import junit.framework.TestCase;
-
-/**
- * Tests {@link ReusableBufferedOutputStream}.
- */
-public class ReusableBufferedOutputStreamTest extends TestCase {
-
-  private static final byte[] TEST_DATA_1 = "test data 1".getBytes();
-  private static final byte[] TEST_DATA_2 = "2 test data".getBytes();
-
-  public void testReset() throws Exception {
-    ByteArrayOutputStream byteArrayOutputStream1 = new ByteArrayOutputStream(1000);
-    ReusableBufferedOutputStream outputStream = new ReusableBufferedOutputStream(
-        byteArrayOutputStream1, 1000);
-    outputStream.write(TEST_DATA_1);
-    outputStream.close();
-
-    ByteArrayOutputStream byteArrayOutputStream2 = new ByteArrayOutputStream(1000);
-    outputStream.reset(byteArrayOutputStream2);
-    outputStream.write(TEST_DATA_2);
-    outputStream.close();
-
-    MoreAsserts.assertEquals(TEST_DATA_1, byteArrayOutputStream1.toByteArray());
-    MoreAsserts.assertEquals(TEST_DATA_2, byteArrayOutputStream2.toByteArray());
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java
deleted file mode 100644
index 1755c6f70d8..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UriUtilTest.java
+++ /dev/null
@@ -1,98 +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.util;
-
-import junit.framework.TestCase;
-
-/**
- * Unit tests for {@link UriUtil}.
- */
-public class UriUtilTest extends TestCase {
-
-  /**
-   * Tests normal usage of {@link UriUtil#resolve(String, String)}.
-   * <p>
-   * The test cases are taken from RFC-3986 5.4.1.
-   */
-  public void testResolveNormal() {
-    String base = "http://a/b/c/d;p?q";
-
-    assertEquals("g:h", UriUtil.resolve(base, "g:h"));
-    assertEquals("http://a/b/c/g", UriUtil.resolve(base, "g"));
-    assertEquals("http://a/b/c/g/", UriUtil.resolve(base, "g/"));
-    assertEquals("http://a/g", UriUtil.resolve(base, "/g"));
-    assertEquals("http://g", UriUtil.resolve(base, "//g"));
-    assertEquals("http://a/b/c/d;p?y", UriUtil.resolve(base, "?y"));
-    assertEquals("http://a/b/c/g?y", UriUtil.resolve(base, "g?y"));
-    assertEquals("http://a/b/c/d;p?q#s", UriUtil.resolve(base, "#s"));
-    assertEquals("http://a/b/c/g#s", UriUtil.resolve(base, "g#s"));
-    assertEquals("http://a/b/c/g?y#s", UriUtil.resolve(base, "g?y#s"));
-    assertEquals("http://a/b/c/;x", UriUtil.resolve(base, ";x"));
-    assertEquals("http://a/b/c/g;x", UriUtil.resolve(base, "g;x"));
-    assertEquals("http://a/b/c/g;x?y#s", UriUtil.resolve(base, "g;x?y#s"));
-    assertEquals("http://a/b/c/d;p?q", UriUtil.resolve(base, ""));
-    assertEquals("http://a/b/c/", UriUtil.resolve(base, "."));
-    assertEquals("http://a/b/c/", UriUtil.resolve(base, "./"));
-    assertEquals("http://a/b/", UriUtil.resolve(base, ".."));
-    assertEquals("http://a/b/", UriUtil.resolve(base, "../"));
-    assertEquals("http://a/b/g", UriUtil.resolve(base, "../g"));
-    assertEquals("http://a/", UriUtil.resolve(base, "../.."));
-    assertEquals("http://a/", UriUtil.resolve(base, "../../"));
-    assertEquals("http://a/g", UriUtil.resolve(base, "../../g"));
-  }
-
-  /**
-   * Tests abnormal usage of {@link UriUtil#resolve(String, String)}.
-   * <p>
-   * The test cases are taken from RFC-3986 5.4.2.
-   */
-  public void testResolveAbnormal() {
-    String base = "http://a/b/c/d;p?q";
-
-    assertEquals("http://a/g", UriUtil.resolve(base, "../../../g"));
-    assertEquals("http://a/g", UriUtil.resolve(base, "../../../../g"));
-
-    assertEquals("http://a/g", UriUtil.resolve(base, "/./g"));
-    assertEquals("http://a/g", UriUtil.resolve(base, "/../g"));
-    assertEquals("http://a/b/c/g.", UriUtil.resolve(base, "g."));
-    assertEquals("http://a/b/c/.g", UriUtil.resolve(base, ".g"));
-    assertEquals("http://a/b/c/g..", UriUtil.resolve(base, "g.."));
-    assertEquals("http://a/b/c/..g", UriUtil.resolve(base, "..g"));
-
-    assertEquals("http://a/b/g", UriUtil.resolve(base, "./../g"));
-    assertEquals("http://a/b/c/g/", UriUtil.resolve(base, "./g/."));
-    assertEquals("http://a/b/c/g/h", UriUtil.resolve(base, "g/./h"));
-    assertEquals("http://a/b/c/h", UriUtil.resolve(base, "g/../h"));
-    assertEquals("http://a/b/c/g;x=1/y", UriUtil.resolve(base, "g;x=1/./y"));
-    assertEquals("http://a/b/c/y", UriUtil.resolve(base, "g;x=1/../y"));
-
-    assertEquals("http://a/b/c/g?y/./x", UriUtil.resolve(base, "g?y/./x"));
-    assertEquals("http://a/b/c/g?y/../x", UriUtil.resolve(base, "g?y/../x"));
-    assertEquals("http://a/b/c/g#s/./x", UriUtil.resolve(base, "g#s/./x"));
-    assertEquals("http://a/b/c/g#s/../x", UriUtil.resolve(base, "g#s/../x"));
-
-    assertEquals("http:g", UriUtil.resolve(base, "http:g"));
-  }
-
-  /**
-   * Tests additional abnormal usage of {@link UriUtil#resolve(String, String)}.
-   */
-  public void testResolveAbnormalAdditional() {
-    assertEquals("c:e", UriUtil.resolve("http://a/b", "c:d/../e"));
-    assertEquals("a:c", UriUtil.resolve("a:b", "../c"));
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java
deleted file mode 100644
index 1d9aff07231..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/util/UtilTest.java
+++ /dev/null
@@ -1,179 +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.util;
-
-import com.google.android.exoplayer2.testutil.TestUtil;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-import junit.framework.TestCase;
-
-/**
- * Unit tests for {@link Util}.
- */
-public class UtilTest extends TestCase {
-
-  public void testArrayBinarySearchFloor() {
-    long[] values = new long[0];
-    assertEquals(-1, Util.binarySearchFloor(values, 0, false, false));
-    assertEquals(0, Util.binarySearchFloor(values, 0, false, true));
-
-    values = new long[] {1, 3, 5};
-    assertEquals(-1, Util.binarySearchFloor(values, 0, false, false));
-    assertEquals(-1, Util.binarySearchFloor(values, 0, true, false));
-    assertEquals(0, Util.binarySearchFloor(values, 0, false, true));
-    assertEquals(0, Util.binarySearchFloor(values, 0, true, true));
-
-    assertEquals(-1, Util.binarySearchFloor(values, 1, false, false));
-    assertEquals(0, Util.binarySearchFloor(values, 1, true, false));
-    assertEquals(0, Util.binarySearchFloor(values, 1, false, true));
-    assertEquals(0, Util.binarySearchFloor(values, 1, true, true));
-
-    assertEquals(1, Util.binarySearchFloor(values, 4, false, false));
-    assertEquals(1, Util.binarySearchFloor(values, 4, true, false));
-
-    assertEquals(1, Util.binarySearchFloor(values, 5, false, false));
-    assertEquals(2, Util.binarySearchFloor(values, 5, true, false));
-
-    assertEquals(2, Util.binarySearchFloor(values, 6, false, false));
-    assertEquals(2, Util.binarySearchFloor(values, 6, true, false));
-  }
-
-  public void testListBinarySearchFloor() {
-    List<Integer> values = new ArrayList<>();
-    assertEquals(-1, Util.binarySearchFloor(values, 0, false, false));
-    assertEquals(0, Util.binarySearchFloor(values, 0, false, true));
-
-    values.add(1);
-    values.add(3);
-    values.add(5);
-    assertEquals(-1, Util.binarySearchFloor(values, 0, false, false));
-    assertEquals(-1, Util.binarySearchFloor(values, 0, true, false));
-    assertEquals(0, Util.binarySearchFloor(values, 0, false, true));
-    assertEquals(0, Util.binarySearchFloor(values, 0, true, true));
-
-    assertEquals(-1, Util.binarySearchFloor(values, 1, false, false));
-    assertEquals(0, Util.binarySearchFloor(values, 1, true, false));
-    assertEquals(0, Util.binarySearchFloor(values, 1, false, true));
-    assertEquals(0, Util.binarySearchFloor(values, 1, true, true));
-
-    assertEquals(1, Util.binarySearchFloor(values, 4, false, false));
-    assertEquals(1, Util.binarySearchFloor(values, 4, true, false));
-
-    assertEquals(1, Util.binarySearchFloor(values, 5, false, false));
-    assertEquals(2, Util.binarySearchFloor(values, 5, true, false));
-
-    assertEquals(2, Util.binarySearchFloor(values, 6, false, false));
-    assertEquals(2, Util.binarySearchFloor(values, 6, true, false));
-  }
-
-  public void testArrayBinarySearchCeil() {
-    long[] values = new long[0];
-    assertEquals(0, Util.binarySearchCeil(values, 0, false, false));
-    assertEquals(-1, Util.binarySearchCeil(values, 0, false, true));
-
-    values = new long[] {1, 3, 5};
-    assertEquals(0, Util.binarySearchCeil(values, 0, false, false));
-    assertEquals(0, Util.binarySearchCeil(values, 0, true, false));
-
-    assertEquals(1, Util.binarySearchCeil(values, 1, false, false));
-    assertEquals(0, Util.binarySearchCeil(values, 1, true, false));
-
-    assertEquals(1, Util.binarySearchCeil(values, 2, false, false));
-    assertEquals(1, Util.binarySearchCeil(values, 2, true, false));
-
-    assertEquals(3, Util.binarySearchCeil(values, 5, false, false));
-    assertEquals(2, Util.binarySearchCeil(values, 5, true, false));
-    assertEquals(2, Util.binarySearchCeil(values, 5, false, true));
-    assertEquals(2, Util.binarySearchCeil(values, 5, true, true));
-
-    assertEquals(3, Util.binarySearchCeil(values, 6, false, false));
-    assertEquals(3, Util.binarySearchCeil(values, 6, true, false));
-    assertEquals(2, Util.binarySearchCeil(values, 6, false, true));
-    assertEquals(2, Util.binarySearchCeil(values, 6, true, true));
-  }
-
-  public void testListBinarySearchCeil() {
-    List<Integer> values = new ArrayList<>();
-    assertEquals(0, Util.binarySearchCeil(values, 0, false, false));
-    assertEquals(-1, Util.binarySearchCeil(values, 0, false, true));
-
-    values.add(1);
-    values.add(3);
-    values.add(5);
-    assertEquals(0, Util.binarySearchCeil(values, 0, false, false));
-    assertEquals(0, Util.binarySearchCeil(values, 0, true, false));
-
-    assertEquals(1, Util.binarySearchCeil(values, 1, false, false));
-    assertEquals(0, Util.binarySearchCeil(values, 1, true, false));
-
-    assertEquals(1, Util.binarySearchCeil(values, 2, false, false));
-    assertEquals(1, Util.binarySearchCeil(values, 2, true, false));
-
-    assertEquals(3, Util.binarySearchCeil(values, 5, false, false));
-    assertEquals(2, Util.binarySearchCeil(values, 5, true, false));
-    assertEquals(2, Util.binarySearchCeil(values, 5, false, true));
-    assertEquals(2, Util.binarySearchCeil(values, 5, true, true));
-
-    assertEquals(3, Util.binarySearchCeil(values, 6, false, false));
-    assertEquals(3, Util.binarySearchCeil(values, 6, true, false));
-    assertEquals(2, Util.binarySearchCeil(values, 6, false, true));
-    assertEquals(2, Util.binarySearchCeil(values, 6, true, true));
-  }
-
-  public void testParseXsDuration() {
-    assertEquals(150279L, Util.parseXsDuration("PT150.279S"));
-    assertEquals(1500L, Util.parseXsDuration("PT1.500S"));
-  }
-
-  public void testParseXsDateTime() throws Exception {
-    assertEquals(1403219262000L, Util.parseXsDateTime("2014-06-19T23:07:42"));
-    assertEquals(1407322800000L, Util.parseXsDateTime("2014-08-06T11:00:00Z"));
-    assertEquals(1407322800000L, Util.parseXsDateTime("2014-08-06T11:00:00,000Z"));
-    assertEquals(1411161535000L, Util.parseXsDateTime("2014-09-19T13:18:55-08:00"));
-    assertEquals(1411161535000L, Util.parseXsDateTime("2014-09-19T13:18:55-0800"));
-    assertEquals(1411161535000L, Util.parseXsDateTime("2014-09-19T13:18:55.000-0800"));
-    assertEquals(1411161535000L, Util.parseXsDateTime("2014-09-19T13:18:55.000-800"));
-  }
-
-  public void testUnescapeInvalidFileName() {
-    assertNull(Util.unescapeFileName("%a"));
-    assertNull(Util.unescapeFileName("%xyz"));
-  }
-
-  public void testEscapeUnescapeFileName() {
-    assertEscapeUnescapeFileName("just+a regular+fileName", "just+a regular+fileName");
-    assertEscapeUnescapeFileName("key:value", "key%3avalue");
-    assertEscapeUnescapeFileName("<>:\"/\\|?*%", "%3c%3e%3a%22%2f%5c%7c%3f%2a%25");
-
-    Random random = new Random(0);
-    for (int i = 0; i < 1000; i++) {
-      String string = TestUtil.buildTestString(1000, random);
-      assertEscapeUnescapeFileName(string);
-    }
-  }
-
-  private static void assertEscapeUnescapeFileName(String fileName, String escapedFileName) {
-    assertEquals(escapedFileName, Util.escapeFileName(fileName));
-    assertEquals(fileName, Util.unescapeFileName(escapedFileName));
-  }
-
-  private static void assertEscapeUnescapeFileName(String fileName) {
-    String escapedFileName = Util.escapeFileName(fileName);
-    assertEquals(fileName, Util.unescapeFileName(escapedFileName));
-  }
-
-}

From daafbb1f1ce0cae9a23c324a073ca38e02ed8a52 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 31 Aug 2017 10:02:43 -0700
Subject: [PATCH 177/421] Add missing Robolectric test path to codebase

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167151714
---
 .../com/google/android/exoplayer2/CTest.java  |  43 ++
 .../google/android/exoplayer2/FormatTest.java | 159 ++++++
 .../exoplayer2/util/AtomicFileTest.java       |  97 ++++
 .../exoplayer2/util/ColorParserTest.java      | 103 ++++
 .../exoplayer2/util/NalUnitUtilTest.java      | 217 +++++++
 .../exoplayer2/util/ParsableBitArrayTest.java | 198 +++++++
 .../util/ParsableByteArrayTest.java           | 530 ++++++++++++++++++
 .../util/ParsableNalUnitBitArrayTest.java     | 128 +++++
 .../ReusableBufferedOutputStreamTest.java     |  53 ++
 .../android/exoplayer2/util/UriUtilTest.java  | 109 ++++
 .../android/exoplayer2/util/UtilTest.java     | 200 +++++++
 11 files changed, 1837 insertions(+)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/CTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java

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
new file mode 100644
index 00000000000..ff4756f5ed5
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/CTest.java
@@ -0,0 +1,43 @@
+/*
+ * 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.annotation.SuppressLint;
+import android.media.MediaCodec;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link C}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class CTest {
+
+  @SuppressLint("InlinedApi")
+  @Test
+  public void testConstants() {
+    // Sanity check that constant values match those defined by the platform.
+    assertThat(C.BUFFER_FLAG_KEY_FRAME).isEqualTo(MediaCodec.BUFFER_FLAG_KEY_FRAME);
+    assertThat(C.BUFFER_FLAG_END_OF_STREAM).isEqualTo(MediaCodec.BUFFER_FLAG_END_OF_STREAM);
+    assertThat(C.CRYPTO_MODE_AES_CTR).isEqualTo(MediaCodec.CRYPTO_MODE_AES_CTR);
+  }
+
+}
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
new file mode 100644
index 00000000000..8e36edc1053
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/FormatTest.java
@@ -0,0 +1,159 @@
+/*
+ * 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;
+
+import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
+import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
+import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_WEBM;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
+import android.media.MediaFormat;
+import android.os.Parcel;
+import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.metadata.Metadata;
+import com.google.android.exoplayer2.metadata.id3.TextInformationFrame;
+import com.google.android.exoplayer2.testutil.TestUtil;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.Util;
+import com.google.android.exoplayer2.video.ColorInfo;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+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 Format}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class FormatTest {
+
+  private static final List<byte[]> INIT_DATA;
+  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);
+  }
+
+  @Test
+  public void testParcelable() {
+    DrmInitData.SchemeData DRM_DATA_1 = new DrmInitData.SchemeData(WIDEVINE_UUID, "cenc", VIDEO_MP4,
+        TestUtil.buildTestData(128, 1 /* data seed */));
+    DrmInitData.SchemeData DRM_DATA_2 = new DrmInitData.SchemeData(C.UUID_NIL, null, VIDEO_WEBM,
+        TestUtil.buildTestData(128, 1 /* data seed */));
+    DrmInitData drmInitData = new DrmInitData(DRM_DATA_1, DRM_DATA_2);
+    byte[] projectionData = new byte[] {1, 2, 3};
+    Metadata metadata = new Metadata(
+        new TextInformationFrame("id1", "description1", "value1"),
+        new TextInformationFrame("id2", "description2", "value2"));
+    ColorInfo colorInfo =  new ColorInfo(C.COLOR_SPACE_BT709,
+        C.COLOR_RANGE_LIMITED, C.COLOR_TRANSFER_SDR, new byte[] {1, 2, 3, 4, 5, 6, 7});
+
+    Format formatToParcel = new Format("id", MimeTypes.VIDEO_MP4, MimeTypes.VIDEO_H264, null,
+        1024, 2048, 1920, 1080, 24, 90, 2, projectionData, C.STEREO_MODE_TOP_BOTTOM, colorInfo, 6,
+        44100, C.ENCODING_PCM_24BIT, 1001, 1002, 0, "und", Format.NO_VALUE,
+        Format.OFFSET_SAMPLE_RELATIVE, INIT_DATA, drmInitData, metadata);
+
+    Parcel parcel = Parcel.obtain();
+    formatToParcel.writeToParcel(parcel, 0);
+    parcel.setDataPosition(0);
+
+    Format formatFromParcel = Format.CREATOR.createFromParcel(parcel);
+    assertThat(formatFromParcel).isEqualTo(formatToParcel);
+
+    parcel.recycle();
+  }
+
+  @Test
+  public void testConversionToFrameworkMediaFormat() {
+    if (Util.SDK_INT < 16) {
+      // Test doesn't apply.
+      return;
+    }
+
+    testConversionToFrameworkMediaFormatV16(Format.createVideoSampleFormat(null, "video/xyz", null,
+        5000, 102400, 1280, 720, 30, INIT_DATA, null));
+    testConversionToFrameworkMediaFormatV16(Format.createVideoSampleFormat(null, "video/xyz", null,
+        5000, Format.NO_VALUE, 1280, 720, 30, null, null));
+    testConversionToFrameworkMediaFormatV16(Format.createAudioSampleFormat(null, "audio/xyz", null,
+        500, 128, 5, 44100, INIT_DATA, null, 0, null));
+    testConversionToFrameworkMediaFormatV16(Format.createAudioSampleFormat(null, "audio/xyz", null,
+        500, Format.NO_VALUE, 5, 44100, null, null, 0, null));
+    testConversionToFrameworkMediaFormatV16(Format.createTextSampleFormat(null, "text/xyz", 0,
+        "eng"));
+    testConversionToFrameworkMediaFormatV16(Format.createTextSampleFormat(null, "text/xyz", 0,
+        null));
+  }
+
+  @SuppressLint("InlinedApi")
+  @TargetApi(16)
+  private static void testConversionToFrameworkMediaFormatV16(Format in) {
+    MediaFormat out = in.getFrameworkMediaFormatV16();
+    assertThat(out.getString(MediaFormat.KEY_MIME)).isEqualTo(in.sampleMimeType);
+    assertOptionalV16(out, MediaFormat.KEY_LANGUAGE, in.language);
+    assertOptionalV16(out, MediaFormat.KEY_MAX_INPUT_SIZE, in.maxInputSize);
+    assertOptionalV16(out, MediaFormat.KEY_WIDTH, in.width);
+    assertOptionalV16(out, MediaFormat.KEY_HEIGHT, in.height);
+    assertOptionalV16(out, MediaFormat.KEY_CHANNEL_COUNT, in.channelCount);
+    assertOptionalV16(out, MediaFormat.KEY_SAMPLE_RATE, in.sampleRate);
+    assertOptionalV16(out, MediaFormat.KEY_FRAME_RATE, in.frameRate);
+
+    for (int i = 0; i < in.initializationData.size(); i++) {
+      byte[] originalData = in.initializationData.get(i);
+      ByteBuffer frameworkBuffer = out.getByteBuffer("csd-" + i);
+      byte[] frameworkData = Arrays.copyOf(frameworkBuffer.array(), frameworkBuffer.limit());
+      assertThat(frameworkData).isEqualTo(originalData);
+    }
+  }
+
+  @TargetApi(16)
+  private static void assertOptionalV16(MediaFormat format, String key, String value) {
+    if (value == null) {
+      assertThat(format.containsKey(key)).isEqualTo(false);
+    } else {
+      assertThat(format.getString(key)).isEqualTo(value);
+    }
+  }
+
+  @TargetApi(16)
+  private static void assertOptionalV16(MediaFormat format, String key, int value) {
+    if (value == Format.NO_VALUE) {
+      assertThat(format.containsKey(key)).isEqualTo(false);
+    } else {
+      assertThat(format.getInteger(key)).isEqualTo(value);
+    }
+  }
+
+  @TargetApi(16)
+  private static void assertOptionalV16(MediaFormat format, String key, float value) {
+    if (value == Format.NO_VALUE) {
+      assertThat(format.containsKey(key)).isEqualTo(false);
+    } else {
+      assertThat(format.getFloat(key)).isEqualTo(value);
+    }
+  }
+
+}
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
new file mode 100644
index 00000000000..dcf3d31eb31
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/AtomicFileTest.java
@@ -0,0 +1,97 @@
+/*
+ * 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.util;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+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;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests {@link AtomicFile}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class AtomicFileTest {
+
+  private File tempFolder;
+  private File file;
+  private AtomicFile atomicFile;
+
+  @Before
+  public void setUp() throws Exception {
+    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
+    file = new File(tempFolder, "atomicFile");
+    atomicFile = new AtomicFile(file);
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    Util.recursiveDelete(tempFolder);
+  }
+
+  @Test
+  public void testDelete() throws Exception {
+    assertThat(file.createNewFile()).isTrue();
+    atomicFile.delete();
+    assertThat(file.exists()).isFalse();
+  }
+
+  @Test
+  public void testWriteRead() throws Exception {
+    OutputStream output = atomicFile.startWrite();
+    output.write(5);
+    atomicFile.endWrite(output);
+    output.close();
+
+    assertRead();
+
+    output = atomicFile.startWrite();
+    output.write(5);
+    output.write(6);
+    output.close();
+
+    assertRead();
+
+    output = atomicFile.startWrite();
+    output.write(6);
+
+    assertRead();
+    output.close();
+
+    output = atomicFile.startWrite();
+
+    assertRead();
+    output.close();
+  }
+
+  private void assertRead() throws IOException {
+    InputStream input = atomicFile.openRead();
+    assertThat(input.read()).isEqualTo(5);
+    assertThat(input.read()).isEqualTo(-1);
+    input.close();
+  }
+
+}
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
new file mode 100644
index 00000000000..13b126090ce
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ColorParserTest.java
@@ -0,0 +1,103 @@
+/*
+ * 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.util;
+
+import static android.graphics.Color.BLACK;
+import static android.graphics.Color.RED;
+import static android.graphics.Color.WHITE;
+import static android.graphics.Color.argb;
+import static android.graphics.Color.parseColor;
+import static com.google.android.exoplayer2.util.ColorParser.parseTtmlColor;
+import static com.google.common.truth.Truth.assertThat;
+
+import android.graphics.Color;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for <code>ColorParser</code>.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ColorParserTest {
+
+  // Negative tests.
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testParseUnknownColor() {
+    ColorParser.parseTtmlColor("colorOfAnElectron");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testParseNull() {
+    ColorParser.parseTtmlColor(null);
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testParseEmpty() {
+    ColorParser.parseTtmlColor("");
+  }
+
+  @Test(expected = IllegalArgumentException.class)
+  public void testRgbColorParsingRgbValuesNegative() {
+    ColorParser.parseTtmlColor("rgb(-4, 55, 209)");
+  }
+
+  // Positive tests.
+
+  @Test
+  public void testHexCodeParsing() {
+    assertThat(parseTtmlColor("#FFFFFF")).isEqualTo(WHITE);
+    assertThat(parseTtmlColor("#FFFFFFFF")).isEqualTo(WHITE);
+    assertThat(parseTtmlColor("#123456")).isEqualTo(parseColor("#FF123456"));
+    // Hex colors in ColorParser are RGBA, where-as {@link Color#parseColor} takes ARGB.
+    assertThat(parseTtmlColor("#FFFFFF00")).isEqualTo(parseColor("#00FFFFFF"));
+    assertThat(parseTtmlColor("#12345678")).isEqualTo(parseColor("#78123456"));
+  }
+
+  @Test
+  public void testRgbColorParsing() {
+    assertThat(parseTtmlColor("rgb(255,255,255)")).isEqualTo(WHITE);
+    // Spaces are ignored.
+    assertThat(parseTtmlColor("   rgb (      255, 255, 255)")).isEqualTo(WHITE);
+  }
+
+  @Test
+  public void testRgbColorParsingRgbValuesOutOfBounds() {
+    int outOfBounds = ColorParser.parseTtmlColor("rgb(999, 999, 999)");
+    int color = Color.rgb(999, 999, 999);
+    // Behave like the framework does.
+    assertThat(outOfBounds).isEqualTo(color);
+  }
+
+  @Test
+  public void testRgbaColorParsing() {
+    assertThat(parseTtmlColor("rgba(255,255,255,255)")).isEqualTo(WHITE);
+    assertThat(parseTtmlColor("rgba(255,255,255,255)"))
+        .isEqualTo(argb(255, 255, 255, 255));
+    assertThat(parseTtmlColor("rgba(0, 0, 0, 255)")).isEqualTo(BLACK);
+    assertThat(parseTtmlColor("rgba(0, 0, 255, 0)"))
+        .isEqualTo(argb(0, 0, 0, 255));
+    assertThat(parseTtmlColor("rgba(255, 0, 0, 255)")).isEqualTo(RED);
+    assertThat(parseTtmlColor("rgba(255, 0, 255, 0)"))
+        .isEqualTo(argb(0, 255, 0, 255));
+    assertThat(parseTtmlColor("rgba(255, 0, 0, 205)"))
+        .isEqualTo(argb(205, 255, 0, 0));
+  }
+
+}
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
new file mode 100644
index 00000000000..ee77664cced
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/NalUnitUtilTest.java
@@ -0,0 +1,217 @@
+/*
+ * 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.util;
+
+import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray;
+import static com.google.common.truth.Truth.assertThat;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link NalUnitUtil}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class NalUnitUtilTest {
+
+  private static final int TEST_PARTIAL_NAL_POSITION = 4;
+  private static final int TEST_NAL_POSITION = 10;
+  private static final byte[] SPS_TEST_DATA = createByteArray(0x00, 0x00, 0x01, 0x67, 0x4D, 0x40,
+      0x16, 0xEC, 0xA0, 0x50, 0x17, 0xFC, 0xB8, 0x08, 0x80, 0x00, 0x00, 0x03, 0x00, 0x80, 0x00,
+      0x00, 0x0F, 0x47, 0x8B, 0x16, 0xCB);
+  private static final int SPS_TEST_DATA_OFFSET = 3;
+
+  @Test
+  public void testFindNalUnit() {
+    byte[] data = buildTestData();
+
+    // Should find NAL unit.
+    int result = NalUnitUtil.findNalUnit(data, 0, data.length, null);
+    assertThat(result).isEqualTo(TEST_NAL_POSITION);
+    // Should find NAL unit whose prefix ends one byte before the limit.
+    result = NalUnitUtil.findNalUnit(data, 0, TEST_NAL_POSITION + 4, null);
+    assertThat(result).isEqualTo(TEST_NAL_POSITION);
+    // Shouldn't find NAL unit whose prefix ends at the limit (since the limit is exclusive).
+    result = NalUnitUtil.findNalUnit(data, 0, TEST_NAL_POSITION + 3, null);
+    assertThat(result).isEqualTo(TEST_NAL_POSITION + 3);
+    // Should find NAL unit whose prefix starts at the offset.
+    result = NalUnitUtil.findNalUnit(data, TEST_NAL_POSITION, data.length, null);
+    assertThat(result).isEqualTo(TEST_NAL_POSITION);
+    // Shouldn't find NAL unit whose prefix starts one byte past the offset.
+    result = NalUnitUtil.findNalUnit(data, TEST_NAL_POSITION + 1, data.length, null);
+    assertThat(result).isEqualTo(data.length);
+  }
+
+  @Test
+  public void testFindNalUnitWithPrefix() {
+    byte[] data = buildTestData();
+
+    // First byte of NAL unit in data1, rest in data2.
+    boolean[] prefixFlags = new boolean[3];
+    byte[] data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 1);
+    byte[] data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 1, data.length);
+    int result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
+    assertThat(result).isEqualTo(data1.length);
+    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
+    assertThat(result).isEqualTo(-1);
+    assertPrefixFlagsCleared(prefixFlags);
+
+    // First three bytes of NAL unit in data1, rest in data2.
+    prefixFlags = new boolean[3];
+    data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 3);
+    data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 3, data.length);
+    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
+    assertThat(result).isEqualTo(data1.length);
+    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
+    assertThat(result).isEqualTo(-3);
+    assertPrefixFlagsCleared(prefixFlags);
+
+    // First byte of NAL unit in data1, second byte in data2, rest in data3.
+    prefixFlags = new boolean[3];
+    data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 1);
+    data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 1, TEST_NAL_POSITION + 2);
+    byte[] data3 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 2, data.length);
+    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
+    assertThat(result).isEqualTo(data1.length);
+    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
+    assertThat(result).isEqualTo(data2.length);
+    result = NalUnitUtil.findNalUnit(data3, 0, data3.length, prefixFlags);
+    assertThat(result).isEqualTo(-2);
+    assertPrefixFlagsCleared(prefixFlags);
+
+    // NAL unit split with one byte in four arrays.
+    prefixFlags = new boolean[3];
+    data1 = Arrays.copyOfRange(data, 0, TEST_NAL_POSITION + 1);
+    data2 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 1, TEST_NAL_POSITION + 2);
+    data3 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 2, TEST_NAL_POSITION + 3);
+    byte[] data4 = Arrays.copyOfRange(data, TEST_NAL_POSITION + 2, data.length);
+    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
+    assertThat(result).isEqualTo(data1.length);
+    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
+    assertThat(result).isEqualTo(data2.length);
+    result = NalUnitUtil.findNalUnit(data3, 0, data3.length, prefixFlags);
+    assertThat(result).isEqualTo(data3.length);
+    result = NalUnitUtil.findNalUnit(data4, 0, data4.length, prefixFlags);
+    assertThat(result).isEqualTo(-3);
+    assertPrefixFlagsCleared(prefixFlags);
+
+    // NAL unit entirely in data2. data1 ends with partial prefix.
+    prefixFlags = new boolean[3];
+    data1 = Arrays.copyOfRange(data, 0, TEST_PARTIAL_NAL_POSITION + 2);
+    data2 = Arrays.copyOfRange(data, TEST_PARTIAL_NAL_POSITION + 2, data.length);
+    result = NalUnitUtil.findNalUnit(data1, 0, data1.length, prefixFlags);
+    assertThat(result).isEqualTo(data1.length);
+    result = NalUnitUtil.findNalUnit(data2, 0, data2.length, prefixFlags);
+    assertThat(result).isEqualTo(4);
+    assertPrefixFlagsCleared(prefixFlags);
+  }
+
+  @Test
+  public void testParseSpsNalUnit() {
+    NalUnitUtil.SpsData data = NalUnitUtil.parseSpsNalUnit(SPS_TEST_DATA, SPS_TEST_DATA_OFFSET,
+        SPS_TEST_DATA.length);
+    assertThat(data.width).isEqualTo(640);
+    assertThat(data.height).isEqualTo(360);
+    assertThat(data.deltaPicOrderAlwaysZeroFlag).isFalse();
+    assertThat(data.frameMbsOnlyFlag).isTrue();
+    assertThat(data.frameNumLength).isEqualTo(4);
+    assertThat(data.picOrderCntLsbLength).isEqualTo(6);
+    assertThat(data.seqParameterSetId).isEqualTo(0);
+    assertThat(data.pixelWidthAspectRatio).isEqualTo(1.0f);
+    assertThat(data.picOrderCountType).isEqualTo(0);
+    assertThat(data.separateColorPlaneFlag).isFalse();
+  }
+
+  @Test
+  public void testUnescapeDoesNotModifyBuffersWithoutStartCodes() {
+    assertUnescapeDoesNotModify("");
+    assertUnescapeDoesNotModify("0000");
+    assertUnescapeDoesNotModify("172BF38A3C");
+    assertUnescapeDoesNotModify("000004");
+  }
+
+  @Test
+  public void testUnescapeModifiesBuffersWithStartCodes() {
+    assertUnescapeMatchesExpected("00000301", "000001");
+    assertUnescapeMatchesExpected("0000030200000300", "000002000000");
+  }
+
+  @Test
+  public void testDiscardToSps() {
+    assertDiscardToSpsMatchesExpected("", "");
+    assertDiscardToSpsMatchesExpected("00", "");
+    assertDiscardToSpsMatchesExpected("FFFF000001", "");
+    assertDiscardToSpsMatchesExpected("00000001", "");
+    assertDiscardToSpsMatchesExpected("00000001FF67", "");
+    assertDiscardToSpsMatchesExpected("00000001000167", "");
+    assertDiscardToSpsMatchesExpected("0000000167", "0000000167");
+    assertDiscardToSpsMatchesExpected("0000000167FF", "0000000167FF");
+    assertDiscardToSpsMatchesExpected("0000000167FF", "0000000167FF");
+    assertDiscardToSpsMatchesExpected("0000000167FF000000016700", "0000000167FF000000016700");
+    assertDiscardToSpsMatchesExpected("000000000167FF", "0000000167FF");
+    assertDiscardToSpsMatchesExpected("0001670000000167FF", "0000000167FF");
+    assertDiscardToSpsMatchesExpected("FF00000001660000000167FF", "0000000167FF");
+  }
+
+  private static byte[] buildTestData() {
+    byte[] data = new byte[20];
+    for (int i = 0; i < data.length; i++) {
+      data[i] = (byte) 0xFF;
+    }
+    // Insert an incomplete NAL unit start code.
+    data[TEST_PARTIAL_NAL_POSITION] = 0;
+    data[TEST_PARTIAL_NAL_POSITION + 1] = 0;
+    // Insert a complete NAL unit start code.
+    data[TEST_NAL_POSITION] = 0;
+    data[TEST_NAL_POSITION + 1] = 0;
+    data[TEST_NAL_POSITION + 2] = 1;
+    data[TEST_NAL_POSITION + 3] = 5;
+    return data;
+  }
+
+  private static void assertPrefixFlagsCleared(boolean[] flags) {
+    assertThat(flags[0] || flags[1] || flags[2]).isEqualTo(false);
+  }
+
+  private static void assertUnescapeDoesNotModify(String input) {
+    assertUnescapeMatchesExpected(input, input);
+  }
+
+  private static void assertUnescapeMatchesExpected(String input, String expectedOutput) {
+    byte[] bitstream = Util.getBytesFromHexString(input);
+    byte[] expectedOutputBitstream = Util.getBytesFromHexString(expectedOutput);
+    int count = NalUnitUtil.unescapeStream(bitstream, bitstream.length);
+    assertThat(count).isEqualTo(expectedOutputBitstream.length);
+    byte[] outputBitstream = new byte[count];
+    System.arraycopy(bitstream, 0, outputBitstream, 0, count);
+    assertThat(outputBitstream).isEqualTo(expectedOutputBitstream);
+  }
+
+  private static void assertDiscardToSpsMatchesExpected(String input, String expectedOutput) {
+    byte[] bitstream = Util.getBytesFromHexString(input);
+    byte[] expectedOutputBitstream = Util.getBytesFromHexString(expectedOutput);
+    ByteBuffer buffer = ByteBuffer.wrap(bitstream);
+    buffer.position(buffer.limit());
+    NalUnitUtil.discardToSps(buffer);
+    assertThat(Arrays.copyOf(buffer.array(), buffer.position())).isEqualTo(expectedOutputBitstream);
+  }
+
+}
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
new file mode 100644
index 00000000000..0d864f407f2
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableBitArrayTest.java
@@ -0,0 +1,198 @@
+/*
+ * 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.util;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link ParsableBitArray}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ParsableBitArrayTest {
+
+  private static final byte[] TEST_DATA = new byte[] {0x3C, (byte) 0xD2, (byte) 0x5F, (byte) 0x01,
+      (byte) 0xFF, (byte) 0x14, (byte) 0x60, (byte) 0x99};
+
+  private ParsableBitArray testArray;
+
+  @Before
+  public void setUp() {
+    testArray = new ParsableBitArray(TEST_DATA);
+  }
+
+  @Test
+  public void testReadAllBytes() {
+    byte[] bytesRead = new byte[TEST_DATA.length];
+    testArray.readBytes(bytesRead, 0, TEST_DATA.length);
+    assertThat(bytesRead).isEqualTo(TEST_DATA);
+    assertThat(testArray.getPosition()).isEqualTo(TEST_DATA.length * 8);
+    assertThat(testArray.getBytePosition()).isEqualTo(TEST_DATA.length);
+  }
+
+  @Test
+  public void testReadBit() {
+    assertReadBitsToEnd(0);
+  }
+
+  @Test
+  public void testReadBits() {
+    assertThat(testArray.readBits(5)).isEqualTo(getTestDataBits(0, 5));
+    assertThat(testArray.readBits(0)).isEqualTo(getTestDataBits(5, 0));
+    assertThat(testArray.readBits(3)).isEqualTo(getTestDataBits(5, 3));
+    assertThat(testArray.readBits(16)).isEqualTo(getTestDataBits(8, 16));
+    assertThat(testArray.readBits(3)).isEqualTo(getTestDataBits(24, 3));
+    assertThat(testArray.readBits(18)).isEqualTo(getTestDataBits(27, 18));
+    assertThat(testArray.readBits(5)).isEqualTo(getTestDataBits(45, 5));
+    assertThat(testArray.readBits(14)).isEqualTo(getTestDataBits(50, 14));
+  }
+
+  @Test
+  public void testReadBitsToByteArray() {
+    byte[] result = new byte[TEST_DATA.length];
+    // Test read within byte boundaries.
+    testArray.readBits(result, 0, 6);
+    assertThat(result[0]).isEqualTo((byte) (TEST_DATA[0] & 0xFC));
+    // Test read across byte boundaries.
+    testArray.readBits(result, 0, 8);
+    assertThat(result[0]).isEqualTo(
+        (byte) (((TEST_DATA[0] & 0x03) << 6) | ((TEST_DATA[1] & 0xFC) >> 2)));
+    // Test reading across multiple bytes.
+    testArray.readBits(result, 1, 50);
+    for (int i = 1; i < 7; i++) {
+      assertThat(result[i])
+          .isEqualTo((byte) (((TEST_DATA[i] & 0x03) << 6) | ((TEST_DATA[i + 1] & 0xFC) >> 2)));
+    }
+    assertThat(result[7]).isEqualTo((byte) ((TEST_DATA[7] & 0x03) << 6));
+    assertThat(testArray.bitsLeft()).isEqualTo(0);
+    // Test read last buffer byte across input data bytes.
+    testArray.setPosition(31);
+    result[3] = 0;
+    testArray.readBits(result, 3, 3);
+    assertThat(result[3]).isEqualTo((byte) 0xE0);
+    // Test read bits in the middle of a input data byte.
+    result[0] = 0;
+    assertThat(testArray.getPosition()).isEqualTo(34);
+    testArray.readBits(result, 0, 3);
+    assertThat(result[0]).isEqualTo((byte) 0xE0);
+    // Test read 0 bits.
+    testArray.setPosition(32);
+    result[1] = 0;
+    testArray.readBits(result, 1, 0);
+    assertThat(result[1]).isEqualTo((byte) 0);
+    // Test reading a number of bits divisible by 8.
+    testArray.setPosition(0);
+    testArray.readBits(result, 0, 16);
+    assertThat(result[0]).isEqualTo(TEST_DATA[0]);
+    assertThat(result[1]).isEqualTo(TEST_DATA[1]);
+    // Test least significant bits are unmodified.
+    result[1] = (byte) 0xFF;
+    testArray.readBits(result, 0, 9);
+    assertThat(result[0]).isEqualTo((byte) 0x5F);
+    assertThat(result[1]).isEqualTo((byte) 0x7F);
+  }
+
+  @Test
+  public void testRead32BitsByteAligned() {
+    assertThat(testArray.readBits(32)).isEqualTo(getTestDataBits(0, 32));
+    assertThat(testArray.readBits(32)).isEqualTo(getTestDataBits(32, 32));
+  }
+
+  @Test
+  public void testRead32BitsNonByteAligned() {
+    assertThat(testArray.readBits(5)).isEqualTo(getTestDataBits(0, 5));
+    assertThat(testArray.readBits(32)).isEqualTo(getTestDataBits(5, 32));
+  }
+
+  @Test
+  public void testSkipBytes() {
+    testArray.skipBytes(2);
+    assertReadBitsToEnd(16);
+  }
+
+  @Test
+  public void testSkipBitsByteAligned() {
+    testArray.skipBits(16);
+    assertReadBitsToEnd(16);
+  }
+
+  @Test
+  public void testSkipBitsNonByteAligned() {
+    testArray.skipBits(5);
+    assertReadBitsToEnd(5);
+  }
+
+  @Test
+  public void testSetPositionByteAligned() {
+    testArray.setPosition(16);
+    assertReadBitsToEnd(16);
+  }
+
+  @Test
+  public void testSetPositionNonByteAligned() {
+    testArray.setPosition(5);
+    assertReadBitsToEnd(5);
+  }
+
+  @Test
+  public void testByteAlignFromNonByteAligned() {
+    testArray.setPosition(11);
+    testArray.byteAlign();
+    assertThat(testArray.getBytePosition()).isEqualTo(2);
+    assertThat(testArray.getPosition()).isEqualTo(16);
+    assertReadBitsToEnd(16);
+  }
+
+  @Test
+  public void testByteAlignFromByteAligned() {
+    testArray.setPosition(16);
+    testArray.byteAlign(); // Should be a no-op.
+    assertThat(testArray.getBytePosition()).isEqualTo(2);
+    assertThat(testArray.getPosition()).isEqualTo(16);
+    assertReadBitsToEnd(16);
+  }
+
+  private void assertReadBitsToEnd(int expectedStartPosition) {
+    int position = testArray.getPosition();
+    assertThat(position).isEqualTo(expectedStartPosition);
+    for (int i = position; i < TEST_DATA.length * 8; i++) {
+      assertThat(testArray.readBit()).isEqualTo(getTestDataBit(i));
+      assertThat(testArray.getPosition()).isEqualTo(i + 1);
+    }
+  }
+
+  private static int getTestDataBits(int bitPosition, int length) {
+    int result = 0;
+    for (int i = 0; i < length; i++) {
+      result = result << 1;
+      if (getTestDataBit(bitPosition++)) {
+        result |= 0x1;
+      }
+    }
+    return result;
+  }
+
+  private static boolean getTestDataBit(int bitPosition) {
+    return (TEST_DATA[bitPosition / 8] & (0x80 >>> (bitPosition % 8))) != 0;
+  }
+
+}
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
new file mode 100644
index 00000000000..504a58b4a85
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableByteArrayTest.java
@@ -0,0 +1,530 @@
+/*
+ * 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.util;
+
+import static com.google.common.truth.Truth.assertThat;
+import static java.nio.charset.Charset.forName;
+import static junit.framework.TestCase.fail;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link ParsableByteArray}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ParsableByteArrayTest {
+
+  private static final byte[] TEST_DATA =
+      new byte[] {0x0F, (byte) 0xFF, (byte) 0x42, (byte) 0x0F, 0x00, 0x00, 0x00, 0x00};
+
+  private static ParsableByteArray getTestDataArray() {
+    ParsableByteArray testArray = new ParsableByteArray(TEST_DATA.length);
+    System.arraycopy(TEST_DATA, 0, testArray.data, 0, TEST_DATA.length);
+    return testArray;
+  }
+
+  @Test
+  public void testReadShort() {
+    testReadShort((short) -1);
+    testReadShort((short) 0);
+    testReadShort((short) 1);
+    testReadShort(Short.MIN_VALUE);
+    testReadShort(Short.MAX_VALUE);
+  }
+
+  private static void testReadShort(short testValue) {
+    ParsableByteArray testArray = new ParsableByteArray(
+        ByteBuffer.allocate(4).putShort(testValue).array());
+    int readValue = testArray.readShort();
+
+    // Assert that the value we read was the value we wrote.
+    assertThat(readValue).isEqualTo(testValue);
+    // And that the position advanced as expected.
+    assertThat(testArray.getPosition()).isEqualTo(2);
+
+    // And that skipping back and reading gives the same results.
+    testArray.skipBytes(-2);
+    readValue = testArray.readShort();
+    assertThat(readValue).isEqualTo(testValue);
+    assertThat(testArray.getPosition()).isEqualTo(2);
+  }
+
+  @Test
+  public void testReadInt() {
+    testReadInt(0);
+    testReadInt(1);
+    testReadInt(-1);
+    testReadInt(Integer.MIN_VALUE);
+    testReadInt(Integer.MAX_VALUE);
+  }
+
+  private static void testReadInt(int testValue) {
+    ParsableByteArray testArray = new ParsableByteArray(
+        ByteBuffer.allocate(4).putInt(testValue).array());
+    int readValue = testArray.readInt();
+
+    // Assert that the value we read was the value we wrote.
+    assertThat(readValue).isEqualTo(testValue);
+    // And that the position advanced as expected.
+    assertThat(testArray.getPosition()).isEqualTo(4);
+
+    // And that skipping back and reading gives the same results.
+    testArray.skipBytes(-4);
+    readValue = testArray.readInt();
+    assertThat(readValue).isEqualTo(testValue);
+    assertThat(testArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadUnsignedInt() {
+    testReadUnsignedInt(0);
+    testReadUnsignedInt(1);
+    testReadUnsignedInt(Integer.MAX_VALUE);
+    testReadUnsignedInt(Integer.MAX_VALUE + 1L);
+    testReadUnsignedInt(0xFFFFFFFFL);
+  }
+
+  private static void testReadUnsignedInt(long testValue) {
+    ParsableByteArray testArray = new ParsableByteArray(
+        Arrays.copyOfRange(ByteBuffer.allocate(8).putLong(testValue).array(), 4, 8));
+    long readValue = testArray.readUnsignedInt();
+
+    // Assert that the value we read was the value we wrote.
+    assertThat(readValue).isEqualTo(testValue);
+    // And that the position advanced as expected.
+    assertThat(testArray.getPosition()).isEqualTo(4);
+
+    // And that skipping back and reading gives the same results.
+    testArray.skipBytes(-4);
+    readValue = testArray.readUnsignedInt();
+    assertThat(readValue).isEqualTo(testValue);
+    assertThat(testArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadUnsignedIntToInt() {
+    testReadUnsignedIntToInt(0);
+    testReadUnsignedIntToInt(1);
+    testReadUnsignedIntToInt(Integer.MAX_VALUE);
+    try {
+      testReadUnsignedIntToInt(-1);
+      fail();
+    } catch (IllegalStateException e) {
+      // Expected.
+    }
+    try {
+      testReadUnsignedIntToInt(Integer.MIN_VALUE);
+      fail();
+    } catch (IllegalStateException e) {
+      // Expected.
+    }
+  }
+
+  private static void testReadUnsignedIntToInt(int testValue) {
+    ParsableByteArray testArray = new ParsableByteArray(
+        ByteBuffer.allocate(4).putInt(testValue).array());
+    int readValue = testArray.readUnsignedIntToInt();
+
+    // Assert that the value we read was the value we wrote.
+    assertThat(readValue).isEqualTo(testValue);
+    // And that the position advanced as expected.
+    assertThat(testArray.getPosition()).isEqualTo(4);
+
+    // And that skipping back and reading gives the same results.
+    testArray.skipBytes(-4);
+    readValue = testArray.readUnsignedIntToInt();
+    assertThat(readValue).isEqualTo(testValue);
+    assertThat(testArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadUnsignedLongToLong() {
+    testReadUnsignedLongToLong(0);
+    testReadUnsignedLongToLong(1);
+    testReadUnsignedLongToLong(Long.MAX_VALUE);
+    try {
+      testReadUnsignedLongToLong(-1);
+      fail();
+    } catch (IllegalStateException e) {
+      // Expected.
+    }
+    try {
+      testReadUnsignedLongToLong(Long.MIN_VALUE);
+      fail();
+    } catch (IllegalStateException e) {
+      // Expected.
+    }
+  }
+
+  private static void testReadUnsignedLongToLong(long testValue) {
+    ParsableByteArray testArray = new ParsableByteArray(
+        ByteBuffer.allocate(8).putLong(testValue).array());
+    long readValue = testArray.readUnsignedLongToLong();
+
+    // Assert that the value we read was the value we wrote.
+    assertThat(readValue).isEqualTo(testValue);
+    // And that the position advanced as expected.
+    assertThat(testArray.getPosition()).isEqualTo(8);
+
+    // And that skipping back and reading gives the same results.
+    testArray.skipBytes(-8);
+    readValue = testArray.readUnsignedLongToLong();
+    assertThat(readValue).isEqualTo(testValue);
+    assertThat(testArray.getPosition()).isEqualTo(8);
+  }
+
+  @Test
+  public void testReadLong() {
+    testReadLong(0);
+    testReadLong(1);
+    testReadLong(-1);
+    testReadLong(Long.MIN_VALUE);
+    testReadLong(Long.MAX_VALUE);
+  }
+
+  private static void testReadLong(long testValue) {
+    ParsableByteArray testArray = new ParsableByteArray(
+        ByteBuffer.allocate(8).putLong(testValue).array());
+    long readValue = testArray.readLong();
+
+    // Assert that the value we read was the value we wrote.
+    assertThat(readValue).isEqualTo(testValue);
+    // And that the position advanced as expected.
+    assertThat(testArray.getPosition()).isEqualTo(8);
+
+    // And that skipping back and reading gives the same results.
+    testArray.skipBytes(-8);
+    readValue = testArray.readLong();
+    assertThat(readValue).isEqualTo(testValue);
+    assertThat(testArray.getPosition()).isEqualTo(8);
+  }
+
+  @Test
+  public void testReadingMovesPosition() {
+    ParsableByteArray parsableByteArray = getTestDataArray();
+
+    // Given an array at the start
+    assertThat(parsableByteArray.getPosition()).isEqualTo(0);
+    // When reading an integer, the position advances
+    parsableByteArray.readUnsignedInt();
+    assertThat(parsableByteArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testOutOfBoundsThrows() {
+    ParsableByteArray parsableByteArray = getTestDataArray();
+
+    // Given an array at the end
+    parsableByteArray.readUnsignedLongToLong();
+    assertThat(parsableByteArray.getPosition()).isEqualTo(TEST_DATA.length);
+    // Then reading more data throws.
+    try {
+      parsableByteArray.readUnsignedInt();
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testModificationsAffectParsableArray() {
+    ParsableByteArray parsableByteArray = getTestDataArray();
+
+    // When modifying the wrapped byte array
+    byte[] data = parsableByteArray.data;
+    long readValue = parsableByteArray.readUnsignedInt();
+    data[0] = (byte) (TEST_DATA[0] + 1);
+    parsableByteArray.setPosition(0);
+    // Then the parsed value changes.
+    assertThat(parsableByteArray.readUnsignedInt()).isNotEqualTo(readValue);
+  }
+
+  @Test
+  public void testReadingUnsignedLongWithMsbSetThrows() {
+    ParsableByteArray parsableByteArray = getTestDataArray();
+
+    // Given an array with the most-significant bit set on the top byte
+    byte[] data = parsableByteArray.data;
+    data[0] = (byte) 0x80;
+    // Then reading an unsigned long throws.
+    try {
+      parsableByteArray.readUnsignedLongToLong();
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testReadUnsignedFixedPoint1616() {
+    ParsableByteArray parsableByteArray = getTestDataArray();
+
+    // When reading the integer part of a 16.16 fixed point value
+    int value = parsableByteArray.readUnsignedFixedPoint1616();
+    // Then the read value is equal to the array elements interpreted as a short.
+    assertThat(value).isEqualTo((0xFF & TEST_DATA[0]) << 8 | (TEST_DATA[1] & 0xFF));
+    assertThat(parsableByteArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadingBytesReturnsCopy() {
+    ParsableByteArray parsableByteArray = getTestDataArray();
+
+    // When reading all the bytes back
+    int length = parsableByteArray.limit();
+    assertThat(length).isEqualTo(TEST_DATA.length);
+    byte[] copy = new byte[length];
+    parsableByteArray.readBytes(copy, 0, length);
+    // Then the array elements are the same.
+    assertThat(copy).isEqualTo(parsableByteArray.data);
+  }
+
+  @Test
+  public void testReadLittleEndianLong() {
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
+        0x01, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, (byte) 0xFF
+    });
+    assertThat(byteArray.readLittleEndianLong()).isEqualTo(0xFF00000000000001L);
+    assertThat(byteArray.getPosition()).isEqualTo(8);
+  }
+
+  @Test
+  public void testReadLittleEndianUnsignedInt() {
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
+        0x10, 0x00, 0x00, (byte) 0xFF
+    });
+    assertThat(byteArray.readLittleEndianUnsignedInt()).isEqualTo(0xFF000010L);
+    assertThat(byteArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadLittleEndianInt() {
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
+        0x01, 0x00, 0x00, (byte) 0xFF
+    });
+    assertThat(byteArray.readLittleEndianInt()).isEqualTo(0xFF000001);
+    assertThat(byteArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadLittleEndianUnsignedInt24() {
+    byte[] data = { 0x01, 0x02, (byte) 0xFF };
+    ParsableByteArray byteArray = new ParsableByteArray(data);
+    assertThat(byteArray.readLittleEndianUnsignedInt24()).isEqualTo(0xFF0201);
+    assertThat(byteArray.getPosition()).isEqualTo(3);
+  }
+
+  @Test
+  public void testReadLittleEndianUnsignedShort() {
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
+        0x01, (byte) 0xFF, 0x02, (byte) 0xFF
+    });
+    assertThat(byteArray.readLittleEndianUnsignedShort()).isEqualTo(0xFF01);
+    assertThat(byteArray.getPosition()).isEqualTo(2);
+    assertThat(byteArray.readLittleEndianUnsignedShort()).isEqualTo(0xFF02);
+    assertThat(byteArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadLittleEndianShort() {
+    ParsableByteArray byteArray = new ParsableByteArray(new byte[] {
+        0x01, (byte) 0xFF, 0x02, (byte) 0xFF
+    });
+    assertThat(byteArray.readLittleEndianShort()).isEqualTo((short) 0xFF01);
+    assertThat(byteArray.getPosition()).isEqualTo(2);
+    assertThat(byteArray.readLittleEndianShort()).isEqualTo((short) 0xFF02);
+    assertThat(byteArray.getPosition()).isEqualTo(4);
+  }
+
+  @Test
+  public void testReadString() {
+    byte[] data = {
+        (byte) 0xC3, (byte) 0xA4, (byte) 0x20,
+        (byte) 0xC3, (byte) 0xB6, (byte) 0x20,
+        (byte) 0xC2, (byte) 0xAE, (byte) 0x20,
+        (byte) 0xCF, (byte) 0x80, (byte) 0x20,
+        (byte) 0xE2, (byte) 0x88, (byte) 0x9A, (byte) 0x20,
+        (byte) 0xC2, (byte) 0xB1, (byte) 0x20,
+        (byte) 0xE8, (byte) 0xB0, (byte) 0xA2, (byte) 0x20,
+    };
+    ParsableByteArray byteArray = new ParsableByteArray(data);
+    assertThat(byteArray.readString(data.length)).isEqualTo("ä ö ® π √ ± 谢 ");
+    assertThat(byteArray.getPosition()).isEqualTo(data.length);
+  }
+
+  @Test
+  public void testReadAsciiString() {
+    byte[] data = new byte[] {'t', 'e', 's', 't'};
+    ParsableByteArray testArray = new ParsableByteArray(data);
+    assertThat(testArray.readString(data.length, forName("US-ASCII"))).isEqualTo("test");
+    assertThat(testArray.getPosition()).isEqualTo(data.length);
+  }
+
+  @Test
+  public void testReadStringOutOfBoundsDoesNotMovePosition() {
+    byte[] data = {
+        (byte) 0xC3, (byte) 0xA4, (byte) 0x20
+    };
+    ParsableByteArray byteArray = new ParsableByteArray(data);
+    try {
+      byteArray.readString(data.length + 1);
+      fail();
+    } catch (StringIndexOutOfBoundsException e) {
+      assertThat(byteArray.getPosition()).isEqualTo(0);
+    }
+  }
+
+  @Test
+  public void testReadEmptyString() {
+    byte[] bytes = new byte[0];
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readLine()).isNull();
+  }
+
+  @Test
+  public void testReadNullTerminatedStringWithLengths() {
+    byte[] bytes = new byte[] {
+        'f', 'o', 'o', 0, 'b', 'a', 'r', 0
+    };
+    // Test with lengths that match NUL byte positions.
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readNullTerminatedString(4)).isEqualTo("foo");
+    assertThat(parser.getPosition()).isEqualTo(4);
+    assertThat(parser.readNullTerminatedString(4)).isEqualTo("bar");
+    assertThat(parser.getPosition()).isEqualTo(8);
+    assertThat(parser.readNullTerminatedString()).isNull();
+    // Test with lengths that do not match NUL byte positions.
+    parser = new ParsableByteArray(bytes);
+    assertThat(parser.readNullTerminatedString(2)).isEqualTo("fo");
+    assertThat(parser.getPosition()).isEqualTo(2);
+    assertThat(parser.readNullTerminatedString(2)).isEqualTo("o");
+    assertThat(parser.getPosition()).isEqualTo(4);
+    assertThat(parser.readNullTerminatedString(3)).isEqualTo("bar");
+    assertThat(parser.getPosition()).isEqualTo(7);
+    assertThat(parser.readNullTerminatedString(1)).isEqualTo("");
+    assertThat(parser.getPosition()).isEqualTo(8);
+    assertThat(parser.readNullTerminatedString()).isNull();
+    // Test with limit at NUL
+    parser = new ParsableByteArray(bytes, 4);
+    assertThat(parser.readNullTerminatedString(4)).isEqualTo("foo");
+    assertThat(parser.getPosition()).isEqualTo(4);
+    assertThat(parser.readNullTerminatedString()).isNull();
+    // Test with limit before NUL
+    parser = new ParsableByteArray(bytes, 3);
+    assertThat(parser.readNullTerminatedString(3)).isEqualTo("foo");
+    assertThat(parser.getPosition()).isEqualTo(3);
+    assertThat(parser.readNullTerminatedString()).isNull();
+  }
+
+  @Test
+  public void testReadNullTerminatedString() {
+    byte[] bytes = new byte[] {
+        'f', 'o', 'o', 0, 'b', 'a', 'r', 0
+    };
+    // Test normal case.
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readNullTerminatedString()).isEqualTo("foo");
+    assertThat(parser.getPosition()).isEqualTo(4);
+    assertThat(parser.readNullTerminatedString()).isEqualTo("bar");
+    assertThat(parser.getPosition()).isEqualTo(8);
+    assertThat(parser.readNullTerminatedString()).isNull();
+    // Test with limit at NUL.
+    parser = new ParsableByteArray(bytes, 4);
+    assertThat(parser.readNullTerminatedString()).isEqualTo("foo");
+    assertThat(parser.getPosition()).isEqualTo(4);
+    assertThat(parser.readNullTerminatedString()).isNull();
+    // Test with limit before NUL.
+    parser = new ParsableByteArray(bytes, 3);
+    assertThat(parser.readNullTerminatedString()).isEqualTo("foo");
+    assertThat(parser.getPosition()).isEqualTo(3);
+    assertThat(parser.readNullTerminatedString()).isNull();
+  }
+
+  @Test
+  public void testReadNullTerminatedStringWithoutEndingNull() {
+    byte[] bytes = new byte[] {
+        'f', 'o', 'o', 0, 'b', 'a', 'r'
+    };
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readNullTerminatedString()).isEqualTo("foo");
+    assertThat(parser.readNullTerminatedString()).isEqualTo("bar");
+    assertThat(parser.readNullTerminatedString()).isNull();
+  }
+
+  @Test
+  public void testReadSingleLineWithoutEndingTrail() {
+    byte[] bytes = new byte[] {
+      'f', 'o', 'o'
+    };
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readLine()).isEqualTo("foo");
+    assertThat(parser.readLine()).isNull();
+  }
+
+  @Test
+  public void testReadSingleLineWithEndingLf() {
+    byte[] bytes = new byte[] {
+      'f', 'o', 'o', '\n'
+    };
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readLine()).isEqualTo("foo");
+    assertThat(parser.readLine()).isNull();
+  }
+
+  @Test
+  public void testReadTwoLinesWithCrFollowedByLf() {
+    byte[] bytes = new byte[] {
+      'f', 'o', 'o', '\r', '\n', 'b', 'a', 'r'
+    };
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readLine()).isEqualTo("foo");
+    assertThat(parser.readLine()).isEqualTo("bar");
+    assertThat(parser.readLine()).isNull();
+  }
+
+  @Test
+  public void testReadThreeLinesWithEmptyLine() {
+    byte[] bytes = new byte[] {
+      'f', 'o', 'o', '\r', '\n', '\r', 'b', 'a', 'r'
+    };
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readLine()).isEqualTo("foo");
+    assertThat(parser.readLine()).isEqualTo("");
+    assertThat(parser.readLine()).isEqualTo("bar");
+    assertThat(parser.readLine()).isNull();
+  }
+
+  @Test
+  public void testReadFourLinesWithLfFollowedByCr() {
+    byte[] bytes = new byte[] {
+      'f', 'o', 'o', '\n', '\r', '\r', 'b', 'a', 'r', '\r', '\n'
+    };
+    ParsableByteArray parser = new ParsableByteArray(bytes);
+    assertThat(parser.readLine()).isEqualTo("foo");
+    assertThat(parser.readLine()).isEqualTo("");
+    assertThat(parser.readLine()).isEqualTo("");
+    assertThat(parser.readLine()).isEqualTo("bar");
+    assertThat(parser.readLine()).isNull();
+  }
+
+}
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
new file mode 100644
index 00000000000..a3f38abcdbb
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ParsableNalUnitBitArrayTest.java
@@ -0,0 +1,128 @@
+/*
+ * 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.util;
+
+import static com.google.android.exoplayer2.testutil.TestUtil.createByteArray;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests for {@link ParsableNalUnitBitArray}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ParsableNalUnitBitArrayTest {
+
+  private static final byte[] NO_ESCAPING_TEST_DATA = createByteArray(0, 3, 0, 1, 3, 0, 0);
+  private static final byte[] ALL_ESCAPING_TEST_DATA = createByteArray(0, 0, 3, 0, 0, 3, 0, 0, 3);
+  private static final byte[] MIX_TEST_DATA = createByteArray(255, 0, 0, 3, 255, 0, 0, 127);
+
+  @Test
+  public void testReadNoEscaping() {
+    ParsableNalUnitBitArray array =
+        new ParsableNalUnitBitArray(NO_ESCAPING_TEST_DATA, 0, NO_ESCAPING_TEST_DATA.length);
+    assertThat(array.readBits(24)).isEqualTo(0x000300);
+    assertThat(array.readBits(7)).isEqualTo(0);
+    assertThat(array.readBit()).isTrue();
+    assertThat(array.readBits(24)).isEqualTo(0x030000);
+    assertThat(array.canReadBits(1)).isFalse();
+    assertThat(array.canReadBits(8)).isFalse();
+  }
+
+  @Test
+  public void testReadNoEscapingTruncated() {
+    ParsableNalUnitBitArray array = new ParsableNalUnitBitArray(NO_ESCAPING_TEST_DATA, 0, 4);
+    assertThat(array.canReadBits(32)).isTrue();
+    array.skipBits(32);
+    assertThat(array.canReadBits(1)).isFalse();
+    try {
+      array.readBit();
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testReadAllEscaping() {
+    ParsableNalUnitBitArray array =
+        new ParsableNalUnitBitArray(ALL_ESCAPING_TEST_DATA, 0, ALL_ESCAPING_TEST_DATA.length);
+    assertThat(array.canReadBits(48)).isTrue();
+    assertThat(array.canReadBits(49)).isFalse();
+    assertThat(array.readBits(15)).isEqualTo(0);
+    assertThat(array.readBit()).isFalse();
+    assertThat(array.readBits(17)).isEqualTo(0);
+    assertThat(array.readBits(15)).isEqualTo(0);
+  }
+
+  @Test
+  public void testReadMix() {
+    ParsableNalUnitBitArray array =
+        new ParsableNalUnitBitArray(MIX_TEST_DATA, 0, MIX_TEST_DATA.length);
+    assertThat(array.canReadBits(56)).isTrue();
+    assertThat(array.canReadBits(57)).isFalse();
+    assertThat(array.readBits(7)).isEqualTo(127);
+    assertThat(array.readBits(2)).isEqualTo(2);
+    assertThat(array.readBits(17)).isEqualTo(3);
+    assertThat(array.readBits(7)).isEqualTo(126);
+    assertThat(array.readBits(23)).isEqualTo(127);
+    assertThat(array.canReadBits(1)).isFalse();
+  }
+
+  @Test
+  public void testReadExpGolomb() {
+    ParsableNalUnitBitArray array = new ParsableNalUnitBitArray(createByteArray(0x9E), 0, 1);
+    assertThat(array.canReadExpGolombCodedNum()).isTrue();
+    assertThat(array.readUnsignedExpGolombCodedInt()).isEqualTo(0);
+    assertThat(array.readUnsignedExpGolombCodedInt()).isEqualTo(6);
+    assertThat(array.readUnsignedExpGolombCodedInt()).isEqualTo(0);
+    assertThat(array.canReadExpGolombCodedNum()).isFalse();
+    try {
+      array.readUnsignedExpGolombCodedInt();
+      fail();
+    } catch (Exception e) {
+      // Expected.
+    }
+  }
+
+  @Test
+  public void testReadExpGolombWithEscaping() {
+    ParsableNalUnitBitArray array =
+        new ParsableNalUnitBitArray(createByteArray(0, 0, 3, 128, 0), 0, 5);
+    assertThat(array.canReadExpGolombCodedNum()).isFalse();
+    array.skipBit();
+    assertThat(array.canReadExpGolombCodedNum()).isTrue();
+    assertThat(array.readUnsignedExpGolombCodedInt()).isEqualTo(32767);
+    assertThat(array.canReadBits(1)).isFalse();
+  }
+
+  @Test
+  public void testReset() {
+    ParsableNalUnitBitArray array = new ParsableNalUnitBitArray(createByteArray(0, 0), 0, 2);
+    assertThat(array.canReadExpGolombCodedNum()).isFalse();
+    assertThat(array.canReadBits(16)).isTrue();
+    assertThat(array.canReadBits(17)).isFalse();
+    array.reset(createByteArray(0, 0, 3, 0), 0, 4);
+    assertThat(array.canReadBits(24)).isTrue();
+    assertThat(array.canReadBits(25)).isFalse();
+  }
+
+}
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
new file mode 100644
index 00000000000..8e384bbb10a
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/ReusableBufferedOutputStreamTest.java
@@ -0,0 +1,53 @@
+/*
+ * 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.util;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import java.io.ByteArrayOutputStream;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Tests {@link ReusableBufferedOutputStream}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ReusableBufferedOutputStreamTest {
+
+  private static final byte[] TEST_DATA_1 = "test data 1".getBytes();
+  private static final byte[] TEST_DATA_2 = "2 test data".getBytes();
+
+  @Test
+  public void testReset() throws Exception {
+    ByteArrayOutputStream byteArrayOutputStream1 = new ByteArrayOutputStream(1000);
+    ReusableBufferedOutputStream outputStream = new ReusableBufferedOutputStream(
+        byteArrayOutputStream1, 1000);
+    outputStream.write(TEST_DATA_1);
+    outputStream.close();
+
+    ByteArrayOutputStream byteArrayOutputStream2 = new ByteArrayOutputStream(1000);
+    outputStream.reset(byteArrayOutputStream2);
+    outputStream.write(TEST_DATA_2);
+    outputStream.close();
+
+    assertThat(byteArrayOutputStream1.toByteArray()).isEqualTo(TEST_DATA_1);
+    assertThat(byteArrayOutputStream2.toByteArray()).isEqualTo(TEST_DATA_2);
+  }
+
+}
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
new file mode 100644
index 00000000000..52e7a722fbb
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/UriUtilTest.java
@@ -0,0 +1,109 @@
+/*
+ * 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.util;
+
+import static com.google.android.exoplayer2.util.UriUtil.resolve;
+import static com.google.common.truth.Truth.assertThat;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit tests for {@link UriUtil}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class UriUtilTest {
+
+  /**
+   * Tests normal usage of {@link UriUtil#resolve(String, String)}.
+   * <p>
+   * The test cases are taken from RFC-3986 5.4.1.
+   */
+  @Test
+  public void testResolveNormal() {
+    String base = "http://a/b/c/d;p?q";
+
+    assertThat(resolve(base, "g:h")).isEqualTo("g:h");
+    assertThat(resolve(base, "g")).isEqualTo("http://a/b/c/g");
+    assertThat(resolve(base, "g/")).isEqualTo("http://a/b/c/g/");
+    assertThat(resolve(base, "/g")).isEqualTo("http://a/g");
+    assertThat(resolve(base, "//g")).isEqualTo("http://g");
+    assertThat(resolve(base, "?y")).isEqualTo("http://a/b/c/d;p?y");
+    assertThat(resolve(base, "g?y")).isEqualTo("http://a/b/c/g?y");
+    assertThat(resolve(base, "#s")).isEqualTo("http://a/b/c/d;p?q#s");
+    assertThat(resolve(base, "g#s")).isEqualTo("http://a/b/c/g#s");
+    assertThat(resolve(base, "g?y#s")).isEqualTo("http://a/b/c/g?y#s");
+    assertThat(resolve(base, ";x")).isEqualTo("http://a/b/c/;x");
+    assertThat(resolve(base, "g;x")).isEqualTo("http://a/b/c/g;x");
+    assertThat(resolve(base, "g;x?y#s")).isEqualTo("http://a/b/c/g;x?y#s");
+    assertThat(resolve(base, "")).isEqualTo("http://a/b/c/d;p?q");
+    assertThat(resolve(base, ".")).isEqualTo("http://a/b/c/");
+    assertThat(resolve(base, "./")).isEqualTo("http://a/b/c/");
+    assertThat(resolve(base, "..")).isEqualTo("http://a/b/");
+    assertThat(resolve(base, "../")).isEqualTo("http://a/b/");
+    assertThat(resolve(base, "../g")).isEqualTo("http://a/b/g");
+    assertThat(resolve(base, "../..")).isEqualTo("http://a/");
+    assertThat(resolve(base, "../../")).isEqualTo("http://a/");
+    assertThat(resolve(base, "../../g")).isEqualTo("http://a/g");
+  }
+
+  /**
+   * Tests abnormal usage of {@link UriUtil#resolve(String, String)}.
+   * <p>
+   * The test cases are taken from RFC-3986 5.4.2.
+   */
+  @Test
+  public void testResolveAbnormal() {
+    String base = "http://a/b/c/d;p?q";
+
+    assertThat(resolve(base, "../../../g")).isEqualTo("http://a/g");
+    assertThat(resolve(base, "../../../../g")).isEqualTo("http://a/g");
+
+    assertThat(resolve(base, "/./g")).isEqualTo("http://a/g");
+    assertThat(resolve(base, "/../g")).isEqualTo("http://a/g");
+    assertThat(resolve(base, "g.")).isEqualTo("http://a/b/c/g.");
+    assertThat(resolve(base, ".g")).isEqualTo("http://a/b/c/.g");
+    assertThat(resolve(base, "g..")).isEqualTo("http://a/b/c/g..");
+    assertThat(resolve(base, "..g")).isEqualTo("http://a/b/c/..g");
+
+    assertThat(resolve(base, "./../g")).isEqualTo("http://a/b/g");
+    assertThat(resolve(base, "./g/.")).isEqualTo("http://a/b/c/g/");
+    assertThat(resolve(base, "g/./h")).isEqualTo("http://a/b/c/g/h");
+    assertThat(resolve(base, "g/../h")).isEqualTo("http://a/b/c/h");
+    assertThat(resolve(base, "g;x=1/./y")).isEqualTo("http://a/b/c/g;x=1/y");
+    assertThat(resolve(base, "g;x=1/../y")).isEqualTo("http://a/b/c/y");
+
+    assertThat(resolve(base, "g?y/./x")).isEqualTo("http://a/b/c/g?y/./x");
+    assertThat(resolve(base, "g?y/../x")).isEqualTo("http://a/b/c/g?y/../x");
+    assertThat(resolve(base, "g#s/./x")).isEqualTo("http://a/b/c/g#s/./x");
+    assertThat(resolve(base, "g#s/../x")).isEqualTo("http://a/b/c/g#s/../x");
+
+    assertThat(resolve(base, "http:g")).isEqualTo("http:g");
+  }
+
+  /**
+   * Tests additional abnormal usage of {@link UriUtil#resolve(String, String)}.
+   */
+  @Test
+  public void testResolveAbnormalAdditional() {
+    assertThat(resolve("http://a/b", "c:d/../e")).isEqualTo("c:e");
+    assertThat(resolve("a:b", "../c")).isEqualTo("a:c");
+  }
+
+}
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
new file mode 100644
index 00000000000..70caff9bf15
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/util/UtilTest.java
@@ -0,0 +1,200 @@
+/*
+ * 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.util;
+
+import static com.google.android.exoplayer2.util.Util.binarySearchCeil;
+import static com.google.android.exoplayer2.util.Util.binarySearchFloor;
+import static com.google.android.exoplayer2.util.Util.escapeFileName;
+import static com.google.android.exoplayer2.util.Util.parseXsDateTime;
+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 com.google.android.exoplayer2.testutil.TestUtil;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit tests for {@link Util}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class UtilTest {
+
+  @Test
+  public void testArrayBinarySearchFloor() {
+    long[] values = new long[0];
+    assertThat(binarySearchFloor(values, 0, false, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 0, false, true)).isEqualTo(0);
+
+    values = new long[] {1, 3, 5};
+    assertThat(binarySearchFloor(values, 0, false, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 0, true, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 0, false, true)).isEqualTo(0);
+    assertThat(binarySearchFloor(values, 0, true, true)).isEqualTo(0);
+
+    assertThat(binarySearchFloor(values, 1, false, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 1, true, false)).isEqualTo(0);
+    assertThat(binarySearchFloor(values, 1, false, true)).isEqualTo(0);
+    assertThat(binarySearchFloor(values, 1, true, true)).isEqualTo(0);
+
+    assertThat(binarySearchFloor(values, 4, false, false)).isEqualTo(1);
+    assertThat(binarySearchFloor(values, 4, true, false)).isEqualTo(1);
+
+    assertThat(binarySearchFloor(values, 5, false, false)).isEqualTo(1);
+    assertThat(binarySearchFloor(values, 5, true, false)).isEqualTo(2);
+
+    assertThat(binarySearchFloor(values, 6, false, false)).isEqualTo(2);
+    assertThat(binarySearchFloor(values, 6, true, false)).isEqualTo(2);
+  }
+
+  @Test
+  public void testListBinarySearchFloor() {
+    List<Integer> values = new ArrayList<>();
+    assertThat(binarySearchFloor(values, 0, false, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 0, false, true)).isEqualTo(0);
+
+    values.add(1);
+    values.add(3);
+    values.add(5);
+    assertThat(binarySearchFloor(values, 0, false, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 0, true, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 0, false, true)).isEqualTo(0);
+    assertThat(binarySearchFloor(values, 0, true, true)).isEqualTo(0);
+
+    assertThat(binarySearchFloor(values, 1, false, false)).isEqualTo(-1);
+    assertThat(binarySearchFloor(values, 1, true, false)).isEqualTo(0);
+    assertThat(binarySearchFloor(values, 1, false, true)).isEqualTo(0);
+    assertThat(binarySearchFloor(values, 1, true, true)).isEqualTo(0);
+
+    assertThat(binarySearchFloor(values, 4, false, false)).isEqualTo(1);
+    assertThat(binarySearchFloor(values, 4, true, false)).isEqualTo(1);
+
+    assertThat(binarySearchFloor(values, 5, false, false)).isEqualTo(1);
+    assertThat(binarySearchFloor(values, 5, true, false)).isEqualTo(2);
+
+    assertThat(binarySearchFloor(values, 6, false, false)).isEqualTo(2);
+    assertThat(binarySearchFloor(values, 6, true, false)).isEqualTo(2);
+  }
+
+  @Test
+  public void testArrayBinarySearchCeil() {
+    long[] values = new long[0];
+    assertThat(binarySearchCeil(values, 0, false, false)).isEqualTo(0);
+    assertThat(binarySearchCeil(values, 0, false, true)).isEqualTo(-1);
+
+    values = new long[] {1, 3, 5};
+    assertThat(binarySearchCeil(values, 0, false, false)).isEqualTo(0);
+    assertThat(binarySearchCeil(values, 0, true, false)).isEqualTo(0);
+
+    assertThat(binarySearchCeil(values, 1, false, false)).isEqualTo(1);
+    assertThat(binarySearchCeil(values, 1, true, false)).isEqualTo(0);
+
+    assertThat(binarySearchCeil(values, 2, false, false)).isEqualTo(1);
+    assertThat(binarySearchCeil(values, 2, true, false)).isEqualTo(1);
+
+    assertThat(binarySearchCeil(values, 5, false, false)).isEqualTo(3);
+    assertThat(binarySearchCeil(values, 5, true, false)).isEqualTo(2);
+    assertThat(binarySearchCeil(values, 5, false, true)).isEqualTo(2);
+    assertThat(binarySearchCeil(values, 5, true, true)).isEqualTo(2);
+
+    assertThat(binarySearchCeil(values, 6, false, false)).isEqualTo(3);
+    assertThat(binarySearchCeil(values, 6, true, false)).isEqualTo(3);
+    assertThat(binarySearchCeil(values, 6, false, true)).isEqualTo(2);
+    assertThat(binarySearchCeil(values, 6, true, true)).isEqualTo(2);
+  }
+
+  @Test
+  public void testListBinarySearchCeil() {
+    List<Integer> values = new ArrayList<>();
+    assertThat(binarySearchCeil(values, 0, false, false)).isEqualTo(0);
+    assertThat(binarySearchCeil(values, 0, false, true)).isEqualTo(-1);
+
+    values.add(1);
+    values.add(3);
+    values.add(5);
+    assertThat(binarySearchCeil(values, 0, false, false)).isEqualTo(0);
+    assertThat(binarySearchCeil(values, 0, true, false)).isEqualTo(0);
+
+    assertThat(binarySearchCeil(values, 1, false, false)).isEqualTo(1);
+    assertThat(binarySearchCeil(values, 1, true, false)).isEqualTo(0);
+
+    assertThat(binarySearchCeil(values, 2, false, false)).isEqualTo(1);
+    assertThat(binarySearchCeil(values, 2, true, false)).isEqualTo(1);
+
+    assertThat(binarySearchCeil(values, 5, false, false)).isEqualTo(3);
+    assertThat(binarySearchCeil(values, 5, true, false)).isEqualTo(2);
+    assertThat(binarySearchCeil(values, 5, false, true)).isEqualTo(2);
+    assertThat(binarySearchCeil(values, 5, true, true)).isEqualTo(2);
+
+    assertThat(binarySearchCeil(values, 6, false, false)).isEqualTo(3);
+    assertThat(binarySearchCeil(values, 6, true, false)).isEqualTo(3);
+    assertThat(binarySearchCeil(values, 6, false, true)).isEqualTo(2);
+    assertThat(binarySearchCeil(values, 6, true, true)).isEqualTo(2);
+  }
+
+  @Test
+  public void testParseXsDuration() {
+    assertThat(parseXsDuration("PT150.279S")).isEqualTo(150279L);
+    assertThat(parseXsDuration("PT1.500S")).isEqualTo(1500L);
+  }
+
+  @Test
+  public void testParseXsDateTime() throws Exception {
+    assertThat(parseXsDateTime("2014-06-19T23:07:42")).isEqualTo(1403219262000L);
+    assertThat(parseXsDateTime("2014-08-06T11:00:00Z")).isEqualTo(1407322800000L);
+    assertThat(parseXsDateTime("2014-08-06T11:00:00,000Z")).isEqualTo(1407322800000L);
+    assertThat(parseXsDateTime("2014-09-19T13:18:55-08:00")).isEqualTo(1411161535000L);
+    assertThat(parseXsDateTime("2014-09-19T13:18:55-0800")).isEqualTo(1411161535000L);
+    assertThat(parseXsDateTime("2014-09-19T13:18:55.000-0800")).isEqualTo(1411161535000L);
+    assertThat(parseXsDateTime("2014-09-19T13:18:55.000-800")).isEqualTo(1411161535000L);
+  }
+
+  @Test
+  public void testUnescapeInvalidFileName() {
+    assertThat(Util.unescapeFileName("%a")).isNull();
+    assertThat(Util.unescapeFileName("%xyz")).isNull();
+  }
+
+  @Test
+  public void testEscapeUnescapeFileName() {
+    assertEscapeUnescapeFileName("just+a regular+fileName", "just+a regular+fileName");
+    assertEscapeUnescapeFileName("key:value", "key%3avalue");
+    assertEscapeUnescapeFileName("<>:\"/\\|?*%", "%3c%3e%3a%22%2f%5c%7c%3f%2a%25");
+
+    Random random = new Random(0);
+    for (int i = 0; i < 1000; i++) {
+      String string = TestUtil.buildTestString(1000, random);
+      assertEscapeUnescapeFileName(string);
+    }
+  }
+
+  private static void assertEscapeUnescapeFileName(String fileName, String escapedFileName) {
+    assertThat(escapeFileName(fileName)).isEqualTo(escapedFileName);
+    assertThat(unescapeFileName(escapedFileName)).isEqualTo(fileName);
+  }
+
+  private static void assertEscapeUnescapeFileName(String fileName) {
+    String escapedFileName = Util.escapeFileName(fileName);
+    assertThat(unescapeFileName(escapedFileName)).isEqualTo(fileName);
+  }
+
+}

From ca2bfbc56ea91169e2abdb56170340cf28e8e9f7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 7 Apr 2017 12:10:08 +0100
Subject: [PATCH 178/421] DashManifestParser: Move schemeType up to DrmInitData

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167171407
---
 .../exoplayer2/drm/DrmInitDataTest.java       | 10 +--
 .../drm/OfflineLicenseHelperTest.java         |  2 +-
 .../drm/DefaultDrmSessionManager.java         |  2 +-
 .../android/exoplayer2/drm/DrmInitData.java   | 77 +++++++------------
 .../extractor/mkv/MatroskaExtractor.java      |  2 +-
 .../extractor/mp4/FragmentedMp4Extractor.java |  2 +-
 .../google/android/exoplayer2/FormatTest.java |  6 +-
 .../exoplayer2/source/dash/DashUtilTest.java  |  2 +-
 .../dash/manifest/DashManifestParser.java     | 62 ++++++++++-----
 .../manifest/SsManifestParser.java            |  2 +-
 10 files changed, 81 insertions(+), 86 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
index aa8cbfdb627..8a2c24beba3 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
@@ -31,15 +31,15 @@
  */
 public class DrmInitDataTest extends TestCase {
 
-  private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, "cbc1", VIDEO_MP4,
+  private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, VIDEO_MP4,
       TestUtil.buildTestData(128, 1 /* data seed */));
-  private static final SchemeData DATA_2 = new SchemeData(PLAYREADY_UUID,  null, VIDEO_MP4,
+  private static final SchemeData DATA_2 = new SchemeData(PLAYREADY_UUID, VIDEO_MP4,
       TestUtil.buildTestData(128, 2 /* data seed */));
-  private static final SchemeData DATA_1B = new SchemeData(WIDEVINE_UUID, "cbc1", VIDEO_MP4,
+  private static final SchemeData DATA_1B = new SchemeData(WIDEVINE_UUID, VIDEO_MP4,
       TestUtil.buildTestData(128, 1 /* data seed */));
-  private static final SchemeData DATA_2B = new SchemeData(PLAYREADY_UUID, null, VIDEO_MP4,
+  private static final SchemeData DATA_2B = new SchemeData(PLAYREADY_UUID, VIDEO_MP4,
       TestUtil.buildTestData(128, 2 /* data seed */));
-  private static final SchemeData DATA_UNIVERSAL = new SchemeData(C.UUID_NIL, null, VIDEO_MP4,
+  private static final SchemeData DATA_UNIVERSAL = new SchemeData(C.UUID_NIL, VIDEO_MP4,
       TestUtil.buildTestData(128, 3 /* data seed */));
 
   public void testParcelable() {
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 43c867f4353..821656475d4 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -153,7 +153,7 @@ private void setStubLicenseAndPlaybackDurationValues(long licenseDuration,
   }
 
   private static DrmInitData newDrmInitData() {
-    return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, "cenc", "mimeType",
+    return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, "mimeType",
         new byte[] {1, 4, 7, 0, 3, 6}));
   }
 
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 25a73a67c19..9ea696e0746 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
@@ -278,7 +278,7 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
       // No data for this manager's scheme.
       return false;
     }
-    String schemeType = schemeData.type;
+    String schemeType = drmInitData.schemeType;
     if (schemeType == null || C.CENC_TYPE_cenc.equals(schemeType)) {
       // If there is no scheme information, assume patternless AES-CTR.
       return true;
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 d814ece31da..c8e76ec2914 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
@@ -37,6 +37,11 @@ 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;
+
   /**
    * Number of {@link SchemeData}s.
    */
@@ -46,17 +51,19 @@ public final class DrmInitData implements Comparator<SchemeData>, Parcelable {
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
   public DrmInitData(List<SchemeData> schemeDatas) {
-    this(false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
+    this(null, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
   }
 
   /**
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
   public DrmInitData(SchemeData... schemeDatas) {
-    this(true, schemeDatas);
+    this(null, true, schemeDatas);
   }
 
-  private DrmInitData(boolean cloneSchemeDatas, SchemeData... schemeDatas) {
+  private DrmInitData(@Nullable String schemeType, boolean cloneSchemeDatas,
+      SchemeData... schemeDatas) {
+    this.schemeType = schemeType;
     if (cloneSchemeDatas) {
       schemeDatas = schemeDatas.clone();
     }
@@ -74,6 +81,7 @@ private DrmInitData(boolean cloneSchemeDatas, SchemeData... schemeDatas) {
   }
 
   /* package */ DrmInitData(Parcel in) {
+    schemeType = in.readString();
     schemeDatas = in.createTypedArray(SchemeData.CREATOR);
     schemeDataCount = schemeDatas.length;
   }
@@ -104,36 +112,24 @@ public SchemeData get(int index) {
   }
 
   /**
-   * Returns a copy of the {@link DrmInitData} instance whose {@link SchemeData}s have been updated
-   * to have the specified scheme type.
+   * Returns a copy with the specified protection scheme type.
    *
    * @param schemeType A protection scheme type. May be null.
-   * @return A copy of the {@link DrmInitData} instance whose {@link SchemeData}s have been updated
-   *     to have the specified scheme type.
+   * @return A copy with the specified protection scheme type.
    */
   public DrmInitData copyWithSchemeType(@Nullable String schemeType) {
-    boolean isCopyRequired = false;
-    for (SchemeData schemeData : schemeDatas) {
-      if (!Util.areEqual(schemeData.type, schemeType)) {
-        isCopyRequired = true;
-        break;
-      }
-    }
-    if (isCopyRequired) {
-      SchemeData[] schemeDatas = new SchemeData[this.schemeDatas.length];
-      for (int i = 0; i < schemeDatas.length; i++) {
-        schemeDatas[i] = this.schemeDatas[i].copyWithSchemeType(schemeType);
-      }
-      return new DrmInitData(schemeDatas);
-    } else {
+    if (Util.areEqual(this.schemeType, schemeType)) {
       return this;
     }
+    return new DrmInitData(schemeType, false, schemeDatas);
   }
 
   @Override
   public int hashCode() {
     if (hashCode == 0) {
-      hashCode = Arrays.hashCode(schemeDatas);
+      int result = (schemeType == null ? 0 : schemeType.hashCode());
+      result = 31 * result + Arrays.hashCode(schemeDatas);
+      hashCode = result;
     }
     return hashCode;
   }
@@ -146,7 +142,9 @@ public boolean equals(Object obj) {
     if (obj == null || getClass() != obj.getClass()) {
       return false;
     }
-    return Arrays.equals(schemeDatas, ((DrmInitData) obj).schemeDatas);
+    DrmInitData other = (DrmInitData) obj;
+    return Util.areEqual(schemeType, other.schemeType)
+        && Arrays.equals(schemeDatas, other.schemeDatas);
   }
 
   @Override
@@ -164,6 +162,7 @@ public int describeContents() {
 
   @Override
   public void writeToParcel(Parcel dest, int flags) {
+    dest.writeString(schemeType);
     dest.writeTypedArray(schemeDatas, 0);
   }
 
@@ -195,10 +194,6 @@ public static final class SchemeData implements Parcelable {
      * applies to all schemes).
      */
     private final UUID uuid;
-    /**
-     * The protection scheme type, or null if not applicable or unknown.
-     */
-    @Nullable public final String type;
     /**
      * The mimeType of {@link #data}.
      */
@@ -215,26 +210,22 @@ public static final class SchemeData implements Parcelable {
     /**
      * @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is
      *     universal (i.e. applies to all schemes).
-     * @param type The type of the protection scheme, or null if not applicable or unknown.
      * @param mimeType The mimeType of the initialization data.
      * @param data The initialization data.
      */
-    public SchemeData(UUID uuid, @Nullable String type, String mimeType, byte[] data) {
-      this(uuid, type, mimeType, data, false);
+    public SchemeData(UUID uuid, String mimeType, byte[] data) {
+      this(uuid, mimeType, data, false);
     }
 
     /**
      * @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is
      *     universal (i.e. applies to all schemes).
-     * @param type The type of the protection scheme, or null if not applicable or unknown.
      * @param mimeType The mimeType of the initialization data.
      * @param data The initialization data.
      * @param requiresSecureDecryption Whether secure decryption is required.
      */
-    public SchemeData(UUID uuid, @Nullable String type, String mimeType, byte[] data,
-        boolean requiresSecureDecryption) {
+    public SchemeData(UUID uuid, String mimeType, byte[] data, boolean requiresSecureDecryption) {
       this.uuid = Assertions.checkNotNull(uuid);
-      this.type = type;
       this.mimeType = Assertions.checkNotNull(mimeType);
       this.data = Assertions.checkNotNull(data);
       this.requiresSecureDecryption = requiresSecureDecryption;
@@ -242,7 +233,6 @@ public SchemeData(UUID uuid, @Nullable String type, String mimeType, byte[] data
 
     /* package */ SchemeData(Parcel in) {
       uuid = new UUID(in.readLong(), in.readLong());
-      type = in.readString();
       mimeType = in.readString();
       data = in.createByteArray();
       requiresSecureDecryption = in.readByte() != 0;
@@ -258,19 +248,6 @@ public boolean matches(UUID schemeUuid) {
       return C.UUID_NIL.equals(uuid) || schemeUuid.equals(uuid);
     }
 
-    /**
-     * Returns a copy of the {@link SchemeData} instance with the given scheme type.
-     *
-     * @param type A protection scheme type.
-     * @return A copy of the {@link SchemeData} instance with the given scheme type.
-     */
-    public SchemeData copyWithSchemeType(String type) {
-      if (Util.areEqual(this.type, type)) {
-        return this;
-      }
-      return new SchemeData(uuid, type, mimeType, data, requiresSecureDecryption);
-    }
-
     @Override
     public boolean equals(Object obj) {
       if (!(obj instanceof SchemeData)) {
@@ -281,14 +258,13 @@ public boolean equals(Object obj) {
       }
       SchemeData other = (SchemeData) obj;
       return mimeType.equals(other.mimeType) && Util.areEqual(uuid, other.uuid)
-          && Util.areEqual(type, other.type) && Arrays.equals(data, other.data);
+          && Arrays.equals(data, other.data);
     }
 
     @Override
     public int hashCode() {
       if (hashCode == 0) {
         int result = uuid.hashCode();
-        result = 31 * result + (type == null ? 0 : type.hashCode());
         result = 31 * result + mimeType.hashCode();
         result = 31 * result + Arrays.hashCode(data);
         hashCode = result;
@@ -307,7 +283,6 @@ public int describeContents() {
     public void writeToParcel(Parcel dest, int flags) {
       dest.writeLong(uuid.getMostSignificantBits());
       dest.writeLong(uuid.getLeastSignificantBits());
-      dest.writeString(type);
       dest.writeString(mimeType);
       dest.writeByteArray(data);
       dest.writeByte((byte) (requiresSecureDecryption ? 1 : 0));
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 6c4eb033ce8..a5fe6ae35b8 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
@@ -628,7 +628,7 @@ public int read(ExtractorInput input, PositionHolder seekPosition) throws IOExce
           if (currentTrack.cryptoData == null) {
             throw new ParserException("Encrypted Track found but ContentEncKeyID was not found");
           }
-          currentTrack.drmInitData = new DrmInitData(new SchemeData(C.UUID_NIL, null,
+          currentTrack.drmInitData = new DrmInitData(new SchemeData(C.UUID_NIL,
               MimeTypes.VIDEO_WEBM, currentTrack.cryptoData.encryptionKey));
         }
         break;
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 c3f2a9fb38b..d9ab47546a7 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
@@ -1275,7 +1275,7 @@ private static DrmInitData getDrmInitDataFromAtoms(List<Atom.LeafAtom> leafChild
         if (uuid == null) {
           Log.w(TAG, "Skipped pssh atom (failed to extract uuid)");
         } else {
-          schemeDatas.add(new SchemeData(uuid, null, MimeTypes.VIDEO_MP4, psshData));
+          schemeDatas.add(new SchemeData(uuid, MimeTypes.VIDEO_MP4, psshData));
         }
       }
     }
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 8e36edc1053..33e1a673bd3 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
@@ -60,11 +60,11 @@ public final class FormatTest {
 
   @Test
   public void testParcelable() {
-    DrmInitData.SchemeData DRM_DATA_1 = new DrmInitData.SchemeData(WIDEVINE_UUID, "cenc", VIDEO_MP4,
+    DrmInitData.SchemeData drmData1 = new DrmInitData.SchemeData(WIDEVINE_UUID, VIDEO_MP4,
         TestUtil.buildTestData(128, 1 /* data seed */));
-    DrmInitData.SchemeData DRM_DATA_2 = new DrmInitData.SchemeData(C.UUID_NIL, null, VIDEO_WEBM,
+    DrmInitData.SchemeData drmData2 = new DrmInitData.SchemeData(C.UUID_NIL, VIDEO_WEBM,
         TestUtil.buildTestData(128, 1 /* data seed */));
-    DrmInitData drmInitData = new DrmInitData(DRM_DATA_1, DRM_DATA_2);
+    DrmInitData drmInitData = new DrmInitData(drmData1, drmData2);
     byte[] projectionData = new byte[] {1, 2, 3};
     Metadata metadata = new Metadata(
         new TextInformationFrame("id1", "description1", "value1"),
diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
index 7a1c78b2e8a..3db8c6b2f9a 100644
--- a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
+++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/DashUtilTest.java
@@ -75,7 +75,7 @@ private static Representation newRepresentations(DrmInitData drmInitData) {
   }
 
   private static DrmInitData newDrmInitData() {
-    return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, null, "mimeType",
+    return new DrmInitData(new SchemeData(C.WIDEVINE_UUID, "mimeType",
         new byte[] {1, 4, 7, 0, 3, 6}));
   }
 
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 2f4724c258a..c973db79d7d 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
@@ -238,6 +238,7 @@ protected AdaptationSet parseAdaptationSet(XmlPullParser xpp, String baseUrl,
     int audioChannels = Format.NO_VALUE;
     int audioSamplingRate = parseInt(xpp, "audioSamplingRate", Format.NO_VALUE);
     String language = xpp.getAttributeValue(null, "lang");
+    String drmSchemeType = null;
     ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>();
     ArrayList<Descriptor> inbandEventStreams = new ArrayList<>();
     ArrayList<Descriptor> accessibilityDescriptors = new ArrayList<>();
@@ -254,9 +255,12 @@ protected AdaptationSet parseAdaptationSet(XmlPullParser xpp, String baseUrl,
           seenFirstBaseUrl = true;
         }
       } else if (XmlPullParserUtil.isStartTag(xpp, "ContentProtection")) {
-        SchemeData contentProtection = parseContentProtection(xpp);
-        if (contentProtection != null) {
-          drmSchemeDatas.add(contentProtection);
+        Pair<String, SchemeData> contentProtection = parseContentProtection(xpp);
+        if (contentProtection.first != null) {
+          drmSchemeType = contentProtection.first;
+        }
+        if (contentProtection.second != null) {
+          drmSchemeDatas.add(contentProtection.second);
         }
       } else if (XmlPullParserUtil.isStartTag(xpp, "ContentComponent")) {
         language = checkLanguageConsistency(language, xpp.getAttributeValue(null, "lang"));
@@ -293,7 +297,7 @@ protected AdaptationSet parseAdaptationSet(XmlPullParser xpp, String baseUrl,
     List<Representation> representations = new ArrayList<>(representationInfos.size());
     for (int i = 0; i < representationInfos.size(); i++) {
       representations.add(buildRepresentation(representationInfos.get(i), contentId,
-          drmSchemeDatas, inbandEventStreams));
+          drmSchemeType, drmSchemeDatas, inbandEventStreams));
     }
 
     return buildAdaptationSet(id, contentType, representations, accessibilityDescriptors,
@@ -311,9 +315,9 @@ protected int parseContentType(XmlPullParser xpp) {
     String contentType = xpp.getAttributeValue(null, "contentType");
     return TextUtils.isEmpty(contentType) ? C.TRACK_TYPE_UNKNOWN
         : MimeTypes.BASE_TYPE_AUDIO.equals(contentType) ? C.TRACK_TYPE_AUDIO
-        : MimeTypes.BASE_TYPE_VIDEO.equals(contentType) ? C.TRACK_TYPE_VIDEO
-        : MimeTypes.BASE_TYPE_TEXT.equals(contentType) ? C.TRACK_TYPE_TEXT
-        : C.TRACK_TYPE_UNKNOWN;
+            : MimeTypes.BASE_TYPE_VIDEO.equals(contentType) ? C.TRACK_TYPE_VIDEO
+                : MimeTypes.BASE_TYPE_TEXT.equals(contentType) ? C.TRACK_TYPE_TEXT
+                    : C.TRACK_TYPE_UNKNOWN;
   }
 
   protected int getContentType(Format format) {
@@ -336,19 +340,20 @@ protected int getContentType(Format format) {
    * @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 SchemeData} parsed from the ContentProtection element, or null if the element is
-   *     unsupported.
+   * @return The scheme type and/or {@link SchemeData} parsed from the ContentProtection element.
+   *     Either or both may be null, depending on the ContentProtection element being parsed.
    */
-  protected SchemeData parseContentProtection(XmlPullParser xpp) throws XmlPullParserException,
-      IOException {
+  protected Pair<String, SchemeData> parseContentProtection(XmlPullParser xpp)
+      throws XmlPullParserException, IOException {
     String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
     boolean isPlayReady = "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95".equals(schemeIdUri);
-    String schemeType = xpp.getAttributeValue(null, "value");
+    String schemeType = null;
     byte[] data = null;
     UUID uuid = null;
     boolean requiresSecureDecoder = false;
 
     if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) {
+      schemeType = xpp.getAttributeValue(null, "value");
       String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
       if (defaultKid != null) {
         UUID keyId = UUID.fromString(defaultKid);
@@ -379,8 +384,9 @@ protected SchemeData parseContentProtection(XmlPullParser xpp) throws XmlPullPar
         requiresSecureDecoder = robustnessLevel != null && robustnessLevel.startsWith("HW");
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "ContentProtection"));
-    return data != null
-        ? new SchemeData(uuid, schemeType, MimeTypes.VIDEO_MP4, data, requiresSecureDecoder) : null;
+    SchemeData schemeData = data != null
+        ? new SchemeData(uuid, MimeTypes.VIDEO_MP4, data, requiresSecureDecoder) : null;
+    return Pair.create(schemeType, schemeData);
   }
 
   /**
@@ -432,6 +438,7 @@ protected RepresentationInfo parseRepresentation(XmlPullParser xpp, String baseU
     float frameRate = parseFrameRate(xpp, adaptationSetFrameRate);
     int audioChannels = adaptationSetAudioChannels;
     int audioSamplingRate = parseInt(xpp, "audioSamplingRate", adaptationSetAudioSamplingRate);
+    String drmSchemeType = null;
     ArrayList<SchemeData> drmSchemeDatas = new ArrayList<>();
     ArrayList<Descriptor> inbandEventStreams = new ArrayList<>();
 
@@ -452,9 +459,12 @@ protected RepresentationInfo parseRepresentation(XmlPullParser xpp, String baseU
       } else if (XmlPullParserUtil.isStartTag(xpp, "SegmentTemplate")) {
         segmentBase = parseSegmentTemplate(xpp, (SegmentTemplate) segmentBase);
       } else if (XmlPullParserUtil.isStartTag(xpp, "ContentProtection")) {
-        SchemeData contentProtection = parseContentProtection(xpp);
-        if (contentProtection != null) {
-          drmSchemeDatas.add(contentProtection);
+        Pair<String, SchemeData> contentProtection = parseContentProtection(xpp);
+        if (contentProtection.first != null) {
+          drmSchemeType = contentProtection.first;
+        }
+        if (contentProtection.second != null) {
+          drmSchemeDatas.add(contentProtection.second);
         }
       } else if (XmlPullParserUtil.isStartTag(xpp, "InbandEventStream")) {
         inbandEventStreams.add(parseDescriptor(xpp, "InbandEventStream"));
@@ -466,7 +476,8 @@ protected RepresentationInfo parseRepresentation(XmlPullParser xpp, String baseU
         adaptationSetAccessibilityDescriptors, codecs);
     segmentBase = segmentBase != null ? segmentBase : new SingleSegmentBase();
 
-    return new RepresentationInfo(format, baseUrl, segmentBase, drmSchemeDatas, inbandEventStreams);
+    return new RepresentationInfo(format, baseUrl, segmentBase, drmSchemeType, drmSchemeDatas,
+        inbandEventStreams);
   }
 
   protected Format buildFormat(String id, String containerMimeType, int width, int height,
@@ -499,13 +510,19 @@ protected Format buildFormat(String id, String containerMimeType, int width, int
   }
 
   protected Representation buildRepresentation(RepresentationInfo representationInfo,
-      String contentId, ArrayList<SchemeData> extraDrmSchemeDatas,
+      String contentId, String extraDrmSchemeType, ArrayList<SchemeData> extraDrmSchemeDatas,
       ArrayList<Descriptor> extraInbandEventStreams) {
     Format format = representationInfo.format;
+    String drmSchemeType = representationInfo.drmSchemeType != null
+        ? representationInfo.drmSchemeType : extraDrmSchemeType;
     ArrayList<SchemeData> drmSchemeDatas = representationInfo.drmSchemeDatas;
     drmSchemeDatas.addAll(extraDrmSchemeDatas);
     if (!drmSchemeDatas.isEmpty()) {
-      format = format.copyWithDrmInitData(new DrmInitData(drmSchemeDatas));
+      DrmInitData drmInitData = new DrmInitData(drmSchemeDatas);
+      if (drmSchemeType != null) {
+        drmInitData = drmInitData.copyWithSchemeType(drmSchemeType);
+      }
+      format = format.copyWithDrmInitData(drmInitData);
     }
     ArrayList<Descriptor> inbandEventStremas = representationInfo.inbandEventStreams;
     inbandEventStremas.addAll(extraInbandEventStreams);
@@ -946,14 +963,17 @@ private static final class RepresentationInfo {
     public final Format format;
     public final String baseUrl;
     public final SegmentBase segmentBase;
+    public final String drmSchemeType;
     public final ArrayList<SchemeData> drmSchemeDatas;
     public final ArrayList<Descriptor> inbandEventStreams;
 
     public RepresentationInfo(Format format, String baseUrl, SegmentBase segmentBase,
-        ArrayList<SchemeData> drmSchemeDatas, ArrayList<Descriptor> inbandEventStreams) {
+        String drmSchemeType, ArrayList<SchemeData> drmSchemeDatas,
+        ArrayList<Descriptor> inbandEventStreams) {
       this.format = format;
       this.baseUrl = baseUrl;
       this.segmentBase = segmentBase;
+      this.drmSchemeType = drmSchemeType;
       this.drmSchemeDatas = drmSchemeDatas;
       this.inbandEventStreams = inbandEventStreams;
     }
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 5784cc7bc6e..3ca5f8d9972 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
@@ -375,7 +375,7 @@ public Object build() {
       StreamElement[] streamElementArray = new StreamElement[streamElements.size()];
       streamElements.toArray(streamElementArray);
       if (protectionElement != null) {
-        DrmInitData drmInitData = new DrmInitData(new SchemeData(protectionElement.uuid, null,
+        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++) {

From 7804c2b07961390d7a91d788ad2883e5dfbbfdfd Mon Sep 17 00:00:00 2001
From: anjalibh <anjalibh@google.com>
Date: Fri, 1 Sep 2017 18:02:20 -0700
Subject: [PATCH 179/421] HDR 10 bits: Use a separate sampler for U and V
 dithering. Using the same sampler introduced some minor horizontal scratches.

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

diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index d02d5247130..f0b93b1dc27 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -197,12 +197,12 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
     const int32_t uvHeight = (img->d_h + 1) / 2;
     const uint64_t yLength = img->stride[VPX_PLANE_Y] * img->d_h;
     const uint64_t uvLength = img->stride[VPX_PLANE_U] * uvHeight;
-    int sample = 0;
     if (img->fmt == VPX_IMG_FMT_I42016) {  // HBD planar 420.
       // Note: The stride for BT2020 is twice of what we use so this is wasting
       // memory. The long term goal however is to upload half-float/short so
       // it's not important to optimize the stride at this time.
       // Y
+      int sampleY = 0;
       for (int y = 0; y < img->d_h; y++) {
         const uint16_t* srcBase = reinterpret_cast<uint16_t*>(
             img->planes[VPX_PLANE_Y] + img->stride[VPX_PLANE_Y] * y);
@@ -210,12 +210,14 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
         for (int x = 0; x < img->d_w; x++) {
           // Lightweight dither. Carryover the remainder of each 10->8 bit
           // conversion to the next pixel.
-          sample += *srcBase++;
-          *destBase++ = sample >> 2;
-          sample = sample & 3;  // Remainder.
+          sampleY += *srcBase++;
+          *destBase++ = sampleY >> 2;
+          sampleY = sampleY & 3;  // Remainder.
         }
       }
       // UV
+      int sampleU = 0;
+      int sampleV = 0;
       const int32_t uvWidth = (img->d_w + 1) / 2;
       for (int y = 0; y < uvHeight; y++) {
         const uint16_t* srcUBase = reinterpret_cast<uint16_t*>(
@@ -228,11 +230,12 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
         for (int x = 0; x < uvWidth; x++) {
           // Lightweight dither. Carryover the remainder of each 10->8 bit
           // conversion to the next pixel.
-          sample += *srcUBase++;
-          *destUBase++ = sample >> 2;
-          sample = (*srcVBase++) + (sample & 3);  // srcV + previousRemainder.
-          *destVBase++ = sample >> 2;
-          sample = sample & 3;  // Remainder.
+          sampleU += *srcUBase++;
+          *destUBase++ = sampleU >> 2;
+          sampleU = sampleU & 3;  // Remainder.
+          sampleV += *srcVBase++;
+          *destVBase++ = sampleV >> 2;
+          sampleV = sampleV & 3;  // Remainder.
         }
       }
     } else {

From ba0bd729192f6f99e80cc11d647e3ddc41977dda Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Sep 2017 02:11:00 -0700
Subject: [PATCH 180/421] Fix typo

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

diff --git a/README.md b/README.md
index aff473c488a..bd261e75ff6 100644
--- a/README.md
+++ b/README.md
@@ -109,7 +109,7 @@ depend on them as you would on any other local module, for example:
 ```gradle
 compile project(':exoplayer-library-core')
 compile project(':exoplayer-library-dash')
-compile project(':exoplayer-library-ui)
+compile project(':exoplayer-library-ui')
 ```
 
 ## Developing ExoPlayer ##

From 74b8c45e6dd9c13ed9a32a1aad1ce795535b2ac2 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 4 Sep 2017 11:34:57 +0100
Subject: [PATCH 181/421] Minor cleanup to AspectRatioFrameLayout

---
 .../exoplayer2/ui/AspectRatioFrameLayout.java   | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

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 3367a46374b..037519b7a4c 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
@@ -32,7 +32,8 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    * Resize modes for {@link AspectRatioFrameLayout}.
    */
   @Retention(RetentionPolicy.SOURCE)
-  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL, RESIZE_MODE_ZOOM})
+  @IntDef({RESIZE_MODE_FIT, RESIZE_MODE_FIXED_WIDTH, RESIZE_MODE_FIXED_HEIGHT, RESIZE_MODE_FILL,
+      RESIZE_MODE_ZOOM})
   public @interface ResizeMode {}
 
   /**
@@ -52,7 +53,7 @@ public final class AspectRatioFrameLayout extends FrameLayout {
    */
   public static final int RESIZE_MODE_FILL = 3;
   /**
-   * Either height or width is increased to obtain the desired aspect ratio.
+   * Either the width or height is increased to obtain the desired aspect ratio.
    */
   public static final int RESIZE_MODE_ZOOM = 4;
 
@@ -89,7 +90,7 @@ public AspectRatioFrameLayout(Context context, AttributeSet attrs) {
   }
 
   /**
-   * Set the aspect ratio that this view should satisfy.
+   * Sets the aspect ratio that this view should satisfy.
    *
    * @param widthHeightRatio The width to height ratio.
    */
@@ -101,12 +102,10 @@ public void setAspectRatio(float widthHeightRatio) {
   }
 
   /**
-   * Gets the resize mode.
-   *
-   * @return The resize mode.
+   * Returns the resize mode.
    */
-  public int getResizeMode() {
-    return this.resizeMode;
+  public @ResizeMode int getResizeMode() {
+    return resizeMode;
   }
 
   /**
@@ -146,7 +145,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         width = (int) (height * videoAspectRatio);
         break;
       case RESIZE_MODE_ZOOM:
-        if (videoAspectRatio > viewAspectRatio) {
+        if (aspectDeformation > 0) {
           width = (int) (height * videoAspectRatio);
         } else {
           height = (int) (width / videoAspectRatio);

From ab1e4df11aefe71c8069730ad5a9300733440f25 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Sep 2017 05:32:54 -0700
Subject: [PATCH 182/421] Update moe eqiuvalence

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

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 8551f2541da..a1820ed7a11 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
@@ -43,7 +43,6 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
-import android.content.pm.PackageManager;
 import android.graphics.SurfaceTexture;
 import android.graphics.SurfaceTexture.OnFrameAvailableListener;
 import android.opengl.EGL14;
@@ -153,16 +152,9 @@ private static void assertApiLevel17OrHigher() {
    *
    * @param context Any {@link Context}.
    */
-  @SuppressWarnings("unused")
+  @SuppressWarnings("unused") // Context may be needed in the future for better targeting.
   private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) {
-    return (Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER))
-            || (Util.SDK_INT >= 24 && Util.SDK_INT < 26
-              && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager()));
-  }
-
-  @TargetApi(24)
-  private static boolean hasVrModeHighPerformanceSystemFeatureV24(PackageManager packageManager) {
-    return packageManager.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
+    return Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER);
   }
 
   private static class DummySurfaceThread extends HandlerThread implements OnFrameAvailableListener,

From bab2ce817e76431243aab61cb40425d163c3141d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 4 Sep 2017 06:47:03 -0700
Subject: [PATCH 183/421] Allow EXIF tracks to be exposed

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167493800
---
 .../main/java/com/google/android/exoplayer2/util/MimeTypes.java  | 1 +
 1 file changed, 1 insertion(+)

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 1c8bb62a756..2daf16d3d2c 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
@@ -85,6 +85,7 @@ public final class MimeTypes {
   public static final String APPLICATION_CAMERA_MOTION = BASE_TYPE_APPLICATION + "/x-camera-motion";
   public static final String APPLICATION_EMSG = BASE_TYPE_APPLICATION + "/x-emsg";
   public static final String APPLICATION_DVBSUBS = BASE_TYPE_APPLICATION + "/dvbsubs";
+  public static final String APPLICATION_EXIF = BASE_TYPE_APPLICATION + "/x-exif";
 
   private MimeTypes() {}
 

From 0d86f4475c4b30e5a1a0ac55a5479ca680fc2096 Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Mon, 4 Sep 2017 06:55:07 -0700
Subject: [PATCH 184/421] Remove the resampling to 16bit step from FlacDecoder.

Currently FlacDecoder/FlacExtractor always perform resampling to 16bit. In some
case (with 24bit audio), this might lower the audio quality if the system
supports 24bit audio.
Since AudioTrack implementation supports resampling, we will remove the
resampling step, and return an output with the same bits-per-sample as the original stream.
User can choose to re-sample to 16bit in AudioTrack if necessary.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167494350
---
 extensions/flac/README.md                     |   2 +-
 .../exoplayer2/ext/flac/FlacExtractor.java    |  20 ++-
 extensions/flac/src/main/jni/flac_parser.cc   | 120 +++++-------------
 .../flac/src/main/jni/include/flac_parser.h   |   4 +-
 .../exoplayer2/util/FlacStreamInfo.java       |   2 +-
 5 files changed, 55 insertions(+), 93 deletions(-)

diff --git a/extensions/flac/README.md b/extensions/flac/README.md
index cd0f2efe470..fda5f0085df 100644
--- a/extensions/flac/README.md
+++ b/extensions/flac/README.md
@@ -38,7 +38,7 @@ NDK_PATH="<path to Android NDK>"
 
 ```
 cd "${FLAC_EXT_PATH}/jni" && \
-curl http://downloads.xiph.org/releases/flac/flac-1.3.1.tar.xz | tar xJ && \
+curl https://ftp.osuosl.org/pub/xiph/releases/flac/flac-1.3.1.tar.xz | tar xJ && \
 mv flac-1.3.1 flac
 ```
 
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 7b71b5c7431..a2f141a7123 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
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.ext.flac;
 
+import static com.google.android.exoplayer2.util.Util.getPcmEncoding;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.extractor.Extractor;
@@ -122,10 +124,20 @@ public long getDurationUs() {
         }
 
       });
-
-      Format mediaFormat = Format.createAudioSampleFormat(null, MimeTypes.AUDIO_RAW, null,
-          streamInfo.bitRate(), Format.NO_VALUE, streamInfo.channels, streamInfo.sampleRate,
-          C.ENCODING_PCM_16BIT, null, null, 0, null);
+      Format mediaFormat =
+          Format.createAudioSampleFormat(
+              null,
+              MimeTypes.AUDIO_RAW,
+              null,
+              streamInfo.bitRate(),
+              Format.NO_VALUE,
+              streamInfo.channels,
+              streamInfo.sampleRate,
+              getPcmEncoding(streamInfo.bitsPerSample),
+              null,
+              null,
+              0,
+              null);
       trackOutput.format(mediaFormat);
 
       outputBuffer = new ParsableByteArray(streamInfo.maxDecodedFrameSize());
diff --git a/extensions/flac/src/main/jni/flac_parser.cc b/extensions/flac/src/main/jni/flac_parser.cc
index 6c6e57f5f78..b9918e78711 100644
--- a/extensions/flac/src/main/jni/flac_parser.cc
+++ b/extensions/flac/src/main/jni/flac_parser.cc
@@ -42,6 +42,9 @@
 #define CHECK(x) \
   if (!(x)) ALOGE("Check failed: %s ", #x)
 
+const int endian = 1;
+#define isBigEndian() (*(reinterpret_cast<const char *>(&endian)) == 0)
+
 // The FLAC parser calls our C++ static callbacks using C calling conventions,
 // inside FLAC__stream_decoder_process_until_end_of_metadata
 // and FLAC__stream_decoder_process_single.
@@ -180,85 +183,42 @@ void FLACParser::errorCallback(FLAC__StreamDecoderErrorStatus status) {
   mErrorStatus = status;
 }
 
-// Copy samples from FLAC native 32-bit non-interleaved to 16-bit interleaved.
+// Copy samples from FLAC native 32-bit non-interleaved to
+// correct bit-depth (non-zero padded), interleaved.
 // These are candidates for optimization if needed.
-
-static void copyMono8(int16_t *dst, const int *const *src, unsigned nSamples,
-                      unsigned /* nChannels */) {
-  for (unsigned i = 0; i < nSamples; ++i) {
-    *dst++ = src[0][i] << 8;
-  }
-}
-
-static void copyStereo8(int16_t *dst, const int *const *src, unsigned nSamples,
-                        unsigned /* nChannels */) {
-  for (unsigned i = 0; i < nSamples; ++i) {
-    *dst++ = src[0][i] << 8;
-    *dst++ = src[1][i] << 8;
-  }
-}
-
-static void copyMultiCh8(int16_t *dst, const int *const *src, unsigned nSamples,
-                         unsigned nChannels) {
+static void copyToByteArrayBigEndian(int8_t *dst, const int *const *src,
+                                     unsigned bytesPerSample, unsigned nSamples,
+                                     unsigned nChannels) {
   for (unsigned i = 0; i < nSamples; ++i) {
     for (unsigned c = 0; c < nChannels; ++c) {
-      *dst++ = src[c][i] << 8;
+      // point to the first byte of the source address
+      // and then skip the first few bytes (most significant bytes)
+      // depending on the bit depth
+      const int8_t *byteSrc =
+          reinterpret_cast<const int8_t *>(&src[c][i]) + 4 - bytesPerSample;
+      memcpy(dst, byteSrc, bytesPerSample);
+      dst = dst + bytesPerSample;
     }
   }
 }
 
-static void copyMono16(int16_t *dst, const int *const *src, unsigned nSamples,
-                       unsigned /* nChannels */) {
-  for (unsigned i = 0; i < nSamples; ++i) {
-    *dst++ = src[0][i];
-  }
-}
-
-static void copyStereo16(int16_t *dst, const int *const *src, unsigned nSamples,
-                         unsigned /* nChannels */) {
-  for (unsigned i = 0; i < nSamples; ++i) {
-    *dst++ = src[0][i];
-    *dst++ = src[1][i];
-  }
-}
-
-static void copyMultiCh16(int16_t *dst, const int *const *src,
-                          unsigned nSamples, unsigned nChannels) {
+static void copyToByteArrayLittleEndian(int8_t *dst, const int *const *src,
+                                        unsigned bytesPerSample,
+                                        unsigned nSamples, unsigned nChannels) {
   for (unsigned i = 0; i < nSamples; ++i) {
     for (unsigned c = 0; c < nChannels; ++c) {
-      *dst++ = src[c][i];
+      // with little endian, the most significant bytes will be at the end
+      // copy the bytes in little endian will remove the most significant byte
+      // so we are good here.
+      memcpy(dst, &(src[c][i]), bytesPerSample);
+      dst = dst + bytesPerSample;
     }
   }
 }
 
-// 24-bit versions should do dithering or noise-shaping, here or in AudioFlinger
-
-static void copyMono24(int16_t *dst, const int *const *src, unsigned nSamples,
-                       unsigned /* nChannels */) {
-  for (unsigned i = 0; i < nSamples; ++i) {
-    *dst++ = src[0][i] >> 8;
-  }
-}
-
-static void copyStereo24(int16_t *dst, const int *const *src, unsigned nSamples,
+static void copyTrespass(int8_t * /* dst */, const int *const * /* src */,
+                         unsigned /* bytesPerSample */, unsigned /* nSamples */,
                          unsigned /* nChannels */) {
-  for (unsigned i = 0; i < nSamples; ++i) {
-    *dst++ = src[0][i] >> 8;
-    *dst++ = src[1][i] >> 8;
-  }
-}
-
-static void copyMultiCh24(int16_t *dst, const int *const *src,
-                          unsigned nSamples, unsigned nChannels) {
-  for (unsigned i = 0; i < nSamples; ++i) {
-    for (unsigned c = 0; c < nChannels; ++c) {
-      *dst++ = src[c][i] >> 8;
-    }
-  }
-}
-
-static void copyTrespass(int16_t * /* dst */, const int *const * /* src */,
-                         unsigned /* nSamples */, unsigned /* nChannels */) {
   TRESPASS();
 }
 
@@ -340,6 +300,7 @@ bool FLACParser::decodeMetadata() {
       case 8:
       case 16:
       case 24:
+      case 32:
         break;
       default:
         ALOGE("unsupported bits per sample %u", getBitsPerSample());
@@ -363,23 +324,11 @@ bool FLACParser::decodeMetadata() {
         ALOGE("unsupported sample rate %u", getSampleRate());
         return false;
     }
-    // configure the appropriate copy function, defaulting to trespass
-    static const struct {
-      unsigned mChannels;
-      unsigned mBitsPerSample;
-      void (*mCopy)(int16_t *dst, const int *const *src, unsigned nSamples,
-                    unsigned nChannels);
-    } table[] = {
-        {1, 8, copyMono8},   {2, 8, copyStereo8},   {8, 8, copyMultiCh8},
-        {1, 16, copyMono16}, {2, 16, copyStereo16}, {8, 16, copyMultiCh16},
-        {1, 24, copyMono24}, {2, 24, copyStereo24}, {8, 24, copyMultiCh24},
-    };
-    for (unsigned i = 0; i < sizeof(table) / sizeof(table[0]); ++i) {
-      if (table[i].mChannels >= getChannels() &&
-          table[i].mBitsPerSample == getBitsPerSample()) {
-        mCopy = table[i].mCopy;
-        break;
-      }
+    // configure the appropriate copy function based on device endianness.
+    if (isBigEndian()) {
+      mCopy = copyToByteArrayBigEndian;
+    } else {
+      mCopy = copyToByteArrayLittleEndian;
     }
   } else {
     ALOGE("missing STREAMINFO");
@@ -424,7 +373,8 @@ size_t FLACParser::readBuffer(void *output, size_t output_size) {
     return -1;
   }
 
-  size_t bufferSize = blocksize * getChannels() * sizeof(int16_t);
+  unsigned bytesPerSample = getBitsPerSample() >> 3;
+  size_t bufferSize = blocksize * getChannels() * bytesPerSample;
   if (bufferSize > output_size) {
     ALOGE(
         "FLACParser::readBuffer not enough space in output buffer "
@@ -434,8 +384,8 @@ size_t FLACParser::readBuffer(void *output, size_t output_size) {
   }
 
   // copy PCM from FLAC write buffer to our media buffer, with interleaving.
-  (*mCopy)(reinterpret_cast<int16_t *>(output), mWriteBuffer, blocksize,
-           getChannels());
+  (*mCopy)(reinterpret_cast<int8_t *>(output), mWriteBuffer, bytesPerSample,
+           blocksize, getChannels());
 
   // fill in buffer metadata
   CHECK(mWriteHeader.number_type == FLAC__FRAME_NUMBER_TYPE_SAMPLE_NUMBER);
diff --git a/extensions/flac/src/main/jni/include/flac_parser.h b/extensions/flac/src/main/jni/include/flac_parser.h
index 8c302adb363..8a769b66d42 100644
--- a/extensions/flac/src/main/jni/include/flac_parser.h
+++ b/extensions/flac/src/main/jni/include/flac_parser.h
@@ -86,8 +86,8 @@ class FLACParser {
  private:
   DataSource *mDataSource;
 
-  void (*mCopy)(int16_t *dst, const int *const *src, unsigned nSamples,
-                unsigned nChannels);
+  void (*mCopy)(int8_t *dst, const int *const *src, unsigned bytesPerSample,
+                unsigned nSamples, unsigned nChannels);
 
   // handle to underlying libFLAC parser
   FLAC__StreamDecoder *mDecoder;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java b/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java
index 6382f1130e8..b08f4a31e3a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/FlacStreamInfo.java
@@ -65,7 +65,7 @@ public FlacStreamInfo(int minBlockSize, int maxBlockSize, int minFrameSize, int
   }
 
   public int maxDecodedFrameSize() {
-    return maxBlockSize * channels * 2;
+    return maxBlockSize * channels * (bitsPerSample / 8);
   }
 
   public int bitRate() {

From c9f31a41cd45bfe0a522ee77dfbe1af8ffd97442 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 4 Sep 2017 07:28:24 -0700
Subject: [PATCH 185/421] Adding missing license header in IMA build.gradle

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167496569
---
 extensions/ima/build.gradle | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index c084ec6bf8c..cb69e929909 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -1,3 +1,16 @@
+// 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.
 apply from: '../../constants.gradle'
 apply plugin: 'com.android.library'
 
@@ -6,7 +19,7 @@ android {
     buildToolsVersion project.ext.buildToolsVersion
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion project.ext.minSdkVersion
         targetSdkVersion project.ext.targetSdkVersion
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

From 472df08f0837ebbdcd0b1c7e8269ad816b13269b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Sep 2017 08:55:20 -0700
Subject: [PATCH 186/421] Additional secure DummySurface device exclusions

Merge: https://github.com/google/ExoPlayer/pull/3225

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167502127
---
 .../google/android/exoplayer2/video/DummySurface.java | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

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 a1820ed7a11..d623ea33ea4 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
@@ -43,6 +43,7 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.content.pm.PackageManager;
 import android.graphics.SurfaceTexture;
 import android.graphics.SurfaceTexture.OnFrameAvailableListener;
 import android.opengl.EGL14;
@@ -152,9 +153,15 @@ private static void assertApiLevel17OrHigher() {
    *
    * @param context Any {@link Context}.
    */
-  @SuppressWarnings("unused") // Context may be needed in the future for better targeting.
   private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) {
-    return Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER);
+    return (Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER))
+        || (Util.SDK_INT < 26
+            && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager()));
+  }
+
+  @TargetApi(24)
+  private static boolean hasVrModeHighPerformanceSystemFeatureV24(PackageManager packageManager) {
+    return packageManager.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
   }
 
   private static class DummySurfaceThread extends HandlerThread implements OnFrameAvailableListener,

From a0df5bb50a817bf99c335be2479ab9293ec735bf Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Sep 2017 09:26:59 -0700
Subject: [PATCH 187/421] Be robust against unexpected EOS in WebvttCueParser

Issue: #3228

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167504122
---
 .../text/webvtt/WebvttCueParser.java          | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

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 30c9c8737eb..54af4dbf634 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
@@ -21,6 +21,7 @@
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
+import android.text.TextUtils;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.AlignmentSpan;
 import android.text.style.BackgroundColorSpan;
@@ -92,19 +93,24 @@ public WebvttCueParser() {
   /* package */ boolean parseCue(ParsableByteArray webvttData, WebvttCue.Builder builder,
       List<WebvttCssStyle> styles) {
     String firstLine = webvttData.readLine();
+    if (firstLine == null) {
+      return false;
+    }
     Matcher cueHeaderMatcher = WebvttCueParser.CUE_HEADER_PATTERN.matcher(firstLine);
     if (cueHeaderMatcher.matches()) {
       // We have found the timestamps in the first line. No id present.
       return parseCue(null, cueHeaderMatcher, webvttData, builder, textBuilder, styles);
-    } else {
-      // The first line is not the timestamps, but could be the cue id.
-      String secondLine = webvttData.readLine();
-      cueHeaderMatcher = WebvttCueParser.CUE_HEADER_PATTERN.matcher(secondLine);
-      if (cueHeaderMatcher.matches()) {
-        // We can do the rest of the parsing, including the id.
-        return parseCue(firstLine.trim(), cueHeaderMatcher, webvttData, builder, textBuilder,
-            styles);
-      }
+    }
+    // The first line is not the timestamps, but could be the cue id.
+    String secondLine = webvttData.readLine();
+    if (secondLine == null) {
+      return false;
+    }
+    cueHeaderMatcher = WebvttCueParser.CUE_HEADER_PATTERN.matcher(secondLine);
+    if (cueHeaderMatcher.matches()) {
+      // We can do the rest of the parsing, including the id.
+      return parseCue(firstLine.trim(), cueHeaderMatcher, webvttData, builder, textBuilder,
+          styles);
     }
     return false;
   }
@@ -233,7 +239,7 @@ private static boolean parseCue(String id, Matcher cueHeaderMatcher, ParsableByt
     // Parse the cue text.
     textBuilder.setLength(0);
     String line;
-    while ((line = webvttData.readLine()) != null && !line.isEmpty()) {
+    while (!TextUtils.isEmpty(line = webvttData.readLine())) {
       if (textBuilder.length() > 0) {
         textBuilder.append("\n");
       }

From bec5e6e2b2b59290963f7a22a6d005c8dac467e5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 4 Sep 2017 09:57:56 -0700
Subject: [PATCH 188/421] Rewrite logic for enabling secure DummySurface

Issue: #3215

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167505797
---
 .../exoplayer2/video/DummySurface.java        | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

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 d623ea33ea4..20fe862dd2b 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
@@ -90,12 +90,7 @@ public final class DummySurface extends Surface {
    */
   public static synchronized boolean isSecureSupported(Context context) {
     if (!secureSupportedInitialized) {
-      if (Util.SDK_INT >= 17) {
-        EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-        String extensions = EGL14.eglQueryString(display, EGL10.EGL_EXTENSIONS);
-        secureSupported = extensions != null && extensions.contains("EGL_EXT_protected_content")
-            && !deviceNeedsSecureDummySurfaceWorkaround(context);
-      }
+      secureSupported = Util.SDK_INT >= 24 && enableSecureDummySurfaceV24(context);
       secureSupportedInitialized = true;
     }
     return secureSupported;
@@ -148,20 +143,28 @@ private static void assertApiLevel17OrHigher() {
   }
 
   /**
-   * Returns whether the device is known to advertise secure surface textures but not implement them
-   * correctly.
+   * Returns whether use of secure dummy surfaces should be enabled.
    *
    * @param context Any {@link Context}.
    */
-  private static boolean deviceNeedsSecureDummySurfaceWorkaround(Context context) {
-    return (Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER))
-        || (Util.SDK_INT < 26
-            && !hasVrModeHighPerformanceSystemFeatureV24(context.getPackageManager()));
-  }
-
   @TargetApi(24)
-  private static boolean hasVrModeHighPerformanceSystemFeatureV24(PackageManager packageManager) {
-    return packageManager.hasSystemFeature(PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE);
+  private static boolean enableSecureDummySurfaceV24(Context context) {
+    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    String eglExtensions = EGL14.eglQueryString(display, EGL10.EGL_EXTENSIONS);
+    if (eglExtensions == null || !eglExtensions.contains("EGL_EXT_protected_content")) {
+      // EGL_EXT_protected_content is required to enable secure dummy surfaces.
+      return false;
+    }
+    if (Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER)) {
+      // Samsung devices running API level 24 are known to be broken [Internal: b/37197802].
+      return false;
+    }
+    if (Util.SDK_INT < 26 && !context.getPackageManager().hasSystemFeature(
+        PackageManager.FEATURE_VR_MODE_HIGH_PERFORMANCE)) {
+      // Pre API level 26 devices were not well tested unless they supported VR mode.
+      return false;
+    }
+    return true;
   }
 
   private static class DummySurfaceThread extends HandlerThread implements OnFrameAvailableListener,

From 264f1c903def8a4f8ec7b65d52478470fc8a6358 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 5 Sep 2017 05:23:22 -0700
Subject: [PATCH 189/421] Fix bug in FakeChunkSource.

In order to retrieve the data set, the track selection index was used, but
the data set is actually indexed by track group indices.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167566049
---
 .../google/android/exoplayer2/testutil/FakeChunkSource.java    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 b8f25bfbce5..41fda178d7a 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
@@ -92,7 +92,8 @@ public void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHold
       Format selectedFormat = trackSelection.getSelectedFormat();
       long startTimeUs = dataSet.getStartTime(chunkIndex);
       long endTimeUs = startTimeUs + dataSet.getChunkDuration(chunkIndex);
-      String uri = dataSet.getUri(trackSelection.getSelectedIndex());
+      int trackGroupIndex = trackSelection.getIndexInTrackGroup(trackSelection.getSelectedIndex());
+      String uri = dataSet.getUri(trackGroupIndex);
       Segment fakeDataChunk = dataSet.getData(uri).getSegments().get(chunkIndex);
       DataSpec dataSpec = new DataSpec(Uri.parse(uri), fakeDataChunk.byteOffset,
           fakeDataChunk.length, null);

From 2f4a3fe1f3a95ed9a8029c6e3d21e537852bc271 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 5 Sep 2017 05:50:43 -0700
Subject: [PATCH 190/421] Add postDelayed operation to Clock interface.

The default implementation is just calling through to handler.postDelayed,
while the fake clock uses its internal time value to trigger the handler
calls at the correct time.

This is useful to apply a fake clock in situations where a handler is used to
post delayed messages.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167567914
---
 .../google/android/exoplayer2/util/Clock.java | 12 +++++++
 .../android/exoplayer2/util/SystemClock.java  |  7 ++++
 .../exoplayer2/testutil/FakeClock.java        | 34 ++++++++++++++++++-
 3 files changed, 52 insertions(+), 1 deletion(-)

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 f8d5759c2c3..9619ed53ea6 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
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.util;
 
+import android.os.Handler;
+
 /**
  * An interface through which system clocks can be read. The {@link #DEFAULT} implementation
  * must be used for all non-test cases.
@@ -36,4 +38,14 @@ public interface Clock {
    */
   void sleep(long sleepTimeMs);
 
+  /**
+   * Post a {@link Runnable} on a {@link Handler} thread with a delay measured by this clock.
+   * @see Handler#postDelayed(Runnable, long)
+   *
+   * @param handler The {@link Handler} to post the {@code runnable} on.
+   * @param runnable A {@link Runnable} to be posted.
+   * @param delayMs The delay in milliseconds as measured by this clock.
+   */
+  void postDelayed(Handler handler, Runnable runnable, long delayMs);
+
 }
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 1f937b721b3..272c3f43ec8 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
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.util;
 
+import android.os.Handler;
+
 /**
  * The standard implementation of {@link Clock}.
  */
@@ -30,4 +32,9 @@ public void sleep(long sleepTimeMs) {
     android.os.SystemClock.sleep(sleepTimeMs);
   }
 
+  @Override
+  public void postDelayed(Handler handler, Runnable runnable, long delayMs) {
+    handler.postDelayed(runnable, delayMs);
+  }
+
 }
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
index 36ce4b5c3e3..843e5858d85 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeClock.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.testutil;
 
+import android.os.Handler;
 import com.google.android.exoplayer2.util.Clock;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +27,7 @@ public final class FakeClock implements Clock {
 
   private long currentTimeMs;
   private final List<Long> wakeUpTimes;
+  private final List<HandlerPostData> handlerPosts;
 
   /**
    * Create {@link FakeClock} with an arbitrary initial timestamp.
@@ -35,6 +37,7 @@ public final class FakeClock implements Clock {
   public FakeClock(long initialTimeMs) {
     this.currentTimeMs = initialTimeMs;
     this.wakeUpTimes = new ArrayList<>();
+    this.handlerPosts = new ArrayList<>();
   }
 
   /**
@@ -50,10 +53,16 @@ public synchronized void advanceTime(long timeDiffMs) {
         break;
       }
     }
+    for (int i = handlerPosts.size() - 1; i >= 0; i--) {
+      if (handlerPosts.get(i).postTime <= currentTimeMs) {
+        HandlerPostData postData = handlerPosts.remove(i);
+        postData.handler.post(postData.runnable);
+      }
+    }
   }
 
   @Override
-  public long elapsedRealtime() {
+  public synchronized long elapsedRealtime() {
     return currentTimeMs;
   }
 
@@ -74,5 +83,28 @@ public synchronized void sleep(long sleepTimeMs) {
     wakeUpTimes.remove(wakeUpTimeMs);
   }
 
+  @Override
+  public synchronized void postDelayed(Handler handler, Runnable runnable, long delayMs) {
+    if (delayMs <= 0) {
+      handler.post(runnable);
+    } else {
+      handlerPosts.add(new HandlerPostData(currentTimeMs + delayMs, handler, runnable));
+    }
+  }
+
+  private static final class HandlerPostData {
+
+    public final long postTime;
+    public final Handler handler;
+    public final Runnable runnable;
+
+    public HandlerPostData(long postTime, Handler handler, Runnable runnable) {
+      this.postTime = postTime;
+      this.handler = handler;
+      this.runnable = runnable;
+    }
+
+  }
+
 }
 

From a90cef0cb5e581757b43264e923e06653cda183e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Sep 2017 08:03:07 -0700
Subject: [PATCH 191/421] Upgrade gradle plugin / wrapper

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167579719
---
 build.gradle                             | 2 +-
 gradle/wrapper/gradle-wrapper.properties | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index d5cc64baa16..8ec24a6e82e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -19,7 +19,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta4'
         classpath 'com.novoda:bintray-release:0.5.0'
     }
     // Workaround for the following test coverage issue. Remove when fixed:
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fc42154505b..32ec7e33275 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jul 12 10:31:13 BST 2017
+#Tue Sep 05 13:43:42 BST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

From 0183a83047360f3bf2c60b2180ce356c75b454da Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Sep 2017 08:17:44 -0700
Subject: [PATCH 192/421] Don't use MediaCodec.setOutputSurface on Nexus 7 with
 qcom decoder

Issue: #3236

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167581198
---
 .../video/MediaCodecVideoRenderer.java          | 17 ++++++++++++++++-
 1 file changed, 16 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 f70d74e413b..d72619dbe1a 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
@@ -78,6 +78,7 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
 
   private Format[] streamFormats;
   private CodecMaxValues codecMaxValues;
+  private boolean codecNeedsSetOutputSurfaceWorkaround;
 
   private Surface surface;
   private Surface dummySurface;
@@ -360,7 +361,8 @@ private void setSurface(Surface surface) throws ExoPlaybackException {
       int state = getState();
       if (state == STATE_ENABLED || state == STATE_STARTED) {
         MediaCodec codec = getCodec();
-        if (Util.SDK_INT >= 23 && codec != null && surface != null) {
+        if (Util.SDK_INT >= 23 && codec != null && surface != null
+            && !codecNeedsSetOutputSurfaceWorkaround) {
           setOutputSurfaceV23(codec, surface);
         } else {
           releaseCodec();
@@ -431,6 +433,7 @@ protected void releaseCodec() {
   protected void onCodecInitialized(String name, long initializedTimestampMs,
       long initializationDurationMs) {
     eventDispatcher.decoderInitialized(name, initializedTimestampMs, initializationDurationMs);
+    codecNeedsSetOutputSurfaceWorkaround = codecNeedsSetOutputSurfaceWorkaround(name);
   }
 
   @Override
@@ -969,6 +972,18 @@ private static boolean deviceNeedsAutoFrcWorkaround() {
     return Util.SDK_INT <= 22 && "foster".equals(Util.DEVICE) && "NVIDIA".equals(Util.MANUFACTURER);
   }
 
+  /**
+   * Returns whether the device is known to implement {@link MediaCodec#setOutputSurface(Surface)}
+   * incorrectly.
+   * <p>
+   * If true is returned then we fall back to releasing and re-instantiating the codec instead.
+   */
+  private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
+    // Work around https://github.com/google/ExoPlayer/issues/3236
+    return ("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
+        && "OMX.qcom.video.decoder.avc".equals(name);
+  }
+
   /**
    * Returns whether a codec with suitable {@link CodecMaxValues} will support adaptation between
    * two {@link Format}s.

From 8413dab9dec518a3311762747084fac83d6e03c4 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 5 Sep 2017 08:32:56 -0700
Subject: [PATCH 193/421] Use clock in action schedule to handle delays.

This allows to use a fake clock and an action schedule with timed delays
together.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167582860
---
 .../exoplayer2/testutil/ActionSchedule.java   | 33 ++++++++++++++-----
 1 file changed, 24 insertions(+), 9 deletions(-)

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 c9ae02c9570..28e62f30570 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
@@ -36,6 +36,7 @@
 import com.google.android.exoplayer2.testutil.Action.WaitForPositionDiscontinuity;
 import com.google.android.exoplayer2.testutil.Action.WaitForTimelineChanged;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
+import com.google.android.exoplayer2.util.Clock;
 
 /**
  * Schedules a sequence of {@link Action}s for execution during a test.
@@ -70,17 +71,27 @@ private ActionSchedule(ActionNode rootNode) {
   public static final class Builder {
 
     private final String tag;
+    private final Clock clock;
     private final ActionNode rootNode;
-    private long currentDelayMs;
 
+    private long currentDelayMs;
     private ActionNode previousNode;
 
     /**
      * @param tag A tag to use for logging.
      */
     public Builder(String tag) {
+      this(tag, Clock.DEFAULT);
+    }
+
+    /**
+     * @param tag A tag to use for logging.
+     * @param clock A clock to use for measuring delays.
+     */
+    public Builder(String tag, Clock clock) {
       this.tag = tag;
-      rootNode = new ActionNode(new RootAction(tag), 0);
+      this.clock = clock;
+      rootNode = new ActionNode(new RootAction(tag), clock, 0);
       previousNode = rootNode;
     }
 
@@ -102,7 +113,7 @@ public Builder delay(long delayMs) {
      * @return The builder, for convenience.
      */
     public Builder apply(Action action) {
-      return appendActionNode(new ActionNode(action, currentDelayMs));
+      return appendActionNode(new ActionNode(action, clock, currentDelayMs));
     }
 
     /**
@@ -113,7 +124,7 @@ public Builder apply(Action action) {
      * @return The builder, for convenience.
      */
     public Builder repeat(Action action, long intervalMs) {
-      return appendActionNode(new ActionNode(action, currentDelayMs, intervalMs));
+      return appendActionNode(new ActionNode(action, clock, currentDelayMs, intervalMs));
     }
 
     /**
@@ -274,6 +285,7 @@ private Builder appendActionNode(ActionNode actionNode) {
   /* package */ static final class ActionNode implements Runnable {
 
     private final Action action;
+    private final Clock clock;
     private final long delayMs;
     private final long repeatIntervalMs;
 
@@ -286,20 +298,23 @@ private Builder appendActionNode(ActionNode actionNode) {
 
     /**
      * @param action The wrapped action.
+     * @param clock The clock to use for measuring the delay.
      * @param delayMs The delay between the node being scheduled and the action being executed.
      */
-    public ActionNode(Action action, long delayMs) {
-      this(action, delayMs, C.TIME_UNSET);
+    public ActionNode(Action action, Clock clock, long delayMs) {
+      this(action, clock, delayMs, C.TIME_UNSET);
     }
 
     /**
      * @param action The wrapped action.
+     * @param clock The clock to use for measuring the delay.
      * @param delayMs The delay between the node being scheduled and the action being executed.
      * @param repeatIntervalMs The interval between one execution and the next repetition. If set to
      *     {@link C#TIME_UNSET}, the action is executed once only.
      */
-    public ActionNode(Action action, long delayMs, long repeatIntervalMs) {
+    public ActionNode(Action action, Clock clock, long delayMs, long repeatIntervalMs) {
       this.action = action;
+      this.clock = clock;
       this.delayMs = delayMs;
       this.repeatIntervalMs = repeatIntervalMs;
     }
@@ -328,14 +343,14 @@ public void schedule(SimpleExoPlayer player, MappingTrackSelector trackSelector,
       this.trackSelector = trackSelector;
       this.surface = surface;
       this.mainHandler = mainHandler;
-      mainHandler.postDelayed(this, delayMs);
+      clock.postDelayed(mainHandler, this, delayMs);
     }
 
     @Override
     public void run() {
       action.doActionAndScheduleNext(player, trackSelector, surface, mainHandler, next);
       if (repeatIntervalMs != C.TIME_UNSET) {
-        mainHandler.postDelayed(this, repeatIntervalMs);
+        clock.postDelayed(mainHandler, this, repeatIntervalMs);
       }
     }
 

From e16610a82c696b6121301c792c7f04d5e36a37c7 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 5 Sep 2017 08:47:02 -0700
Subject: [PATCH 194/421] Fix import formatting

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167584287
---
 .../exoplayer2/ext/mediasession/DefaultPlaybackController.java | 1 -
 .../exoplayer2/ext/mediasession/MediaSessionConnector.java     | 1 -
 .../exoplayer2/ext/mediasession/RepeatModeActionProvider.java  | 3 ++-
 .../exoplayer2/ext/mediasession/TimelineQueueNavigator.java    | 1 -
 4 files changed, 2 insertions(+), 4 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 95ebcde095f..dcb6f8ca107 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
@@ -18,7 +18,6 @@
 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;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
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 4c7ad123f32..7304d9cdb6e 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,7 +40,6 @@
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
-
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
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 b4cb3c73d01..1db5889e002 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
@@ -1,4 +1,3 @@
-package com.google.android.exoplayer2.ext.mediasession;
 /*
  * Copyright (c) 2017 The Android Open Source Project
  *
@@ -14,6 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+package com.google.android.exoplayer2.ext.mediasession;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.media.session.PlaybackStateCompat;
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 0484c0b6417..1b9bd3ecd92 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,7 +25,6 @@
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Util;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

From b62eab63a4d13945d07431be3d30628392646260 Mon Sep 17 00:00:00 2001
From: zhihuichen <zhihuichen@google.com>
Date: Tue, 5 Sep 2017 11:06:03 -0700
Subject: [PATCH 195/421] Implement multi session to support DRM key rotation.
 Spec:
 https://storage.googleapis.com/wvdocs/Widevine_DRM_Android_Using_Key_Rotation.pdf

1. Implement multisession to support drm key rotation
2. Put MediaDrmEventListener back to manager since this is a per mediaDrm thing.
3. It seems diffrenciate between single/multi session is unnecessary.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167602965
---
 .../exoplayer2/demo/PlayerActivity.java       |   9 +-
 .../demo/SampleChooserActivity.java           |  63 ++++--
 .../exoplayer2/drm/DefaultDrmSession.java     | 194 ++++++++----------
 .../drm/DefaultDrmSessionManager.java         | 185 +++++++++++++++--
 4 files changed, 301 insertions(+), 150 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 b2750a93bbf..c2c4df9ea8d 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
@@ -89,6 +89,7 @@ public class PlayerActivity extends Activity implements OnClickListener, EventLi
   public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid";
   public static final String DRM_LICENSE_URL = "drm_license_url";
   public static final String DRM_KEY_REQUEST_PROPERTIES = "drm_key_request_properties";
+  public static final String DRM_MULTI_SESSION = "drm_multi_session";
   public static final String PREFER_EXTENSION_DECODERS = "prefer_extension_decoders";
 
   public static final String ACTION_VIEW = "com.google.android.exoplayer.demo.action.VIEW";
@@ -264,13 +265,14 @@ private void initializePlayer() {
       if (drmSchemeUuid != null) {
         String drmLicenseUrl = intent.getStringExtra(DRM_LICENSE_URL);
         String[] keyRequestPropertiesArray = intent.getStringArrayExtra(DRM_KEY_REQUEST_PROPERTIES);
+        boolean multiSession = intent.getBooleanExtra(DRM_MULTI_SESSION, false);
         int errorStringId = R.string.error_drm_unknown;
         if (Util.SDK_INT < 18) {
           errorStringId = R.string.error_drm_not_supported;
         } else {
           try {
             drmSessionManager = buildDrmSessionManagerV18(drmSchemeUuid, drmLicenseUrl,
-                keyRequestPropertiesArray);
+                keyRequestPropertiesArray, multiSession);
           } catch (UnsupportedDrmException e) {
             errorStringId = e.reason == UnsupportedDrmException.REASON_UNSUPPORTED_SCHEME
                 ? R.string.error_drm_unsupported_scheme : R.string.error_drm_unknown;
@@ -379,7 +381,8 @@ private MediaSource buildMediaSource(Uri uri, String overrideExtension) {
   }
 
   private DrmSessionManager<FrameworkMediaCrypto> buildDrmSessionManagerV18(UUID uuid,
-      String licenseUrl, String[] keyRequestPropertiesArray) throws UnsupportedDrmException {
+      String licenseUrl, String[] keyRequestPropertiesArray, boolean multiSession)
+      throws UnsupportedDrmException {
     HttpMediaDrmCallback drmCallback = new HttpMediaDrmCallback(licenseUrl,
         buildHttpDataSourceFactory(false));
     if (keyRequestPropertiesArray != null) {
@@ -389,7 +392,7 @@ private DrmSessionManager<FrameworkMediaCrypto> buildDrmSessionManagerV18(UUID u
       }
     }
     return new DefaultDrmSessionManager<>(uuid, FrameworkMediaDrm.newInstance(uuid), drmCallback,
-        null, mainHandler, eventLogger);
+        null, mainHandler, eventLogger, multiSession);
   }
 
   private void releasePlayer() {
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 c0edb1d1b88..1f84b1f29c8 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
@@ -182,6 +182,7 @@ private Sample readEntry(JsonReader reader, boolean insidePlaylist) throws IOExc
       UUID drmUuid = null;
       String drmLicenseUrl = null;
       String[] drmKeyRequestProperties = null;
+      boolean drmMultiSession = false;
       boolean preferExtensionDecoders = false;
       ArrayList<UriSample> playlistSamples = null;
       String adTagUri = null;
@@ -220,6 +221,9 @@ private Sample readEntry(JsonReader reader, boolean insidePlaylist) throws IOExc
             reader.endObject();
             drmKeyRequestProperties = drmKeyRequestPropertiesList.toArray(new String[0]);
             break;
+          case "drm_multi_session":
+            drmMultiSession = reader.nextBoolean();
+            break;
           case "prefer_extension_decoders":
             Assertions.checkState(!insidePlaylist,
                 "Invalid attribute on nested item: prefer_extension_decoders");
@@ -242,15 +246,16 @@ private Sample readEntry(JsonReader reader, boolean insidePlaylist) throws IOExc
         }
       }
       reader.endObject();
-
+      DrmInfo drmInfo = drmUuid == null ? null : new DrmInfo(drmUuid, drmLicenseUrl,
+          drmKeyRequestProperties, drmMultiSession);
       if (playlistSamples != null) {
         UriSample[] playlistSamplesArray = playlistSamples.toArray(
             new UriSample[playlistSamples.size()]);
-        return new PlaylistSample(sampleName, drmUuid, drmLicenseUrl, drmKeyRequestProperties,
-            preferExtensionDecoders, playlistSamplesArray);
+        return new PlaylistSample(sampleName, preferExtensionDecoders, drmInfo,
+            playlistSamplesArray);
       } else {
-        return new UriSample(sampleName, drmUuid, drmLicenseUrl, drmKeyRequestProperties,
-            preferExtensionDecoders, uri, extension, adTagUri);
+        return new UriSample(sampleName, preferExtensionDecoders, drmInfo, uri, extension,
+            adTagUri);
       }
     }
 
@@ -372,31 +377,47 @@ public SampleGroup(String title) {
 
   }
 
-  private abstract static class Sample {
-
-    public final String name;
-    public final boolean preferExtensionDecoders;
+  private static final class DrmInfo {
     public final UUID drmSchemeUuid;
     public final String drmLicenseUrl;
     public final String[] drmKeyRequestProperties;
+    public final boolean drmMultiSession;
 
-    public Sample(String name, UUID drmSchemeUuid, String drmLicenseUrl,
-        String[] drmKeyRequestProperties, boolean preferExtensionDecoders) {
-      this.name = name;
+    public DrmInfo(UUID drmSchemeUuid, String drmLicenseUrl,
+        String[] drmKeyRequestProperties, boolean drmMultiSession) {
       this.drmSchemeUuid = drmSchemeUuid;
       this.drmLicenseUrl = drmLicenseUrl;
       this.drmKeyRequestProperties = drmKeyRequestProperties;
+      this.drmMultiSession = drmMultiSession;
+    }
+
+    public void updateIntent(Intent intent) {
+      Assertions.checkNotNull(intent);
+      intent.putExtra(PlayerActivity.DRM_SCHEME_UUID_EXTRA, drmSchemeUuid.toString());
+      intent.putExtra(PlayerActivity.DRM_LICENSE_URL, drmLicenseUrl);
+      intent.putExtra(PlayerActivity.DRM_KEY_REQUEST_PROPERTIES, drmKeyRequestProperties);
+      intent.putExtra(PlayerActivity.DRM_MULTI_SESSION, drmMultiSession);
+    }
+  }
+
+  private abstract static class Sample {
+    public final String name;
+    public final boolean preferExtensionDecoders;
+    public final DrmInfo drmInfo;
+
+    public Sample(String name, boolean preferExtensionDecoders, DrmInfo drmInfo) {
+      this.name = name;
       this.preferExtensionDecoders = preferExtensionDecoders;
+      this.drmInfo = drmInfo;
     }
 
     public Intent buildIntent(Context context) {
       Intent intent = new Intent(context, PlayerActivity.class);
       intent.putExtra(PlayerActivity.PREFER_EXTENSION_DECODERS, preferExtensionDecoders);
-      if (drmSchemeUuid != null) {
-        intent.putExtra(PlayerActivity.DRM_SCHEME_UUID_EXTRA, drmSchemeUuid.toString());
-        intent.putExtra(PlayerActivity.DRM_LICENSE_URL, drmLicenseUrl);
-        intent.putExtra(PlayerActivity.DRM_KEY_REQUEST_PROPERTIES, drmKeyRequestProperties);
+      if (drmInfo != null) {
+        drmInfo.updateIntent(intent);
       }
+
       return intent;
     }
 
@@ -408,10 +429,9 @@ private static final class UriSample extends Sample {
     public final String extension;
     public final String adTagUri;
 
-    public UriSample(String name, UUID drmSchemeUuid, String drmLicenseUrl,
-        String[] drmKeyRequestProperties, boolean preferExtensionDecoders, String uri,
+    public UriSample(String name, boolean preferExtensionDecoders, DrmInfo drmInfo, String uri,
         String extension, String adTagUri) {
-      super(name, drmSchemeUuid, drmLicenseUrl, drmKeyRequestProperties, preferExtensionDecoders);
+      super(name, preferExtensionDecoders, drmInfo);
       this.uri = uri;
       this.extension = extension;
       this.adTagUri = adTagUri;
@@ -432,10 +452,9 @@ private static final class PlaylistSample extends Sample {
 
     public final UriSample[] children;
 
-    public PlaylistSample(String name, UUID drmSchemeUuid, String drmLicenseUrl,
-        String[] drmKeyRequestProperties, boolean preferExtensionDecoders,
+    public PlaylistSample(String name, boolean preferExtensionDecoders, DrmInfo drmInfo,
         UriSample... children) {
-      super(name, drmSchemeUuid, drmLicenseUrl, drmKeyRequestProperties, preferExtensionDecoders);
+      super(name, preferExtensionDecoders, drmInfo);
       this.children = children;
     }
 
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 b4dab7b9715..d6776c8ed0a 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
@@ -27,29 +27,36 @@
 import android.util.Log;
 import android.util.Pair;
 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.OnEventListener;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.ProvisionRequest;
-import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
-import com.google.android.exoplayer2.util.MimeTypes;
-import com.google.android.exoplayer2.util.Util;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A {@link DrmSession} that supports playbacks using {@link MediaDrm}.
  */
 @TargetApi(18)
 /* package */ class DefaultDrmSession<T extends ExoMediaCrypto> implements DrmSession<T> {
-  private static final String TAG = "DefaultDrmSession";
 
-  private static final String CENC_SCHEME_MIME_TYPE = "cenc";
+  /**
+   * Listener of {@link DefaultDrmSession} events.
+   */
+  public interface EventListener {
+
+    /**
+     * Called each time provision is completed.
+     */
+    void onProvisionCompleted();
+
+  }
+
+  private static final String TAG = "DefaultDrmSession";
 
   private static final int MSG_PROVISION = 0;
   private static final int MSG_KEYS = 1;
-
   private static final int MAX_LICENSE_DURATION_TO_RENEW = 60;
 
   private final Handler eventHandler;
@@ -58,7 +65,6 @@
   private final HashMap<String, String> optionalKeyRequestParameters;
   /* package */ final MediaDrmCallback callback;
   /* package */ final UUID uuid;
-  /* package */ MediaDrmHandler mediaDrmHandler;
   /* package */ PostResponseHandler postResponseHandler;
   private HandlerThread requestHandlerThread;
   private Handler postRequestHandler;
@@ -66,13 +72,14 @@
   @DefaultDrmSessionManager.Mode
   private final int mode;
   private int openCount;
-  private boolean provisioningInProgress;
+  private final AtomicBoolean provisioningInProgress;
+  private final EventListener sessionEventListener;
   @DrmSession.State
   private int state;
   private T mediaCrypto;
   private DrmSessionException lastException;
-  private final byte[] schemeInitData;
-  private final String schemeMimeType;
+  private final byte[] initData;
+  private final String mimeType;
   private byte[] sessionId;
   private byte[] offlineLicenseKeySetId;
 
@@ -90,11 +97,12 @@
    * @param eventHandler The handler to post listener events.
    * @param eventListener The DRM session manager event listener.
    */
-  public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm, DrmInitData initData,
+  public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm, byte[] initData, String mimeType,
       @DefaultDrmSessionManager.Mode int mode, byte[] offlineLicenseKeySetId,
       HashMap<String, String> optionalKeyRequestParameters, MediaDrmCallback callback,
       Looper playbackLooper, Handler eventHandler,
-      DefaultDrmSessionManager.EventListener eventListener) {
+      DefaultDrmSessionManager.EventListener eventListener, AtomicBoolean provisioningInProgress,
+      EventListener sessionEventListener) {
     this.uuid = uuid;
     this.mediaDrm = mediaDrm;
     this.mode = mode;
@@ -104,44 +112,22 @@ public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm, DrmInitData initDat
 
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
+    this.provisioningInProgress = provisioningInProgress;
+    this.sessionEventListener = sessionEventListener;
     state = STATE_OPENING;
 
-    mediaDrmHandler = new MediaDrmHandler(playbackLooper);
-    mediaDrm.setOnEventListener(new MediaDrmEventListener());
     postResponseHandler = new PostResponseHandler(playbackLooper);
     requestHandlerThread = new HandlerThread("DrmRequestHandler");
     requestHandlerThread.start();
     postRequestHandler = new PostRequestHandler(requestHandlerThread.getLooper());
 
-    // Parse init data.
-    byte[] schemeInitData = null;
-    String schemeMimeType = null;
     if (offlineLicenseKeySetId == null) {
-      SchemeData data = getSchemeData(initData, uuid);
-      if (data == null) {
-        onError(new IllegalStateException("Media does not support uuid: " + uuid));
-      } else {
-        schemeInitData = data.data;
-        schemeMimeType = data.mimeType;
-        if (Util.SDK_INT < 21) {
-          // Prior to L the Widevine CDM required data to be extracted from the PSSH atom.
-          byte[] psshData = PsshAtomUtil.parseSchemeSpecificData(schemeInitData, uuid);
-          if (psshData == null) {
-            // Extraction failed. schemeData isn't a Widevine PSSH atom, so leave it unchanged.
-          } else {
-            schemeInitData = psshData;
-          }
-        }
-        if (Util.SDK_INT < 26 && C.CLEARKEY_UUID.equals(uuid)
-            && (MimeTypes.VIDEO_MP4.equals(schemeMimeType)
-            || MimeTypes.AUDIO_MP4.equals(schemeMimeType))) {
-          // Prior to API level 26 the ClearKey CDM only accepted "cenc" as the scheme for MP4.
-          schemeMimeType = CENC_SCHEME_MIME_TYPE;
-        }
-      }
+      this.initData = initData;
+      this.mimeType = mimeType;
+    } else {
+      this.initData = null;
+      this.mimeType = null;
     }
-    this.schemeInitData = schemeInitData;
-    this.schemeMimeType = schemeMimeType;
   }
 
   // Life cycle.
@@ -163,9 +149,6 @@ public void acquire() {
   public boolean release() {
     if (--openCount == 0) {
       state = STATE_RELEASED;
-      provisioningInProgress = false;
-      mediaDrmHandler.removeCallbacksAndMessages(null);
-      mediaDrmHandler = null;
       postResponseHandler.removeCallbacksAndMessages(null);
       postRequestHandler.removeCallbacksAndMessages(null);
       postRequestHandler = null;
@@ -182,6 +165,14 @@ public boolean release() {
     return false;
   }
 
+  public boolean canReuse(byte[] initData) {
+    return Arrays.equals(this.initData, initData);
+  }
+
+  public boolean hasSessionId(byte[] sessionId) {
+    return Arrays.equals(this.sessionId, sessionId);
+  }
+
   // DrmSession Implementation.
 
   @Override
@@ -245,21 +236,15 @@ private boolean openInternal(boolean allowProvisioning) {
   }
 
   private void postProvisionRequest() {
-    if (provisioningInProgress) {
+    if (provisioningInProgress.getAndSet(true)) {
       return;
     }
-    provisioningInProgress = true;
     ProvisionRequest request = mediaDrm.getProvisionRequest();
     postRequestHandler.obtainMessage(MSG_PROVISION, request).sendToTarget();
   }
 
   private void onProvisionResponse(Object response) {
-    provisioningInProgress = false;
-    if (state != STATE_OPENING && !isOpen()) {
-      // This event is stale.
-      return;
-    }
-
+    provisioningInProgress.set(false);
     if (response instanceof Exception) {
       onError((Exception) response);
       return;
@@ -267,11 +252,24 @@ private void onProvisionResponse(Object response) {
 
     try {
       mediaDrm.provideProvisionResponse((byte[]) response);
-      if (openInternal(false)) {
-        doLicense();
-      }
     } catch (DeniedByServerException e) {
       onError(e);
+      return;
+    }
+
+    if (sessionEventListener != null) {
+      sessionEventListener.onProvisionCompleted();
+    }
+  }
+
+  public void onProvisionCompleted() {
+    if (state != STATE_OPENING && !isOpen()) {
+      // This event is stale.
+      return;
+    }
+
+    if (openInternal(false)) {
+      doLicense();
     }
   }
 
@@ -322,6 +320,8 @@ public void run() {
           postKeyRequest(MediaDrm.KEY_TYPE_RELEASE);
         }
         break;
+      default:
+        break;
     }
   }
 
@@ -347,7 +347,7 @@ private long getLicenseDurationRemainingSec() {
   private void postKeyRequest(int type) {
     byte[] scope = type == MediaDrm.KEY_TYPE_RELEASE ? offlineLicenseKeySetId : sessionId;
     try {
-      KeyRequest request = mediaDrm.getKeyRequest(scope, schemeInitData, schemeMimeType, type,
+      KeyRequest request = mediaDrm.getKeyRequest(scope, initData, mimeType, type,
           optionalKeyRequestParameters);
       postRequestHandler.obtainMessage(MSG_KEYS, request).sendToTarget();
     } catch (Exception e) {
@@ -433,46 +433,27 @@ private boolean isOpen() {
     return state == STATE_OPENED || state == STATE_OPENED_WITH_KEYS;
   }
 
-  @SuppressLint("HandlerLeak")
-  private class MediaDrmHandler extends Handler {
-
-    public MediaDrmHandler(Looper looper) {
-      super(looper);
-    }
-
-    @SuppressWarnings("deprecation")
-    @Override
-    public void handleMessage(Message msg) {
-      if (!isOpen()) {
-        return;
-      }
-      switch (msg.what) {
-        case MediaDrm.EVENT_KEY_REQUIRED:
-          doLicense();
-          break;
-        case MediaDrm.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 MediaDrm.EVENT_PROVISION_REQUIRED:
-          state = STATE_OPENED;
-          postProvisionRequest();
-          break;
-      }
+  @SuppressWarnings("deprecation")
+  public void onMediaDrmEvent(int what) {
+    if (!isOpen()) {
+      return;
     }
-
-  }
-
-  private class MediaDrmEventListener implements OnEventListener<T> {
-
-    @Override
-    public void onEvent(ExoMediaDrm<? extends T> md, byte[] sessionId, int event, int extra,
-        byte[] data) {
-      if (mode == DefaultDrmSessionManager.MODE_PLAYBACK) {
-        mediaDrmHandler.sendEmptyMessage(event);
-      }
+    switch (what) {
+      case MediaDrm.EVENT_KEY_REQUIRED:
+        doLicense();
+        break;
+      case MediaDrm.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 MediaDrm.EVENT_PROVISION_REQUIRED:
+        state = STATE_OPENED;
+        postProvisionRequest();
+        break;
+      default:
+        break;
     }
 
   }
@@ -493,6 +474,9 @@ public void handleMessage(Message msg) {
         case MSG_KEYS:
           onKeyResponse(msg.obj);
           break;
+        default:
+          break;
+
       }
     }
 
@@ -527,20 +511,4 @@ public void handleMessage(Message msg) {
 
   }
 
-  /**
-   * Extracts {@link SchemeData} suitable for the given DRM scheme {@link UUID}.
-   *
-   * @param drmInitData The {@link DrmInitData} from which to extract the {@link SchemeData}.
-   * @param uuid The UUID of the scheme.
-   * @return The extracted {@link SchemeData}, or null if no suitable data is present.
-   */
-  public static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid) {
-    SchemeData schemeData = drmInitData.get(uuid);
-    if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
-      // If present, the Common PSSH box should be used for ClearKey.
-      schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
-    }
-    return 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 9ea696e0746..67931d106bb 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
@@ -15,27 +15,36 @@
  */
 package com.google.android.exoplayer2.drm;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.media.MediaDrm;
 import android.os.Handler;
 import android.os.Looper;
+import android.os.Message;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
+import com.google.android.exoplayer2.drm.ExoMediaDrm.OnEventListener;
+import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 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.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.UUID;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A {@link DrmSessionManager} that supports playbacks using {@link MediaDrm}.
  */
 @TargetApi(18)
-public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T> {
+public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>,
+    DefaultDrmSession.EventListener {
 
   /**
    * Listener of {@link DefaultDrmSessionManager} events.
@@ -70,6 +79,7 @@ public interface EventListener {
    * The key to use when passing CustomData to a PlayReady instance in an optional parameter map.
    */
   public static final String PLAYREADY_CUSTOM_DATA_KEY = "PRCustomData";
+  private static final String CENC_SCHEME_MIME_TYPE = "cenc";
 
   /** Determines the action to be done after a session acquired. */
   @Retention(RetentionPolicy.SOURCE)
@@ -93,14 +103,17 @@ public interface EventListener {
   private final EventListener eventListener;
   private final ExoMediaDrm<T> mediaDrm;
   private final HashMap<String, String> optionalKeyRequestParameters;
-
   private final MediaDrmCallback callback;
   private final UUID uuid;
+  private final boolean multiSession;
 
   private Looper playbackLooper;
   private int mode;
   private byte[] offlineLicenseKeySetId;
-  private DefaultDrmSession<T> session;
+
+  private final List<DefaultDrmSession<T>> sessions;
+  private final AtomicBoolean provisioningInProgress;
+  /* package */ MediaDrmHandler mediaDrmHandler;
 
   /**
    * Instantiates a new instance using the Widevine scheme.
@@ -163,7 +176,7 @@ public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstanc
       UUID uuid, MediaDrmCallback callback, HashMap<String, String> optionalKeyRequestParameters,
       Handler eventHandler, EventListener eventListener) throws UnsupportedDrmException {
     return new DefaultDrmSessionManager<>(uuid, FrameworkMediaDrm.newInstance(uuid), callback,
-        optionalKeyRequestParameters, eventHandler, eventListener);
+        optionalKeyRequestParameters, eventHandler, eventListener, false);
   }
 
   /**
@@ -179,7 +192,27 @@ public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstanc
   public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCallback callback,
       HashMap<String, String> optionalKeyRequestParameters, Handler eventHandler,
       EventListener eventListener) {
+    this(uuid, mediaDrm, callback, optionalKeyRequestParameters, eventHandler, eventListener,
+        false);
+  }
+
+  /**
+   * @param uuid The UUID of the drm scheme.
+   * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
+   * @param callback Performs key and provisioning requests.
+   * @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.
+   * @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 multiSession A boolean that specify whether multiple key session support is enabled.
+   *     Default is false.
+   */
+  public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCallback callback,
+      HashMap<String, String> optionalKeyRequestParameters, Handler eventHandler,
+      EventListener eventListener, boolean multiSession) {
     Assertions.checkNotNull(uuid);
+    Assertions.checkNotNull(mediaDrm);
     Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");
     this.uuid = uuid;
     this.mediaDrm = mediaDrm;
@@ -187,7 +220,13 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
     this.optionalKeyRequestParameters = optionalKeyRequestParameters;
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
+    this.multiSession = multiSession;
     mode = MODE_PLAYBACK;
+    sessions = new ArrayList<>();
+    provisioningInProgress = new AtomicBoolean(false);
+    if (multiSession) {
+      mediaDrm.setPropertyString("sessionSharing", "enable");
+    }
   }
 
   /**
@@ -261,7 +300,7 @@ public final void setPropertyByteArray(String key, byte[] value) {
    * @param offlineLicenseKeySetId The key set id of the license to be used with the given mode.
    */
   public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
-    Assertions.checkState(session == null);
+    Assertions.checkState(sessions.isEmpty());
     if (mode == MODE_QUERY || mode == MODE_RELEASE) {
       Assertions.checkNotNull(offlineLicenseKeySetId);
     }
@@ -273,7 +312,7 @@ public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
 
   @Override
   public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
-    SchemeData schemeData = DefaultDrmSession.getSchemeData(drmInitData, uuid);
+    SchemeData schemeData = getSchemeData(drmInitData, uuid);
     if (schemeData == null) {
       // No data for this manager's scheme.
       return false;
@@ -294,22 +333,144 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
   @Override
   public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitData) {
     Assertions.checkState(this.playbackLooper == null || this.playbackLooper == playbackLooper);
-    if (session == null) {
+    if (sessions.isEmpty()) {
       this.playbackLooper = playbackLooper;
-      session = new DefaultDrmSession<T>(uuid, mediaDrm, drmInitData, mode, offlineLicenseKeySetId,
-          optionalKeyRequestParameters, callback, playbackLooper, eventHandler, eventListener);
+      mediaDrmHandler = new MediaDrmHandler(playbackLooper);
+      mediaDrm.setOnEventListener(new MediaDrmEventListener());
+    }
+
+    DefaultDrmSession<T> session = null;
+    byte[] initData = null;
+    String mimeType = null;
+
+    if (offlineLicenseKeySetId == null) {
+      SchemeData data = getSchemeData(drmInitData, uuid);
+      if (data == null) {
+        if (eventHandler != null && eventListener != null) {
+          eventHandler.post(new Runnable() {
+            @Override
+            public void run() {
+              eventListener.onDrmSessionManagerError(new IllegalStateException(
+                  "Media does not support uuid: " + uuid));
+            }
+          });
+        }
+      } else {
+        initData = getSchemeInitData(data, uuid);
+        mimeType = getSchemeMimeType(data, uuid);
+      }
     }
 
+    for (DefaultDrmSession<T> s : sessions) {
+      if (!multiSession || s.canReuse(initData)) {
+        session = s;
+        break;
+      }
+    }
+
+    if (session == null) {
+      session = new DefaultDrmSession<T>(uuid, mediaDrm, initData, mimeType, mode,
+          offlineLicenseKeySetId, optionalKeyRequestParameters, callback, playbackLooper,
+          eventHandler, eventListener, provisioningInProgress, this);
+      sessions.add(session);
+    }
     session.acquire();
     return session;
   }
 
   @Override
   public void releaseSession(DrmSession<T> session) {
-    Assertions.checkState(session == this.session);
-    if (this.session.release()) {
-      this.session = null;
+    DefaultDrmSession<T> drmSession = (DefaultDrmSession<T>) session;
+    if (drmSession.release()) {
+      sessions.remove(drmSession);
     }
+
+    if (sessions.isEmpty()) {
+      mediaDrm.setOnEventListener(null);
+      mediaDrmHandler.removeCallbacksAndMessages(null);
+      mediaDrmHandler = null;
+      playbackLooper = null;
+    }
+  }
+
+  @Override
+  public void onProvisionCompleted() {
+    for (DefaultDrmSession<T> session : sessions) {
+      session.onProvisionCompleted();
+    }
+  }
+
+  /**
+   * Extracts {@link SchemeData} suitable for the given DRM scheme {@link UUID}.
+   *
+   * @param drmInitData The {@link DrmInitData} from which to extract the {@link SchemeData}.
+   * @param uuid The UUID.
+   * @return The extracted {@link SchemeData}, or null if no suitable data is present.
+   */
+  private static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid) {
+    SchemeData schemeData = drmInitData.get(uuid);
+    if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
+      // If present, the Common PSSH box should be used for ClearKey.
+      schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
+    }
+    return schemeData;
+  }
+
+  private static byte[] getSchemeInitData(SchemeData data, UUID uuid) {
+    byte[] schemeInitData = data.data;
+    if (Util.SDK_INT < 21) {
+      // Prior to L the Widevine CDM required data to be extracted from the PSSH atom.
+      byte[] psshData = PsshAtomUtil.parseSchemeSpecificData(schemeInitData, uuid);
+      if (psshData == null) {
+        // Extraction failed. schemeData isn't a Widevine PSSH atom, so leave it unchanged.
+      } else {
+        schemeInitData = psshData;
+      }
+    }
+    return schemeInitData;
+  }
+
+  private static String getSchemeMimeType(SchemeData data, UUID uuid) {
+    String schemeMimeType = data.mimeType;
+    if (Util.SDK_INT < 26 && C.CLEARKEY_UUID.equals(uuid)
+        && (MimeTypes.VIDEO_MP4.equals(schemeMimeType)
+        || MimeTypes.AUDIO_MP4.equals(schemeMimeType))) {
+      // Prior to API level 26 the ClearKey CDM only accepted "cenc" as the scheme for MP4.
+      schemeMimeType = CENC_SCHEME_MIME_TYPE;
+    }
+    return schemeMimeType;
+  }
+
+  @SuppressLint("HandlerLeak")
+  private class MediaDrmHandler extends Handler {
+
+    public MediaDrmHandler(Looper looper) {
+      super(looper);
+    }
+
+    @Override
+    public void handleMessage(Message msg) {
+      byte[] sessionId = (byte[]) msg.obj;
+      for (DefaultDrmSession<T> session : sessions) {
+        if (session.hasSessionId(sessionId)) {
+          session.onMediaDrmEvent(msg.what);
+          return;
+        }
+      }
+    }
+
+  }
+
+  private class MediaDrmEventListener implements OnEventListener<T> {
+
+    @Override
+    public void onEvent(ExoMediaDrm<? extends T> md, byte[] sessionId, int event, int extra,
+        byte[] data) {
+      if (mode == DefaultDrmSessionManager.MODE_PLAYBACK) {
+        mediaDrmHandler.obtainMessage(event, sessionId).sendToTarget();
+      }
+    }
+
   }
 
 }

From fb023da529d9d86ec2f7c921dae7ba084fa50e5c Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 5 Sep 2017 13:06:02 -0700
Subject: [PATCH 196/421] Fix attr inheritance in SimpleExoPlayerView

When creating PlaybackControlView inside SimpleExoPlayerView,
we want certain attributes to be passed through. This lets you
set control attributes on the SimpleExoPlayerView directly. We
don't want all attributes to be propagated though; only our own
custom ones.

Not sure if there's a cleaner way to do this. Pragmatically this
solution seems ... ok :)?

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167619801
---
 .../android/exoplayer2/ui/PlaybackControlView.java     | 10 +++++++---
 .../android/exoplayer2/ui/SimpleExoPlayerView.java     |  8 ++++----
 2 files changed, 11 insertions(+), 7 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 c89feaebf57..9bbb2fa27be 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
@@ -298,16 +298,20 @@ public PlaybackControlView(Context context, AttributeSet attrs) {
   }
 
   public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
+    this(context, attrs, defStyleAttr, attrs);
+  }
 
+  public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr,
+      AttributeSet playbackAttrs) {
+    super(context, attrs, defStyleAttr);
     int controllerLayoutId = R.layout.exo_playback_control_view;
     rewindMs = DEFAULT_REWIND_MS;
     fastForwardMs = DEFAULT_FAST_FORWARD_MS;
     showTimeoutMs = DEFAULT_SHOW_TIMEOUT_MS;
     repeatToggleModes = DEFAULT_REPEAT_TOGGLE_MODES;
     showShuffleButton = false;
-    if (attrs != null) {
-      TypedArray a = context.getTheme().obtainStyledAttributes(attrs,
+    if (playbackAttrs != null) {
+      TypedArray a = context.getTheme().obtainStyledAttributes(playbackAttrs,
           R.styleable.PlaybackControlView, 0, 0);
       try {
         rewindMs = a.getInt(R.styleable.PlaybackControlView_rewind_increment, rewindMs);
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 5b6e11c5e4b..488411550cc 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
@@ -240,7 +240,7 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
       controller = null;
       componentListener = null;
       overlayFrameLayout = null;
-      ImageView logo = new ImageView(context, attrs);
+      ImageView logo = new ImageView(context);
       if (Util.SDK_INT >= 23) {
         configureEditModeLogoV23(getResources(), logo);
       } else {
@@ -330,9 +330,9 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
     if (customController != null) {
       this.controller = customController;
     } else if (controllerPlaceholder != null) {
-      // Note: rewindMs and fastForwardMs are passed via attrs, so we don't need to make explicit
-      // calls to set them.
-      this.controller = new PlaybackControlView(context, attrs);
+      // Propagate attrs as playbackAttrs so that PlaybackControlView's custom attributes are
+      // transferred, but standard FrameLayout attributes (e.g. background) are not.
+      this.controller = new PlaybackControlView(context, null, 0, attrs);
       controller.setLayoutParams(controllerPlaceholder.getLayoutParams());
       ViewGroup parent = ((ViewGroup) controllerPlaceholder.getParent());
       int controllerIndex = parent.indexOfChild(controllerPlaceholder);

From 8ef6a2e7bd4f10c4e1600b67bfc94a1ab00865b7 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 6 Sep 2017 00:14:55 -0700
Subject: [PATCH 197/421] Clear gapless playback metadata for clipped media

Also pass an unresolved end point to ClippingMediaPeriod. This removes some
assertions checking timestamps in the ClippingMediaPeriod, but makes it
possible to identify when the end point is at the end of the media.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167683358
---
 .../android/exoplayer2/source/ClippingMediaPeriod.java   | 9 ++++++++-
 .../android/exoplayer2/source/ClippingMediaSource.java   | 5 +----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
index a8c33b4625e..89af07a3f09 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ClippingMediaPeriod.java
@@ -270,7 +270,14 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
         return C.RESULT_BUFFER_READ;
       }
       int result = stream.readData(formatHolder, buffer, requireFormat);
-      // TODO: Clear gapless playback metadata if a format was read (if applicable).
+      if (result == C.RESULT_FORMAT_READ) {
+        // Clear gapless playback metadata if the start/end points don't match the media.
+        Format format = formatHolder.format;
+        int encoderDelay = startUs != 0 ? 0 : format.encoderDelay;
+        int encoderPadding = endUs != C.TIME_END_OF_SOURCE ? 0 : format.encoderPadding;
+        formatHolder.format = format.copyWithGaplessInfo(encoderDelay, encoderPadding);
+        return C.RESULT_FORMAT_READ;
+      }
       if (endUs != C.TIME_END_OF_SOURCE && ((result == C.RESULT_BUFFER_READ
           && buffer.timeUs >= endUs) || (result == C.RESULT_NOTHING_READ
           && mediaPeriod.getBufferedPositionUs() == C.TIME_END_OF_SOURCE))) {
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 2387b43d5ed..21de83524a3 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
@@ -98,7 +98,7 @@ public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     ClippingMediaPeriod mediaPeriod = new ClippingMediaPeriod(
         mediaSource.createPeriod(id, allocator), enableInitialDiscontinuity);
     mediaPeriods.add(mediaPeriod);
-    mediaPeriod.setClipping(clippingTimeline.startUs, clippingTimeline.endUs);
+    mediaPeriod.setClipping(startUs, endUs);
     return mediaPeriod;
   }
 
@@ -119,9 +119,6 @@ public void releaseSource() {
   public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
     clippingTimeline = new ClippingTimeline(timeline, startUs, endUs);
     sourceListener.onSourceInfoRefreshed(clippingTimeline, manifest);
-    long startUs = clippingTimeline.startUs;
-    long endUs = clippingTimeline.endUs == C.TIME_UNSET ? C.TIME_END_OF_SOURCE
-        : clippingTimeline.endUs;
     int count = mediaPeriods.size();
     for (int i = 0; i < count; i++) {
       mediaPeriods.get(i).setClipping(startUs, endUs);

From 17232f58a339809279c0d7f8432a8014ce72309b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 03:51:04 -0700
Subject: [PATCH 198/421] Fix position reporting during ads when period has
 non-zero window offset.

Reporting incorrect positions for ad playbacks was causing IMA to
think the ad wasn't playing, when in fact it was.

Issue: #3180

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167702032
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java        |  4 +++-
 .../android/exoplayer2/ExoPlayerImpl.java       | 17 ++++++++++++-----
 2 files changed, 15 insertions(+), 6 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 c27ef17b872..87033173def 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
@@ -430,7 +430,9 @@ public VideoProgressUpdate getAdProgress() {
     } else if (!playingAd) {
       return VideoProgressUpdate.VIDEO_TIME_NOT_READY;
     } else {
-      return new VideoProgressUpdate(player.getCurrentPosition(), player.getDuration());
+      long adDuration = player.getDuration();
+      return adDuration == C.TIME_UNSET ? VideoProgressUpdate.VIDEO_TIME_NOT_READY
+          : new VideoProgressUpdate(player.getCurrentPosition(), adDuration);
     }
   }
 
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 7bf0cd5a028..e574bfc1eed 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
@@ -349,8 +349,7 @@ public long getCurrentPosition() {
     if (timeline.isEmpty() || pendingSeekAcks > 0) {
       return maskingWindowPositionMs;
     } else {
-      timeline.getPeriod(playbackInfo.periodId.periodIndex, period);
-      return period.getPositionInWindowMs() + C.usToMs(playbackInfo.positionUs);
+      return playbackInfoPositionUsToWindowPositionMs(playbackInfo.positionUs);
     }
   }
 
@@ -360,8 +359,7 @@ public long getBufferedPosition() {
     if (timeline.isEmpty() || pendingSeekAcks > 0) {
       return maskingWindowPositionMs;
     } else {
-      timeline.getPeriod(playbackInfo.periodId.periodIndex, period);
-      return period.getPositionInWindowMs() + C.usToMs(playbackInfo.bufferedPositionUs);
+      return playbackInfoPositionUsToWindowPositionMs(playbackInfo.bufferedPositionUs);
     }
   }
 
@@ -388,7 +386,7 @@ public boolean isCurrentWindowSeekable() {
 
   @Override
   public boolean isPlayingAd() {
-    return pendingSeekAcks == 0 && playbackInfo.periodId.adGroupIndex != C.INDEX_UNSET;
+    return pendingSeekAcks == 0 && playbackInfo.periodId.isAd();
   }
 
   @Override
@@ -542,4 +540,13 @@ public Object getCurrentManifest() {
     }
   }
 
+  private long playbackInfoPositionUsToWindowPositionMs(long positionUs) {
+    long positionMs = C.usToMs(positionUs);
+    if (!playbackInfo.periodId.isAd()) {
+      timeline.getPeriod(playbackInfo.periodId.periodIndex, period);
+      positionMs += period.getPositionInWindowMs();
+    }
+    return positionMs;
+  }
+
 }

From 013379fd3ee299ab6f24e8d42686af13249d54c2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 05:40:33 -0700
Subject: [PATCH 199/421] Workaround for SurfaceView not being hidden properly

This appears to be fixed in Oreo, but given how harmless
the workaround is we can probably just apply it on all
API levels to be sure.

Issue: #3160

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167709070
---
 .../android/exoplayer2/ui/SimpleExoPlayerView.java       | 9 +++++++++
 1 file changed, 9 insertions(+)

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 488411550cc..8fa264cad15 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
@@ -428,6 +428,15 @@ public void setPlayer(SimpleExoPlayer player) {
     }
   }
 
+  @Override
+  public void setVisibility(int visibility) {
+    super.setVisibility(visibility);
+    if (surfaceView instanceof SurfaceView) {
+      // Work around https://github.com/google/ExoPlayer/issues/3160
+      surfaceView.setVisibility(visibility);
+    }
+  }
+
   /**
    * Sets the resize mode.
    *

From e7992513d3494c273cba15e97a9292527f46f668 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 05:58:56 -0700
Subject: [PATCH 200/421] Remove references to MediaDrm from DefaultDrmSession
 classes

Everything should go through the ExoMediaDrm layer. We still
need to abstract away the android.media exception classes, but
this is left as future work.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167710213
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 23 +++++------
 .../drm/DefaultDrmSessionManager.java         | 19 +++++----
 .../android/exoplayer2/drm/ExoMediaDrm.java   | 39 ++++++++++++++++++-
 .../exoplayer2/drm/FrameworkMediaDrm.java     |  4 +-
 4 files changed, 58 insertions(+), 27 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 d6776c8ed0a..d9550c756c5 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
@@ -18,7 +18,6 @@
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.media.DeniedByServerException;
-import android.media.MediaDrm;
 import android.media.NotProvisionedException;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -36,7 +35,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A {@link DrmSession} that supports playbacks using {@link MediaDrm}.
+ * A {@link DrmSession} that supports playbacks using {@link ExoMediaDrm}.
  */
 @TargetApi(18)
 /* package */ class DefaultDrmSession<T extends ExoMediaCrypto> implements DrmSession<T> {
@@ -227,8 +226,6 @@ private boolean openInternal(boolean allowProvisioning) {
         onError(e);
       }
     } catch (Exception e) {
-      // MediaCryptoException
-      // ResourceBusyException only available on 19+
       onError(e);
     }
 
@@ -278,7 +275,7 @@ private void doLicense() {
       case DefaultDrmSessionManager.MODE_PLAYBACK:
       case DefaultDrmSessionManager.MODE_QUERY:
         if (offlineLicenseKeySetId == null) {
-          postKeyRequest(MediaDrm.KEY_TYPE_STREAMING);
+          postKeyRequest(ExoMediaDrm.KEY_TYPE_STREAMING);
         } else {
           if (restoreKeys()) {
             long licenseDurationRemainingSec = getLicenseDurationRemainingSec();
@@ -286,7 +283,7 @@ private void doLicense() {
                 && licenseDurationRemainingSec <= MAX_LICENSE_DURATION_TO_RENEW) {
               Log.d(TAG, "Offline license has expired or will expire soon. "
                   + "Remaining seconds: " + licenseDurationRemainingSec);
-              postKeyRequest(MediaDrm.KEY_TYPE_OFFLINE);
+              postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE);
             } else if (licenseDurationRemainingSec <= 0) {
               onError(new KeysExpiredException());
             } else {
@@ -305,11 +302,11 @@ public void run() {
         break;
       case DefaultDrmSessionManager.MODE_DOWNLOAD:
         if (offlineLicenseKeySetId == null) {
-          postKeyRequest(MediaDrm.KEY_TYPE_OFFLINE);
+          postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE);
         } else {
           // Renew
           if (restoreKeys()) {
-            postKeyRequest(MediaDrm.KEY_TYPE_OFFLINE);
+            postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE);
           }
         }
         break;
@@ -317,7 +314,7 @@ public void run() {
         // 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(MediaDrm.KEY_TYPE_RELEASE);
+          postKeyRequest(ExoMediaDrm.KEY_TYPE_RELEASE);
         }
         break;
       default:
@@ -345,7 +342,7 @@ private long getLicenseDurationRemainingSec() {
   }
 
   private void postKeyRequest(int type) {
-    byte[] scope = type == MediaDrm.KEY_TYPE_RELEASE ? offlineLicenseKeySetId : sessionId;
+    byte[] scope = type == ExoMediaDrm.KEY_TYPE_RELEASE ? offlineLicenseKeySetId : sessionId;
     try {
       KeyRequest request = mediaDrm.getKeyRequest(scope, initData, mimeType, type,
           optionalKeyRequestParameters);
@@ -439,16 +436,16 @@ public void onMediaDrmEvent(int what) {
       return;
     }
     switch (what) {
-      case MediaDrm.EVENT_KEY_REQUIRED:
+      case ExoMediaDrm.EVENT_KEY_REQUIRED:
         doLicense();
         break;
-      case MediaDrm.EVENT_KEY_EXPIRED:
+      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 MediaDrm.EVENT_PROVISION_REQUIRED:
+      case ExoMediaDrm.EVENT_PROVISION_REQUIRED:
         state = STATE_OPENED;
         postProvisionRequest();
         break;
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 67931d106bb..029b41fde82 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
@@ -17,7 +17,6 @@
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.media.MediaDrm;
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
@@ -40,7 +39,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
- * A {@link DrmSessionManager} that supports playbacks using {@link MediaDrm}.
+ * A {@link DrmSessionManager} that supports playbacks using {@link ExoMediaDrm}.
  */
 @TargetApi(18)
 public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>,
@@ -120,7 +119,7 @@ public interface EventListener {
    *
    * @param callback Performs key and provisioning requests.
    * @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.
+   *     to {@link ExoMediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap)}. May be null.
    * @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.
@@ -166,7 +165,7 @@ public static DefaultDrmSessionManager<FrameworkMediaCrypto> newPlayReadyInstanc
    * @param uuid The UUID of the drm scheme.
    * @param callback Performs key and provisioning requests.
    * @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.
+   *     to {@link ExoMediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap)}. May be null.
    * @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.
@@ -184,7 +183,7 @@ public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstanc
    * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
    * @param callback Performs key and provisioning requests.
    * @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.
+   *     to {@link ExoMediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap)}. May be null.
    * @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.
@@ -201,7 +200,7 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
    * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
    * @param callback Performs key and provisioning requests.
    * @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.
+   *     to {@link ExoMediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap)}. May be null.
    * @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.
@@ -230,7 +229,7 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
   }
 
   /**
-   * Provides access to {@link MediaDrm#getPropertyString(String)}.
+   * Provides access to {@link ExoMediaDrm#getPropertyString(String)}.
    * <p>
    * This method may be called when the manager is in any state.
    *
@@ -242,7 +241,7 @@ public final String getPropertyString(String key) {
   }
 
   /**
-   * Provides access to {@link MediaDrm#setPropertyString(String, String)}.
+   * Provides access to {@link ExoMediaDrm#setPropertyString(String, String)}.
    * <p>
    * This method may be called when the manager is in any state.
    *
@@ -254,7 +253,7 @@ public final void setPropertyString(String key, String value) {
   }
 
   /**
-   * Provides access to {@link MediaDrm#getPropertyByteArray(String)}.
+   * Provides access to {@link ExoMediaDrm#getPropertyByteArray(String)}.
    * <p>
    * This method may be called when the manager is in any state.
    *
@@ -266,7 +265,7 @@ public final byte[] getPropertyByteArray(String key) {
   }
 
   /**
-   * Provides access to {@link MediaDrm#setPropertyByteArray(String, byte[])}.
+   * Provides access to {@link ExoMediaDrm#setPropertyByteArray(String, byte[])}.
    * <p>
    * This method may be called when the manager is in any state.
    *
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 63387f19e16..25b065c543a 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
@@ -15,19 +15,54 @@
  */
 package com.google.android.exoplayer2.drm;
 
+import android.annotation.TargetApi;
 import android.media.DeniedByServerException;
 import android.media.MediaCryptoException;
 import android.media.MediaDrm;
+import android.media.MediaDrmException;
 import android.media.NotProvisionedException;
-import android.media.ResourceBusyException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.UUID;
 
 /**
  * Used to obtain keys for decrypting protected media streams. See {@link android.media.MediaDrm}.
  */
+@TargetApi(18)
 public interface ExoMediaDrm<T extends ExoMediaCrypto> {
 
+  /**
+   * @see MediaDrm#EVENT_KEY_REQUIRED
+   */
+  @SuppressWarnings("InlinedApi")
+  int EVENT_KEY_REQUIRED = MediaDrm.EVENT_KEY_REQUIRED;
+  /**
+   * @see MediaDrm#EVENT_KEY_EXPIRED
+   */
+  @SuppressWarnings("InlinedApi")
+  int EVENT_KEY_EXPIRED = MediaDrm.EVENT_KEY_EXPIRED;
+  /**
+   * @see MediaDrm#EVENT_PROVISION_REQUIRED
+   */
+  @SuppressWarnings("InlinedApi")
+  int EVENT_PROVISION_REQUIRED = MediaDrm.EVENT_PROVISION_REQUIRED;
+
+  /**
+   * @see MediaDrm#KEY_TYPE_STREAMING
+   */
+  @SuppressWarnings("InlinedApi")
+  int KEY_TYPE_STREAMING = MediaDrm.KEY_TYPE_STREAMING;
+  /**
+   * @see MediaDrm#KEY_TYPE_OFFLINE
+   */
+  @SuppressWarnings("InlinedApi")
+  int KEY_TYPE_OFFLINE = MediaDrm.KEY_TYPE_OFFLINE;
+  /**
+   * @see MediaDrm#KEY_TYPE_RELEASE
+   */
+  @SuppressWarnings("InlinedApi")
+  int KEY_TYPE_RELEASE = MediaDrm.KEY_TYPE_RELEASE;
+
   /**
    * @see android.media.MediaDrm.OnEventListener
    */
@@ -69,7 +104,7 @@ interface ProvisionRequest {
   /**
    * @see MediaDrm#openSession()
    */
-  byte[] openSession() throws NotProvisionedException, ResourceBusyException;
+  byte[] openSession() throws MediaDrmException;
 
   /**
    * @see MediaDrm#closeSession(byte[])
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 d664cb69a95..2edd6ff254b 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
@@ -20,8 +20,8 @@
 import android.media.MediaCrypto;
 import android.media.MediaCryptoException;
 import android.media.MediaDrm;
+import android.media.MediaDrmException;
 import android.media.NotProvisionedException;
-import android.media.ResourceBusyException;
 import android.media.UnsupportedSchemeException;
 import android.support.annotation.NonNull;
 import com.google.android.exoplayer2.C;
@@ -79,7 +79,7 @@ public void onEvent(@NonNull MediaDrm md, byte[] sessionId, int event, int extra
   }
 
   @Override
-  public byte[] openSession() throws NotProvisionedException, ResourceBusyException {
+  public byte[] openSession() throws MediaDrmException {
     return mediaDrm.openSession();
   }
 

From d66143d96d3fab350ed67d437acfc927667001ae Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 06:10:02 -0700
Subject: [PATCH 201/421] Add full stops

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167711267
---
 .../android/exoplayer2/extractor/mp4/AtomParsers.java       | 2 +-
 .../android/exoplayer2/mediacodec/MediaCodecUtil.java       | 6 +++---
 .../android/exoplayer2/metadata/MetadataRenderer.java       | 4 ++--
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java   | 2 +-
 .../google/android/exoplayer2/ui/SimpleExoPlayerView.java   | 2 +-
 5 files changed, 8 insertions(+), 8 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 450e0682e69..c754c4b566b 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
@@ -1147,7 +1147,7 @@ private static TrackEncryptionBox parseSchiFromParent(ParsableByteArray parent,
   }
 
   /**
-   * Parses the proj box from sv3d box, as specified by https://github.com/google/spatial-media
+   * Parses the proj box from sv3d box, as specified by https://github.com/google/spatial-media.
    */
   private static byte[] parseProjFromParent(ParsableByteArray parent, int position, int size) {
     int childPosition = position + Atom.HEADER_SIZE;
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 1073e8d9c18..2cd336e9ef5 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
@@ -283,13 +283,13 @@ private static boolean isCodecUsableDecoder(android.media.MediaCodecInfo info, S
       return false;
     }
 
-    // Work around https://github.com/google/ExoPlayer/issues/398
+    // 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/1528 and
-    // https://github.com/google/ExoPlayer/issues/3171
+    // https://github.com/google/ExoPlayer/issues/3171.
     if (Util.SDK_INT < 18 && "OMX.MTK.AUDIO.DECODER.AAC".equals(name)
         && ("a70".equals(Util.DEVICE)
             || ("Xiaomi".equals(Util.MANUFACTURER) && Util.DEVICE.startsWith("HM")))) {
@@ -325,7 +325,7 @@ private static boolean isCodecUsableDecoder(android.media.MediaCodecInfo info, S
       return false;
     }
 
-    // Work around https://github.com/google/ExoPlayer/issues/548
+    // 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)
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 869e9306a5f..7d36d87a9ec 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
@@ -40,8 +40,8 @@ public interface Output extends MetadataOutput {}
 
   private static final int MSG_INVOKE_RENDERER = 0;
   // TODO: Holding multiple pending metadata objects is temporary mitigation against
-  // https://github.com/google/ExoPlayer/issues/1874
-  // It should be removed once this issue has been addressed.
+  // https://github.com/google/ExoPlayer/issues/1874. It should be removed once this issue has been
+  // addressed.
   private static final int MAX_PENDING_METADATA_COUNT = 5;
 
   private final MetadataDecoderFactory decoderFactory;
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 d72619dbe1a..4c1f4c0eb20 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
@@ -979,7 +979,7 @@ private static boolean deviceNeedsAutoFrcWorkaround() {
    * If true is returned then we fall back to releasing and re-instantiating the codec instead.
    */
   private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
-    // Work around https://github.com/google/ExoPlayer/issues/3236
+    // Work around https://github.com/google/ExoPlayer/issues/3236.
     return ("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
         && "OMX.qcom.video.decoder.avc".equals(name);
   }
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 8fa264cad15..9bc4bb5b871 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
@@ -432,7 +432,7 @@ public void setPlayer(SimpleExoPlayer player) {
   public void setVisibility(int visibility) {
     super.setVisibility(visibility);
     if (surfaceView instanceof SurfaceView) {
-      // Work around https://github.com/google/ExoPlayer/issues/3160
+      // Work around https://github.com/google/ExoPlayer/issues/3160.
       surfaceView.setVisibility(visibility);
     }
   }

From c6fa034eba88fe1a7fc62aae3288006ff4f3ad6d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 06:17:09 -0700
Subject: [PATCH 202/421] DecryptionException cleanup + add missing header

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167711928
---
 .../exoplayer2/drm/DecryptionException.java   | 33 ++++++++++++++-----
 .../android/exoplayer2/drm/DrmSession.java    |  4 ++-
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
index 6916b972b22..81cfc263931 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/DecryptionException.java
@@ -1,20 +1,37 @@
+/*
+ * 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.drm;
 
 /**
- * An exception when doing drm decryption using the In-App Drm
+ * Thrown when a non-platform component fails to decrypt data.
  */
 public class DecryptionException extends Exception {
-  private final int errorCode;
 
+  /**
+   * A component specific error code.
+   */
+  public final int errorCode;
+
+  /**
+   * @param errorCode A component specific error code.
+   * @param message The detail message.
+   */
   public DecryptionException(int errorCode, String message) {
     super(message);
     this.errorCode = errorCode;
   }
 
-  /**
-   * Get error code
-   */
-  public int getErrorCode() {
-    return errorCode;
-  }
 }
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 0c17b102fd9..a3ae1d8b712 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
@@ -28,7 +28,9 @@
 @TargetApi(16)
 public interface DrmSession<T extends ExoMediaCrypto> {
 
-  /** Wraps the throwable which is the cause of the error state. */
+  /**
+   * Wraps the throwable which is the cause of the error state.
+   */
   class DrmSessionException extends Exception {
 
     public DrmSessionException(Throwable cause) {

From 7d4190f3c84a223d189d5f0689778b1b047da886 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 07:22:00 -0700
Subject: [PATCH 203/421] Regroup final/non-final vars

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167717715
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 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 d9550c756c5..4f187264a68 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
@@ -58,30 +58,30 @@ public interface EventListener {
   private static final int MSG_KEYS = 1;
   private static final int MAX_LICENSE_DURATION_TO_RENEW = 60;
 
-  private final Handler eventHandler;
-  private final DefaultDrmSessionManager.EventListener eventListener;
   private final ExoMediaDrm<T> mediaDrm;
+  private final byte[] initData;
+  private final String mimeType;
+  private final @DefaultDrmSessionManager.Mode int mode;
   private final HashMap<String, String> optionalKeyRequestParameters;
+  private final Handler eventHandler;
+  private final DefaultDrmSessionManager.EventListener eventListener;
+  private final AtomicBoolean provisioningInProgress;
+  private final EventListener sessionEventListener;
+
   /* package */ final MediaDrmCallback callback;
   /* package */ final UUID uuid;
-  /* package */ PostResponseHandler postResponseHandler;
-  private HandlerThread requestHandlerThread;
-  private Handler postRequestHandler;
 
-  @DefaultDrmSessionManager.Mode
-  private final int mode;
+  private @DrmSession.State int state;
   private int openCount;
-  private final AtomicBoolean provisioningInProgress;
-  private final EventListener sessionEventListener;
-  @DrmSession.State
-  private int state;
+  private HandlerThread requestHandlerThread;
+  private Handler postRequestHandler;
   private T mediaCrypto;
   private DrmSessionException lastException;
-  private final byte[] initData;
-  private final String mimeType;
   private byte[] sessionId;
   private byte[] offlineLicenseKeySetId;
 
+  /* package */ PostResponseHandler postResponseHandler;
+
   /**
    * Instantiates a new DRM session.
    *

From 4869a2506960899a94215df1fbf536e6542ac984 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 6 Sep 2017 07:26:23 -0700
Subject: [PATCH 204/421] Pick up rtmpClient fix

Issue: #3156

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

diff --git a/extensions/rtmp/build.gradle b/extensions/rtmp/build.gradle
index c832cb82e94..7687f03e32e 100644
--- a/extensions/rtmp/build.gradle
+++ b/extensions/rtmp/build.gradle
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     compile project(modulePrefix + 'library-core')
-    compile 'net.butterflytv.utils:rtmp-client:0.2.8'
+    compile 'net.butterflytv.utils:rtmp-client:3.0.0'
 }
 
 ext {

From 7c3fe19d3f5e0a08d855d4564c5c09d9e41d2ba2 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 7 Sep 2017 01:45:56 -0700
Subject: [PATCH 205/421] Migrate remaining tests to Robolectric

Remaining instrumentation tests either use android.os.Handler or rely on assets.
In the latter case, the tests are difficult to migrate due to differences
between the internal and external build systems, and configuration needed in
Android Studio. In addition, SimpleCacheSpanTest remains as an instrumentation
test because it fails due to a problem with string encoding on the internal
build (and two other tests in its package are kept with it because they depend
on it).

This test removes a dependency from testutils on Mockito, as a different
version of Mockito needs to be used for instrumentation tests vs Robolectric
tests, yet both sets of tests need to rely on testutils. Mockito setup is now
done directly in the tests that need it.

Move OggTestData to testutils so it can be used from both instrumentation and
Robolectric tests.

It may be possible to simplify assertions further using Truth but this is left
for possible later changes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167831435
---
 .../drm/OfflineLicenseHelperTest.java         |  14 +-
 .../extractor/ogg/OggExtractorTest.java       |  13 +-
 .../extractor/ogg/OggPacketTest.java          |  43 ++--
 .../exoplayer2/extractor/ogg/OggTestFile.java |   3 +-
 .../extractor/ogg/VorbisBitArrayTest.java     | 139 -------------
 .../extractor/ogg/VorbisReaderTest.java       | 104 ----------
 .../extractor/ogg/VorbisUtilTest.java         | 126 ------------
 .../exoplayer2/text/ttml/TtmlStyleTest.java   | 132 -------------
 .../cache/CachedRegionTrackerTest.java        |  15 +-
 .../exoplayer2/drm/DrmInitDataTest.java       |  82 ++++----
 .../extractor/DefaultExtractorInputTest.java  | 140 ++++++++-----
 .../exoplayer2/extractor/ExtractorTest.java   |  20 +-
 .../extractor/mkv/DefaultEbmlReaderTest.java  |  31 ++-
 .../extractor/mkv/VarintReaderTest.java       |  30 ++-
 .../extractor/mp3/XingSeekerTest.java         |  53 +++--
 .../extractor/mp4/AtomParsersTest.java        |  20 +-
 .../extractor/mp4/PsshAtomUtilTest.java       |  31 ++-
 .../ogg/DefaultOggSeekerUtilMethodsTest.java  |  78 +++++---
 .../extractor/ogg/OggPageHeaderTest.java      |  54 +++--
 .../extractor/ogg/VorbisBitArrayTest.java     | 155 +++++++++++++++
 .../extractor/ogg/VorbisReaderTest.java       | 117 +++++++++++
 .../extractor/ogg/VorbisUtilTest.java         | 146 ++++++++++++++
 .../extractor/ts/SectionReaderTest.java       |  53 +++--
 .../emsg/EventMessageDecoderTest.java         |  25 ++-
 .../metadata/emsg/EventMessageTest.java       |  14 +-
 .../metadata/id3/ChapterFrameTest.java        |  14 +-
 .../metadata/id3/ChapterTocFrameTest.java     |  14 +-
 .../metadata/id3/Id3DecoderTest.java          | 135 +++++++------
 .../scte35/SpliceInfoDecoderTest.java         |  78 ++++----
 .../ProgressiveDownloadActionTest.java        | 143 ++++++++++++++
 .../exoplayer2/source/SampleQueueTest.java    | 146 ++++++++------
 .../exoplayer2/source/ShuffleOrderTest.java   |  43 ++--
 .../text/ttml/TtmlRenderUtilTest.java         |  62 ++++--
 .../exoplayer2/text/ttml/TtmlStyleTest.java   | 155 +++++++++++++++
 .../exoplayer2/text/webvtt/CssParserTest.java | 115 ++++++-----
 .../text/webvtt/Mp4WebvttDecoderTest.java     |  38 ++--
 .../text/webvtt/WebvttCueParserTest.java      | 184 ++++++++++--------
 .../text/webvtt/WebvttSubtitleTest.java       |  76 +++++---
 .../MappingTrackSelectorTest.java             |  38 ++--
 .../upstream/ByteArrayDataSourceTest.java     |  42 ++--
 .../upstream/DataSchemeDataSourceTest.java    |  46 +++--
 .../upstream/DataSourceAsserts.java           |  50 +++++
 .../upstream/DataSourceInputStreamTest.java   |  51 +++--
 .../upstream/cache/CacheAsserts.java          | 115 +++++++++++
 .../upstream/cache/CacheDataSourceTest.java   |  74 ++++---
 .../upstream/cache/CacheDataSourceTest2.java  |  37 ++--
 .../upstream/cache/CacheUtilTest.java         |  68 +++++--
 .../upstream/cache/SimpleCacheTest.java       | 105 ++++++----
 .../crypto/AesFlushingCipherTest.java         |  63 +++---
 .../exoplayer2/source/dash/MockitoUtil.java   |  38 ++++
 .../dash/offline/DashDownloaderTest.java      |   3 +-
 .../exoplayer2/testutil/OggTestData.java      |  10 +-
 .../android/exoplayer2/testutil/TestUtil.java |   9 -
 53 files changed, 2268 insertions(+), 1322 deletions(-)
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java (61%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java (78%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/ExtractorTest.java (60%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java (92%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java (92%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java (67%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java (79%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java (56%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java (72%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java (59%)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java (81%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java (70%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java (74%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java (75%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java (76%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java (66%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java (73%)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/source/SampleQueueTest.java (86%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java (78%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java (59%)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java (61%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java (82%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java (50%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java (78%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java (87%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java (82%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java (61%)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceAsserts.java
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java (65%)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheAsserts.java
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java (77%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java (86%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java (83%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java (69%)
 rename library/core/src/{androidTest => test}/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java (77%)
 create mode 100644 library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/MockitoUtil.java
 rename library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java => testutils/src/main/java/com/google/android/exoplayer2/testutil/OggTestData.java (99%)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 821656475d4..35bfbe613ac 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -23,10 +23,10 @@
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
-import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import java.util.HashMap;
 import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 
 /**
  * Tests {@link OfflineLicenseHelper}.
@@ -40,7 +40,7 @@ public class OfflineLicenseHelperTest extends InstrumentationTestCase {
 
   @Override
   protected void setUp() throws Exception {
-    TestUtil.setUpMockito(this);
+    setUpMockito(this);
     when(mediaDrm.openSession()).thenReturn(new byte[] {1, 2, 3});
     offlineLicenseHelper = new OfflineLicenseHelper<>(mediaDrm, mediaDrmCallback, null);
   }
@@ -157,4 +157,14 @@ private static DrmInitData newDrmInitData() {
         new byte[] {1, 4, 7, 0, 3, 6}));
   }
 
+  /**
+   * Sets up Mockito for an instrumentation test.
+   */
+  private static void setUpMockito(InstrumentationTestCase instrumentationTestCase) {
+    // Workaround for https://code.google.com/p/dexmaker/issues/detail?id=2.
+    System.setProperty("dexmaker.dexcache",
+        instrumentationTestCase.getInstrumentation().getTargetContext().getCacheDir().getPath());
+    MockitoAnnotations.initMocks(instrumentationTestCase);
+  }
+
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
index 3be23422ccf..b1ebdf32618 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggExtractorTest.java
@@ -20,6 +20,7 @@
 import com.google.android.exoplayer2.testutil.ExtractorAsserts;
 import com.google.android.exoplayer2.testutil.ExtractorAsserts.ExtractorFactory;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.OggTestData;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 
@@ -56,7 +57,7 @@ public void testVorbis() throws Exception {
 
   public void testSniffVorbis() throws Exception {
     byte[] data = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x02, 0, 1000, 1),
+        OggTestData.buildOggHeader(0x02, 0, 1000, 1),
         TestUtil.createByteArray(7),  // Laces
         new byte[] {0x01, 'v', 'o', 'r', 'b', 'i', 's'});
     assertTrue(sniff(data));
@@ -64,7 +65,7 @@ public void testSniffVorbis() throws Exception {
 
   public void testSniffFlac() throws Exception {
     byte[] data = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x02, 0, 1000, 1),
+        OggTestData.buildOggHeader(0x02, 0, 1000, 1),
         TestUtil.createByteArray(5),  // Laces
         new byte[] {0x7F, 'F', 'L', 'A', 'C'});
     assertTrue(sniff(data));
@@ -72,26 +73,26 @@ public void testSniffFlac() throws Exception {
 
   public void testSniffFailsOpusFile() throws Exception {
     byte[] data = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x02, 0, 1000, 0x00),
+        OggTestData.buildOggHeader(0x02, 0, 1000, 0x00),
         new byte[] {'O', 'p', 'u', 's'});
     assertFalse(sniff(data));
   }
 
   public void testSniffFailsInvalidOggHeader() throws Exception {
-    byte[] data = TestData.buildOggHeader(0x00, 0, 1000, 0x00);
+    byte[] data = OggTestData.buildOggHeader(0x00, 0, 1000, 0x00);
     assertFalse(sniff(data));
   }
 
   public void testSniffInvalidHeader() throws Exception {
     byte[] data = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x02, 0, 1000, 1),
+        OggTestData.buildOggHeader(0x02, 0, 1000, 1),
         TestUtil.createByteArray(7),  // Laces
         new byte[] {0x7F, 'X', 'o', 'r', 'b', 'i', 's'});
     assertFalse(sniff(data));
   }
 
   public void testSniffFailsEOF() throws Exception {
-    byte[] data = TestData.buildOggHeader(0x02, 0, 1000, 0x00);
+    byte[] data = OggTestData.buildOggHeader(0x02, 0, 1000, 0x00);
     assertFalse(sniff(data));
   }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
index 991d31ff036..186b842babe 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPacketTest.java
@@ -18,6 +18,7 @@
 import android.test.InstrumentationTestCase;
 import android.test.MoreAsserts;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.OggTestData;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.io.IOException;
@@ -47,20 +48,20 @@ public void testReadPacketsWithEmptyPage() throws Exception {
     byte[] thirdPacket = TestUtil.buildTestData(256, random);
     byte[] fourthPacket = TestUtil.buildTestData(271, random);
 
-    FakeExtractorInput input = TestData.createInput(
+    FakeExtractorInput input = OggTestData.createInput(
         TestUtil.joinByteArrays(
             // First page with a single packet.
-            TestData.buildOggHeader(0x02,  0, 1000, 0x01),
+            OggTestData.buildOggHeader(0x02,  0, 1000, 0x01),
             TestUtil.createByteArray(0x08), // Laces
             firstPacket,
             // Second page with a single packet.
-            TestData.buildOggHeader(0x00,  16, 1001, 0x02),
+            OggTestData.buildOggHeader(0x00,  16, 1001, 0x02),
             TestUtil.createByteArray(0xFF, 0x11), // Laces
             secondPacket,
             // Third page with zero packets.
-            TestData.buildOggHeader(0x00,  16, 1002, 0x00),
+            OggTestData.buildOggHeader(0x00,  16, 1002, 0x00),
             // Fourth page with two packets.
-            TestData.buildOggHeader(0x04,  128, 1003, 0x04),
+            OggTestData.buildOggHeader(0x04,  128, 1003, 0x04),
             TestUtil.createByteArray(0xFF, 0x01, 0xFF, 0x10), // Laces
             thirdPacket,
             fourthPacket), true);
@@ -107,9 +108,9 @@ public void testReadPacketWithZeroSizeTerminator() throws Exception {
     byte[] firstPacket = TestUtil.buildTestData(255, random);
     byte[] secondPacket = TestUtil.buildTestData(8, random);
 
-    FakeExtractorInput input = TestData.createInput(
+    FakeExtractorInput input = OggTestData.createInput(
         TestUtil.joinByteArrays(
-            TestData.buildOggHeader(0x06, 0, 1000, 0x04),
+            OggTestData.buildOggHeader(0x06, 0, 1000, 0x04),
             TestUtil.createByteArray(0xFF, 0x00, 0x00, 0x08), // Laces.
             firstPacket,
             secondPacket), true);
@@ -122,14 +123,14 @@ public void testReadPacketWithZeroSizeTerminator() throws Exception {
   public void testReadContinuedPacketOverTwoPages() throws Exception {
     byte[] firstPacket = TestUtil.buildTestData(518);
 
-    FakeExtractorInput input = TestData.createInput(
+    FakeExtractorInput input = OggTestData.createInput(
         TestUtil.joinByteArrays(
             // First page.
-            TestData.buildOggHeader(0x02, 0, 1000, 0x02),
+            OggTestData.buildOggHeader(0x02, 0, 1000, 0x02),
             TestUtil.createByteArray(0xFF, 0xFF), // Laces.
             Arrays.copyOf(firstPacket, 510),
             // Second page (continued packet).
-            TestData.buildOggHeader(0x05, 10, 1001, 0x01),
+            OggTestData.buildOggHeader(0x05, 10, 1001, 0x01),
             TestUtil.createByteArray(0x08), // Laces.
             Arrays.copyOfRange(firstPacket, 510, 510 + 8)), true);
 
@@ -144,22 +145,22 @@ public void testReadContinuedPacketOverTwoPages() throws Exception {
   public void testReadContinuedPacketOverFourPages() throws Exception {
     byte[] firstPacket = TestUtil.buildTestData(1028);
 
-    FakeExtractorInput input = TestData.createInput(
+    FakeExtractorInput input = OggTestData.createInput(
         TestUtil.joinByteArrays(
             // First page.
-            TestData.buildOggHeader(0x02, 0, 1000, 0x02),
+            OggTestData.buildOggHeader(0x02, 0, 1000, 0x02),
             TestUtil.createByteArray(0xFF, 0xFF), // Laces.
             Arrays.copyOf(firstPacket, 510),
             // Second page (continued packet).
-            TestData.buildOggHeader(0x01, 10, 1001, 0x01),
+            OggTestData.buildOggHeader(0x01, 10, 1001, 0x01),
             TestUtil.createByteArray(0xFF), // Laces.
             Arrays.copyOfRange(firstPacket, 510, 510 + 255),
             // Third page (continued packet).
-            TestData.buildOggHeader(0x01, 10, 1002, 0x01),
+            OggTestData.buildOggHeader(0x01, 10, 1002, 0x01),
             TestUtil.createByteArray(0xFF), // Laces.
             Arrays.copyOfRange(firstPacket, 510 + 255, 510 + 255 + 255),
             // Fourth page (continued packet).
-            TestData.buildOggHeader(0x05, 10, 1003, 0x01),
+            OggTestData.buildOggHeader(0x05, 10, 1003, 0x01),
             TestUtil.createByteArray(0x08), // Laces.
             Arrays.copyOfRange(firstPacket, 510 + 255 + 255, 510 + 255 + 255 + 8)), true);
 
@@ -174,10 +175,10 @@ public void testReadContinuedPacketOverFourPages() throws Exception {
   public void testReadDiscardContinuedPacketAtStart() throws Exception {
     byte[] pageBody = TestUtil.buildTestData(256 + 8);
 
-    FakeExtractorInput input = TestData.createInput(
+    FakeExtractorInput input = OggTestData.createInput(
         TestUtil.joinByteArrays(
             // Page with a continued packet at start.
-            TestData.buildOggHeader(0x01, 10, 1001, 0x03),
+            OggTestData.buildOggHeader(0x01, 10, 1001, 0x03),
             TestUtil.createByteArray(255, 1, 8), // Laces.
             pageBody), true);
 
@@ -191,15 +192,15 @@ public void testReadZeroSizedPacketsAtEndOfStream() throws Exception {
     byte[] secondPacket = TestUtil.buildTestData(8, random);
     byte[] thirdPacket = TestUtil.buildTestData(8, random);
 
-    FakeExtractorInput input = TestData.createInput(
+    FakeExtractorInput input = OggTestData.createInput(
         TestUtil.joinByteArrays(
-            TestData.buildOggHeader(0x02, 0, 1000, 0x01),
+            OggTestData.buildOggHeader(0x02, 0, 1000, 0x01),
             TestUtil.createByteArray(0x08), // Laces.
             firstPacket,
-            TestData.buildOggHeader(0x04, 0, 1001, 0x03),
+            OggTestData.buildOggHeader(0x04, 0, 1001, 0x03),
             TestUtil.createByteArray(0x08, 0x00, 0x00), // Laces.
             secondPacket,
-            TestData.buildOggHeader(0x04, 0, 1002, 0x03),
+            OggTestData.buildOggHeader(0x04, 0, 1002, 0x03),
             TestUtil.createByteArray(0x08, 0x00, 0x00), // Laces.
             thirdPacket), true);
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java
index d5d187ee7c4..6d839a8355e 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggTestFile.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import com.google.android.exoplayer2.testutil.OggTestData;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.util.ArrayList;
 import java.util.Random;
@@ -68,7 +69,7 @@ public static OggTestFile generate(Random random, int pageCount) {
       }
       granule += random.nextInt(MAX_GRANULES_IN_PAGE - 1) + 1;
       int pageSegmentCount = random.nextInt(MAX_SEGMENT_COUNT);
-      byte[] header = TestData.buildOggHeader(headerType, granule, 0, pageSegmentCount);
+      byte[] header = OggTestData.buildOggHeader(headerType, granule, 0, pageSegmentCount);
       fileData.add(header);
       fileSize += header.length;
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
deleted file mode 100644
index a24cb1599ba..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
+++ /dev/null
@@ -1,139 +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.extractor.ogg;
-
-import com.google.android.exoplayer2.testutil.TestUtil;
-import junit.framework.TestCase;
-
-/**
- * Unit test for {@link VorbisBitArray}.
- */
-public final class VorbisBitArrayTest extends TestCase {
-
-  public void testReadBit() {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x5c, 0x50));
-    assertFalse(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-  }
-
-  public void testSkipBits() {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F));
-    bitArray.skipBits(10);
-    assertEquals(10, bitArray.getPosition());
-    assertTrue(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-    bitArray.skipBits(1);
-    assertEquals(14, bitArray.getPosition());
-    assertFalse(bitArray.readBit());
-    assertFalse(bitArray.readBit());
-  }
-
-  public void testGetPosition() throws Exception {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F));
-    assertEquals(0, bitArray.getPosition());
-    bitArray.readBit();
-    assertEquals(1, bitArray.getPosition());
-    bitArray.readBit();
-    bitArray.readBit();
-    bitArray.skipBits(4);
-    assertEquals(7, bitArray.getPosition());
-  }
-
-  public void testSetPosition() throws Exception {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F));
-    assertEquals(0, bitArray.getPosition());
-    bitArray.setPosition(4);
-    assertEquals(4, bitArray.getPosition());
-    bitArray.setPosition(15);
-    assertFalse(bitArray.readBit());
-  }
-
-  public void testReadInt32() {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F, 0xF0, 0x0F));
-    assertEquals(0x0FF00FF0, bitArray.readBits(32));
-    bitArray = new VorbisBitArray(TestUtil.createByteArray(0x0F, 0xF0, 0x0F, 0xF0));
-    assertEquals(0xF00FF00F, bitArray.readBits(32));
-  }
-
-  public void testReadBits() throws Exception {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x03, 0x22));
-    assertEquals(3, bitArray.readBits(2));
-    bitArray.skipBits(6);
-    assertEquals(2, bitArray.readBits(2));
-    bitArray.skipBits(2);
-    assertEquals(2, bitArray.readBits(2));
-    bitArray.reset();
-    assertEquals(0x2203, bitArray.readBits(16));
-  }
-
-  public void testRead4BitsBeyondBoundary() throws Exception {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x2e, 0x10));
-    assertEquals(0x2e, bitArray.readBits(7));
-    assertEquals(7, bitArray.getPosition());
-    assertEquals(0x0, bitArray.readBits(4));
-  }
-
-  public void testReadBitsBeyondByteBoundaries() throws Exception {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xFF, 0x0F, 0xFF, 0x0F));
-    assertEquals(0x0FFF0FFF, bitArray.readBits(32));
-
-    bitArray.reset();
-    bitArray.skipBits(4);
-    assertEquals(0xF0FF, bitArray.readBits(16));
-
-    bitArray.reset();
-    bitArray.skipBits(6);
-    assertEquals(0xc3F, bitArray.readBits(12));
-
-    bitArray.reset();
-    bitArray.skipBits(6);
-    assertTrue(bitArray.readBit());
-    assertTrue(bitArray.readBit());
-    assertEquals(24, bitArray.bitsLeft());
-
-    bitArray.reset();
-    bitArray.skipBits(10);
-    assertEquals(3, bitArray.readBits(5));
-    assertEquals(15, bitArray.getPosition());
-  }
-
-  public void testReadBitsIllegalLengths() throws Exception {
-    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x03, 0x22, 0x30));
-
-    // reading zero bits gets 0 without advancing position
-    // (like a zero-bit read is defined to yield zer0)
-    assertEquals(0, bitArray.readBits(0));
-    assertEquals(0, bitArray.getPosition());
-    bitArray.readBit();
-    assertEquals(1, bitArray.getPosition());
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
deleted file mode 100644
index c3165b34f68..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
+++ /dev/null
@@ -1,104 +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.extractor.ogg;
-
-import com.google.android.exoplayer2.extractor.ExtractorInput;
-import com.google.android.exoplayer2.extractor.ogg.VorbisReader.VorbisSetup;
-import com.google.android.exoplayer2.testutil.FakeExtractorInput;
-import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
-import com.google.android.exoplayer2.util.ParsableByteArray;
-import java.io.IOException;
-import junit.framework.TestCase;
-
-/**
- * Unit test for {@link VorbisReader}.
- */
-public final class VorbisReaderTest extends TestCase {
-
-  public void testReadBits() throws Exception {
-    assertEquals(0, VorbisReader.readBits((byte) 0x00, 2, 2));
-    assertEquals(1, VorbisReader.readBits((byte) 0x02, 1, 1));
-    assertEquals(15, VorbisReader.readBits((byte) 0xF0, 4, 4));
-    assertEquals(1, VorbisReader.readBits((byte) 0x80, 1, 7));
-  }
-
-  public void testAppendNumberOfSamples() throws Exception {
-    ParsableByteArray buffer = new ParsableByteArray(4);
-    buffer.setLimit(0);
-    VorbisReader.appendNumberOfSamples(buffer, 0x01234567);
-    assertEquals(4, buffer.limit());
-    assertEquals(0x67, buffer.data[0]);
-    assertEquals(0x45, buffer.data[1]);
-    assertEquals(0x23, buffer.data[2]);
-    assertEquals(0x01, buffer.data[3]);
-  }
-
-  public void testReadSetupHeadersWithIOExceptions() throws IOException, InterruptedException {
-    byte[] data = TestData.getVorbisHeaderPages();
-    ExtractorInput input = new FakeExtractorInput.Builder().setData(data).setSimulateIOErrors(true)
-        .setSimulateUnknownLength(true).setSimulatePartialReads(true).build();
-
-    VorbisReader reader = new VorbisReader();
-    VorbisReader.VorbisSetup vorbisSetup = readSetupHeaders(reader, input);
-
-    assertNotNull(vorbisSetup.idHeader);
-    assertNotNull(vorbisSetup.commentHeader);
-    assertNotNull(vorbisSetup.setupHeaderData);
-    assertNotNull(vorbisSetup.modes);
-
-    assertEquals(45, vorbisSetup.commentHeader.length);
-    assertEquals(30, vorbisSetup.idHeader.data.length);
-    assertEquals(3597, vorbisSetup.setupHeaderData.length);
-
-    assertEquals(-1, vorbisSetup.idHeader.bitrateMax);
-    assertEquals(-1, vorbisSetup.idHeader.bitrateMin);
-    assertEquals(66666, vorbisSetup.idHeader.bitrateNominal);
-    assertEquals(512, vorbisSetup.idHeader.blockSize0);
-    assertEquals(1024, vorbisSetup.idHeader.blockSize1);
-    assertEquals(2, vorbisSetup.idHeader.channels);
-    assertTrue(vorbisSetup.idHeader.framingFlag);
-    assertEquals(22050, vorbisSetup.idHeader.sampleRate);
-    assertEquals(0, vorbisSetup.idHeader.version);
-
-    assertEquals("Xiph.Org libVorbis I 20030909", vorbisSetup.commentHeader.vendor);
-    assertEquals(1, vorbisSetup.iLogModes);
-
-    assertEquals(data[data.length - 1],
-        vorbisSetup.setupHeaderData[vorbisSetup.setupHeaderData.length - 1]);
-
-    assertFalse(vorbisSetup.modes[0].blockFlag);
-    assertTrue(vorbisSetup.modes[1].blockFlag);
-  }
-
-  private static VorbisSetup readSetupHeaders(VorbisReader reader, ExtractorInput input)
-      throws IOException, InterruptedException {
-    OggPacket oggPacket = new OggPacket();
-    while (true) {
-      try {
-        if (!oggPacket.populate(input)) {
-          fail();
-        }
-        VorbisSetup vorbisSetup = reader.readSetupHeaders(oggPacket.getPayload());
-        if (vorbisSetup != null) {
-          return vorbisSetup;
-        }
-      } catch (SimulatedIOException e) {
-        // Ignore.
-      }
-    }
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
deleted file mode 100644
index ddbfee84469..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
+++ /dev/null
@@ -1,126 +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.extractor.ogg;
-
-import com.google.android.exoplayer2.ParserException;
-import com.google.android.exoplayer2.util.ParsableByteArray;
-import junit.framework.TestCase;
-
-/**
- * Unit test for {@link VorbisUtil}.
- */
-public final class VorbisUtilTest extends TestCase {
-
-  public void testILog() throws Exception {
-    assertEquals(0, VorbisUtil.iLog(0));
-    assertEquals(1, VorbisUtil.iLog(1));
-    assertEquals(2, VorbisUtil.iLog(2));
-    assertEquals(2, VorbisUtil.iLog(3));
-    assertEquals(3, VorbisUtil.iLog(4));
-    assertEquals(3, VorbisUtil.iLog(5));
-    assertEquals(4, VorbisUtil.iLog(8));
-    assertEquals(0, VorbisUtil.iLog(-1));
-    assertEquals(0, VorbisUtil.iLog(-122));
-  }
-
-  public void testReadIdHeader() throws Exception {
-    byte[] data = TestData.getIdentificationHeaderData();
-    ParsableByteArray headerData = new ParsableByteArray(data, data.length);
-    VorbisUtil.VorbisIdHeader vorbisIdHeader =
-        VorbisUtil.readVorbisIdentificationHeader(headerData);
-
-    assertEquals(22050, vorbisIdHeader.sampleRate);
-    assertEquals(0, vorbisIdHeader.version);
-    assertTrue(vorbisIdHeader.framingFlag);
-    assertEquals(2, vorbisIdHeader.channels);
-    assertEquals(512, vorbisIdHeader.blockSize0);
-    assertEquals(1024, vorbisIdHeader.blockSize1);
-    assertEquals(-1, vorbisIdHeader.bitrateMax);
-    assertEquals(-1, vorbisIdHeader.bitrateMin);
-    assertEquals(66666, vorbisIdHeader.bitrateNominal);
-    assertEquals(66666, vorbisIdHeader.getApproximateBitrate());
-  }
-
-  public void testReadCommentHeader() throws ParserException {
-    byte[] data = TestData.getCommentHeaderDataUTF8();
-    ParsableByteArray headerData = new ParsableByteArray(data, data.length);
-    VorbisUtil.CommentHeader commentHeader = VorbisUtil.readVorbisCommentHeader(headerData);
-
-    assertEquals("Xiph.Org libVorbis I 20120203 (Omnipresent)", commentHeader.vendor);
-    assertEquals(3, commentHeader.comments.length);
-    assertEquals("ALBUM=äö", commentHeader.comments[0]);
-    assertEquals("TITLE=A sample song", commentHeader.comments[1]);
-    assertEquals("ARTIST=Google", commentHeader.comments[2]);
-  }
-
-  public void testReadVorbisModes() throws ParserException {
-    byte[] data = TestData.getSetupHeaderData();
-    ParsableByteArray headerData = new ParsableByteArray(data, data.length);
-    VorbisUtil.Mode[] modes = VorbisUtil.readVorbisModes(headerData, 2);
-
-    assertEquals(2, modes.length);
-    assertEquals(false, modes[0].blockFlag);
-    assertEquals(0, modes[0].mapping);
-    assertEquals(0, modes[0].transformType);
-    assertEquals(0, modes[0].windowType);
-    assertEquals(true, modes[1].blockFlag);
-    assertEquals(1, modes[1].mapping);
-    assertEquals(0, modes[1].transformType);
-    assertEquals(0, modes[1].windowType);
-  }
-
-  public void testVerifyVorbisHeaderCapturePattern() throws ParserException {
-    ParsableByteArray header = new ParsableByteArray(
-        new byte[] {0x01, 'v', 'o', 'r', 'b', 'i', 's'});
-    assertEquals(true, VorbisUtil.verifyVorbisHeaderCapturePattern(0x01, header, false));
-  }
-
-  public void testVerifyVorbisHeaderCapturePatternInvalidHeader() {
-    ParsableByteArray header = new ParsableByteArray(
-        new byte[] {0x01, 'v', 'o', 'r', 'b', 'i', 's'});
-    try {
-      VorbisUtil.verifyVorbisHeaderCapturePattern(0x99, header, false);
-      fail();
-    } catch (ParserException e) {
-      assertEquals("expected header type 99", e.getMessage());
-    }
-  }
-
-  public void testVerifyVorbisHeaderCapturePatternInvalidHeaderQuite() throws ParserException {
-    ParsableByteArray header = new ParsableByteArray(
-        new byte[] {0x01, 'v', 'o', 'r', 'b', 'i', 's'});
-    assertFalse(VorbisUtil.verifyVorbisHeaderCapturePattern(0x99, header, true));
-  }
-
-  public void testVerifyVorbisHeaderCapturePatternInvalidPattern() {
-    ParsableByteArray header = new ParsableByteArray(
-        new byte[] {0x01, 'x', 'v', 'o', 'r', 'b', 'i', 's'});
-    try {
-      VorbisUtil.verifyVorbisHeaderCapturePattern(0x01, header, false);
-      fail();
-    } catch (ParserException e) {
-      assertEquals("expected characters 'vorbis'", e.getMessage());
-    }
-  }
-
-  public void testVerifyVorbisHeaderCapturePatternQuiteInvalidPatternQuite()
-      throws ParserException {
-    ParsableByteArray header = new ParsableByteArray(
-        new byte[] {0x01, 'x', 'v', 'o', 'r', 'b', 'i', 's'});
-    assertFalse(VorbisUtil.verifyVorbisHeaderCapturePattern(0x01, header, true));
-  }
-
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
deleted file mode 100644
index 1690371a47e..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
+++ /dev/null
@@ -1,132 +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.text.ttml;
-
-import android.graphics.Color;
-import android.test.InstrumentationTestCase;
-
-/**
- * Unit test for {@link TtmlStyle}.
- */
-public final class TtmlStyleTest extends InstrumentationTestCase {
-
-    private static final String FONT_FAMILY = "serif";
-    private static final String ID = "id";
-    public static final int FOREGROUND_COLOR = Color.WHITE;
-    public static final int BACKGROUND_COLOR = Color.BLACK;
-    private TtmlStyle style;
-
-    @Override
-    public void setUp() throws Exception {
-        super.setUp();
-        style = new TtmlStyle();
-    }
-
-    public void testInheritStyle() {
-        style.inherit(createAncestorStyle());
-        assertNull("id must not be inherited", style.getId());
-        assertTrue(style.isUnderline());
-        assertTrue(style.isLinethrough());
-        assertEquals(TtmlStyle.STYLE_BOLD_ITALIC, style.getStyle());
-        assertEquals(FONT_FAMILY, style.getFontFamily());
-        assertEquals(Color.WHITE, style.getFontColor());
-        assertFalse("do not inherit backgroundColor", style.hasBackgroundColor());
-    }
-
-    public void testChainStyle() {
-        style.chain(createAncestorStyle());
-        assertNull("id must not be inherited", style.getId());
-        assertTrue(style.isUnderline());
-        assertTrue(style.isLinethrough());
-        assertEquals(TtmlStyle.STYLE_BOLD_ITALIC, style.getStyle());
-        assertEquals(FONT_FAMILY, style.getFontFamily());
-        assertEquals(FOREGROUND_COLOR, style.getFontColor());
-        // do inherit backgroundColor when chaining
-        assertEquals("do not inherit backgroundColor when chaining",
-            BACKGROUND_COLOR, style.getBackgroundColor());
-    }
-
-    private TtmlStyle createAncestorStyle() {
-        TtmlStyle ancestor = new TtmlStyle();
-        ancestor.setId(ID);
-        ancestor.setItalic(true);
-        ancestor.setBold(true);
-        ancestor.setBackgroundColor(BACKGROUND_COLOR);
-        ancestor.setFontColor(FOREGROUND_COLOR);
-        ancestor.setLinethrough(true);
-        ancestor.setUnderline(true);
-        ancestor.setFontFamily(FONT_FAMILY);
-        return ancestor;
-    }
-
-    public void testStyle() {
-        assertEquals(TtmlStyle.UNSPECIFIED, style.getStyle());
-        style.setItalic(true);
-        assertEquals(TtmlStyle.STYLE_ITALIC, style.getStyle());
-        style.setBold(true);
-        assertEquals(TtmlStyle.STYLE_BOLD_ITALIC, style.getStyle());
-        style.setItalic(false);
-        assertEquals(TtmlStyle.STYLE_BOLD, style.getStyle());
-        style.setBold(false);
-        assertEquals(TtmlStyle.STYLE_NORMAL, style.getStyle());
-    }
-
-    public void testLinethrough() {
-        assertFalse(style.isLinethrough());
-        style.setLinethrough(true);
-        assertTrue(style.isLinethrough());
-        style.setLinethrough(false);
-        assertFalse(style.isLinethrough());
-    }
-
-    public void testUnderline() {
-        assertFalse(style.isUnderline());
-        style.setUnderline(true);
-        assertTrue(style.isUnderline());
-        style.setUnderline(false);
-        assertFalse(style.isUnderline());
-    }
-
-    public void testFontFamily() {
-        assertNull(style.getFontFamily());
-        style.setFontFamily(FONT_FAMILY);
-        assertEquals(FONT_FAMILY, style.getFontFamily());
-        style.setFontFamily(null);
-        assertNull(style.getFontFamily());
-    }
-
-    public void testColor() {
-        assertFalse(style.hasFontColor());
-        style.setFontColor(Color.BLACK);
-        assertEquals(Color.BLACK, style.getFontColor());
-        assertTrue(style.hasFontColor());
-    }
-
-    public void testBackgroundColor() {
-        assertFalse(style.hasBackgroundColor());
-        style.setBackgroundColor(Color.BLACK);
-        assertEquals(Color.BLACK, style.getBackgroundColor());
-        assertTrue(style.hasBackgroundColor());
-    }
-
-    public void testId() {
-        assertNull(style.getId());
-        style.setId(ID);
-        assertEquals(ID, style.getId());
-        style.setId(null);
-        assertNull(style.getId());
-    }
-}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
index f2e199578cc..472b5c724ba 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CachedRegionTrackerTest.java
@@ -17,11 +17,11 @@
 
 import android.test.InstrumentationTestCase;
 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.IOException;
 import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
 
 /**
  * Tests for {@link CachedRegionTracker}.
@@ -46,10 +46,9 @@ public final class CachedRegionTrackerTest extends InstrumentationTestCase {
 
   @Override
   protected void setUp() throws Exception {
-    TestUtil.setUpMockito(this);
+    setUpMockito(this);
 
     tracker = new CachedRegionTracker(cache, CACHE_KEY, CHUNK_INDEX);
-
     cacheDir = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
     index = new CachedContentIndex(cacheDir);
   }
@@ -124,4 +123,14 @@ private CacheSpan newCacheSpan(int position, int length) throws IOException {
     return SimpleCacheSpanTest.createCacheSpan(index, cacheDir, CACHE_KEY, position, length, 0);
   }
 
+  /**
+   * Sets up Mockito for an instrumentation test.
+   */
+  private static void setUpMockito(InstrumentationTestCase instrumentationTestCase) {
+    // Workaround for https://code.google.com/p/dexmaker/issues/detail?id=2.
+    System.setProperty("dexmaker.dexcache",
+        instrumentationTestCase.getInstrumentation().getTargetContext().getCacheDir().getPath());
+    MockitoAnnotations.initMocks(instrumentationTestCase);
+  }
+
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java b/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
similarity index 61%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
index 8a2c24beba3..b6c068c2180 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/DrmInitDataTest.java
@@ -16,20 +16,27 @@
 package com.google.android.exoplayer2.drm;
 
 import static com.google.android.exoplayer2.C.PLAYREADY_UUID;
+import static com.google.android.exoplayer2.C.UUID_NIL;
 import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
 import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
 
 import android.os.Parcel;
-import android.test.MoreAsserts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.testutil.TestUtil;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link DrmInitData}.
  */
-public class DrmInitDataTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class DrmInitDataTest {
 
   private static final SchemeData DATA_1 = new SchemeData(WIDEVINE_UUID, VIDEO_MP4,
       TestUtil.buildTestData(128, 1 /* data seed */));
@@ -42,6 +49,7 @@ public class DrmInitDataTest extends TestCase {
   private static final SchemeData DATA_UNIVERSAL = new SchemeData(C.UUID_NIL, VIDEO_MP4,
       TestUtil.buildTestData(128, 3 /* data seed */));
 
+  @Test
   public void testParcelable() {
     DrmInitData drmInitDataToParcel = new DrmInitData(DATA_1, DATA_2);
 
@@ -50,69 +58,72 @@ public void testParcelable() {
     parcel.setDataPosition(0);
 
     DrmInitData drmInitDataFromParcel = DrmInitData.CREATOR.createFromParcel(parcel);
-    assertEquals(drmInitDataToParcel, drmInitDataFromParcel);
+    assertThat(drmInitDataFromParcel).isEqualTo(drmInitDataToParcel);
 
     parcel.recycle();
   }
 
+  @Test
   public void testEquals() {
     DrmInitData drmInitData = new DrmInitData(DATA_1, DATA_2);
 
     // Basic non-referential equality test.
     DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
-    assertEquals(drmInitData, testInitData);
-    assertEquals(drmInitData.hashCode(), testInitData.hashCode());
+    assertThat(testInitData).isEqualTo(drmInitData);
+    assertThat(testInitData.hashCode()).isEqualTo(drmInitData.hashCode());
 
     // Basic non-referential equality test with non-referential scheme data.
     testInitData = new DrmInitData(DATA_1B, DATA_2B);
-    assertEquals(drmInitData, testInitData);
-    assertEquals(drmInitData.hashCode(), testInitData.hashCode());
+    assertThat(testInitData).isEqualTo(drmInitData);
+    assertThat(testInitData.hashCode()).isEqualTo(drmInitData.hashCode());
 
     // Passing the scheme data in reverse order shouldn't affect equality.
     testInitData = new DrmInitData(DATA_2, DATA_1);
-    assertEquals(drmInitData, testInitData);
-    assertEquals(drmInitData.hashCode(), testInitData.hashCode());
+    assertThat(testInitData).isEqualTo(drmInitData);
+    assertThat(testInitData.hashCode()).isEqualTo(drmInitData.hashCode());
 
     // Ditto.
     testInitData = new DrmInitData(DATA_2B, DATA_1B);
-    assertEquals(drmInitData, testInitData);
-    assertEquals(drmInitData.hashCode(), testInitData.hashCode());
+    assertThat(testInitData).isEqualTo(drmInitData);
+    assertThat(testInitData.hashCode()).isEqualTo(drmInitData.hashCode());
 
     // Different number of tuples should affect equality.
     testInitData = new DrmInitData(DATA_1);
-    MoreAsserts.assertNotEqual(drmInitData, testInitData);
+    assertThat(drmInitData).isNotEqualTo(testInitData);
 
     // Different data in one of the tuples should affect equality.
     testInitData = new DrmInitData(DATA_1, DATA_UNIVERSAL);
-    MoreAsserts.assertNotEqual(drmInitData, testInitData);
+    assertThat(testInitData).isNotEqualTo(drmInitData);
   }
 
+  @Test
   public void testGet() {
     // Basic matching.
     DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
-    assertEquals(DATA_1, testInitData.get(WIDEVINE_UUID));
-    assertEquals(DATA_2, testInitData.get(PLAYREADY_UUID));
-    assertNull(testInitData.get(C.UUID_NIL));
+    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
+    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
+    assertThat(testInitData.get(UUID_NIL)).isNull();
 
     // Basic matching including universal data.
     testInitData = new DrmInitData(DATA_1, DATA_2, DATA_UNIVERSAL);
-    assertEquals(DATA_1, testInitData.get(WIDEVINE_UUID));
-    assertEquals(DATA_2, testInitData.get(PLAYREADY_UUID));
-    assertEquals(DATA_UNIVERSAL, testInitData.get(C.UUID_NIL));
+    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
+    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
+    assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
 
     // Passing the scheme data in reverse order shouldn't affect equality.
     testInitData = new DrmInitData(DATA_UNIVERSAL, DATA_2, DATA_1);
-    assertEquals(DATA_1, testInitData.get(WIDEVINE_UUID));
-    assertEquals(DATA_2, testInitData.get(PLAYREADY_UUID));
-    assertEquals(DATA_UNIVERSAL, testInitData.get(C.UUID_NIL));
+    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
+    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
+    assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
 
     // Universal data should be returned in the absence of a specific match.
     testInitData = new DrmInitData(DATA_1, DATA_UNIVERSAL);
-    assertEquals(DATA_1, testInitData.get(WIDEVINE_UUID));
-    assertEquals(DATA_UNIVERSAL, testInitData.get(PLAYREADY_UUID));
-    assertEquals(DATA_UNIVERSAL, testInitData.get(C.UUID_NIL));
+    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
+    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_UNIVERSAL);
+    assertThat(testInitData.get(UUID_NIL)).isEqualTo(DATA_UNIVERSAL);
   }
 
+  @Test
   public void testDuplicateSchemeDataRejected() {
     try {
       new DrmInitData(DATA_1, DATA_1);
@@ -136,18 +147,19 @@ public void testDuplicateSchemeDataRejected() {
     }
   }
 
+  @Test
   public void testSchemeDataMatches() {
-    assertTrue(DATA_1.matches(WIDEVINE_UUID));
-    assertFalse(DATA_1.matches(PLAYREADY_UUID));
-    assertFalse(DATA_2.matches(C.UUID_NIL));
+    assertThat(DATA_1.matches(WIDEVINE_UUID)).isTrue();
+    assertThat(DATA_1.matches(PLAYREADY_UUID)).isFalse();
+    assertThat(DATA_2.matches(UUID_NIL)).isFalse();
 
-    assertFalse(DATA_2.matches(WIDEVINE_UUID));
-    assertTrue(DATA_2.matches(PLAYREADY_UUID));
-    assertFalse(DATA_2.matches(C.UUID_NIL));
+    assertThat(DATA_2.matches(WIDEVINE_UUID)).isFalse();
+    assertThat(DATA_2.matches(PLAYREADY_UUID)).isTrue();
+    assertThat(DATA_2.matches(UUID_NIL)).isFalse();
 
-    assertTrue(DATA_UNIVERSAL.matches(WIDEVINE_UUID));
-    assertTrue(DATA_UNIVERSAL.matches(PLAYREADY_UUID));
-    assertTrue(DATA_UNIVERSAL.matches(C.UUID_NIL));
+    assertThat(DATA_UNIVERSAL.matches(WIDEVINE_UUID)).isTrue();
+    assertThat(DATA_UNIVERSAL.matches(PLAYREADY_UUID)).isTrue();
+    assertThat(DATA_UNIVERSAL.matches(UUID_NIL)).isTrue();
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
similarity index 78%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
index 6abd116086b..8e27c4f7ca6 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/DefaultExtractorInputTest.java
@@ -15,6 +15,12 @@
  */
 package com.google.android.exoplayer2.extractor;
 
+import static com.google.android.exoplayer2.C.RESULT_END_OF_INPUT;
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.Arrays.copyOf;
+import static java.util.Arrays.copyOfRange;
+import static org.junit.Assert.fail;
+
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
@@ -22,42 +28,50 @@
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.Arrays;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link DefaultExtractorInput}.
  */
-public class DefaultExtractorInputTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class DefaultExtractorInputTest {
 
   private static final String TEST_URI = "http://www.google.com";
   private static final byte[] TEST_DATA = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8};
   private static final int LARGE_TEST_DATA_LENGTH = 8192;
 
+  @Test
   public void testInitialPosition() throws Exception {
     FakeDataSource testDataSource = buildDataSource();
     DefaultExtractorInput input =
         new DefaultExtractorInput(testDataSource, 123, C.LENGTH_UNSET);
-    assertEquals(123, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(123);
   }
 
+  @Test
   public void testRead() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
     // We expect to perform three reads of three bytes, as setup in buildTestDataSource.
     int bytesRead = 0;
     bytesRead += input.read(target, 0, TEST_DATA.length);
-    assertEquals(3, bytesRead);
+    assertThat(bytesRead).isEqualTo(3);
     bytesRead += input.read(target, 3, TEST_DATA.length);
-    assertEquals(6, bytesRead);
+    assertThat(bytesRead).isEqualTo(6);
     bytesRead += input.read(target, 6, TEST_DATA.length);
-    assertEquals(9, bytesRead);
+    assertThat(bytesRead).isEqualTo(9);
     // Check the read data is correct.
-    assertTrue(Arrays.equals(TEST_DATA, target));
+    assertThat(Arrays.equals(TEST_DATA, target)).isTrue();
     // Check we're now indicated that the end of input is reached.
     int expectedEndOfInput = input.read(target, 0, TEST_DATA.length);
-    assertEquals(C.RESULT_END_OF_INPUT, expectedEndOfInput);
+    assertThat(expectedEndOfInput).isEqualTo(RESULT_END_OF_INPUT);
   }
 
+  @Test
   public void testReadPeeked() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
@@ -65,12 +79,13 @@ public void testReadPeeked() throws Exception {
     input.advancePeekPosition(TEST_DATA.length);
 
     int bytesRead = input.read(target, 0, TEST_DATA.length);
-    assertEquals(TEST_DATA.length, bytesRead);
+    assertThat(bytesRead).isEqualTo(TEST_DATA.length);
 
     // Check the read data is correct.
-    assertTrue(Arrays.equals(TEST_DATA, target));
+    assertThat(Arrays.equals(TEST_DATA, target)).isTrue();
   }
 
+  @Test
   public void testReadMoreDataPeeked() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
@@ -78,22 +93,23 @@ public void testReadMoreDataPeeked() throws Exception {
     input.advancePeekPosition(TEST_DATA.length);
 
     int bytesRead = input.read(target, 0, TEST_DATA.length + 1);
-    assertEquals(TEST_DATA.length, bytesRead);
+    assertThat(bytesRead).isEqualTo(TEST_DATA.length);
 
     // Check the read data is correct.
-    assertTrue(Arrays.equals(TEST_DATA, target));
+    assertThat(Arrays.equals(TEST_DATA, target)).isTrue();
   }
 
+  @Test
   public void testReadFullyOnce() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
     input.readFully(target, 0, TEST_DATA.length);
     // Check that we read the whole of TEST_DATA.
-    assertTrue(Arrays.equals(TEST_DATA, target));
-    assertEquals(TEST_DATA.length, input.getPosition());
+    assertThat(Arrays.equals(TEST_DATA, target)).isTrue();
+    assertThat(input.getPosition()).isEqualTo(TEST_DATA.length);
     // Check that we see end of input if we read again with allowEndOfInput set.
     boolean result = input.readFully(target, 0, 1, true);
-    assertFalse(result);
+    assertThat(result).isFalse();
     // Check that we fail with EOFException we read again with allowEndOfInput unset.
     try {
       input.readFully(target, 0, 1);
@@ -103,19 +119,21 @@ public void testReadFullyOnce() throws Exception {
     }
   }
 
+  @Test
   public void testReadFullyTwice() throws Exception {
     // Read TEST_DATA in two parts.
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[5];
     input.readFully(target, 0, 5);
-    assertTrue(Arrays.equals(Arrays.copyOf(TEST_DATA, 5), target));
-    assertEquals(5, input.getPosition());
+    assertThat(Arrays.equals(copyOf(TEST_DATA, 5), target)).isTrue();
+    assertThat(input.getPosition()).isEqualTo(5);
     target = new byte[4];
     input.readFully(target, 0, 4);
-    assertTrue(Arrays.equals(Arrays.copyOfRange(TEST_DATA, 5, 9), target));
-    assertEquals(5 + 4, input.getPosition());
+    assertThat(Arrays.equals(copyOfRange(TEST_DATA, 5, 9), target)).isTrue();
+    assertThat(input.getPosition()).isEqualTo(5 + 4);
   }
 
+  @Test
   public void testReadFullyTooMuch() throws Exception {
     // Read more than TEST_DATA. Should fail with an EOFException. Position should not update.
     DefaultExtractorInput input = createDefaultExtractorInput();
@@ -126,7 +144,7 @@ public void testReadFullyTooMuch() throws Exception {
     } catch (EOFException e) {
       // Expected.
     }
-    assertEquals(0, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(0);
 
     // Read more than TEST_DATA with allowEndOfInput set. Should fail with an EOFException because
     // the end of input isn't encountered immediately. Position should not update.
@@ -138,9 +156,10 @@ public void testReadFullyTooMuch() throws Exception {
     } catch (EOFException e) {
       // Expected.
     }
-    assertEquals(0, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(0);
   }
 
+  @Test
   public void testReadFullyWithFailingDataSource() throws Exception {
     FakeDataSource testDataSource = buildFailingDataSource();
     DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNSET);
@@ -152,9 +171,10 @@ public void testReadFullyWithFailingDataSource() throws Exception {
       // Expected.
     }
     // The position should not have advanced.
-    assertEquals(0, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(0);
   }
 
+  @Test
   public void testReadFullyHalfPeeked() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
@@ -164,22 +184,24 @@ public void testReadFullyHalfPeeked() throws Exception {
     input.readFully(target, 0, TEST_DATA.length);
 
     // Check the read data is correct.
-    assertTrue(Arrays.equals(TEST_DATA, target));
-    assertEquals(TEST_DATA.length, input.getPosition());
+    assertThat(Arrays.equals(TEST_DATA, target)).isTrue();
+    assertThat(input.getPosition()).isEqualTo(TEST_DATA.length);
   }
 
+  @Test
   public void testSkip() throws Exception {
     FakeDataSource testDataSource = buildDataSource();
     DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNSET);
     // We expect to perform three skips of three bytes, as setup in buildTestDataSource.
     for (int i = 0; i < 3; i++) {
-      assertEquals(3, input.skip(TEST_DATA.length));
+      assertThat(input.skip(TEST_DATA.length)).isEqualTo(3);
     }
     // Check we're now indicated that the end of input is reached.
     int expectedEndOfInput = input.skip(TEST_DATA.length);
-    assertEquals(C.RESULT_END_OF_INPUT, expectedEndOfInput);
+    assertThat(expectedEndOfInput).isEqualTo(RESULT_END_OF_INPUT);
   }
 
+  @Test
   public void testLargeSkip() throws Exception {
     FakeDataSource testDataSource = buildLargeDataSource();
     DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNSET);
@@ -190,14 +212,15 @@ public void testLargeSkip() throws Exception {
     }
   }
 
+  @Test
   public void testSkipFullyOnce() throws Exception {
     // Skip TEST_DATA.
     DefaultExtractorInput input = createDefaultExtractorInput();
     input.skipFully(TEST_DATA.length);
-    assertEquals(TEST_DATA.length, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(TEST_DATA.length);
     // Check that we see end of input if we skip again with allowEndOfInput set.
     boolean result = input.skipFully(1, true);
-    assertFalse(result);
+    assertThat(result).isFalse();
     // Check that we fail with EOFException we skip again.
     try {
       input.skipFully(1);
@@ -207,15 +230,17 @@ public void testSkipFullyOnce() throws Exception {
     }
   }
 
+  @Test
   public void testSkipFullyTwice() throws Exception {
     // Skip TEST_DATA in two parts.
     DefaultExtractorInput input = createDefaultExtractorInput();
     input.skipFully(5);
-    assertEquals(5, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(5);
     input.skipFully(4);
-    assertEquals(5 + 4, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(5 + 4);
   }
 
+  @Test
   public void testSkipFullyTwicePeeked() throws Exception {
     // Skip TEST_DATA.
     DefaultExtractorInput input = createDefaultExtractorInput();
@@ -224,12 +249,13 @@ public void testSkipFullyTwicePeeked() throws Exception {
 
     int halfLength = TEST_DATA.length / 2;
     input.skipFully(halfLength);
-    assertEquals(halfLength, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(halfLength);
 
     input.skipFully(TEST_DATA.length - halfLength);
-    assertEquals(TEST_DATA.length, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(TEST_DATA.length);
   }
 
+  @Test
   public void testSkipFullyTooMuch() throws Exception {
     // Skip more than TEST_DATA. Should fail with an EOFException. Position should not update.
     DefaultExtractorInput input = createDefaultExtractorInput();
@@ -239,7 +265,7 @@ public void testSkipFullyTooMuch() throws Exception {
     } catch (EOFException e) {
       // Expected.
     }
-    assertEquals(0, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(0);
 
     // Skip more than TEST_DATA with allowEndOfInput set. Should fail with an EOFException because
     // the end of input isn't encountered immediately. Position should not update.
@@ -250,9 +276,10 @@ public void testSkipFullyTooMuch() throws Exception {
     } catch (EOFException e) {
       // Expected.
     }
-    assertEquals(0, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(0);
   }
 
+  @Test
   public void testSkipFullyWithFailingDataSource() throws Exception {
     FakeDataSource testDataSource = buildFailingDataSource();
     DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNSET);
@@ -263,9 +290,10 @@ public void testSkipFullyWithFailingDataSource() throws Exception {
       // Expected.
     }
     // The position should not have advanced.
-    assertEquals(0, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(0);
   }
 
+  @Test
   public void testSkipFullyLarge() throws Exception {
     // Tests skipping an amount of data that's larger than any internal scratch space.
     int largeSkipSize = 1024 * 1024;
@@ -275,7 +303,7 @@ public void testSkipFullyLarge() throws Exception {
 
     DefaultExtractorInput input = new DefaultExtractorInput(testDataSource, 0, C.LENGTH_UNSET);
     input.skipFully(largeSkipSize);
-    assertEquals(largeSkipSize, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(largeSkipSize);
     // Check that we fail with EOFException we skip again.
     try {
       input.skipFully(1);
@@ -285,22 +313,23 @@ public void testSkipFullyLarge() throws Exception {
     }
   }
 
+  @Test
   public void testPeekFully() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
     input.peekFully(target, 0, TEST_DATA.length);
 
     // Check that we read the whole of TEST_DATA.
-    assertTrue(Arrays.equals(TEST_DATA, target));
-    assertEquals(0, input.getPosition());
-    assertEquals(TEST_DATA.length, input.getPeekPosition());
+    assertThat(Arrays.equals(TEST_DATA, target)).isTrue();
+    assertThat(input.getPosition()).isEqualTo(0);
+    assertThat(input.getPeekPosition()).isEqualTo(TEST_DATA.length);
 
     // Check that we can read again from the buffer
     byte[] target2 = new byte[TEST_DATA.length];
     input.readFully(target2, 0, TEST_DATA.length);
-    assertTrue(Arrays.equals(TEST_DATA, target2));
-    assertEquals(TEST_DATA.length, input.getPosition());
-    assertEquals(TEST_DATA.length, input.getPeekPosition());
+    assertThat(Arrays.equals(TEST_DATA, target2)).isTrue();
+    assertThat(input.getPosition()).isEqualTo(TEST_DATA.length);
+    assertThat(input.getPeekPosition()).isEqualTo(TEST_DATA.length);
 
     // Check that we fail with EOFException if we peek again
     try {
@@ -311,20 +340,21 @@ public void testPeekFully() throws Exception {
     }
   }
 
+  @Test
   public void testResetPeekPosition() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
     input.peekFully(target, 0, TEST_DATA.length);
 
     // Check that we read the whole of TEST_DATA.
-    assertTrue(Arrays.equals(TEST_DATA, target));
-    assertEquals(0, input.getPosition());
+    assertThat(Arrays.equals(TEST_DATA, target)).isTrue();
+    assertThat(input.getPosition()).isEqualTo(0);
 
     // Check that we can peek again after resetting.
     input.resetPeekPosition();
     byte[] target2 = new byte[TEST_DATA.length];
     input.peekFully(target2, 0, TEST_DATA.length);
-    assertTrue(Arrays.equals(TEST_DATA, target2));
+    assertThat(Arrays.equals(TEST_DATA, target2)).isTrue();
 
     // Check that we fail with EOFException if we peek past the end of the input.
     try {
@@ -335,40 +365,43 @@ public void testResetPeekPosition() throws Exception {
     }
   }
 
+  @Test
   public void testPeekFullyAtEndOfStreamWithAllowEndOfInputSucceeds() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
 
     // Check peeking up to the end of input succeeds.
-    assertTrue(input.peekFully(target, 0, TEST_DATA.length, true));
+    assertThat(input.peekFully(target, 0, TEST_DATA.length, true)).isTrue();
 
     // Check peeking at the end of input with allowEndOfInput signals the end of input.
-    assertFalse(input.peekFully(target, 0, 1, true));
+    assertThat(input.peekFully(target, 0, 1, true)).isFalse();
   }
 
+  @Test
   public void testPeekFullyAtEndThenReadEndOfInput() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
 
     // Peek up to the end of the input.
-    assertTrue(input.peekFully(target, 0, TEST_DATA.length, false));
+    assertThat(input.peekFully(target, 0, TEST_DATA.length, false)).isTrue();
 
     // Peek the end of the input.
-    assertFalse(input.peekFully(target, 0, 1, true));
+    assertThat(input.peekFully(target, 0, 1, true)).isFalse();
 
     // Read up to the end of the input.
-    assertTrue(input.readFully(target, 0, TEST_DATA.length, false));
+    assertThat(input.readFully(target, 0, TEST_DATA.length, false)).isTrue();
 
     // Read the end of the input.
-    assertFalse(input.readFully(target, 0, 1, true));
+    assertThat(input.readFully(target, 0, 1, true)).isFalse();
   }
 
+  @Test
   public void testPeekFullyAcrossEndOfInputWithAllowEndOfInputFails() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
 
     // Check peeking before the end of input with allowEndOfInput succeeds.
-    assertTrue(input.peekFully(target, 0, TEST_DATA.length - 1, true));
+    assertThat(input.peekFully(target, 0, TEST_DATA.length - 1, true)).isTrue();
 
     // Check peeking across the end of input with allowEndOfInput throws.
     try {
@@ -379,12 +412,13 @@ public void testPeekFullyAcrossEndOfInputWithAllowEndOfInputFails() throws Excep
     }
   }
 
+  @Test
   public void testResetAndPeekFullyPastEndOfStreamWithAllowEndOfInputFails() throws Exception {
     DefaultExtractorInput input = createDefaultExtractorInput();
     byte[] target = new byte[TEST_DATA.length];
 
     // Check peeking up to the end of input succeeds.
-    assertTrue(input.peekFully(target, 0, TEST_DATA.length, true));
+    assertThat(input.peekFully(target, 0, TEST_DATA.length, true)).isTrue();
     input.resetPeekPosition();
     try {
       // Check peeking one more byte throws.
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
similarity index 60%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
index 250ae8c5131..fc31a7be739 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ExtractorTest.java
@@ -15,20 +15,28 @@
  */
 package com.google.android.exoplayer2.extractor;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.C;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link Extractor}.
  */
-public class ExtractorTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ExtractorTest {
 
-  public static void testConstants() {
+  @Test
+  public void testConstants() {
     // Sanity check that constant values match those defined by {@link C}.
-    assertEquals(C.RESULT_END_OF_INPUT, Extractor.RESULT_END_OF_INPUT);
+    assertThat(Extractor.RESULT_END_OF_INPUT).isEqualTo(C.RESULT_END_OF_INPUT);
     // Sanity check that the other constant values don't overlap.
-    assertTrue(C.RESULT_END_OF_INPUT != Extractor.RESULT_CONTINUE);
-    assertTrue(C.RESULT_END_OF_INPUT != Extractor.RESULT_SEEK);
+    assertThat(C.RESULT_END_OF_INPUT != Extractor.RESULT_CONTINUE).isTrue();
+    assertThat(C.RESULT_END_OF_INPUT != Extractor.RESULT_SEEK).isTrue();
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
similarity index 92%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
index acc62f41f90..708ffde0809 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/DefaultEbmlReaderTest.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -22,13 +24,19 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Tests {@link DefaultEbmlReader}.
  */
-public class DefaultEbmlReaderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+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();
@@ -38,6 +46,7 @@ public void testMasterElement() throws IOException, InterruptedException {
     assertEvents(input, expected.events);
   }
 
+  @Test
   public void testMasterElementEmpty() throws IOException, InterruptedException {
     ExtractorInput input = createTestInput(0x18, 0x53, 0x80, 0x67, 0x80);
     TestOutput expected = new TestOutput();
@@ -46,6 +55,7 @@ public void testMasterElementEmpty() throws IOException, InterruptedException {
     assertEvents(input, expected.events);
   }
 
+  @Test
   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);
@@ -54,6 +64,7 @@ public void testUnsignedIntegerElement() throws IOException, InterruptedExceptio
     assertEvents(input, expected.events);
   }
 
+  @Test
   public void testUnsignedIntegerElementLarge() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0x42, 0xF7, 0x88, 0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF);
@@ -62,6 +73,7 @@ public void testUnsignedIntegerElementLarge() throws IOException, InterruptedExc
     assertEvents(input, expected.events);
   }
 
+  @Test
   public void testUnsignedIntegerElementTooLargeBecomesNegative()
       throws IOException, InterruptedException {
     ExtractorInput input =
@@ -71,6 +83,7 @@ public void testUnsignedIntegerElementTooLargeBecomesNegative()
     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();
@@ -78,6 +91,7 @@ public void testStringElement() throws IOException, InterruptedException {
     assertEvents(input, expected.events);
   }
 
+  @Test
   public void testStringElementEmpty() throws IOException, InterruptedException {
     ExtractorInput input = createTestInput(0x42, 0x82, 0x80);
     TestOutput expected = new TestOutput();
@@ -85,6 +99,7 @@ public void testStringElementEmpty() throws IOException, InterruptedException {
     assertEvents(input, expected.events);
   }
 
+  @Test
   public void testFloatElementFourBytes() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0x44, 0x89, 0x84, 0x3F, 0x80, 0x00, 0x00);
@@ -93,6 +108,7 @@ public void testFloatElementFourBytes() throws IOException, InterruptedException
     assertEvents(input, expected.events);
   }
 
+  @Test
   public void testFloatElementEightBytes() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0x44, 0x89, 0x88, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
@@ -101,6 +117,7 @@ public void testFloatElementEightBytes() throws IOException, InterruptedExceptio
     assertEvents(input, expected.events);
   }
 
+  @Test
   public void testBinaryElement() throws IOException, InterruptedException {
     ExtractorInput input =
         createTestInput(0xA3, 0x88, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08);
@@ -118,16 +135,16 @@ private static void assertEvents(ExtractorInput input, List<String> expectedEven
 
     // We expect the number of successful reads to equal the number of expected events.
     for (int i = 0; i < expectedEvents.size(); i++) {
-      assertTrue(reader.read(input));
+      assertThat(reader.read(input)).isTrue();
     }
     // The next read should be unsuccessful.
-    assertFalse(reader.read(input));
+    assertThat(reader.read(input)).isFalse();
     // Check that we really did get to the end of input.
-    assertFalse(input.readFully(new byte[1], 0, 1, true));
+    assertThat(input.readFully(new byte[1], 0, 1, true)).isFalse();
 
-    assertEquals(expectedEvents.size(), output.events.size());
+    assertThat(output.events).hasSize(expectedEvents.size());
     for (int i = 0; i < expectedEvents.size(); i++) {
-      assertEquals(expectedEvents.get(i), output.events.get(i));
+      assertThat(output.events.get(i)).isEqualTo(expectedEvents.get(i));
     }
   }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
similarity index 92%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
index 3eb2c10a305..bda93db8127 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mkv/VarintReaderTest.java
@@ -15,18 +15,28 @@
  */
 package com.google.android.exoplayer2.extractor.mkv;
 
+import static com.google.android.exoplayer2.C.RESULT_END_OF_INPUT;
+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 com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
 import java.io.EOFException;
 import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Tests for {@link VarintReader}.
  */
-public final class VarintReaderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class VarintReaderTest {
 
   private static final byte MAX_BYTE = (byte) 0xFF;
 
@@ -78,6 +88,7 @@ public final class VarintReaderTest extends TestCase {
   private static final long VALUE_8_BYTE_MAX = 0xFFFFFFFFFFFFFFL;
   private static final long VALUE_8_BYTE_MAX_WITH_MASK = 0x1FFFFFFFFFFFFFFL;
 
+  @Test
   public void testReadVarintEndOfInputAtStart() throws IOException, InterruptedException {
     VarintReader reader = new VarintReader();
     // Build an input with no data.
@@ -86,7 +97,7 @@ public void testReadVarintEndOfInputAtStart() throws IOException, InterruptedExc
         .build();
     // End of input allowed.
     long result = reader.readUnsignedVarint(input, true, false, 8);
-    assertEquals(C.RESULT_END_OF_INPUT, result);
+    assertThat(result).isEqualTo(RESULT_END_OF_INPUT);
     // End of input not allowed.
     try {
       reader.readUnsignedVarint(input, false, false, 8);
@@ -96,6 +107,7 @@ public void testReadVarintEndOfInputAtStart() throws IOException, InterruptedExc
     }
   }
 
+  @Test
   public void testReadVarintExceedsMaximumAllowedLength() throws IOException, InterruptedException {
     VarintReader reader = new VarintReader();
     ExtractorInput input = new FakeExtractorInput.Builder()
@@ -103,9 +115,10 @@ public void testReadVarintExceedsMaximumAllowedLength() throws IOException, Inte
         .setSimulateUnknownLength(true)
         .build();
     long result = reader.readUnsignedVarint(input, false, true, 4);
-    assertEquals(C.RESULT_MAX_LENGTH_EXCEEDED, result);
+    assertThat(result).isEqualTo(RESULT_MAX_LENGTH_EXCEEDED);
   }
 
+  @Test
   public void testReadVarint() throws IOException, InterruptedException {
     VarintReader reader = new VarintReader();
     testReadVarint(reader, true, DATA_1_BYTE_0, 1, 0);
@@ -142,6 +155,7 @@ public void testReadVarint() throws IOException, InterruptedException {
     testReadVarint(reader, false, DATA_8_BYTE_MAX, 8, VALUE_8_BYTE_MAX_WITH_MASK);
   }
 
+  @Test
   public void testReadVarintFlaky() throws IOException, InterruptedException {
     VarintReader reader = new VarintReader();
     testReadVarintFlaky(reader, true, DATA_1_BYTE_0, 1, 0);
@@ -185,8 +199,8 @@ private static void testReadVarint(VarintReader reader, boolean removeMask, byte
         .setSimulateUnknownLength(true)
         .build();
     long result = reader.readUnsignedVarint(input, false, removeMask, 8);
-    assertEquals(expectedLength, input.getPosition());
-    assertEquals(expectedValue, result);
+    assertThat(input.getPosition()).isEqualTo(expectedLength);
+    assertThat(result).isEqualTo(expectedValue);
   }
 
   private static void testReadVarintFlaky(VarintReader reader, boolean removeMask, byte[] data,
@@ -209,8 +223,8 @@ private static void testReadVarintFlaky(VarintReader reader, boolean removeMask,
         // Expected.
       }
     }
-    assertEquals(expectedLength, input.getPosition());
-    assertEquals(expectedValue, result);
+    assertThat(input.getPosition()).isEqualTo(expectedLength);
+    assertThat(result).isEqualTo(expectedValue);
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
similarity index 67%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
index 18775b17f4f..b43949b7c28 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp3/XingSeekerTest.java
@@ -15,16 +15,24 @@
  */
 package com.google.android.exoplayer2.extractor.mp3;
 
-import android.test.InstrumentationTestCase;
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.extractor.MpegAudioHeader;
 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;
+import org.robolectric.annotation.Config;
 
 /**
  * Tests for {@link XingSeeker}.
  */
-public final class XingSeekerTest extends InstrumentationTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class XingSeekerTest {
 
   // Xing header/payload from http://storage.googleapis.com/exoplayer-test-media-0/play.mp3.
   private static final int XING_FRAME_HEADER_DATA = 0xFFFB3000;
@@ -51,7 +59,7 @@ public final class XingSeekerTest extends InstrumentationTestCase {
   private XingSeeker seekerWithInputLength;
   private int xingFrameSize;
 
-  @Override
+  @Before
   public void setUp() throws Exception {
     MpegAudioHeader xingFrameHeader = new MpegAudioHeader();
     MpegAudioHeader.populateHeader(XING_FRAME_HEADER_DATA, xingFrameHeader);
@@ -62,42 +70,49 @@ public void setUp() throws Exception {
     xingFrameSize = xingFrameHeader.frameSize;
   }
 
+  @Test
   public void testGetTimeUsBeforeFirstAudioFrame() {
-    assertEquals(0, seeker.getTimeUs(-1));
-    assertEquals(0, seekerWithInputLength.getTimeUs(-1));
+    assertThat(seeker.getTimeUs(-1)).isEqualTo(0);
+    assertThat(seekerWithInputLength.getTimeUs(-1)).isEqualTo(0);
   }
 
+  @Test
   public void testGetTimeUsAtFirstAudioFrame() {
-    assertEquals(0, seeker.getTimeUs(XING_FRAME_POSITION + xingFrameSize));
-    assertEquals(0, seekerWithInputLength.getTimeUs(XING_FRAME_POSITION + xingFrameSize));
+    assertThat(seeker.getTimeUs(XING_FRAME_POSITION + xingFrameSize)).isEqualTo(0);
+    assertThat(seekerWithInputLength.getTimeUs(XING_FRAME_POSITION + xingFrameSize)).isEqualTo(0);
   }
 
+  @Test
   public void testGetTimeUsAtEndOfStream() {
-    assertEquals(STREAM_DURATION_US,
-        seeker.getTimeUs(XING_FRAME_POSITION + xingFrameSize + STREAM_SIZE_BYTES));
-    assertEquals(STREAM_DURATION_US,
-        seekerWithInputLength.getTimeUs(XING_FRAME_POSITION + xingFrameSize + STREAM_SIZE_BYTES));
+    assertThat(seeker.getTimeUs(XING_FRAME_POSITION + xingFrameSize + STREAM_SIZE_BYTES))
+        .isEqualTo(STREAM_DURATION_US);
+    assertThat(
+        seekerWithInputLength.getTimeUs(XING_FRAME_POSITION + xingFrameSize + STREAM_SIZE_BYTES))
+        .isEqualTo(STREAM_DURATION_US);
   }
 
+  @Test
   public void testGetPositionAtStartOfStream() {
-    assertEquals(XING_FRAME_POSITION + xingFrameSize, seeker.getPosition(0));
-    assertEquals(XING_FRAME_POSITION + xingFrameSize, seekerWithInputLength.getPosition(0));
+    assertThat(seeker.getPosition(0)).isEqualTo(XING_FRAME_POSITION + xingFrameSize);
+    assertThat(seekerWithInputLength.getPosition(0)).isEqualTo(XING_FRAME_POSITION + xingFrameSize);
   }
 
+  @Test
   public void testGetPositionAtEndOfStream() {
-    assertEquals(XING_FRAME_POSITION + STREAM_SIZE_BYTES - 1,
-        seeker.getPosition(STREAM_DURATION_US));
-    assertEquals(XING_FRAME_POSITION + STREAM_SIZE_BYTES - 1,
-        seekerWithInputLength.getPosition(STREAM_DURATION_US));
+    assertThat(seeker.getPosition(STREAM_DURATION_US))
+        .isEqualTo(XING_FRAME_POSITION + STREAM_SIZE_BYTES - 1);
+    assertThat(seekerWithInputLength.getPosition(STREAM_DURATION_US))
+        .isEqualTo(XING_FRAME_POSITION + STREAM_SIZE_BYTES - 1);
   }
 
+  @Test
   public void testGetTimeForAllPositions() {
     for (int offset = xingFrameSize; offset < STREAM_SIZE_BYTES; offset++) {
       int position = XING_FRAME_POSITION + offset;
       long timeUs = seeker.getTimeUs(position);
-      assertEquals(position, seeker.getPosition(timeUs));
+      assertThat(seeker.getPosition(timeUs)).isEqualTo(position);
       timeUs = seekerWithInputLength.getTimeUs(position);
-      assertEquals(position, seekerWithInputLength.getPosition(timeUs));
+      assertThat(seekerWithInputLength.getPosition(timeUs)).isEqualTo(position);
     }
   }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
similarity index 79%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
index d0213337b8f..0c69e0b1769 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/AtomParsersTest.java
@@ -15,14 +15,21 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.Util;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Tests for {@link AtomParsers}.
  */
-public final class AtomParsersTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class AtomParsersTest {
 
   private static final String ATOM_HEADER = "000000000000000000000000";
   private static final String SAMPLE_COUNT = "00000004";
@@ -33,24 +40,27 @@ public final class AtomParsersTest extends TestCase {
   private static final byte[] SIXTEEN_BIT_STZ2 = Util.getBytesFromHexString(ATOM_HEADER + "00000010"
       + SAMPLE_COUNT + "0001000200030004");
 
+  @Test
   public void testStz2Parsing4BitFieldSize() {
     verifyParsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(FOUR_BIT_STZ2)));
   }
 
+  @Test
   public void testStz2Parsing8BitFieldSize() {
     verifyParsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(EIGHT_BIT_STZ2)));
   }
 
+  @Test
   public void testStz2Parsing16BitFieldSize() {
     verifyParsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(SIXTEEN_BIT_STZ2)));
   }
 
   private void verifyParsing(Atom.LeafAtom stz2Atom) {
     AtomParsers.Stz2SampleSizeBox box = new AtomParsers.Stz2SampleSizeBox(stz2Atom);
-    assertEquals(4, box.getSampleCount());
-    assertFalse(box.isFixedSampleSize());
+    assertThat(box.getSampleCount()).isEqualTo(4);
+    assertThat(box.isFixedSampleSize()).isFalse();
     for (int i = 0; i < box.getSampleCount(); i++) {
-      assertEquals(i + 1, box.readNextSampleSize());
+      assertThat(box.readNextSampleSize()).isEqualTo(i + 1);
     }
   }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
similarity index 56%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
index 5ac39797466..4d7931cc02a 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/mp4/PsshAtomUtilTest.java
@@ -15,33 +15,44 @@
  */
 package com.google.android.exoplayer2.extractor.mp4;
 
-import android.test.MoreAsserts;
+import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
+import static com.google.android.exoplayer2.extractor.mp4.Atom.TYPE_pssh;
+import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomFlags;
+import static com.google.android.exoplayer2.extractor.mp4.Atom.parseFullAtomVersion;
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.util.UUID;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Tests for {@link PsshAtomUtil}.
  */
-public class PsshAtomUtilTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class PsshAtomUtilTest {
 
+  @Test
   public void testBuildPsshAtom() {
     byte[] schemeData = new byte[]{0, 1, 2, 3, 4, 5};
     byte[] psshAtom = PsshAtomUtil.buildPsshAtom(C.WIDEVINE_UUID, schemeData);
     // Read the PSSH atom back and assert its content is as expected.
     ParsableByteArray parsablePsshAtom = new ParsableByteArray(psshAtom);
-    assertEquals(psshAtom.length, parsablePsshAtom.readUnsignedIntToInt()); // length
-    assertEquals(Atom.TYPE_pssh, parsablePsshAtom.readInt()); // type
+    assertThat(parsablePsshAtom.readUnsignedIntToInt()).isEqualTo(psshAtom.length); // length
+    assertThat(parsablePsshAtom.readInt()).isEqualTo(TYPE_pssh); // type
     int fullAtomInt = parsablePsshAtom.readInt(); // version + flags
-    assertEquals(0, Atom.parseFullAtomVersion(fullAtomInt));
-    assertEquals(0, Atom.parseFullAtomFlags(fullAtomInt));
+    assertThat(parseFullAtomVersion(fullAtomInt)).isEqualTo(0);
+    assertThat(parseFullAtomFlags(fullAtomInt)).isEqualTo(0);
     UUID systemId = new UUID(parsablePsshAtom.readLong(), parsablePsshAtom.readLong());
-    assertEquals(C.WIDEVINE_UUID, systemId);
-    assertEquals(schemeData.length, parsablePsshAtom.readUnsignedIntToInt());
+    assertThat(systemId).isEqualTo(WIDEVINE_UUID);
+    assertThat(parsablePsshAtom.readUnsignedIntToInt()).isEqualTo(schemeData.length);
     byte[] psshSchemeData = new byte[schemeData.length];
     parsablePsshAtom.readBytes(psshSchemeData, 0, schemeData.length);
-    MoreAsserts.assertEquals(schemeData, psshSchemeData);
+    assertThat(psshSchemeData).isEqualTo(schemeData);
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
similarity index 72%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
index 1acc208c297..a3f7e9a5488 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/DefaultOggSeekerUtilMethodsTest.java
@@ -15,54 +15,67 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
 import com.google.android.exoplayer2.extractor.ExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.OggTestData;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.EOFException;
 import java.io.IOException;
 import java.util.Random;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link DefaultOggSeeker} utility methods.
  */
-public class DefaultOggSeekerUtilMethodsTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class DefaultOggSeekerUtilMethodsTest {
 
   private final Random random = new Random(0);
 
+  @Test
   public void testSkipToNextPage() throws Exception {
-    FakeExtractorInput extractorInput = TestData.createInput(
+    FakeExtractorInput extractorInput = OggTestData.createInput(
         TestUtil.joinByteArrays(
             TestUtil.buildTestData(4000, random),
             new byte[] {'O', 'g', 'g', 'S'},
             TestUtil.buildTestData(4000, random)
         ), false);
     skipToNextPage(extractorInput);
-    assertEquals(4000, extractorInput.getPosition());
+    assertThat(extractorInput.getPosition()).isEqualTo(4000);
   }
 
+  @Test
   public void testSkipToNextPageOverlap() throws Exception {
-    FakeExtractorInput extractorInput = TestData.createInput(
+    FakeExtractorInput extractorInput = OggTestData.createInput(
         TestUtil.joinByteArrays(
             TestUtil.buildTestData(2046, random),
             new byte[] {'O', 'g', 'g', 'S'},
             TestUtil.buildTestData(4000, random)
         ), false);
     skipToNextPage(extractorInput);
-    assertEquals(2046, extractorInput.getPosition());
+    assertThat(extractorInput.getPosition()).isEqualTo(2046);
   }
 
+  @Test
   public void testSkipToNextPageInputShorterThanPeekLength() throws Exception {
-    FakeExtractorInput extractorInput = TestData.createInput(
+    FakeExtractorInput extractorInput = OggTestData.createInput(
         TestUtil.joinByteArrays(
             new byte[] {'x', 'O', 'g', 'g', 'S'}
         ), false);
     skipToNextPage(extractorInput);
-    assertEquals(1, extractorInput.getPosition());
+    assertThat(extractorInput.getPosition()).isEqualTo(1);
   }
 
+  @Test
   public void testSkipToNextPageNoMatch() throws Exception {
-    FakeExtractorInput extractorInput = TestData.createInput(
+    FakeExtractorInput extractorInput = OggTestData.createInput(
         new byte[] {'g', 'g', 'S', 'O', 'g', 'g'}, false);
     try {
       skipToNextPage(extractorInput);
@@ -84,16 +97,17 @@ private static void skipToNextPage(ExtractorInput extractorInput)
     }
   }
 
+  @Test
   public void testSkipToPageOfGranule() throws IOException, InterruptedException {
     byte[] packet = TestUtil.buildTestData(3 * 254, random);
     byte[] data = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x01, 20000, 1000, 0x03),
+        OggTestData.buildOggHeader(0x01, 20000, 1000, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet,
-        TestData.buildOggHeader(0x04, 40000, 1001, 0x03),
+        OggTestData.buildOggHeader(0x04, 40000, 1001, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet,
-        TestData.buildOggHeader(0x04, 60000, 1002, 0x03),
+        OggTestData.buildOggHeader(0x04, 60000, 1002, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet);
     FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
@@ -101,44 +115,46 @@ public void testSkipToPageOfGranule() throws IOException, InterruptedException {
     // expect to be granule of the previous page returned as elapsedSamples
     skipToPageOfGranule(input, 54000, 40000);
     // expect to be at the start of the third page
-    assertEquals(2 * (30 + (3 * 254)), input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(2 * (30 + (3 * 254)));
   }
 
+  @Test
   public void testSkipToPageOfGranulePreciseMatch() throws IOException, InterruptedException {
     byte[] packet = TestUtil.buildTestData(3 * 254, random);
     byte[] data = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x01, 20000, 1000, 0x03),
+        OggTestData.buildOggHeader(0x01, 20000, 1000, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet,
-        TestData.buildOggHeader(0x04, 40000, 1001, 0x03),
+        OggTestData.buildOggHeader(0x04, 40000, 1001, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet,
-        TestData.buildOggHeader(0x04, 60000, 1002, 0x03),
+        OggTestData.buildOggHeader(0x04, 60000, 1002, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet);
     FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
 
     skipToPageOfGranule(input, 40000, 20000);
     // expect to be at the start of the second page
-    assertEquals((30 + (3 * 254)), input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(30 + (3 * 254));
   }
 
+  @Test
   public void testSkipToPageOfGranuleAfterTargetPage() throws IOException, InterruptedException {
     byte[] packet = TestUtil.buildTestData(3 * 254, random);
     byte[] data = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x01, 20000, 1000, 0x03),
+        OggTestData.buildOggHeader(0x01, 20000, 1000, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet,
-        TestData.buildOggHeader(0x04, 40000, 1001, 0x03),
+        OggTestData.buildOggHeader(0x04, 40000, 1001, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet,
-        TestData.buildOggHeader(0x04, 60000, 1002, 0x03),
+        OggTestData.buildOggHeader(0x04, 60000, 1002, 0x03),
         TestUtil.createByteArray(254, 254, 254), // Laces.
         packet);
     FakeExtractorInput input = new FakeExtractorInput.Builder().setData(data).build();
 
     skipToPageOfGranule(input, 10000, -1);
-    assertEquals(0, input.getPosition());
+    assertThat(input.getPosition()).isEqualTo(0);
   }
 
   private void skipToPageOfGranule(ExtractorInput input, long granule,
@@ -146,7 +162,8 @@ private void skipToPageOfGranule(ExtractorInput input, long granule,
     DefaultOggSeeker oggSeeker = new DefaultOggSeeker(0, input.getLength(), new FlacReader(), 1, 2);
     while (true) {
       try {
-        assertEquals(elapsedSamplesExpected, oggSeeker.skipToPageOfGranule(input, granule, -1));
+        assertThat(oggSeeker.skipToPageOfGranule(input, granule, -1))
+            .isEqualTo(elapsedSamplesExpected);
         return;
       } catch (FakeExtractorInput.SimulatedIOException e) {
         input.resetPeekPosition();
@@ -154,24 +171,26 @@ private void skipToPageOfGranule(ExtractorInput input, long granule,
     }
   }
 
+  @Test
   public void testReadGranuleOfLastPage() throws IOException, InterruptedException {
-    FakeExtractorInput input = TestData.createInput(TestUtil.joinByteArrays(
+    FakeExtractorInput input = OggTestData.createInput(TestUtil.joinByteArrays(
         TestUtil.buildTestData(100, random),
-        TestData.buildOggHeader(0x00, 20000, 66, 3),
+        OggTestData.buildOggHeader(0x00, 20000, 66, 3),
         TestUtil.createByteArray(254, 254, 254), // laces
         TestUtil.buildTestData(3 * 254, random),
-        TestData.buildOggHeader(0x00, 40000, 67, 3),
+        OggTestData.buildOggHeader(0x00, 40000, 67, 3),
         TestUtil.createByteArray(254, 254, 254), // laces
         TestUtil.buildTestData(3 * 254, random),
-        TestData.buildOggHeader(0x05, 60000, 68, 3),
+        OggTestData.buildOggHeader(0x05, 60000, 68, 3),
         TestUtil.createByteArray(254, 254, 254), // laces
         TestUtil.buildTestData(3 * 254, random)
     ), false);
     assertReadGranuleOfLastPage(input, 60000);
   }
 
+  @Test
   public void testReadGranuleOfLastPageAfterLastHeader() throws IOException, InterruptedException {
-    FakeExtractorInput input = TestData.createInput(TestUtil.buildTestData(100, random), false);
+    FakeExtractorInput input = OggTestData.createInput(TestUtil.buildTestData(100, random), false);
     try {
       assertReadGranuleOfLastPage(input, 60000);
       fail();
@@ -180,9 +199,10 @@ public void testReadGranuleOfLastPageAfterLastHeader() throws IOException, Inter
     }
   }
 
+  @Test
   public void testReadGranuleOfLastPageWithUnboundedLength()
       throws IOException, InterruptedException {
-    FakeExtractorInput input = TestData.createInput(new byte[0], true);
+    FakeExtractorInput input = OggTestData.createInput(new byte[0], true);
     try {
       assertReadGranuleOfLastPage(input, 60000);
       fail();
@@ -196,7 +216,7 @@ private void assertReadGranuleOfLastPage(FakeExtractorInput input, int expected)
     DefaultOggSeeker oggSeeker = new DefaultOggSeeker(0, input.getLength(), new FlacReader(), 1, 2);
     while (true) {
       try {
-        assertEquals(expected, oggSeeker.readGranuleOfLastPage(input));
+        assertThat(oggSeeker.readGranuleOfLastPage(input)).isEqualTo(expected);
         break;
       } catch (FakeExtractorInput.SimulatedIOException e) {
         // ignored
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
similarity index 59%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
index 9d39eba174d..c8bcffde3c9 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/OggPageHeaderTest.java
@@ -15,67 +15,79 @@
  */
 package com.google.android.exoplayer2.extractor.ogg;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.testutil.FakeExtractorInput;
 import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
+import com.google.android.exoplayer2.testutil.OggTestData;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link OggPageHeader}.
  */
-public final class OggPageHeaderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class OggPageHeaderTest {
 
+  @Test
   public void testPopulatePageHeader() throws IOException, InterruptedException {
-    FakeExtractorInput input = TestData.createInput(TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x01, 123456, 4, 2),
+    FakeExtractorInput input = OggTestData.createInput(TestUtil.joinByteArrays(
+        OggTestData.buildOggHeader(0x01, 123456, 4, 2),
         TestUtil.createByteArray(2, 2)
     ), true);
     OggPageHeader header = new OggPageHeader();
     populatePageHeader(input, header, false);
 
-    assertEquals(0x01, header.type);
-    assertEquals(27 + 2, header.headerSize);
-    assertEquals(4, header.bodySize);
-    assertEquals(2, header.pageSegmentCount);
-    assertEquals(123456, header.granulePosition);
-    assertEquals(4, header.pageSequenceNumber);
-    assertEquals(0x1000, header.streamSerialNumber);
-    assertEquals(0x100000, header.pageChecksum);
-    assertEquals(0, header.revision);
+    assertThat(header.type).isEqualTo(0x01);
+    assertThat(header.headerSize).isEqualTo(27 + 2);
+    assertThat(header.bodySize).isEqualTo(4);
+    assertThat(header.pageSegmentCount).isEqualTo(2);
+    assertThat(header.granulePosition).isEqualTo(123456);
+    assertThat(header.pageSequenceNumber).isEqualTo(4);
+    assertThat(header.streamSerialNumber).isEqualTo(0x1000);
+    assertThat(header.pageChecksum).isEqualTo(0x100000);
+    assertThat(header.revision).isEqualTo(0);
   }
 
+  @Test
   public void testPopulatePageHeaderQuiteOnExceptionLessThan27Bytes()
       throws IOException, InterruptedException {
-    FakeExtractorInput input = TestData.createInput(TestUtil.createByteArray(2, 2), false);
+    FakeExtractorInput input = OggTestData.createInput(TestUtil.createByteArray(2, 2), false);
     OggPageHeader header = new OggPageHeader();
-    assertFalse(populatePageHeader(input, header, true));
+    assertThat(populatePageHeader(input, header, true)).isFalse();
   }
 
+  @Test
   public void testPopulatePageHeaderQuiteOnExceptionNotOgg()
       throws IOException, InterruptedException {
     byte[] headerBytes = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x01, 123456, 4, 2),
+        OggTestData.buildOggHeader(0x01, 123456, 4, 2),
         TestUtil.createByteArray(2, 2)
     );
     // change from 'O' to 'o'
     headerBytes[0] = 'o';
-    FakeExtractorInput input = TestData.createInput(headerBytes, false);
+    FakeExtractorInput input = OggTestData.createInput(headerBytes, false);
     OggPageHeader header = new OggPageHeader();
-    assertFalse(populatePageHeader(input, header, true));
+    assertThat(populatePageHeader(input, header, true)).isFalse();
   }
 
+  @Test
   public void testPopulatePageHeaderQuiteOnExceptionWrongRevision()
       throws IOException, InterruptedException {
     byte[] headerBytes = TestUtil.joinByteArrays(
-        TestData.buildOggHeader(0x01, 123456, 4, 2),
+        OggTestData.buildOggHeader(0x01, 123456, 4, 2),
         TestUtil.createByteArray(2, 2)
     );
     // change revision from 0 to 1
     headerBytes[4] = 0x01;
-    FakeExtractorInput input = TestData.createInput(headerBytes, false);
+    FakeExtractorInput input = OggTestData.createInput(headerBytes, false);
     OggPageHeader header = new OggPageHeader();
-    assertFalse(populatePageHeader(input, header, true));
+    assertThat(populatePageHeader(input, header, true)).isFalse();
   }
 
   private boolean populatePageHeader(FakeExtractorInput input, OggPageHeader header,
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
new file mode 100644
index 00000000000..08b9b12a182
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisBitArrayTest.java
@@ -0,0 +1,155 @@
+/*
+ * 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.extractor.ogg;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.android.exoplayer2.testutil.TestUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link VorbisBitArray}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class VorbisBitArrayTest {
+
+  @Test
+  public void testReadBit() {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x5c, 0x50));
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isFalse();
+  }
+
+  @Test
+  public void testSkipBits() {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F));
+    bitArray.skipBits(10);
+    assertThat(bitArray.getPosition()).isEqualTo(10);
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isFalse();
+    bitArray.skipBits(1);
+    assertThat(bitArray.getPosition()).isEqualTo(14);
+    assertThat(bitArray.readBit()).isFalse();
+    assertThat(bitArray.readBit()).isFalse();
+  }
+
+  @Test
+  public void testGetPosition() throws Exception {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F));
+    assertThat(bitArray.getPosition()).isEqualTo(0);
+    bitArray.readBit();
+    assertThat(bitArray.getPosition()).isEqualTo(1);
+    bitArray.readBit();
+    bitArray.readBit();
+    bitArray.skipBits(4);
+    assertThat(bitArray.getPosition()).isEqualTo(7);
+  }
+
+  @Test
+  public void testSetPosition() throws Exception {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F));
+    assertThat(bitArray.getPosition()).isEqualTo(0);
+    bitArray.setPosition(4);
+    assertThat(bitArray.getPosition()).isEqualTo(4);
+    bitArray.setPosition(15);
+    assertThat(bitArray.readBit()).isFalse();
+  }
+
+  @Test
+  public void testReadInt32() {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xF0, 0x0F, 0xF0, 0x0F));
+    assertThat(bitArray.readBits(32)).isEqualTo(0x0FF00FF0);
+    bitArray = new VorbisBitArray(TestUtil.createByteArray(0x0F, 0xF0, 0x0F, 0xF0));
+    assertThat(bitArray.readBits(32)).isEqualTo(0xF00FF00F);
+  }
+
+  @Test
+  public void testReadBits() throws Exception {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x03, 0x22));
+    assertThat(bitArray.readBits(2)).isEqualTo(3);
+    bitArray.skipBits(6);
+    assertThat(bitArray.readBits(2)).isEqualTo(2);
+    bitArray.skipBits(2);
+    assertThat(bitArray.readBits(2)).isEqualTo(2);
+    bitArray.reset();
+    assertThat(bitArray.readBits(16)).isEqualTo(0x2203);
+  }
+
+  @Test
+  public void testRead4BitsBeyondBoundary() throws Exception {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x2e, 0x10));
+    assertThat(bitArray.readBits(7)).isEqualTo(0x2e);
+    assertThat(bitArray.getPosition()).isEqualTo(7);
+    assertThat(bitArray.readBits(4)).isEqualTo(0x0);
+  }
+
+  @Test
+  public void testReadBitsBeyondByteBoundaries() throws Exception {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0xFF, 0x0F, 0xFF, 0x0F));
+    assertThat(bitArray.readBits(32)).isEqualTo(0x0FFF0FFF);
+
+    bitArray.reset();
+    bitArray.skipBits(4);
+    assertThat(bitArray.readBits(16)).isEqualTo(0xF0FF);
+
+    bitArray.reset();
+    bitArray.skipBits(6);
+    assertThat(bitArray.readBits(12)).isEqualTo(0xc3F);
+
+    bitArray.reset();
+    bitArray.skipBits(6);
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.readBit()).isTrue();
+    assertThat(bitArray.bitsLeft()).isEqualTo(24);
+
+    bitArray.reset();
+    bitArray.skipBits(10);
+    assertThat(bitArray.readBits(5)).isEqualTo(3);
+    assertThat(bitArray.getPosition()).isEqualTo(15);
+  }
+
+  @Test
+  public void testReadBitsIllegalLengths() throws Exception {
+    VorbisBitArray bitArray = new VorbisBitArray(TestUtil.createByteArray(0x03, 0x22, 0x30));
+
+    // reading zero bits gets 0 without advancing position
+    // (like a zero-bit read is defined to yield zer0)
+    assertThat(bitArray.readBits(0)).isEqualTo(0);
+    assertThat(bitArray.getPosition()).isEqualTo(0);
+    bitArray.readBit();
+    assertThat(bitArray.getPosition()).isEqualTo(1);
+  }
+
+}
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
new file mode 100644
index 00000000000..20a76e83e01
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisReaderTest.java
@@ -0,0 +1,117 @@
+/*
+ * 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.extractor.ogg;
+
+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 com.google.android.exoplayer2.extractor.ExtractorInput;
+import com.google.android.exoplayer2.extractor.ogg.VorbisReader.VorbisSetup;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput;
+import com.google.android.exoplayer2.testutil.FakeExtractorInput.SimulatedIOException;
+import com.google.android.exoplayer2.testutil.OggTestData;
+import com.google.android.exoplayer2.util.ParsableByteArray;
+import java.io.IOException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link VorbisReader}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class VorbisReaderTest {
+
+  @Test
+  public void testReadBits() throws Exception {
+    assertThat(readBits((byte) 0x00, 2, 2)).isEqualTo(0);
+    assertThat(readBits((byte) 0x02, 1, 1)).isEqualTo(1);
+    assertThat(readBits((byte) 0xF0, 4, 4)).isEqualTo(15);
+    assertThat(readBits((byte) 0x80, 1, 7)).isEqualTo(1);
+  }
+
+  @Test
+  public void testAppendNumberOfSamples() throws Exception {
+    ParsableByteArray buffer = new ParsableByteArray(4);
+    buffer.setLimit(0);
+    VorbisReader.appendNumberOfSamples(buffer, 0x01234567);
+    assertThat(buffer.limit()).isEqualTo(4);
+    assertThat(buffer.data[0]).isEqualTo(0x67);
+    assertThat(buffer.data[1]).isEqualTo(0x45);
+    assertThat(buffer.data[2]).isEqualTo(0x23);
+    assertThat(buffer.data[3]).isEqualTo(0x01);
+  }
+
+  @Test
+  public void testReadSetupHeadersWithIOExceptions() throws IOException, InterruptedException {
+    byte[] data = OggTestData.getVorbisHeaderPages();
+    ExtractorInput input = new FakeExtractorInput.Builder().setData(data).setSimulateIOErrors(true)
+        .setSimulateUnknownLength(true).setSimulatePartialReads(true).build();
+
+    VorbisReader reader = new VorbisReader();
+    VorbisReader.VorbisSetup vorbisSetup = readSetupHeaders(reader, input);
+
+    assertThat(vorbisSetup.idHeader).isNotNull();
+    assertThat(vorbisSetup.commentHeader).isNotNull();
+    assertThat(vorbisSetup.setupHeaderData).isNotNull();
+    assertThat(vorbisSetup.modes).isNotNull();
+
+    assertThat(vorbisSetup.commentHeader.length).isEqualTo(45);
+    assertThat(vorbisSetup.idHeader.data).hasLength(30);
+    assertThat(vorbisSetup.setupHeaderData).hasLength(3597);
+
+    assertThat(vorbisSetup.idHeader.bitrateMax).isEqualTo(-1);
+    assertThat(vorbisSetup.idHeader.bitrateMin).isEqualTo(-1);
+    assertThat(vorbisSetup.idHeader.bitrateNominal).isEqualTo(66666);
+    assertThat(vorbisSetup.idHeader.blockSize0).isEqualTo(512);
+    assertThat(vorbisSetup.idHeader.blockSize1).isEqualTo(1024);
+    assertThat(vorbisSetup.idHeader.channels).isEqualTo(2);
+    assertThat(vorbisSetup.idHeader.framingFlag).isTrue();
+    assertThat(vorbisSetup.idHeader.sampleRate).isEqualTo(22050);
+    assertThat(vorbisSetup.idHeader.version).isEqualTo(0);
+
+    assertThat(vorbisSetup.commentHeader.vendor).isEqualTo("Xiph.Org libVorbis I 20030909");
+    assertThat(vorbisSetup.iLogModes).isEqualTo(1);
+
+    assertThat(vorbisSetup.setupHeaderData[vorbisSetup.setupHeaderData.length - 1])
+        .isEqualTo(data[data.length - 1]);
+
+    assertThat(vorbisSetup.modes[0].blockFlag).isFalse();
+    assertThat(vorbisSetup.modes[1].blockFlag).isTrue();
+  }
+
+  private static VorbisSetup readSetupHeaders(VorbisReader reader, ExtractorInput input)
+      throws IOException, InterruptedException {
+    OggPacket oggPacket = new OggPacket();
+    while (true) {
+      try {
+        if (!oggPacket.populate(input)) {
+          fail();
+        }
+        VorbisSetup vorbisSetup = reader.readSetupHeaders(oggPacket.getPayload());
+        if (vorbisSetup != null) {
+          return vorbisSetup;
+        }
+      } catch (SimulatedIOException e) {
+        // Ignore.
+      }
+    }
+  }
+
+}
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
new file mode 100644
index 00000000000..bdc573f2189
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ogg/VorbisUtilTest.java
@@ -0,0 +1,146 @@
+/*
+ * 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.extractor.ogg;
+
+import static com.google.android.exoplayer2.extractor.ogg.VorbisUtil.iLog;
+import static com.google.android.exoplayer2.extractor.ogg.VorbisUtil.verifyVorbisHeaderCapturePattern;
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+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;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link VorbisUtil}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class VorbisUtilTest {
+
+  @Test
+  public void testILog() throws Exception {
+    assertThat(iLog(0)).isEqualTo(0);
+    assertThat(iLog(1)).isEqualTo(1);
+    assertThat(iLog(2)).isEqualTo(2);
+    assertThat(iLog(3)).isEqualTo(2);
+    assertThat(iLog(4)).isEqualTo(3);
+    assertThat(iLog(5)).isEqualTo(3);
+    assertThat(iLog(8)).isEqualTo(4);
+    assertThat(iLog(-1)).isEqualTo(0);
+    assertThat(iLog(-122)).isEqualTo(0);
+  }
+
+  @Test
+  public void testReadIdHeader() throws Exception {
+    byte[] data = OggTestData.getIdentificationHeaderData();
+    ParsableByteArray headerData = new ParsableByteArray(data, data.length);
+    VorbisUtil.VorbisIdHeader vorbisIdHeader =
+        VorbisUtil.readVorbisIdentificationHeader(headerData);
+
+    assertThat(vorbisIdHeader.sampleRate).isEqualTo(22050);
+    assertThat(vorbisIdHeader.version).isEqualTo(0);
+    assertThat(vorbisIdHeader.framingFlag).isTrue();
+    assertThat(vorbisIdHeader.channels).isEqualTo(2);
+    assertThat(vorbisIdHeader.blockSize0).isEqualTo(512);
+    assertThat(vorbisIdHeader.blockSize1).isEqualTo(1024);
+    assertThat(vorbisIdHeader.bitrateMax).isEqualTo(-1);
+    assertThat(vorbisIdHeader.bitrateMin).isEqualTo(-1);
+    assertThat(vorbisIdHeader.bitrateNominal).isEqualTo(66666);
+    assertThat(vorbisIdHeader.getApproximateBitrate()).isEqualTo(66666);
+  }
+
+  @Test
+  public void testReadCommentHeader() throws ParserException {
+    byte[] data = OggTestData.getCommentHeaderDataUTF8();
+    ParsableByteArray headerData = new ParsableByteArray(data, data.length);
+    VorbisUtil.CommentHeader commentHeader = VorbisUtil.readVorbisCommentHeader(headerData);
+
+    assertThat(commentHeader.vendor).isEqualTo("Xiph.Org libVorbis I 20120203 (Omnipresent)");
+    assertThat(commentHeader.comments).hasLength(3);
+    assertThat(commentHeader.comments[0]).isEqualTo("ALBUM=äö");
+    assertThat(commentHeader.comments[1]).isEqualTo("TITLE=A sample song");
+    assertThat(commentHeader.comments[2]).isEqualTo("ARTIST=Google");
+  }
+
+  @Test
+  public void testReadVorbisModes() throws ParserException {
+    byte[] data = OggTestData.getSetupHeaderData();
+    ParsableByteArray headerData = new ParsableByteArray(data, data.length);
+    VorbisUtil.Mode[] modes = VorbisUtil.readVorbisModes(headerData, 2);
+
+    assertThat(modes).hasLength(2);
+    assertThat(modes[0].blockFlag).isFalse();
+    assertThat(modes[0].mapping).isEqualTo(0);
+    assertThat(modes[0].transformType).isEqualTo(0);
+    assertThat(modes[0].windowType).isEqualTo(0);
+    assertThat(modes[1].blockFlag).isTrue();
+    assertThat(modes[1].mapping).isEqualTo(1);
+    assertThat(modes[1].transformType).isEqualTo(0);
+    assertThat(modes[1].windowType).isEqualTo(0);
+  }
+
+  @Test
+  public void testVerifyVorbisHeaderCapturePattern() throws ParserException {
+    ParsableByteArray header = new ParsableByteArray(
+        new byte[] {0x01, 'v', 'o', 'r', 'b', 'i', 's'});
+    assertThat(verifyVorbisHeaderCapturePattern(0x01, header, false)).isTrue();
+  }
+
+  @Test
+  public void testVerifyVorbisHeaderCapturePatternInvalidHeader() {
+    ParsableByteArray header = new ParsableByteArray(
+        new byte[] {0x01, 'v', 'o', 'r', 'b', 'i', 's'});
+    try {
+      VorbisUtil.verifyVorbisHeaderCapturePattern(0x99, header, false);
+      fail();
+    } catch (ParserException e) {
+      assertThat(e.getMessage()).isEqualTo("expected header type 99");
+    }
+  }
+
+  @Test
+  public void testVerifyVorbisHeaderCapturePatternInvalidHeaderQuite() throws ParserException {
+    ParsableByteArray header = new ParsableByteArray(
+        new byte[] {0x01, 'v', 'o', 'r', 'b', 'i', 's'});
+    assertThat(verifyVorbisHeaderCapturePattern(0x99, header, true)).isFalse();
+  }
+
+  @Test
+  public void testVerifyVorbisHeaderCapturePatternInvalidPattern() {
+    ParsableByteArray header = new ParsableByteArray(
+        new byte[] {0x01, 'x', 'v', 'o', 'r', 'b', 'i', 's'});
+    try {
+      VorbisUtil.verifyVorbisHeaderCapturePattern(0x01, header, false);
+      fail();
+    } catch (ParserException e) {
+      assertThat(e.getMessage()).isEqualTo("expected characters 'vorbis'");
+    }
+  }
+
+  @Test
+  public void testVerifyVorbisHeaderCapturePatternQuiteInvalidPatternQuite()
+      throws ParserException {
+    ParsableByteArray header = new ParsableByteArray(
+        new byte[] {0x01, 'x', 'v', 'o', 'r', 'b', 'i', 's'});
+    assertThat(verifyVorbisHeaderCapturePattern(0x01, header, true)).isFalse();
+  }
+
+}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
similarity index 81%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
index c4d9de3100d..56668d51248 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/extractor/ts/SectionReaderTest.java
@@ -15,26 +15,35 @@
  */
 package com.google.android.exoplayer2.extractor.ts;
 
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.Arrays.asList;
+import static java.util.Collections.singletonList;
+
 import com.google.android.exoplayer2.extractor.ExtractorOutput;
 import com.google.android.exoplayer2.testutil.FakeExtractorOutput;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link SectionReader}.
  */
-public class SectionReaderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class SectionReaderTest {
 
   private byte[] packetPayload;
   private CustomSectionPayloadReader payloadReader;
   private SectionReader reader;
 
-  @Override
+  @Before
   public void setUp() {
     packetPayload = new byte[512];
     Arrays.fill(packetPayload, (byte) 0xFF);
@@ -44,27 +53,30 @@ public void setUp() {
         new TsPayloadReader.TrackIdGenerator(0, 1));
   }
 
+  @Test
   public void testSingleOnePacketSection() {
     packetPayload[0] = 3;
     insertTableSection(4, (byte) 99, 3);
     reader.consume(new ParsableByteArray(packetPayload), true);
-    assertEquals(Collections.singletonList(99), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(99));
   }
 
+  @Test
   public void testHeaderSplitAcrossPackets() {
     packetPayload[0] = 3; // The first packet includes a pointer_field.
     insertTableSection(4, (byte) 100, 3); // This section header spreads across both packets.
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 5);
     reader.consume(firstPacket, true);
-    assertEquals(Collections.emptyList(), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload);
     secondPacket.setPosition(5);
     reader.consume(secondPacket, false);
-    assertEquals(Collections.singletonList(100), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(100));
   }
 
+  @Test
   public void testFiveSectionsInTwoPackets() {
     packetPayload[0] = 0; // The first packet includes a pointer_field.
     insertTableSection(1, (byte) 101, 10);
@@ -76,14 +88,15 @@ public void testFiveSectionsInTwoPackets() {
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 40);
     reader.consume(firstPacket, true);
-    assertEquals(Arrays.asList(101, 102, 103), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(asList(101, 102, 103));
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload);
     secondPacket.setPosition(40);
     reader.consume(secondPacket, true);
-    assertEquals(Arrays.asList(101, 102, 103, 104, 105), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(asList(101, 102, 103, 104, 105));
   }
 
+  @Test
   public void testLongSectionAcrossFourPackets() {
     packetPayload[0] = 13; // The first packet includes a pointer_field.
     insertTableSection(1, (byte) 106, 10); // First section. Should be skipped.
@@ -95,24 +108,25 @@ public void testLongSectionAcrossFourPackets() {
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 100);
     reader.consume(firstPacket, true);
-    assertEquals(Collections.emptyList(), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload, 200);
     secondPacket.setPosition(100);
     reader.consume(secondPacket, false);
-    assertEquals(Collections.emptyList(), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray thirdPacket = new ParsableByteArray(packetPayload, 300);
     thirdPacket.setPosition(200);
     reader.consume(thirdPacket, false);
-    assertEquals(Collections.emptyList(), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray fourthPacket = new ParsableByteArray(packetPayload);
     fourthPacket.setPosition(300);
     reader.consume(fourthPacket, true);
-    assertEquals(Arrays.asList(107, 108), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(asList(107, 108));
   }
 
+  @Test
   public void testSeek() {
     packetPayload[0] = 13; // The first packet includes a pointer_field.
     insertTableSection(1, (byte) 109, 10); // First section. Should be skipped.
@@ -124,26 +138,27 @@ public void testSeek() {
 
     ParsableByteArray firstPacket = new ParsableByteArray(packetPayload, 100);
     reader.consume(firstPacket, true);
-    assertEquals(Collections.emptyList(), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray secondPacket = new ParsableByteArray(packetPayload, 200);
     secondPacket.setPosition(100);
     reader.consume(secondPacket, false);
-    assertEquals(Collections.emptyList(), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEmpty();
 
     ParsableByteArray thirdPacket = new ParsableByteArray(packetPayload, 300);
     thirdPacket.setPosition(200);
     reader.consume(thirdPacket, false);
-    assertEquals(Collections.emptyList(), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEmpty();
 
     reader.seek();
 
     ParsableByteArray fourthPacket = new ParsableByteArray(packetPayload);
     fourthPacket.setPosition(300);
     reader.consume(fourthPacket, true);
-    assertEquals(Collections.singletonList(111), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(111));
   }
 
+  @Test
   public void testCrcChecks() {
     byte[] correctCrcPat = new byte[] {
         (byte) 0x0, (byte) 0x0, (byte) 0xb0, (byte) 0xd, (byte) 0x0, (byte) 0x1, (byte) 0xc1,
@@ -153,9 +168,9 @@ public void testCrcChecks() {
     // Crc field is incorrect, and should not be passed to the payload reader.
     incorrectCrcPat[16]--;
     reader.consume(new ParsableByteArray(correctCrcPat), true);
-    assertEquals(Collections.singletonList(0), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(0));
     reader.consume(new ParsableByteArray(incorrectCrcPat), true);
-    assertEquals(Collections.singletonList(0), payloadReader.parsedTableIds);
+    assertThat(payloadReader.parsedTableIds).isEqualTo(singletonList(0));
   }
 
   // Internal methods.
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
similarity index 70%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
index b33dfd1067c..1ce0ccb93df 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageDecoderTest.java
@@ -15,17 +15,24 @@
  */
 package com.google.android.exoplayer2.metadata.emsg;
 
-import android.test.MoreAsserts;
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import java.nio.ByteBuffer;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link EventMessageDecoder}.
  */
-public final class EventMessageDecoderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class EventMessageDecoderTest {
 
+  @Test
   public void testDecodeEventMessage() {
     byte[] rawEmsgBody = new byte[] {
         117, 114, 110, 58, 116, 101, 115, 116, 0, // scheme_id_uri = "urn:test"
@@ -39,13 +46,13 @@ public void testDecodeEventMessage() {
     MetadataInputBuffer buffer = new MetadataInputBuffer();
     buffer.data = ByteBuffer.allocate(rawEmsgBody.length).put(rawEmsgBody);
     Metadata metadata = decoder.decode(buffer);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     EventMessage eventMessage = (EventMessage) metadata.get(0);
-    assertEquals("urn:test", eventMessage.schemeIdUri);
-    assertEquals("123", eventMessage.value);
-    assertEquals(3000, eventMessage.durationMs);
-    assertEquals(1000403, eventMessage.id);
-    MoreAsserts.assertEquals(new byte[] {0, 1, 2, 3, 4}, eventMessage.messageData);
+    assertThat(eventMessage.schemeIdUri).isEqualTo("urn:test");
+    assertThat(eventMessage.value).isEqualTo("123");
+    assertThat(eventMessage.durationMs).isEqualTo(3000);
+    assertThat(eventMessage.id).isEqualTo(1000403);
+    assertThat(eventMessage.messageData).isEqualTo(new byte[]{0, 1, 2, 3, 4});
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
similarity index 74%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
index baafb6b18b9..b48a071d0df 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/emsg/EventMessageTest.java
@@ -15,14 +15,22 @@
  */
 package com.google.android.exoplayer2.metadata.emsg;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.os.Parcel;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link EventMessage}.
  */
-public final class EventMessageTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class EventMessageTest {
 
+  @Test
   public void testEventMessageParcelable() {
     EventMessage eventMessage = new EventMessage("urn:test", "123", 3000, 1000403,
         new byte[] {0, 1, 2, 3, 4});
@@ -33,7 +41,7 @@ public void testEventMessageParcelable() {
     parcel.setDataPosition(0);
     EventMessage fromParcelEventMessage = EventMessage.CREATOR.createFromParcel(parcel);
     // Assert equals.
-    assertEquals(eventMessage, fromParcelEventMessage);
+    assertThat(fromParcelEventMessage).isEqualTo(eventMessage);
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
similarity index 75%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
index 182ae6f1c90..a42b71731ae 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterFrameTest.java
@@ -15,14 +15,22 @@
  */
 package com.google.android.exoplayer2.metadata.id3;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.os.Parcel;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link ChapterFrame}.
  */
-public final class ChapterFrameTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ChapterFrameTest {
 
+  @Test
   public void testParcelable() {
     Id3Frame[] subFrames = new Id3Frame[] {
       new TextInformationFrame("TIT2", null, "title"),
@@ -35,7 +43,7 @@ public void testParcelable() {
     parcel.setDataPosition(0);
 
     ChapterFrame chapterFrameFromParcel = ChapterFrame.CREATOR.createFromParcel(parcel);
-    assertEquals(chapterFrameToParcel, chapterFrameFromParcel);
+    assertThat(chapterFrameFromParcel).isEqualTo(chapterFrameToParcel);
 
     parcel.recycle();
   }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
similarity index 76%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
index 9641de76694..9636b04e51e 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/ChapterTocFrameTest.java
@@ -15,14 +15,22 @@
  */
 package com.google.android.exoplayer2.metadata.id3;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.os.Parcel;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link ChapterTocFrame}.
  */
-public final class ChapterTocFrameTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ChapterTocFrameTest {
 
+  @Test
   public void testParcelable() {
     String[] children = new String[] {"child0", "child1"};
     Id3Frame[] subFrames = new Id3Frame[] {
@@ -37,7 +45,7 @@ public void testParcelable() {
     parcel.setDataPosition(0);
 
     ChapterTocFrame chapterTocFrameFromParcel = ChapterTocFrame.CREATOR.createFromParcel(parcel);
-    assertEquals(chapterTocFrameToParcel, chapterTocFrameFromParcel);
+    assertThat(chapterTocFrameFromParcel).isEqualTo(chapterTocFrameToParcel);
 
     parcel.recycle();
   }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
similarity index 66%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
index 6b39ed1645b..06ce3301468 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/id3/Id3DecoderTest.java
@@ -15,182 +15,197 @@
  */
 package com.google.android.exoplayer2.metadata.id3;
 
-import android.test.MoreAsserts;
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataDecoderException;
 import com.google.android.exoplayer2.util.Assertions;
-import junit.framework.TestCase;
+import java.nio.charset.Charset;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link Id3Decoder}.
  */
-public final class Id3DecoderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class Id3DecoderTest {
 
   private static final byte[] TAG_HEADER = new byte[] {73, 68, 51, 4, 0, 0, 0, 0, 0, 0};
   private static final int FRAME_HEADER_LENGTH = 10;
   private static final int ID3_TEXT_ENCODING_UTF_8 = 3;
 
+  @Test
   public void testDecodeTxxxFrame() throws MetadataDecoderException {
     byte[] rawId3 = buildSingleFrameTag("TXXX", new byte[] {3, 0, 109, 100, 105, 97, 108, 111, 103,
         95, 86, 73, 78, 68, 73, 67, 79, 49, 53, 50, 55, 54, 54, 52, 95, 115, 116, 97, 114, 116, 0});
     Id3Decoder decoder = new Id3Decoder();
     Metadata metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     TextInformationFrame textInformationFrame = (TextInformationFrame) metadata.get(0);
-    assertEquals("TXXX", textInformationFrame.id);
-    assertEquals("", textInformationFrame.description);
-    assertEquals("mdialog_VINDICO1527664_start", textInformationFrame.value);
+    assertThat(textInformationFrame.id).isEqualTo("TXXX");
+    assertThat(textInformationFrame.description).isEmpty();
+    assertThat(textInformationFrame.value).isEqualTo("mdialog_VINDICO1527664_start");
 
     // Test empty.
     rawId3 = buildSingleFrameTag("TXXX", new byte[0]);
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(0, metadata.length());
+    assertThat(metadata.length()).isEqualTo(0);
 
     // Test encoding byte only.
     rawId3 = buildSingleFrameTag("TXXX", new byte[] {ID3_TEXT_ENCODING_UTF_8});
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     textInformationFrame = (TextInformationFrame) metadata.get(0);
-    assertEquals("TXXX", textInformationFrame.id);
-    assertEquals("", textInformationFrame.description);
-    assertEquals("", textInformationFrame.value);
+    assertThat(textInformationFrame.id).isEqualTo("TXXX");
+    assertThat(textInformationFrame.description).isEmpty();
+    assertThat(textInformationFrame.value).isEmpty();
   }
 
+  @Test
   public void testDecodeTextInformationFrame() throws MetadataDecoderException {
     byte[] rawId3 = buildSingleFrameTag("TIT2", new byte[] {3, 72, 101, 108, 108, 111, 32, 87, 111,
         114, 108, 100, 0});
     Id3Decoder decoder = new Id3Decoder();
     Metadata metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     TextInformationFrame textInformationFrame = (TextInformationFrame) metadata.get(0);
-    assertEquals("TIT2", textInformationFrame.id);
-    assertNull(textInformationFrame.description);
-    assertEquals("Hello World", textInformationFrame.value);
+    assertThat(textInformationFrame.id).isEqualTo("TIT2");
+    assertThat(textInformationFrame.description).isNull();
+    assertThat(textInformationFrame.value).isEqualTo("Hello World");
 
     // Test empty.
     rawId3 = buildSingleFrameTag("TIT2", new byte[0]);
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(0, metadata.length());
+    assertThat(metadata.length()).isEqualTo(0);
 
     // Test encoding byte only.
     rawId3 = buildSingleFrameTag("TIT2", new byte[] {ID3_TEXT_ENCODING_UTF_8});
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     textInformationFrame = (TextInformationFrame) metadata.get(0);
-    assertEquals("TIT2", textInformationFrame.id);
-    assertEquals(null, textInformationFrame.description);
-    assertEquals("", textInformationFrame.value);
+    assertThat(textInformationFrame.id).isEqualTo("TIT2");
+    assertThat(textInformationFrame.description).isNull();
+    assertThat(textInformationFrame.value).isEmpty();
   }
 
+  @Test
   public void testDecodeWxxxFrame() throws MetadataDecoderException {
     byte[] rawId3 = buildSingleFrameTag("WXXX", new byte[] {ID3_TEXT_ENCODING_UTF_8, 116, 101, 115,
         116, 0, 104, 116, 116, 112, 115, 58, 47, 47, 116, 101, 115, 116, 46, 99, 111, 109, 47, 97,
         98, 99, 63, 100, 101, 102});
     Id3Decoder decoder = new Id3Decoder();
     Metadata metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     UrlLinkFrame urlLinkFrame = (UrlLinkFrame) metadata.get(0);
-    assertEquals("WXXX", urlLinkFrame.id);
-    assertEquals("test", urlLinkFrame.description);
-    assertEquals("https://test.com/abc?def", urlLinkFrame.url);
+    assertThat(urlLinkFrame.id).isEqualTo("WXXX");
+    assertThat(urlLinkFrame.description).isEqualTo("test");
+    assertThat(urlLinkFrame.url).isEqualTo("https://test.com/abc?def");
 
     // Test empty.
     rawId3 = buildSingleFrameTag("WXXX", new byte[0]);
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(0, metadata.length());
+    assertThat(metadata.length()).isEqualTo(0);
 
     // Test encoding byte only.
     rawId3 = buildSingleFrameTag("WXXX", new byte[] {ID3_TEXT_ENCODING_UTF_8});
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     urlLinkFrame = (UrlLinkFrame) metadata.get(0);
-    assertEquals("WXXX", urlLinkFrame.id);
-    assertEquals("", urlLinkFrame.description);
-    assertEquals("", urlLinkFrame.url);
+    assertThat(urlLinkFrame.id).isEqualTo("WXXX");
+    assertThat(urlLinkFrame.description).isEmpty();
+    assertThat(urlLinkFrame.url).isEmpty();
   }
 
+  @Test
   public void testDecodeUrlLinkFrame() throws MetadataDecoderException {
     byte[] rawId3 = buildSingleFrameTag("WCOM", new byte[] {104, 116, 116, 112, 115, 58, 47, 47,
         116, 101, 115, 116, 46, 99, 111, 109, 47, 97, 98, 99, 63, 100, 101, 102});
     Id3Decoder decoder = new Id3Decoder();
     Metadata metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     UrlLinkFrame urlLinkFrame = (UrlLinkFrame) metadata.get(0);
-    assertEquals("WCOM", urlLinkFrame.id);
-    assertEquals(null, urlLinkFrame.description);
-    assertEquals("https://test.com/abc?def", urlLinkFrame.url);
+    assertThat(urlLinkFrame.id).isEqualTo("WCOM");
+    assertThat(urlLinkFrame.description).isNull();
+    assertThat(urlLinkFrame.url).isEqualTo("https://test.com/abc?def");
 
     // Test empty.
     rawId3 = buildSingleFrameTag("WCOM", new byte[0]);
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     urlLinkFrame = (UrlLinkFrame) metadata.get(0);
-    assertEquals("WCOM", urlLinkFrame.id);
-    assertEquals(null, urlLinkFrame.description);
-    assertEquals("", urlLinkFrame.url);
+    assertThat(urlLinkFrame.id).isEqualTo("WCOM");
+    assertThat(urlLinkFrame.description).isNull();
+    assertThat(urlLinkFrame.url).isEmpty();
   }
 
+  @Test
   public void testDecodePrivFrame() throws MetadataDecoderException {
     byte[] rawId3 = buildSingleFrameTag("PRIV", new byte[] {116, 101, 115, 116, 0, 1, 2, 3, 4});
     Id3Decoder decoder = new Id3Decoder();
     Metadata metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     PrivFrame privFrame = (PrivFrame) metadata.get(0);
-    assertEquals("test", privFrame.owner);
-    MoreAsserts.assertEquals(new byte[] {1, 2, 3, 4}, privFrame.privateData);
+    assertThat(privFrame.owner).isEqualTo("test");
+    assertThat(privFrame.privateData).isEqualTo(new byte[]{1, 2, 3, 4});
 
     // Test empty.
     rawId3 = buildSingleFrameTag("PRIV", new byte[0]);
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     privFrame = (PrivFrame) metadata.get(0);
-    assertEquals("", privFrame.owner);
-    MoreAsserts.assertEquals(new byte[0], privFrame.privateData);
+    assertThat(privFrame.owner).isEmpty();
+    assertThat(privFrame.privateData).isEqualTo(new byte[0]);
   }
 
+  @Test
   public void testDecodeApicFrame() throws MetadataDecoderException {
     byte[] rawId3 = buildSingleFrameTag("APIC", new byte[] {3, 105, 109, 97, 103, 101, 47, 106, 112,
         101, 103, 0, 16, 72, 101, 108, 108, 111, 32, 87, 111, 114, 108, 100, 0, 1, 2, 3, 4, 5, 6, 7,
         8, 9, 0});
     Id3Decoder decoder = new Id3Decoder();
     Metadata metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     ApicFrame apicFrame = (ApicFrame) metadata.get(0);
-    assertEquals("image/jpeg", apicFrame.mimeType);
-    assertEquals(16, apicFrame.pictureType);
-    assertEquals("Hello World", apicFrame.description);
-    assertEquals(10, apicFrame.pictureData.length);
-    MoreAsserts.assertEquals(new byte[] {1, 2, 3, 4, 5, 6, 7, 8, 9, 0}, apicFrame.pictureData);
+    assertThat(apicFrame.mimeType).isEqualTo("image/jpeg");
+    assertThat(apicFrame.pictureType).isEqualTo(16);
+    assertThat(apicFrame.description).isEqualTo("Hello World");
+    assertThat(apicFrame.pictureData).hasLength(10);
+    assertThat(apicFrame.pictureData).isEqualTo(new byte[]{1, 2, 3, 4, 5, 6, 7, 8, 9, 0});
   }
 
+  @Test
   public void testDecodeCommentFrame() throws MetadataDecoderException {
     byte[] rawId3 = buildSingleFrameTag("COMM", new byte[] {ID3_TEXT_ENCODING_UTF_8, 101, 110, 103,
         100, 101, 115, 99, 114, 105, 112, 116, 105, 111, 110, 0, 116, 101, 120, 116, 0});
     Id3Decoder decoder = new Id3Decoder();
     Metadata metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     CommentFrame commentFrame = (CommentFrame) metadata.get(0);
-    assertEquals("eng", commentFrame.language);
-    assertEquals("description", commentFrame.description);
-    assertEquals("text", commentFrame.text);
+    assertThat(commentFrame.language).isEqualTo("eng");
+    assertThat(commentFrame.description).isEqualTo("description");
+    assertThat(commentFrame.text).isEqualTo("text");
 
     // Test empty.
     rawId3 = buildSingleFrameTag("COMM", new byte[0]);
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(0, metadata.length());
+    assertThat(metadata.length()).isEqualTo(0);
 
     // Test language only.
     rawId3 = buildSingleFrameTag("COMM", new byte[] {ID3_TEXT_ENCODING_UTF_8, 101, 110, 103});
     metadata = decoder.decode(rawId3, rawId3.length);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     commentFrame = (CommentFrame) metadata.get(0);
-    assertEquals("eng", commentFrame.language);
-    assertEquals("", commentFrame.description);
-    assertEquals("", commentFrame.text);
+    assertThat(commentFrame.language).isEqualTo("eng");
+    assertThat(commentFrame.description).isEmpty();
+    assertThat(commentFrame.text).isEmpty();
   }
 
   private static byte[] buildSingleFrameTag(String frameId, byte[] frameData) {
-    byte[] frameIdBytes = frameId.getBytes();
+    byte[] frameIdBytes = frameId.getBytes(Charset.forName(C.UTF8_NAME));
     Assertions.checkState(frameIdBytes.length == 4);
 
     byte[] tagData = new byte[TAG_HEADER.length + FRAME_HEADER_LENGTH + frameData.length];
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
similarity index 73%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
index c50ff066993..15cb9b23c52 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/metadata/scte35/SpliceInfoDecoderTest.java
@@ -15,29 +15,38 @@
  */
 package com.google.android.exoplayer2.metadata.scte35;
 
-import com.google.android.exoplayer2.C;
+import static com.google.android.exoplayer2.C.TIME_UNSET;
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.MetadataDecoderException;
 import com.google.android.exoplayer2.metadata.MetadataInputBuffer;
 import com.google.android.exoplayer2.util.TimestampAdjuster;
 import java.nio.ByteBuffer;
 import java.util.List;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Test for {@link SpliceInfoDecoder}.
  */
-public final class SpliceInfoDecoderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class SpliceInfoDecoderTest {
 
   private SpliceInfoDecoder decoder;
   private MetadataInputBuffer inputBuffer;
 
-  @Override
+  @Before
   public void setUp() {
     decoder = new SpliceInfoDecoder();
     inputBuffer = new MetadataInputBuffer();
   }
 
+  @Test
   public void testWrappedAroundTimeSignalCommand() throws MetadataDecoderException {
     byte[] rawTimeSignalSection = new byte[] {
         0, // table_id.
@@ -59,11 +68,12 @@ public void testWrappedAroundTimeSignalCommand() throws MetadataDecoderException
     // The playback position is 57:15:58.43 approximately.
     // With this offset, the playback position pts before wrapping is 0x451ebf851.
     Metadata metadata = feedInputBuffer(rawTimeSignalSection, 0x3000000000L, -0x50000L);
-    assertEquals(1, metadata.length());
-    assertEquals(removePtsConversionPrecisionError(0x3001000000L, inputBuffer.subsampleOffsetUs),
-        ((TimeSignalCommand) metadata.get(0)).playbackPositionUs);
+    assertThat(metadata.length()).isEqualTo(1);
+    assertThat(((TimeSignalCommand) metadata.get(0)).playbackPositionUs)
+        .isEqualTo(removePtsConversionPrecisionError(0x3001000000L, inputBuffer.subsampleOffsetUs));
   }
 
+  @Test
   public void test2SpliceInsertCommands() throws MetadataDecoderException {
     byte[] rawSpliceInsertCommand1 = new byte[] {
         0, // table_id.
@@ -91,18 +101,18 @@ public void test2SpliceInsertCommands() throws MetadataDecoderException {
         0x00, 0x00, 0x00, 0x00}; // CRC_32 (ignored, check happens at extraction).
 
     Metadata metadata = feedInputBuffer(rawSpliceInsertCommand1, 2000000, 3000000);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     SpliceInsertCommand command = (SpliceInsertCommand) metadata.get(0);
-    assertEquals(66, command.spliceEventId);
-    assertFalse(command.spliceEventCancelIndicator);
-    assertFalse(command.outOfNetworkIndicator);
-    assertTrue(command.programSpliceFlag);
-    assertFalse(command.spliceImmediateFlag);
-    assertEquals(3000000, command.programSplicePlaybackPositionUs);
-    assertEquals(C.TIME_UNSET, command.breakDuration);
-    assertEquals(16, command.uniqueProgramId);
-    assertEquals(1, command.availNum);
-    assertEquals(2, command.availsExpected);
+    assertThat(command.spliceEventId).isEqualTo(66);
+    assertThat(command.spliceEventCancelIndicator).isFalse();
+    assertThat(command.outOfNetworkIndicator).isFalse();
+    assertThat(command.programSpliceFlag).isTrue();
+    assertThat(command.spliceImmediateFlag).isFalse();
+    assertThat(command.programSplicePlaybackPositionUs).isEqualTo(3000000);
+    assertThat(command.breakDuration).isEqualTo(TIME_UNSET);
+    assertThat(command.uniqueProgramId).isEqualTo(16);
+    assertThat(command.availNum).isEqualTo(1);
+    assertThat(command.availsExpected).isEqualTo(2);
 
     byte[] rawSpliceInsertCommand2 = new byte[] {
         0, // table_id.
@@ -137,24 +147,24 @@ public void test2SpliceInsertCommands() throws MetadataDecoderException {
     // By changing the subsample offset we force adjuster reconstruction.
     long subsampleOffset = 1000011;
     metadata = feedInputBuffer(rawSpliceInsertCommand2, 1000000, subsampleOffset);
-    assertEquals(1, metadata.length());
+    assertThat(metadata.length()).isEqualTo(1);
     command = (SpliceInsertCommand) metadata.get(0);
-    assertEquals(0xffffffffL, command.spliceEventId);
-    assertFalse(command.spliceEventCancelIndicator);
-    assertFalse(command.outOfNetworkIndicator);
-    assertFalse(command.programSpliceFlag);
-    assertFalse(command.spliceImmediateFlag);
-    assertEquals(C.TIME_UNSET, command.programSplicePlaybackPositionUs);
-    assertEquals(C.TIME_UNSET, command.breakDuration);
+    assertThat(command.spliceEventId).isEqualTo(0xffffffffL);
+    assertThat(command.spliceEventCancelIndicator).isFalse();
+    assertThat(command.outOfNetworkIndicator).isFalse();
+    assertThat(command.programSpliceFlag).isFalse();
+    assertThat(command.spliceImmediateFlag).isFalse();
+    assertThat(command.programSplicePlaybackPositionUs).isEqualTo(TIME_UNSET);
+    assertThat(command.breakDuration).isEqualTo(TIME_UNSET);
     List<SpliceInsertCommand.ComponentSplice> componentSplices = command.componentSpliceList;
-    assertEquals(2, componentSplices.size());
-    assertEquals(16, componentSplices.get(0).componentTag);
-    assertEquals(1000000, componentSplices.get(0).componentSplicePlaybackPositionUs);
-    assertEquals(17, componentSplices.get(1).componentTag);
-    assertEquals(C.TIME_UNSET, componentSplices.get(1).componentSplicePts);
-    assertEquals(32, command.uniqueProgramId);
-    assertEquals(1, command.availNum);
-    assertEquals(2, command.availsExpected);
+    assertThat(componentSplices).hasSize(2);
+    assertThat(componentSplices.get(0).componentTag).isEqualTo(16);
+    assertThat(componentSplices.get(0).componentSplicePlaybackPositionUs).isEqualTo(1000000);
+    assertThat(componentSplices.get(1).componentTag).isEqualTo(17);
+    assertThat(componentSplices.get(1).componentSplicePts).isEqualTo(TIME_UNSET);
+    assertThat(command.uniqueProgramId).isEqualTo(32);
+    assertThat(command.availNum).isEqualTo(1);
+    assertThat(command.availsExpected).isEqualTo(2);
   }
 
   private Metadata feedInputBuffer(byte[] data, long timeUs, long subsampleOffset)
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
new file mode 100644
index 00000000000..95dd2180923
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
@@ -0,0 +1,143 @@
+/*
+ * 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 com.google.android.exoplayer2.upstream.DummyDataSource;
+import com.google.android.exoplayer2.upstream.cache.Cache;
+import com.google.android.exoplayer2.util.ClosedSource;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit tests for {@link ProgressiveDownloadAction}.
+ */
+@ClosedSource(reason = "Not ready yet")
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class ProgressiveDownloadActionTest {
+
+  @Test
+  public void testDownloadActionIsNotRemoveAction() throws Exception {
+    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
+    assertThat(action.isRemoveAction()).isFalse();
+  }
+
+  @Test
+  public void testRemoveActionIsRemoveAction() throws Exception {
+    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
+    assertThat(action2.isRemoveAction()).isTrue();
+  }
+
+  @Test
+  public void testCreateDownloader() throws Exception {
+    MockitoAnnotations.initMocks(this);
+    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
+    DownloaderConstructorHelper constructorHelper = new DownloaderConstructorHelper(
+        Mockito.mock(Cache.class), DummyDataSource.FACTORY);
+    assertThat(action.createDownloader(constructorHelper)).isNotNull();
+  }
+
+  @Test
+  public void testSameUriCacheKeyDifferentAction_IsSameMedia() throws Exception {
+    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, false);
+    assertThat(action1.isSameMedia(action2)).isTrue();
+  }
+
+  @Test
+  public void testNullCacheKeyDifferentUriAction_IsNotSameMedia() throws Exception {
+    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri2", null, true);
+    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, false);
+    assertThat(action3.isSameMedia(action4)).isFalse();
+  }
+
+  @Test
+  public void testSameCacheKeyDifferentUriAction_IsSameMedia() throws Exception {
+    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri2", "key", true);
+    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", "key", false);
+    assertThat(action5.isSameMedia(action6)).isTrue();
+  }
+
+  @Test
+  public void testSameUriDifferentCacheKeyAction_IsNotSameMedia() throws Exception {
+    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
+    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", false);
+    assertThat(action7.isSameMedia(action8)).isFalse();
+  }
+
+  @Test
+  public void testEquals() throws Exception {
+    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
+    assertThat(action1.equals(action1)).isTrue();
+
+    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri", null, true);
+    assertThat(action2.equals(action3)).isTrue();
+
+    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri", null, false);
+    assertThat(action4.equals(action5)).isFalse();
+
+    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
+    assertThat(action6.equals(action7)).isFalse();
+
+    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", true);
+    ProgressiveDownloadAction action9 = new ProgressiveDownloadAction("uri", "key", true);
+    assertThat(action8.equals(action9)).isFalse();
+
+    ProgressiveDownloadAction action10 = new ProgressiveDownloadAction("uri", null, true);
+    ProgressiveDownloadAction action11 = new ProgressiveDownloadAction("uri2", null, true);
+    assertThat(action10.equals(action11)).isFalse();
+  }
+
+  @Test
+  public void testSerializerGetType() throws Exception {
+    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
+    assertThat(action.getType()).isNotNull();
+  }
+
+  @Test
+  public void testSerializerWriteRead() throws Exception {
+    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri1", null, false));
+    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri2", "key", true));
+  }
+
+  private static void doTestSerializationRoundTrip(ProgressiveDownloadAction action1)
+      throws IOException {
+    ByteArrayOutputStream out = new ByteArrayOutputStream();
+    DataOutputStream output = new DataOutputStream(out);
+    action1.writeToStream(output);
+
+    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
+    DataInputStream input = new DataInputStream(in);
+    DownloadAction action2 = ProgressiveDownloadAction.DESERIALIZER.readFromStream(input);
+
+    assertThat(action2).isEqualTo(action1);
+  }
+
+}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/SampleQueueTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
similarity index 86%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/source/SampleQueueTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
index 77e61e39a93..49983fae300 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/SampleQueueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SampleQueueTest.java
@@ -15,7 +15,14 @@
  */
 package com.google.android.exoplayer2.source;
 
-import android.test.MoreAsserts;
+import static com.google.android.exoplayer2.C.RESULT_BUFFER_READ;
+import static com.google.android.exoplayer2.C.RESULT_FORMAT_READ;
+import static com.google.android.exoplayer2.C.RESULT_NOTHING_READ;
+import static com.google.android.exoplayer2.source.SampleQueue.ADVANCE_FAILED;
+import static com.google.common.truth.Truth.assertThat;
+import static java.lang.Long.MIN_VALUE;
+import static java.util.Arrays.copyOfRange;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
@@ -24,13 +31,19 @@
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.DefaultAllocator;
 import com.google.android.exoplayer2.util.ParsableByteArray;
-import java.util.Arrays;
-import junit.framework.TestCase;
+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;
 
 /**
  * Test for {@link SampleQueue}.
  */
-public class SampleQueueTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class SampleQueueTest {
 
   private static final int ALLOCATION_SIZE = 16;
 
@@ -75,24 +88,23 @@ public class SampleQueueTest extends TestCase {
   private FormatHolder formatHolder;
   private DecoderInputBuffer inputBuffer;
 
-  @Override
+  @Before
   public void setUp() throws Exception {
-    super.setUp();
     allocator = new DefaultAllocator(false, ALLOCATION_SIZE);
     sampleQueue = new SampleQueue(allocator);
     formatHolder = new FormatHolder();
     inputBuffer = new DecoderInputBuffer(DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_NORMAL);
   }
 
-  @Override
+  @After
   public void tearDown() throws Exception {
-    super.tearDown();
     allocator = null;
     sampleQueue = null;
     formatHolder = null;
     inputBuffer = null;
   }
 
+  @Test
   public void testResetReleasesAllocations() {
     writeTestData();
     assertAllocationCount(10);
@@ -100,10 +112,12 @@ public void testResetReleasesAllocations() {
     assertAllocationCount(0);
   }
 
+  @Test
   public void testReadWithoutWrite() {
     assertNoSamplesToRead(null);
   }
 
+  @Test
   public void testReadFormatDeduplicated() {
     sampleQueue.format(TEST_FORMAT_1);
     assertReadFormat(false, TEST_FORMAT_1);
@@ -115,6 +129,7 @@ public void testReadFormatDeduplicated() {
     assertNoSamplesToRead(TEST_FORMAT_1);
   }
 
+  @Test
   public void testReadSingleSamples() {
     sampleQueue.sampleData(new ParsableByteArray(TEST_DATA), ALLOCATION_SIZE);
 
@@ -173,9 +188,10 @@ public void testReadSingleSamples() {
     assertAllocationCount(0);
   }
 
+  @Test
   public void testReadMultiSamples() {
     writeTestData();
-    assertEquals(LAST_SAMPLE_TIMESTAMP, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(LAST_SAMPLE_TIMESTAMP);
     assertAllocationCount(10);
     assertReadTestData();
     assertAllocationCount(10);
@@ -183,6 +199,7 @@ public void testReadMultiSamples() {
     assertAllocationCount(0);
   }
 
+  @Test
   public void testReadMultiSamplesTwice() {
     writeTestData();
     writeTestData();
@@ -194,19 +211,21 @@ public void testReadMultiSamplesTwice() {
     assertAllocationCount(0);
   }
 
+  @Test
   public void testReadMultiWithRewind() {
     writeTestData();
     assertReadTestData();
-    assertEquals(8, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(8);
     assertAllocationCount(10);
     // Rewind.
     sampleQueue.rewind();
     assertAllocationCount(10);
     // Read again.
-    assertEquals(0, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(0);
     assertReadTestData();
   }
 
+  @Test
   public void testRewindAfterDiscard() {
     writeTestData();
     assertReadTestData();
@@ -216,10 +235,11 @@ public void testRewindAfterDiscard() {
     sampleQueue.rewind();
     assertAllocationCount(0);
     // Can't read again.
-    assertEquals(8, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(8);
     assertReadEndOfStream(false);
   }
 
+  @Test
   public void testAdvanceToEnd() {
     writeTestData();
     sampleQueue.advanceToEnd();
@@ -233,6 +253,7 @@ public void testAdvanceToEnd() {
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testAdvanceToEndRetainsUnassignedData() {
     sampleQueue.format(TEST_FORMAT_1);
     sampleQueue.sampleData(new ParsableByteArray(TEST_DATA), ALLOCATION_SIZE);
@@ -256,56 +277,62 @@ public void testAdvanceToEndRetainsUnassignedData() {
     assertAllocationCount(0);
   }
 
+  @Test
   public void testAdvanceToBeforeBuffer() {
     writeTestData();
     int skipCount = sampleQueue.advanceTo(TEST_SAMPLE_TIMESTAMPS[0] - 1, true, false);
     // Should fail and have no effect.
-    assertEquals(SampleQueue.ADVANCE_FAILED, skipCount);
+    assertThat(skipCount).isEqualTo(ADVANCE_FAILED);
     assertReadTestData();
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testAdvanceToStartOfBuffer() {
     writeTestData();
     int skipCount = sampleQueue.advanceTo(TEST_SAMPLE_TIMESTAMPS[0], true, false);
     // Should succeed but have no effect (we're already at the first frame).
-    assertEquals(0, skipCount);
+    assertThat(skipCount).isEqualTo(0);
     assertReadTestData();
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testAdvanceToEndOfBuffer() {
     writeTestData();
     int skipCount = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP, true, false);
     // Should succeed and skip to 2nd keyframe (the 4th frame).
-    assertEquals(4, skipCount);
+    assertThat(skipCount).isEqualTo(4);
     assertReadTestData(null, TEST_DATA_SECOND_KEYFRAME_INDEX);
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testAdvanceToAfterBuffer() {
     writeTestData();
     int skipCount = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP + 1, true, false);
     // Should fail and have no effect.
-    assertEquals(SampleQueue.ADVANCE_FAILED, skipCount);
+    assertThat(skipCount).isEqualTo(ADVANCE_FAILED);
     assertReadTestData();
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testAdvanceToAfterBufferAllowed() {
     writeTestData();
     int skipCount = sampleQueue.advanceTo(LAST_SAMPLE_TIMESTAMP + 1, true, true);
     // Should succeed and skip to 2nd keyframe (the 4th frame).
-    assertEquals(4, skipCount);
+    assertThat(skipCount).isEqualTo(4);
     assertReadTestData(null, TEST_DATA_SECOND_KEYFRAME_INDEX);
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testDiscardToEnd() {
     writeTestData();
     // Should discard everything.
     sampleQueue.discardToEnd();
-    assertEquals(8, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(8);
     assertAllocationCount(0);
     // We should still be able to read the upstream format.
     assertReadFormat(false, TEST_FORMAT_2);
@@ -314,17 +341,18 @@ public void testDiscardToEnd() {
     assertReadTestData(TEST_FORMAT_2);
   }
 
+  @Test
   public void testDiscardToStopAtReadPosition() {
     writeTestData();
     // Shouldn't discard anything.
     sampleQueue.discardTo(LAST_SAMPLE_TIMESTAMP, false, true);
-    assertEquals(0, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(0);
     assertAllocationCount(10);
     // Read the first sample.
     assertReadTestData(null, 0, 1);
     // Shouldn't discard anything.
     sampleQueue.discardTo(TEST_SAMPLE_TIMESTAMPS[1] - 1, false, true);
-    assertEquals(1, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(1);
     assertAllocationCount(10);
     // Should discard the read sample.
     sampleQueue.discardTo(TEST_SAMPLE_TIMESTAMPS[1], false, true);
@@ -334,7 +362,7 @@ public void testDiscardToStopAtReadPosition() {
     assertAllocationCount(9);
     // Should be able to read the remaining samples.
     assertReadTestData(TEST_FORMAT_1, 1, 7);
-    assertEquals(8, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(8);
     // Should discard up to the second last sample
     sampleQueue.discardTo(LAST_SAMPLE_TIMESTAMP - 1, false, true);
     assertAllocationCount(3);
@@ -343,20 +371,22 @@ public void testDiscardToStopAtReadPosition() {
     assertAllocationCount(1);
   }
 
+  @Test
   public void testDiscardToDontStopAtReadPosition() {
     writeTestData();
     // Shouldn't discard anything.
     sampleQueue.discardTo(TEST_SAMPLE_TIMESTAMPS[1] - 1, false, false);
-    assertEquals(0, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(0);
     assertAllocationCount(10);
     // Should discard the first sample.
     sampleQueue.discardTo(TEST_SAMPLE_TIMESTAMPS[1], false, false);
-    assertEquals(1, sampleQueue.getReadIndex());
+    assertThat(sampleQueue.getReadIndex()).isEqualTo(1);
     assertAllocationCount(9);
     // Should be able to read the remaining samples.
     assertReadTestData(TEST_FORMAT_1, 1, 7);
   }
 
+  @Test
   public void testDiscardUpstream() {
     writeTestData();
     sampleQueue.discardUpstreamSamples(8);
@@ -381,6 +411,7 @@ public void testDiscardUpstream() {
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testDiscardUpstreamMulti() {
     writeTestData();
     sampleQueue.discardUpstreamSamples(4);
@@ -391,6 +422,7 @@ public void testDiscardUpstreamMulti() {
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testDiscardUpstreamBeforeRead() {
     writeTestData();
     sampleQueue.discardUpstreamSamples(4);
@@ -400,6 +432,7 @@ public void testDiscardUpstreamBeforeRead() {
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testDiscardUpstreamAfterRead() {
     writeTestData();
     assertReadTestData(null, 0, 3);
@@ -421,41 +454,44 @@ public void testDiscardUpstreamAfterRead() {
     assertNoSamplesToRead(TEST_FORMAT_2);
   }
 
+  @Test
   public void testLargestQueuedTimestampWithDiscardUpstream() {
     writeTestData();
-    assertEquals(LAST_SAMPLE_TIMESTAMP, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(LAST_SAMPLE_TIMESTAMP);
     sampleQueue.discardUpstreamSamples(TEST_SAMPLE_TIMESTAMPS.length - 1);
     // Discarding from upstream should reduce the largest timestamp.
-    assertEquals(TEST_SAMPLE_TIMESTAMPS[TEST_SAMPLE_TIMESTAMPS.length - 2],
-        sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs())
+        .isEqualTo(TEST_SAMPLE_TIMESTAMPS[TEST_SAMPLE_TIMESTAMPS.length - 2]);
     sampleQueue.discardUpstreamSamples(0);
     // Discarding everything from upstream without reading should unset the largest timestamp.
-    assertEquals(Long.MIN_VALUE, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(MIN_VALUE);
   }
 
+  @Test
   public void testLargestQueuedTimestampWithDiscardUpstreamDecodeOrder() {
     long[] decodeOrderTimestamps = new long[] {0, 3000, 2000, 1000, 4000, 7000, 6000, 5000};
     writeTestData(TEST_DATA, TEST_SAMPLE_SIZES, TEST_SAMPLE_OFFSETS, decodeOrderTimestamps,
         TEST_SAMPLE_FORMATS, TEST_SAMPLE_FLAGS);
-    assertEquals(7000, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(7000);
     sampleQueue.discardUpstreamSamples(TEST_SAMPLE_TIMESTAMPS.length - 2);
     // Discarding the last two samples should not change the largest timestamp, due to the decode
     // ordering of the timestamps.
-    assertEquals(7000, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(7000);
     sampleQueue.discardUpstreamSamples(TEST_SAMPLE_TIMESTAMPS.length - 3);
     // Once a third sample is discarded, the largest timestamp should have changed.
-    assertEquals(4000, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(4000);
     sampleQueue.discardUpstreamSamples(0);
     // Discarding everything from upstream without reading should unset the largest timestamp.
-    assertEquals(Long.MIN_VALUE, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(MIN_VALUE);
   }
 
+  @Test
   public void testLargestQueuedTimestampWithRead() {
     writeTestData();
-    assertEquals(LAST_SAMPLE_TIMESTAMP, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(LAST_SAMPLE_TIMESTAMP);
     assertReadTestData();
     // Reading everything should not reduce the largest timestamp.
-    assertEquals(LAST_SAMPLE_TIMESTAMP, sampleQueue.getLargestQueuedTimestampUs());
+    assertThat(sampleQueue.getLargestQueuedTimestampUs()).isEqualTo(LAST_SAMPLE_TIMESTAMP);
   }
 
   // Internal methods.
@@ -580,9 +616,9 @@ private void assertNoSamplesToRead(Format endFormat) {
   private void assertReadNothing(boolean formatRequired) {
     clearFormatHolderAndInputBuffer();
     int result = sampleQueue.read(formatHolder, inputBuffer, formatRequired, false, 0);
-    assertEquals(C.RESULT_NOTHING_READ, result);
+    assertThat(result).isEqualTo(RESULT_NOTHING_READ);
     // formatHolder should not be populated.
-    assertNull(formatHolder.format);
+    assertThat(formatHolder.format).isNull();
     // inputBuffer should not be populated.
     assertInputBufferContainsNoSampleData();
     assertInputBufferHasNoDefaultFlagsSet();
@@ -597,14 +633,14 @@ private void assertReadNothing(boolean formatRequired) {
   private void assertReadEndOfStream(boolean formatRequired) {
     clearFormatHolderAndInputBuffer();
     int result = sampleQueue.read(formatHolder, inputBuffer, formatRequired, true, 0);
-    assertEquals(C.RESULT_BUFFER_READ, result);
+    assertThat(result).isEqualTo(RESULT_BUFFER_READ);
     // formatHolder should not be populated.
-    assertNull(formatHolder.format);
+    assertThat(formatHolder.format).isNull();
     // inputBuffer should not contain sample data, but end of stream flag should be set.
     assertInputBufferContainsNoSampleData();
-    assertTrue(inputBuffer.isEndOfStream());
-    assertFalse(inputBuffer.isDecodeOnly());
-    assertFalse(inputBuffer.isEncrypted());
+    assertThat(inputBuffer.isEndOfStream()).isTrue();
+    assertThat(inputBuffer.isDecodeOnly()).isFalse();
+    assertThat(inputBuffer.isEncrypted()).isFalse();
   }
 
   /**
@@ -617,9 +653,9 @@ private void assertReadEndOfStream(boolean formatRequired) {
   private void assertReadFormat(boolean formatRequired, Format format) {
     clearFormatHolderAndInputBuffer();
     int result = sampleQueue.read(formatHolder, inputBuffer, formatRequired, false, 0);
-    assertEquals(C.RESULT_FORMAT_READ, result);
+    assertThat(result).isEqualTo(RESULT_FORMAT_READ);
     // formatHolder should be populated.
-    assertEquals(format, formatHolder.format);
+    assertThat(formatHolder.format).isEqualTo(format);
     // inputBuffer should not be populated.
     assertInputBufferContainsNoSampleData();
     assertInputBufferHasNoDefaultFlagsSet();
@@ -639,19 +675,19 @@ private void assertSampleRead(long timeUs, boolean isKeyframe, byte[] sampleData
       int length) {
     clearFormatHolderAndInputBuffer();
     int result = sampleQueue.read(formatHolder, inputBuffer, false, false, 0);
-    assertEquals(C.RESULT_BUFFER_READ, result);
+    assertThat(result).isEqualTo(RESULT_BUFFER_READ);
     // formatHolder should not be populated.
-    assertNull(formatHolder.format);
+    assertThat(formatHolder.format).isNull();
     // inputBuffer should be populated.
-    assertEquals(timeUs, inputBuffer.timeUs);
-    assertEquals(isKeyframe, inputBuffer.isKeyFrame());
-    assertFalse(inputBuffer.isDecodeOnly());
-    assertFalse(inputBuffer.isEncrypted());
+    assertThat(inputBuffer.timeUs).isEqualTo(timeUs);
+    assertThat(inputBuffer.isKeyFrame()).isEqualTo(isKeyframe);
+    assertThat(inputBuffer.isDecodeOnly()).isFalse();
+    assertThat(inputBuffer.isEncrypted()).isFalse();
     inputBuffer.flip();
-    assertEquals(length, inputBuffer.data.limit());
+    assertThat(inputBuffer.data.limit()).isEqualTo(length);
     byte[] readData = new byte[length];
     inputBuffer.data.get(readData);
-    MoreAsserts.assertEquals(Arrays.copyOfRange(sampleData, offset, offset + length), readData);
+    assertThat(readData).isEqualTo(copyOfRange(sampleData, offset, offset + length));
   }
 
   /**
@@ -660,7 +696,7 @@ private void assertSampleRead(long timeUs, boolean isKeyframe, byte[] sampleData
    * @param count The expected number of allocations.
    */
   private void assertAllocationCount(int count) {
-    assertEquals(ALLOCATION_SIZE * count, allocator.getTotalBytesAllocated());
+    assertThat(allocator.getTotalBytesAllocated()).isEqualTo(ALLOCATION_SIZE * count);
   }
 
   /**
@@ -671,13 +707,13 @@ private void assertInputBufferContainsNoSampleData() {
       return;
     }
     inputBuffer.flip();
-    assertEquals(0, inputBuffer.data.limit());
+    assertThat(inputBuffer.data.limit()).isEqualTo(0);
   }
 
   private void assertInputBufferHasNoDefaultFlagsSet() {
-    assertFalse(inputBuffer.isEndOfStream());
-    assertFalse(inputBuffer.isDecodeOnly());
-    assertFalse(inputBuffer.isEncrypted());
+    assertThat(inputBuffer.isEndOfStream()).isFalse();
+    assertThat(inputBuffer.isDecodeOnly()).isFalse();
+    assertThat(inputBuffer.isEncrypted()).isFalse();
   }
 
   private void clearFormatHolderAndInputBuffer() {
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
similarity index 78%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
index 5de6bdf3e11..1229e478830 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/ShuffleOrderTest.java
@@ -15,18 +15,27 @@
  */
 package com.google.android.exoplayer2.source;
 
+import static com.google.android.exoplayer2.C.INDEX_UNSET;
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.source.ShuffleOrder.DefaultShuffleOrder;
 import com.google.android.exoplayer2.source.ShuffleOrder.UnshuffledShuffleOrder;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link ShuffleOrder}.
  */
-public final class ShuffleOrderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ShuffleOrderTest {
 
   public static final long RANDOM_SEED = 1234567890L;
 
+  @Test
   public void testDefaultShuffleOrder() {
     assertShuffleOrderCorrectness(new DefaultShuffleOrder(0, RANDOM_SEED), 0);
     assertShuffleOrderCorrectness(new DefaultShuffleOrder(1, RANDOM_SEED), 1);
@@ -44,6 +53,7 @@ public void testDefaultShuffleOrder() {
     testCloneAndRemove(new DefaultShuffleOrder(1, RANDOM_SEED), 0);
   }
 
+  @Test
   public void testUnshuffledShuffleOrder() {
     assertShuffleOrderCorrectness(new UnshuffledShuffleOrder(0), 0);
     assertShuffleOrderCorrectness(new UnshuffledShuffleOrder(1), 1);
@@ -61,35 +71,36 @@ public void testUnshuffledShuffleOrder() {
     testCloneAndRemove(new UnshuffledShuffleOrder(1), 0);
   }
 
+  @Test
   public void testUnshuffledShuffleOrderIsUnshuffled() {
     ShuffleOrder shuffleOrder = new UnshuffledShuffleOrder(5);
-    assertEquals(0, shuffleOrder.getFirstIndex());
-    assertEquals(4, shuffleOrder.getLastIndex());
+    assertThat(shuffleOrder.getFirstIndex()).isEqualTo(0);
+    assertThat(shuffleOrder.getLastIndex()).isEqualTo(4);
     for (int i = 0; i < 4; i++) {
-      assertEquals(i + 1, shuffleOrder.getNextIndex(i));
+      assertThat(shuffleOrder.getNextIndex(i)).isEqualTo(i + 1);
     }
   }
 
   private static void assertShuffleOrderCorrectness(ShuffleOrder shuffleOrder, int length) {
-    assertEquals(length, shuffleOrder.getLength());
+    assertThat(shuffleOrder.getLength()).isEqualTo(length);
     if (length == 0) {
-      assertEquals(C.INDEX_UNSET, shuffleOrder.getFirstIndex());
-      assertEquals(C.INDEX_UNSET, shuffleOrder.getLastIndex());
+      assertThat(shuffleOrder.getFirstIndex()).isEqualTo(INDEX_UNSET);
+      assertThat(shuffleOrder.getLastIndex()).isEqualTo(INDEX_UNSET);
     } else {
       int[] indices = new int[length];
       indices[0] = shuffleOrder.getFirstIndex();
-      assertEquals(C.INDEX_UNSET, shuffleOrder.getPreviousIndex(indices[0]));
+      assertThat(shuffleOrder.getPreviousIndex(indices[0])).isEqualTo(INDEX_UNSET);
       for (int i = 1; i < length; i++) {
         indices[i] = shuffleOrder.getNextIndex(indices[i - 1]);
-        assertEquals(indices[i - 1], shuffleOrder.getPreviousIndex(indices[i]));
+        assertThat(shuffleOrder.getPreviousIndex(indices[i])).isEqualTo(indices[i - 1]);
         for (int j = 0; j < i; j++) {
-          assertTrue(indices[i] != indices[j]);
+          assertThat(indices[i] != indices[j]).isTrue();
         }
       }
-      assertEquals(indices[length - 1], shuffleOrder.getLastIndex());
-      assertEquals(C.INDEX_UNSET, shuffleOrder.getNextIndex(indices[length - 1]));
+      assertThat(shuffleOrder.getLastIndex()).isEqualTo(indices[length - 1]);
+      assertThat(shuffleOrder.getNextIndex(indices[length - 1])).isEqualTo(INDEX_UNSET);
       for (int i = 0; i < length; i++) {
-        assertTrue(indices[i] >= 0 && indices[i] < length);
+        assertThat(indices[i] >= 0 && indices[i] < length).isTrue();
       }
     }
   }
@@ -107,7 +118,7 @@ private static void testCloneAndInsert(ShuffleOrder shuffleOrder, int position,
       while (newNextIndex >= position && newNextIndex < position + count) {
         newNextIndex = newOrder.getNextIndex(newNextIndex);
       }
-      assertEquals(expectedNextIndex, newNextIndex);
+      assertThat(newNextIndex).isEqualTo(expectedNextIndex);
     }
   }
 
@@ -127,7 +138,7 @@ private static void testCloneAndRemove(ShuffleOrder shuffleOrder, int position)
         expectedNextIndex--;
       }
       int newNextIndex = newOrder.getNextIndex(i < position ? i : i - 1);
-      assertEquals(expectedNextIndex, newNextIndex);
+      assertThat(newNextIndex).isEqualTo(expectedNextIndex);
     }
   }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
similarity index 59%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
index 82dc6b4ad5c..557611c4ea3 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
@@ -15,43 +15,62 @@
  */
 package com.google.android.exoplayer2.text.ttml;
 
+import static android.graphics.Color.BLACK;
+import static android.graphics.Color.RED;
+import static android.graphics.Color.YELLOW;
+import static com.google.android.exoplayer2.text.ttml.TtmlRenderUtil.resolveStyle;
+import static com.google.android.exoplayer2.text.ttml.TtmlStyle.STYLE_BOLD;
+import static com.google.android.exoplayer2.text.ttml.TtmlStyle.STYLE_BOLD_ITALIC;
+import static com.google.common.truth.Truth.assertThat;
+
 import android.graphics.Color;
-import android.test.InstrumentationTestCase;
 import java.util.HashMap;
 import java.util.Map;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
- * Unit test for <code>TtmlRenderUtil</code>
+ * Unit test for {@link TtmlRenderUtil}.
  */
-public class TtmlRenderUtilTest extends InstrumentationTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class TtmlRenderUtilTest {
 
+  @Test
   public void testResolveStyleNoStyleAtAll() {
-    assertNull(TtmlRenderUtil.resolveStyle(null, null, null));
+    assertThat(resolveStyle(null, null, null)).isNull();
   }
+
+  @Test
   public void testResolveStyleSingleReferentialStyle() {
     Map<String, TtmlStyle> globalStyles = getGlobalStyles();
     String[] styleIds = {"s0"};
 
-    assertSame(globalStyles.get("s0"),
-        TtmlRenderUtil.resolveStyle(null, styleIds, globalStyles));
+    assertThat(TtmlRenderUtil.resolveStyle(null, styleIds, globalStyles))
+        .isSameAs(globalStyles.get("s0"));
   }
+
+  @Test
   public void testResolveStyleMultipleReferentialStyles() {
     Map<String, TtmlStyle> globalStyles = getGlobalStyles();
     String[] styleIds = {"s0", "s1"};
 
     TtmlStyle resolved = TtmlRenderUtil.resolveStyle(null, styleIds, globalStyles);
-    assertNotSame(globalStyles.get("s0"), resolved);
-    assertNotSame(globalStyles.get("s1"), resolved);
-    assertNull(resolved.getId());
+    assertThat(resolved).isNotSameAs(globalStyles.get("s0"));
+    assertThat(resolved).isNotSameAs(globalStyles.get("s1"));
+    assertThat(resolved.getId()).isNull();
 
     // inherited from s0
-    assertEquals(Color.BLACK, resolved.getBackgroundColor());
+    assertThat(resolved.getBackgroundColor()).isEqualTo(BLACK);
     // inherited from s1
-    assertEquals(Color.RED, resolved.getFontColor());
+    assertThat(resolved.getFontColor()).isEqualTo(RED);
     // merged from s0 and s1
-    assertEquals(TtmlStyle.STYLE_BOLD_ITALIC, resolved.getStyle());
+    assertThat(resolved.getStyle()).isEqualTo(STYLE_BOLD_ITALIC);
   }
 
+  @Test
   public void testResolveMergeSingleReferentialStyleIntoInlineStyle() {
     Map<String, TtmlStyle> globalStyles = getGlobalStyles();
     String[] styleIds = {"s0"};
@@ -59,15 +78,15 @@ public void testResolveMergeSingleReferentialStyleIntoInlineStyle() {
     style.setBackgroundColor(Color.YELLOW);
 
     TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles);
-    assertSame(style, resolved);
+    assertThat(resolved).isSameAs(style);
 
     // inline attribute not overridden
-    assertEquals(Color.YELLOW, resolved.getBackgroundColor());
+    assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW);
     // inherited from referential style
-    assertEquals(TtmlStyle.STYLE_BOLD, resolved.getStyle());
+    assertThat(resolved.getStyle()).isEqualTo(STYLE_BOLD);
   }
 
-
+  @Test
   public void testResolveMergeMultipleReferentialStylesIntoInlineStyle() {
     Map<String, TtmlStyle> globalStyles = getGlobalStyles();
     String[] styleIds = {"s0", "s1"};
@@ -75,20 +94,21 @@ public void testResolveMergeMultipleReferentialStylesIntoInlineStyle() {
     style.setBackgroundColor(Color.YELLOW);
 
     TtmlStyle resolved = TtmlRenderUtil.resolveStyle(style, styleIds, globalStyles);
-    assertSame(style, resolved);
+    assertThat(resolved).isSameAs(style);
 
     // inline attribute not overridden
-    assertEquals(Color.YELLOW, resolved.getBackgroundColor());
+    assertThat(resolved.getBackgroundColor()).isEqualTo(YELLOW);
     // inherited from both referential style
-    assertEquals(TtmlStyle.STYLE_BOLD_ITALIC, resolved.getStyle());
+    assertThat(resolved.getStyle()).isEqualTo(STYLE_BOLD_ITALIC);
   }
 
+  @Test
   public void testResolveStyleOnlyInlineStyle() {
     TtmlStyle inlineStyle = new TtmlStyle();
-    assertSame(inlineStyle, TtmlRenderUtil.resolveStyle(inlineStyle, null, null));
+    assertThat(TtmlRenderUtil.resolveStyle(inlineStyle, null, null)).isSameAs(inlineStyle);
   }
 
-  private Map<String, TtmlStyle> getGlobalStyles() {
+  private static Map<String, TtmlStyle> getGlobalStyles() {
     Map<String, TtmlStyle> globalStyles = new HashMap<>();
 
     TtmlStyle s0 = new TtmlStyle();
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
new file mode 100644
index 00000000000..4c35e259ffe
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
@@ -0,0 +1,155 @@
+/*
+ * 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.text.ttml;
+
+import static android.graphics.Color.BLACK;
+import static android.graphics.Color.WHITE;
+import static com.google.android.exoplayer2.text.ttml.TtmlStyle.STYLE_BOLD;
+import static com.google.android.exoplayer2.text.ttml.TtmlStyle.STYLE_BOLD_ITALIC;
+import static com.google.android.exoplayer2.text.ttml.TtmlStyle.STYLE_ITALIC;
+import static com.google.android.exoplayer2.text.ttml.TtmlStyle.STYLE_NORMAL;
+import static com.google.android.exoplayer2.text.ttml.TtmlStyle.UNSPECIFIED;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+
+import android.graphics.Color;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/** Unit test for {@link TtmlStyle}. */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class TtmlStyleTest {
+
+  private static final String FONT_FAMILY = "serif";
+  private static final String ID = "id";
+  public static final int FOREGROUND_COLOR = Color.WHITE;
+  public static final int BACKGROUND_COLOR = Color.BLACK;
+  private TtmlStyle style;
+
+  @Before
+  public void setUp() throws Exception {
+    style = new TtmlStyle();
+  }
+
+  @Test
+  public void testInheritStyle() {
+    style.inherit(createAncestorStyle());
+    assertWithMessage("id must not be inherited").that(style.getId()).isNull();
+    assertThat(style.isUnderline()).isTrue();
+    assertThat(style.isLinethrough()).isTrue();
+    assertThat(style.getStyle()).isEqualTo(STYLE_BOLD_ITALIC);
+    assertThat(style.getFontFamily()).isEqualTo(FONT_FAMILY);
+    assertThat(style.getFontColor()).isEqualTo(WHITE);
+    assertWithMessage("do not inherit backgroundColor").that(style.hasBackgroundColor()).isFalse();
+  }
+
+  @Test
+  public void testChainStyle() {
+    style.chain(createAncestorStyle());
+    assertWithMessage("id must not be inherited").that(style.getId()).isNull();
+    assertThat(style.isUnderline()).isTrue();
+    assertThat(style.isLinethrough()).isTrue();
+    assertThat(style.getStyle()).isEqualTo(STYLE_BOLD_ITALIC);
+    assertThat(style.getFontFamily()).isEqualTo(FONT_FAMILY);
+    assertThat(style.getFontColor()).isEqualTo(FOREGROUND_COLOR);
+    // do inherit backgroundColor when chaining
+    assertWithMessage("do not inherit backgroundColor when chaining")
+        .that(style.getBackgroundColor()).isEqualTo(BACKGROUND_COLOR);
+  }
+
+  private static TtmlStyle createAncestorStyle() {
+    TtmlStyle ancestor = new TtmlStyle();
+    ancestor.setId(ID);
+    ancestor.setItalic(true);
+    ancestor.setBold(true);
+    ancestor.setBackgroundColor(BACKGROUND_COLOR);
+    ancestor.setFontColor(FOREGROUND_COLOR);
+    ancestor.setLinethrough(true);
+    ancestor.setUnderline(true);
+    ancestor.setFontFamily(FONT_FAMILY);
+    return ancestor;
+  }
+
+  @Test
+  public void testStyle() {
+    assertThat(style.getStyle()).isEqualTo(UNSPECIFIED);
+    style.setItalic(true);
+    assertThat(style.getStyle()).isEqualTo(STYLE_ITALIC);
+    style.setBold(true);
+    assertThat(style.getStyle()).isEqualTo(STYLE_BOLD_ITALIC);
+    style.setItalic(false);
+    assertThat(style.getStyle()).isEqualTo(STYLE_BOLD);
+    style.setBold(false);
+    assertThat(style.getStyle()).isEqualTo(STYLE_NORMAL);
+  }
+
+  @Test
+  public void testLinethrough() {
+    assertThat(style.isLinethrough()).isFalse();
+    style.setLinethrough(true);
+    assertThat(style.isLinethrough()).isTrue();
+    style.setLinethrough(false);
+    assertThat(style.isLinethrough()).isFalse();
+  }
+
+  @Test
+  public void testUnderline() {
+    assertThat(style.isUnderline()).isFalse();
+    style.setUnderline(true);
+    assertThat(style.isUnderline()).isTrue();
+    style.setUnderline(false);
+    assertThat(style.isUnderline()).isFalse();
+  }
+
+  @Test
+  public void testFontFamily() {
+    assertThat(style.getFontFamily()).isNull();
+    style.setFontFamily(FONT_FAMILY);
+    assertThat(style.getFontFamily()).isEqualTo(FONT_FAMILY);
+    style.setFontFamily(null);
+    assertThat(style.getFontFamily()).isNull();
+  }
+
+  @Test
+  public void testColor() {
+    assertThat(style.hasFontColor()).isFalse();
+    style.setFontColor(Color.BLACK);
+    assertThat(style.getFontColor()).isEqualTo(BLACK);
+    assertThat(style.hasFontColor()).isTrue();
+  }
+
+  @Test
+  public void testBackgroundColor() {
+    assertThat(style.hasBackgroundColor()).isFalse();
+    style.setBackgroundColor(Color.BLACK);
+    assertThat(style.getBackgroundColor()).isEqualTo(BLACK);
+    assertThat(style.hasBackgroundColor()).isTrue();
+  }
+
+  @Test
+  public void testId() {
+    assertThat(style.getId()).isNull();
+    style.setId(ID);
+    assertThat(style.getId()).isEqualTo(ID);
+    style.setId(null);
+    assertThat(style.getId()).isNull();
+  }
+
+}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
similarity index 61%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
index d6be1008770..6ade85be285 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/CssParserTest.java
@@ -15,22 +15,32 @@
  */
 package com.google.android.exoplayer2.text.webvtt;
 
-import android.test.InstrumentationTestCase;
+import static com.google.android.exoplayer2.text.webvtt.CssParser.parseNextToken;
+import static com.google.common.truth.Truth.assertThat;
+
 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;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link CssParser}.
  */
-public final class CssParserTest extends InstrumentationTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class CssParserTest {
 
   private CssParser parser;
 
-  @Override
+  @Before
   public void setUp() {
     parser = new CssParser();
   }
 
+  @Test
   public void testSkipWhitespacesAndComments() {
     // Skip only whitespaces
     String skipOnlyWhitespaces = " \t\r\n\f End of skip\n /*  */";
@@ -53,6 +63,7 @@ public void testSkipWhitespacesAndComments() {
     assertSkipsToEndOfSkip(null, skipEverything);
   }
 
+  @Test
   public void testGetInputLimit() {
     // \r After 3 lines.
     String threeLinesThen3Cr = "One Line\nThen other\rAnd finally\r\r\r";
@@ -78,6 +89,7 @@ public void testGetInputLimit() {
     assertInputLimit(null, "");
   }
 
+  @Test
   public void testParseMethodSimpleInput() {
     String styleBlock1 = " ::cue { color : black; background-color: PapayaWhip }";
     WebvttCssStyle expectedStyle = new WebvttCssStyle();
@@ -96,6 +108,7 @@ public void testParseMethodSimpleInput() {
     assertParserProduces(expectedStyle, styleBlock3);
   }
 
+  @Test
   public void testMultiplePropertiesInBlock() {
     String styleBlock = "::cue(#id){text-decoration:underline; background-color:green;"
         + "color:red; font-family:Courier; font-weight:bold}";
@@ -110,6 +123,7 @@ public void testMultiplePropertiesInBlock() {
     assertParserProduces(expectedStyle, styleBlock);
   }
 
+  @Test
   public void testRgbaColorExpression() {
     String styleBlock = "::cue(#rgb){background-color: rgba(\n10/* Ugly color */,11\t, 12\n,.1);"
         + "color:rgb(1,1,\n1)}";
@@ -121,59 +135,62 @@ public void testRgbaColorExpression() {
     assertParserProduces(expectedStyle, styleBlock);
   }
 
+  @Test
   public void testGetNextToken() {
     String stringInput = " lorem:ipsum\n{dolor}#sit,amet;lorem:ipsum\r\t\f\ndolor(())\n";
     ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(stringInput));
     StringBuilder builder = new StringBuilder();
-    assertEquals("lorem", CssParser.parseNextToken(input, builder));
-    assertEquals(":", CssParser.parseNextToken(input, builder));
-    assertEquals("ipsum", CssParser.parseNextToken(input, builder));
-    assertEquals("{", CssParser.parseNextToken(input, builder));
-    assertEquals("dolor", CssParser.parseNextToken(input, builder));
-    assertEquals("}", CssParser.parseNextToken(input, builder));
-    assertEquals("#sit", CssParser.parseNextToken(input, builder));
-    assertEquals(",", CssParser.parseNextToken(input, builder));
-    assertEquals("amet", CssParser.parseNextToken(input, builder));
-    assertEquals(";", CssParser.parseNextToken(input, builder));
-    assertEquals("lorem", CssParser.parseNextToken(input, builder));
-    assertEquals(":", CssParser.parseNextToken(input, builder));
-    assertEquals("ipsum", CssParser.parseNextToken(input, builder));
-    assertEquals("dolor", CssParser.parseNextToken(input, builder));
-    assertEquals("(", CssParser.parseNextToken(input, builder));
-    assertEquals("(", CssParser.parseNextToken(input, builder));
-    assertEquals(")", CssParser.parseNextToken(input, builder));
-    assertEquals(")", CssParser.parseNextToken(input, builder));
-    assertEquals(null, CssParser.parseNextToken(input, builder));
+    assertThat(parseNextToken(input, builder)).isEqualTo("lorem");
+    assertThat(parseNextToken(input, builder)).isEqualTo(":");
+    assertThat(parseNextToken(input, builder)).isEqualTo("ipsum");
+    assertThat(parseNextToken(input, builder)).isEqualTo("{");
+    assertThat(parseNextToken(input, builder)).isEqualTo("dolor");
+    assertThat(parseNextToken(input, builder)).isEqualTo("}");
+    assertThat(parseNextToken(input, builder)).isEqualTo("#sit");
+    assertThat(parseNextToken(input, builder)).isEqualTo(",");
+    assertThat(parseNextToken(input, builder)).isEqualTo("amet");
+    assertThat(parseNextToken(input, builder)).isEqualTo(";");
+    assertThat(parseNextToken(input, builder)).isEqualTo("lorem");
+    assertThat(parseNextToken(input, builder)).isEqualTo(":");
+    assertThat(parseNextToken(input, builder)).isEqualTo("ipsum");
+    assertThat(parseNextToken(input, builder)).isEqualTo("dolor");
+    assertThat(parseNextToken(input, builder)).isEqualTo("(");
+    assertThat(parseNextToken(input, builder)).isEqualTo("(");
+    assertThat(parseNextToken(input, builder)).isEqualTo(")");
+    assertThat(parseNextToken(input, builder)).isEqualTo(")");
+    assertThat(parseNextToken(input, builder)).isNull();
   }
 
+  @Test
   public void testStyleScoreSystem() {
     WebvttCssStyle style = new WebvttCssStyle();
     // Universal selector.
-    assertEquals(1, style.getSpecificityScore("", "", new String[0], ""));
+    assertThat(style.getSpecificityScore("", "", new String[0], "")).isEqualTo(1);
     // Class match without tag match.
     style.setTargetClasses(new String[] { "class1", "class2"});
-    assertEquals(8, style.getSpecificityScore("", "", new String[] { "class1", "class2", "class3" },
-        ""));
+    assertThat(style.getSpecificityScore("", "", new String[]{"class1", "class2", "class3"},
+        "")).isEqualTo(8);
     // Class and tag match
     style.setTargetTagName("b");
-    assertEquals(10, style.getSpecificityScore("", "b",
-        new String[] { "class1", "class2", "class3" }, ""));
+    assertThat(style.getSpecificityScore("", "b",
+        new String[]{"class1", "class2", "class3"}, "")).isEqualTo(10);
     // Class insufficiency.
-    assertEquals(0, style.getSpecificityScore("", "b", new String[] { "class1", "class" }, ""));
+    assertThat(style.getSpecificityScore("", "b", new String[]{"class1", "class"}, ""))
+        .isEqualTo(0);
     // Voice, classes and tag match.
     style.setTargetVoice("Manuel Cráneo");
-    assertEquals(14, style.getSpecificityScore("", "b",
-        new String[] { "class1", "class2", "class3" }, "Manuel Cráneo"));
+    assertThat(style.getSpecificityScore("", "b",
+        new String[]{"class1", "class2", "class3"}, "Manuel Cráneo")).isEqualTo(14);
     // Voice mismatch.
-    assertEquals(0, style.getSpecificityScore(null, "b",
-        new String[] { "class1", "class2", "class3" }, "Manuel Craneo"));
+    assertThat(style.getSpecificityScore(null, "b",
+        new String[]{"class1", "class2", "class3"}, "Manuel Craneo")).isEqualTo(0);
     // Id, voice, classes and tag match.
     style.setTargetId("id");
-    assertEquals(0x40000000 + 14, style.getSpecificityScore("id", "b",
-        new String[] { "class1", "class2", "class3" }, "Manuel Cráneo"));
+    assertThat(style.getSpecificityScore("id", "b",
+        new String[]{"class1", "class2", "class3"}, "Manuel Cráneo")).isEqualTo(0x40000000 + 14);
     // Id mismatch.
-    assertEquals(0, style.getSpecificityScore("id1", "b",
-        new String[] { "class1", "class2", "class3" }, ""));
+    assertThat(style.getSpecificityScore("id1", "b",
+        new String[]{"class1", "class2", "class3"}, "")).isEqualTo(0);
   }
 
   // Utility methods.
@@ -181,34 +198,34 @@ public void testStyleScoreSystem() {
   private void assertSkipsToEndOfSkip(String expectedLine, String s) {
     ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(s));
     CssParser.skipWhitespaceAndComments(input);
-    assertEquals(expectedLine, input.readLine());
+    assertThat(input.readLine()).isEqualTo(expectedLine);
   }
 
   private void assertInputLimit(String expectedLine, String s) {
     ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(s));
     CssParser.skipStyleBlock(input);
-    assertEquals(expectedLine, input.readLine());
+    assertThat(input.readLine()).isEqualTo(expectedLine);
   }
 
   private void assertParserProduces(WebvttCssStyle expected,
       String styleBlock){
     ParsableByteArray input = new ParsableByteArray(Util.getUtf8Bytes(styleBlock));
     WebvttCssStyle actualElem = parser.parseBlock(input);
-    assertEquals(expected.hasBackgroundColor(), actualElem.hasBackgroundColor());
+    assertThat(actualElem.hasBackgroundColor()).isEqualTo(expected.hasBackgroundColor());
     if (expected.hasBackgroundColor()) {
-      assertEquals(expected.getBackgroundColor(), actualElem.getBackgroundColor());
+      assertThat(actualElem.getBackgroundColor()).isEqualTo(expected.getBackgroundColor());
     }
-    assertEquals(expected.hasFontColor(), actualElem.hasFontColor());
+    assertThat(actualElem.hasFontColor()).isEqualTo(expected.hasFontColor());
     if (expected.hasFontColor()) {
-      assertEquals(expected.getFontColor(), actualElem.getFontColor());
+      assertThat(actualElem.getFontColor()).isEqualTo(expected.getFontColor());
     }
-    assertEquals(expected.getFontFamily(), actualElem.getFontFamily());
-    assertEquals(expected.getFontSize(), actualElem.getFontSize());
-    assertEquals(expected.getFontSizeUnit(), actualElem.getFontSizeUnit());
-    assertEquals(expected.getStyle(), actualElem.getStyle());
-    assertEquals(expected.isLinethrough(), actualElem.isLinethrough());
-    assertEquals(expected.isUnderline(), actualElem.isUnderline());
-    assertEquals(expected.getTextAlign(), actualElem.getTextAlign());
+    assertThat(actualElem.getFontFamily()).isEqualTo(expected.getFontFamily());
+    assertThat(actualElem.getFontSize()).isEqualTo(expected.getFontSize());
+    assertThat(actualElem.getFontSizeUnit()).isEqualTo(expected.getFontSizeUnit());
+    assertThat(actualElem.getStyle()).isEqualTo(expected.getStyle());
+    assertThat(actualElem.isLinethrough()).isEqualTo(expected.isLinethrough());
+    assertThat(actualElem.isUnderline()).isEqualTo(expected.isUnderline());
+    assertThat(actualElem.getTextAlign()).isEqualTo(expected.getTextAlign());
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
similarity index 82%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
index 2cdad081c53..89370079901 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
@@ -15,16 +15,24 @@
  */
 package com.google.android.exoplayer2.text.webvtt;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
 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 junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link Mp4WebvttDecoder}.
  */
-public final class Mp4WebvttDecoderTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class Mp4WebvttDecoderTest {
 
   private static final byte[] SINGLE_CUE_SAMPLE = {
       0x00, 0x00, 0x00, 0x1C,  // Size
@@ -79,6 +87,7 @@ public final class Mp4WebvttDecoderTest extends TestCase {
 
   // Positive tests.
 
+  @Test
   public void testSingleCueSample() throws SubtitleDecoderException {
     Mp4WebvttDecoder decoder = new Mp4WebvttDecoder();
     Subtitle result = decoder.decode(SINGLE_CUE_SAMPLE, SINGLE_CUE_SAMPLE.length, false);
@@ -86,6 +95,7 @@ public void testSingleCueSample() throws SubtitleDecoderException {
     assertMp4WebvttSubtitleEquals(result, expectedCue);
   }
 
+  @Test
   public void testTwoCuesSample() throws SubtitleDecoderException {
     Mp4WebvttDecoder decoder = new Mp4WebvttDecoder();
     Subtitle result = decoder.decode(DOUBLE_CUE_SAMPLE, DOUBLE_CUE_SAMPLE.length, false);
@@ -94,6 +104,7 @@ public void testTwoCuesSample() throws SubtitleDecoderException {
     assertMp4WebvttSubtitleEquals(result, firstExpectedCue, secondExpectedCue);
   }
 
+  @Test
   public void testNoCueSample() throws SubtitleDecoderException {
     Mp4WebvttDecoder decoder = new Mp4WebvttDecoder();
     Subtitle result = decoder.decode(NO_CUE_SAMPLE, NO_CUE_SAMPLE.length, false);
@@ -102,6 +113,7 @@ public void testNoCueSample() throws SubtitleDecoderException {
 
   // Negative tests.
 
+  @Test
   public void testSampleWithIncompleteHeader() {
     Mp4WebvttDecoder decoder = new Mp4WebvttDecoder();
     try {
@@ -122,10 +134,10 @@ public void testSampleWithIncompleteHeader() {
    * @param expectedCues The expected {@link Cue}s.
    */
   private static void assertMp4WebvttSubtitleEquals(Subtitle subtitle, Cue... expectedCues) {
-    assertEquals(1, subtitle.getEventTimeCount());
-    assertEquals(0, subtitle.getEventTime(0));
+    assertThat(subtitle.getEventTimeCount()).isEqualTo(1);
+    assertThat(subtitle.getEventTime(0)).isEqualTo(0);
     List<Cue> subtitleCues = subtitle.getCues(0);
-    assertEquals(expectedCues.length, subtitleCues.size());
+    assertThat(subtitleCues).hasSize(expectedCues.length);
     for (int i = 0; i < subtitleCues.size(); i++) {
       assertCueEquals(expectedCues[i], subtitleCues.get(i));
     }
@@ -135,14 +147,14 @@ private static void assertMp4WebvttSubtitleEquals(Subtitle subtitle, Cue... expe
    * Asserts that two cues are equal.
    */
   private static void assertCueEquals(Cue expected, Cue actual) {
-    assertEquals(expected.line, actual.line);
-    assertEquals(expected.lineAnchor, actual.lineAnchor);
-    assertEquals(expected.lineType, actual.lineType);
-    assertEquals(expected.position, actual.position);
-    assertEquals(expected.positionAnchor, actual.positionAnchor);
-    assertEquals(expected.size, actual.size);
-    assertEquals(expected.text.toString(), actual.text.toString());
-    assertEquals(expected.textAlignment, actual.textAlignment);
+    assertThat(actual.line).isEqualTo(expected.line);
+    assertThat(actual.lineAnchor).isEqualTo(expected.lineAnchor);
+    assertThat(actual.lineType).isEqualTo(expected.lineType);
+    assertThat(actual.position).isEqualTo(expected.position);
+    assertThat(actual.positionAnchor).isEqualTo(expected.positionAnchor);
+    assertThat(actual.size).isEqualTo(expected.size);
+    assertThat(actual.text.toString()).isEqualTo(expected.text.toString());
+    assertThat(actual.textAlignment).isEqualTo(expected.textAlignment);
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
similarity index 50%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
index 1ee8976a7e2..2a6e4616271 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
@@ -15,209 +15,235 @@
  */
 package com.google.android.exoplayer2.text.webvtt;
 
+import static android.graphics.Typeface.BOLD;
+import static android.graphics.Typeface.ITALIC;
+import static com.google.common.truth.Truth.assertThat;
+
 import android.graphics.Typeface;
-import android.test.InstrumentationTestCase;
 import android.text.Spanned;
 import android.text.style.StyleSpan;
 import android.text.style.UnderlineSpan;
 import java.util.Collections;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link WebvttCueParser}.
  */
-public final class WebvttCueParserTest extends InstrumentationTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class WebvttCueParserTest {
 
+  @Test
   public void testParseStrictValidClassesAndTrailingTokens() throws Exception {
     Spanned text = parseCueText("<v.first.loud Esme>"
         + "This <u.style1.style2 some stuff>is</u> text with <b.foo><i.bar>html</i></b> tags");
 
-    assertEquals("This is text with html tags", text.toString());
+    assertThat(text.toString()).isEqualTo("This is text with html tags");
 
     UnderlineSpan[] underlineSpans = getSpans(text, UnderlineSpan.class);
     StyleSpan[] styleSpans = getSpans(text, StyleSpan.class);
-    assertEquals(1, underlineSpans.length);
-    assertEquals(2, styleSpans.length);
-    assertEquals(Typeface.ITALIC, styleSpans[0].getStyle());
-    assertEquals(Typeface.BOLD, styleSpans[1].getStyle());
-
-    assertEquals(5, text.getSpanStart(underlineSpans[0]));
-    assertEquals(7, text.getSpanEnd(underlineSpans[0]));
-    assertEquals(18, text.getSpanStart(styleSpans[0]));
-    assertEquals(18, text.getSpanStart(styleSpans[1]));
-    assertEquals(22, text.getSpanEnd(styleSpans[0]));
-    assertEquals(22, text.getSpanEnd(styleSpans[1]));
+    assertThat(underlineSpans).hasLength(1);
+    assertThat(styleSpans).hasLength(2);
+    assertThat(styleSpans[0].getStyle()).isEqualTo(ITALIC);
+    assertThat(styleSpans[1].getStyle()).isEqualTo(BOLD);
+
+    assertThat(text.getSpanStart(underlineSpans[0])).isEqualTo(5);
+    assertThat(text.getSpanEnd(underlineSpans[0])).isEqualTo(7);
+    assertThat(text.getSpanStart(styleSpans[0])).isEqualTo(18);
+    assertThat(text.getSpanStart(styleSpans[1])).isEqualTo(18);
+    assertThat(text.getSpanEnd(styleSpans[0])).isEqualTo(22);
+    assertThat(text.getSpanEnd(styleSpans[1])).isEqualTo(22);
   }
 
+  @Test
   public void testParseStrictValidUnsupportedTagsStrippedOut() throws Exception {
     Spanned text = parseCueText("<v.first.loud Esme>This <unsupported>is</unsupported> text with "
         + "<notsupp><invalid>html</invalid></notsupp> tags");
-    assertEquals("This is text with html tags", text.toString());
-    assertEquals(0, getSpans(text, UnderlineSpan.class).length);
-    assertEquals(0, getSpans(text, StyleSpan.class).length);
+    assertThat(text.toString()).isEqualTo("This is text with html tags");
+    assertThat(getSpans(text, UnderlineSpan.class)).hasLength(0);
+    assertThat(getSpans(text, StyleSpan.class)).hasLength(0);
   }
 
+  @Test
   public void testParseWellFormedUnclosedEndAtCueEnd() throws Exception {
     Spanned text = parseCueText("An <u some trailing stuff>unclosed u tag with "
         + "<i>italic</i> inside");
 
-    assertEquals("An unclosed u tag with italic inside", text.toString());
+    assertThat(text.toString()).isEqualTo("An unclosed u tag with italic inside");
 
     UnderlineSpan[] underlineSpans = getSpans(text, UnderlineSpan.class);
     StyleSpan[] styleSpans = getSpans(text, StyleSpan.class);
-    assertEquals(1, underlineSpans.length);
-    assertEquals(1, styleSpans.length);
-    assertEquals(Typeface.ITALIC, styleSpans[0].getStyle());
-
-    assertEquals(3, text.getSpanStart(underlineSpans[0]));
-    assertEquals(23, text.getSpanStart(styleSpans[0]));
-    assertEquals(29, text.getSpanEnd(styleSpans[0]));
-    assertEquals(36, text.getSpanEnd(underlineSpans[0]));
+    assertThat(underlineSpans).hasLength(1);
+    assertThat(styleSpans).hasLength(1);
+    assertThat(styleSpans[0].getStyle()).isEqualTo(ITALIC);
+
+    assertThat(text.getSpanStart(underlineSpans[0])).isEqualTo(3);
+    assertThat(text.getSpanStart(styleSpans[0])).isEqualTo(23);
+    assertThat(text.getSpanEnd(styleSpans[0])).isEqualTo(29);
+    assertThat(text.getSpanEnd(underlineSpans[0])).isEqualTo(36);
   }
 
+  @Test
   public void testParseWellFormedUnclosedEndAtParent() throws Exception {
     Spanned text = parseCueText("An unclosed u tag with <i><u>underline and italic</i> inside");
 
-    assertEquals("An unclosed u tag with underline and italic inside", text.toString());
+    assertThat(text.toString()).isEqualTo("An unclosed u tag with underline and italic inside");
 
     UnderlineSpan[] underlineSpans = getSpans(text, UnderlineSpan.class);
     StyleSpan[] styleSpans = getSpans(text, StyleSpan.class);
-    assertEquals(1, underlineSpans.length);
-    assertEquals(1, styleSpans.length);
+    assertThat(underlineSpans).hasLength(1);
+    assertThat(styleSpans).hasLength(1);
 
-    assertEquals(23, text.getSpanStart(underlineSpans[0]));
-    assertEquals(23, text.getSpanStart(styleSpans[0]));
-    assertEquals(43, text.getSpanEnd(underlineSpans[0]));
-    assertEquals(43, text.getSpanEnd(styleSpans[0]));
+    assertThat(text.getSpanStart(underlineSpans[0])).isEqualTo(23);
+    assertThat(text.getSpanStart(styleSpans[0])).isEqualTo(23);
+    assertThat(text.getSpanEnd(underlineSpans[0])).isEqualTo(43);
+    assertThat(text.getSpanEnd(styleSpans[0])).isEqualTo(43);
 
-    assertEquals(Typeface.ITALIC, styleSpans[0].getStyle());
+    assertThat(styleSpans[0].getStyle()).isEqualTo(ITALIC);
   }
 
+  @Test
   public void testParseMalformedNestedElements() throws Exception {
     Spanned text = parseCueText("<b><u>An unclosed u tag with <i>italic</u> inside</i></b>");
-    assertEquals("An unclosed u tag with italic inside", text.toString());
+    assertThat(text.toString()).isEqualTo("An unclosed u tag with italic inside");
 
     UnderlineSpan[] underlineSpans = getSpans(text, UnderlineSpan.class);
     StyleSpan[] styleSpans = getSpans(text, StyleSpan.class);
-    assertEquals(1, underlineSpans.length);
-    assertEquals(2, styleSpans.length);
+    assertThat(underlineSpans).hasLength(1);
+    assertThat(styleSpans).hasLength(2);
 
     // all tags applied until matching start tag found
-    assertEquals(0, text.getSpanStart(underlineSpans[0]));
-    assertEquals(29, text.getSpanEnd(underlineSpans[0]));
+    assertThat(text.getSpanStart(underlineSpans[0])).isEqualTo(0);
+    assertThat(text.getSpanEnd(underlineSpans[0])).isEqualTo(29);
     if (styleSpans[0].getStyle() == Typeface.BOLD) {
-      assertEquals(0, text.getSpanStart(styleSpans[0]));
-      assertEquals(23, text.getSpanStart(styleSpans[1]));
-      assertEquals(29, text.getSpanEnd(styleSpans[1]));
-      assertEquals(36, text.getSpanEnd(styleSpans[0]));
+      assertThat(text.getSpanStart(styleSpans[0])).isEqualTo(0);
+      assertThat(text.getSpanStart(styleSpans[1])).isEqualTo(23);
+      assertThat(text.getSpanEnd(styleSpans[1])).isEqualTo(29);
+      assertThat(text.getSpanEnd(styleSpans[0])).isEqualTo(36);
     } else {
-      assertEquals(0, text.getSpanStart(styleSpans[1]));
-      assertEquals(23, text.getSpanStart(styleSpans[0]));
-      assertEquals(29, text.getSpanEnd(styleSpans[0]));
-      assertEquals(36, text.getSpanEnd(styleSpans[1]));
+      assertThat(text.getSpanStart(styleSpans[1])).isEqualTo(0);
+      assertThat(text.getSpanStart(styleSpans[0])).isEqualTo(23);
+      assertThat(text.getSpanEnd(styleSpans[0])).isEqualTo(29);
+      assertThat(text.getSpanEnd(styleSpans[1])).isEqualTo(36);
     }
   }
 
+  @Test
   public void testParseCloseNonExistingTag() throws Exception {
     Spanned text = parseCueText("blah<b>blah</i>blah</b>blah");
-    assertEquals("blahblahblahblah", text.toString());
+    assertThat(text.toString()).isEqualTo("blahblahblahblah");
 
     StyleSpan[] spans = getSpans(text, StyleSpan.class);
-    assertEquals(1, spans.length);
-    assertEquals(Typeface.BOLD, spans[0].getStyle());
-    assertEquals(4, text.getSpanStart(spans[0]));
-    assertEquals(8, text.getSpanEnd(spans[0])); // should be 12 when valid
+    assertThat(spans).hasLength(1);
+    assertThat(spans[0].getStyle()).isEqualTo(BOLD);
+    assertThat(text.getSpanStart(spans[0])).isEqualTo(4);
+    assertThat(text.getSpanEnd(spans[0])).isEqualTo(8); // should be 12 when valid
   }
 
+  @Test
   public void testParseEmptyTagName() throws Exception {
     Spanned text = parseCueText("An unclosed u tag with <>italic inside");
-    assertEquals("An unclosed u tag with italic inside", text.toString());
+    assertThat(text.toString()).isEqualTo("An unclosed u tag with italic inside");
   }
 
+  @Test
   public void testParseEntities() throws Exception {
     Spanned text = parseCueText("&amp; &gt; &lt; &nbsp;");
-    assertEquals("& > <  ", text.toString());
+    assertThat(text.toString()).isEqualTo("& > <  ");
   }
 
+  @Test
   public void testParseEntitiesUnsupported() throws Exception {
     Spanned text = parseCueText("&noway; &sure;");
-    assertEquals(" ", text.toString());
+    assertThat(text.toString()).isEqualTo(" ");
   }
 
+  @Test
   public void testParseEntitiesNotTerminated() throws Exception {
     Spanned text = parseCueText("&amp here comes text");
-    assertEquals("& here comes text", text.toString());
+    assertThat(text.toString()).isEqualTo("& here comes text");
   }
 
+  @Test
   public void testParseEntitiesNotTerminatedUnsupported() throws Exception {
     Spanned text = parseCueText("&surenot here comes text");
-    assertEquals(" here comes text", text.toString());
+    assertThat(text.toString()).isEqualTo(" here comes text");
   }
 
+  @Test
   public void testParseEntitiesNotTerminatedNoSpace() throws Exception {
     Spanned text = parseCueText("&surenot");
-    assertEquals("&surenot", text.toString());
+    assertThat(text.toString()).isEqualTo("&surenot");
   }
 
+  @Test
   public void testParseVoidTag() throws Exception {
     Spanned text = parseCueText("here comes<br/> text<br/>");
-    assertEquals("here comes text", text.toString());
+    assertThat(text.toString()).isEqualTo("here comes text");
   }
 
+  @Test
   public void testParseMultipleTagsOfSameKind() {
     Spanned text = parseCueText("blah <b>blah</b> blah <b>foo</b>");
 
-    assertEquals("blah blah blah foo", text.toString());
+    assertThat(text.toString()).isEqualTo("blah blah blah foo");
     StyleSpan[] spans = getSpans(text, StyleSpan.class);
-    assertEquals(2, spans.length);
-    assertEquals(5, text.getSpanStart(spans[0]));
-    assertEquals(9, text.getSpanEnd(spans[0]));
-    assertEquals(15, text.getSpanStart(spans[1]));
-    assertEquals(18, text.getSpanEnd(spans[1]));
-    assertEquals(Typeface.BOLD, spans[0].getStyle());
-    assertEquals(Typeface.BOLD, spans[1].getStyle());
+    assertThat(spans).hasLength(2);
+    assertThat(text.getSpanStart(spans[0])).isEqualTo(5);
+    assertThat(text.getSpanEnd(spans[0])).isEqualTo(9);
+    assertThat(text.getSpanStart(spans[1])).isEqualTo(15);
+    assertThat(text.getSpanEnd(spans[1])).isEqualTo(18);
+    assertThat(spans[0].getStyle()).isEqualTo(BOLD);
+    assertThat(spans[1].getStyle()).isEqualTo(BOLD);
   }
 
+  @Test
   public void testParseInvalidVoidSlash() {
     Spanned text = parseCueText("blah <b/.st1.st2 trailing stuff> blah");
 
-    assertEquals("blah  blah", text.toString());
+    assertThat(text.toString()).isEqualTo("blah  blah");
     StyleSpan[] spans = getSpans(text, StyleSpan.class);
-    assertEquals(0, spans.length);
+    assertThat(spans).hasLength(0);
   }
 
+  @Test
   public void testParseMonkey() throws Exception {
     Spanned text = parseCueText("< u>An unclosed u tag with <<<<< i>italic</u></u></u></u    >"
         + "</i><u><u> inside");
-    assertEquals("An unclosed u tag with italic inside", text.toString());
+    assertThat(text.toString()).isEqualTo("An unclosed u tag with italic inside");
     text = parseCueText(">>>>>>>>>An unclosed u tag with <<<<< italic</u></u></u>"
         + "</u  ></i><u><u> inside");
-    assertEquals(">>>>>>>>>An unclosed u tag with  inside", text.toString());
+    assertThat(text.toString()).isEqualTo(">>>>>>>>>An unclosed u tag with  inside");
   }
 
+  @Test
   public void testParseCornerCases() throws Exception {
     Spanned text = parseCueText(">");
-    assertEquals(">", text.toString());
+    assertThat(text.toString()).isEqualTo(">");
 
     text = parseCueText("<");
-    assertEquals("", text.toString());
+    assertThat(text.toString()).isEmpty();
 
     text = parseCueText("<b.st1.st2 annotation");
-    assertEquals("", text.toString());
+    assertThat(text.toString()).isEmpty();
 
     text = parseCueText("<<<<<<<<<<<<<<<<");
-    assertEquals("", text.toString());
+    assertThat(text.toString()).isEmpty();
 
     text = parseCueText("<<<<<<>><<<<<<<<<<");
-    assertEquals(">", text.toString());
+    assertThat(text.toString()).isEqualTo(">");
 
     text = parseCueText("<>");
-    assertEquals("", text.toString());
+    assertThat(text.toString()).isEmpty();
 
     text = parseCueText("&");
-    assertEquals("&", text.toString());
+    assertThat(text.toString()).isEqualTo("&");
 
     text = parseCueText("&&&&&&&");
-    assertEquals("&&&&&&&", text.toString());
+    assertThat(text.toString()).isEqualTo("&&&&&&&");
   }
 
   private static Spanned parseCueText(String string) {
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
similarity index 78%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
index 164c6c149a5..c3c30e44a8e 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
@@ -15,17 +15,25 @@
  */
 package com.google.android.exoplayer2.text.webvtt;
 
-import com.google.android.exoplayer2.C;
+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 com.google.android.exoplayer2.text.Cue;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit test for {@link WebvttSubtitle}.
  */
-public class WebvttSubtitleTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class WebvttSubtitleTest {
 
   private static final String FIRST_SUBTITLE_STRING = "This is the first subtitle.";
   private static final String SECOND_SUBTITLE_STRING = "This is the second subtitle.";
@@ -65,21 +73,25 @@ public class WebvttSubtitleTest extends TestCase {
     nestedSubtitle = new WebvttSubtitle(nestedSubtitleCues);
   }
 
+  @Test
   public void testEventCount() {
-    assertEquals(0, emptySubtitle.getEventTimeCount());
-    assertEquals(4, simpleSubtitle.getEventTimeCount());
-    assertEquals(4, overlappingSubtitle.getEventTimeCount());
-    assertEquals(4, nestedSubtitle.getEventTimeCount());
+    assertThat(emptySubtitle.getEventTimeCount()).isEqualTo(0);
+    assertThat(simpleSubtitle.getEventTimeCount()).isEqualTo(4);
+    assertThat(overlappingSubtitle.getEventTimeCount()).isEqualTo(4);
+    assertThat(nestedSubtitle.getEventTimeCount()).isEqualTo(4);
   }
 
+  @Test
   public void testSimpleSubtitleEventTimes() {
     testSubtitleEventTimesHelper(simpleSubtitle);
   }
 
+  @Test
   public void testSimpleSubtitleEventIndices() {
     testSubtitleEventIndicesHelper(simpleSubtitle);
   }
 
+  @Test
   public void testSimpleSubtitleText() {
     // Test before first subtitle
     assertSingleCueEmpty(simpleSubtitle.getCues(0));
@@ -107,14 +119,17 @@ public void testSimpleSubtitleText() {
     assertSingleCueEmpty(simpleSubtitle.getCues(Long.MAX_VALUE));
   }
 
+  @Test
   public void testOverlappingSubtitleEventTimes() {
     testSubtitleEventTimesHelper(overlappingSubtitle);
   }
 
+  @Test
   public void testOverlappingSubtitleEventIndices() {
     testSubtitleEventIndicesHelper(overlappingSubtitle);
   }
 
+  @Test
   public void testOverlappingSubtitleText() {
     // Test before first subtitle
     assertSingleCueEmpty(overlappingSubtitle.getCues(0));
@@ -145,14 +160,17 @@ public void testOverlappingSubtitleText() {
     assertSingleCueEmpty(overlappingSubtitle.getCues(Long.MAX_VALUE));
   }
 
+  @Test
   public void testNestedSubtitleEventTimes() {
     testSubtitleEventTimesHelper(nestedSubtitle);
   }
 
+  @Test
   public void testNestedSubtitleEventIndices() {
     testSubtitleEventIndicesHelper(nestedSubtitle);
   }
 
+  @Test
   public void testNestedSubtitleText() {
     // Test before first subtitle
     assertSingleCueEmpty(nestedSubtitle.getCues(0));
@@ -181,46 +199,46 @@ public void testNestedSubtitleText() {
   }
 
   private void testSubtitleEventTimesHelper(WebvttSubtitle subtitle) {
-    assertEquals(1000000, subtitle.getEventTime(0));
-    assertEquals(2000000, subtitle.getEventTime(1));
-    assertEquals(3000000, subtitle.getEventTime(2));
-    assertEquals(4000000, subtitle.getEventTime(3));
+    assertThat(subtitle.getEventTime(0)).isEqualTo(1000000);
+    assertThat(subtitle.getEventTime(1)).isEqualTo(2000000);
+    assertThat(subtitle.getEventTime(2)).isEqualTo(3000000);
+    assertThat(subtitle.getEventTime(3)).isEqualTo(4000000);
   }
 
   private void testSubtitleEventIndicesHelper(WebvttSubtitle subtitle) {
     // Test first event
-    assertEquals(0, subtitle.getNextEventTimeIndex(0));
-    assertEquals(0, subtitle.getNextEventTimeIndex(500000));
-    assertEquals(0, subtitle.getNextEventTimeIndex(999999));
+    assertThat(subtitle.getNextEventTimeIndex(0)).isEqualTo(0);
+    assertThat(subtitle.getNextEventTimeIndex(500000)).isEqualTo(0);
+    assertThat(subtitle.getNextEventTimeIndex(999999)).isEqualTo(0);
 
     // Test second event
-    assertEquals(1, subtitle.getNextEventTimeIndex(1000000));
-    assertEquals(1, subtitle.getNextEventTimeIndex(1500000));
-    assertEquals(1, subtitle.getNextEventTimeIndex(1999999));
+    assertThat(subtitle.getNextEventTimeIndex(1000000)).isEqualTo(1);
+    assertThat(subtitle.getNextEventTimeIndex(1500000)).isEqualTo(1);
+    assertThat(subtitle.getNextEventTimeIndex(1999999)).isEqualTo(1);
 
     // Test third event
-    assertEquals(2, subtitle.getNextEventTimeIndex(2000000));
-    assertEquals(2, subtitle.getNextEventTimeIndex(2500000));
-    assertEquals(2, subtitle.getNextEventTimeIndex(2999999));
+    assertThat(subtitle.getNextEventTimeIndex(2000000)).isEqualTo(2);
+    assertThat(subtitle.getNextEventTimeIndex(2500000)).isEqualTo(2);
+    assertThat(subtitle.getNextEventTimeIndex(2999999)).isEqualTo(2);
 
     // Test fourth event
-    assertEquals(3, subtitle.getNextEventTimeIndex(3000000));
-    assertEquals(3, subtitle.getNextEventTimeIndex(3500000));
-    assertEquals(3, subtitle.getNextEventTimeIndex(3999999));
+    assertThat(subtitle.getNextEventTimeIndex(3000000)).isEqualTo(3);
+    assertThat(subtitle.getNextEventTimeIndex(3500000)).isEqualTo(3);
+    assertThat(subtitle.getNextEventTimeIndex(3999999)).isEqualTo(3);
 
     // Test null event (i.e. look for events after the last event)
-    assertEquals(C.INDEX_UNSET, subtitle.getNextEventTimeIndex(4000000));
-    assertEquals(C.INDEX_UNSET, subtitle.getNextEventTimeIndex(4500000));
-    assertEquals(C.INDEX_UNSET, subtitle.getNextEventTimeIndex(Long.MAX_VALUE));
+    assertThat(subtitle.getNextEventTimeIndex(4000000)).isEqualTo(INDEX_UNSET);
+    assertThat(subtitle.getNextEventTimeIndex(4500000)).isEqualTo(INDEX_UNSET);
+    assertThat(subtitle.getNextEventTimeIndex(MAX_VALUE)).isEqualTo(INDEX_UNSET);
   }
 
   private void assertSingleCueEmpty(List<Cue> cues) {
-    assertTrue(cues.size() == 0);
+    assertThat(cues).isEmpty();
   }
 
   private void assertSingleCueTextEquals(String expected, List<Cue> cues) {
-    assertTrue(cues.size() == 1);
-    assertEquals(expected, cues.get(0).text.toString());
+    assertThat(cues).hasSize(1);
+    assertThat(cues.get(0).text.toString()).isEqualTo(expected);
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
similarity index 87%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
index c31c651384f..cffc5303545 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/MappingTrackSelectorTest.java
@@ -15,6 +15,8 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
@@ -22,12 +24,17 @@
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.util.MimeTypes;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit tests for {@link MappingTrackSelector}.
  */
-public final class MappingTrackSelectorTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class MappingTrackSelectorTest {
 
   private static final RendererCapabilities VIDEO_CAPABILITIES =
       new FakeRendererCapabilities(C.TRACK_TYPE_VIDEO);
@@ -54,6 +61,7 @@ public final class MappingTrackSelectorTest extends TestCase {
   /**
    * Tests that the video and audio track groups are mapped onto the correct renderers.
    */
+  @Test
   public void testMapping() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
     trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
@@ -65,6 +73,7 @@ public void testMapping() throws ExoPlaybackException {
    * Tests that the video and audio track groups are mapped onto the correct renderers when the
    * renderer ordering is reversed.
    */
+  @Test
   public void testMappingReverseOrder() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
     RendererCapabilities[] reverseOrderRendererCapabilities = new RendererCapabilities[] {
@@ -78,6 +87,7 @@ public void testMappingReverseOrder() throws ExoPlaybackException {
    * Tests video and audio track groups are mapped onto the correct renderers when there are
    * multiple track groups of the same type.
    */
+  @Test
   public void testMappingMulti() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector();
     TrackGroupArray multiTrackGroups = new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP,
@@ -92,46 +102,50 @@ public void testMappingMulti() throws ExoPlaybackException {
    * TrackGroupArray[], int[][][])} is propagated correctly to the result of
    * {@link MappingTrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray)}.
    */
+  @Test
   public void testSelectTracks() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
-    assertEquals(TRACK_SELECTIONS[0], result.selections.get(0));
-    assertEquals(TRACK_SELECTIONS[1], result.selections.get(1));
+    assertThat(result.selections.get(0)).isEqualTo(TRACK_SELECTIONS[0]);
+    assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
   }
 
   /**
    * Tests that a null override clears a track selection.
    */
+  @Test
   public void testSelectTracksWithNullOverride() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
     trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
-    assertNull(result.selections.get(0));
-    assertEquals(TRACK_SELECTIONS[1], result.selections.get(1));
+    assertThat(result.selections.get(0)).isNull();
+    assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
   }
 
   /**
    * Tests that a null override can be cleared.
    */
+  @Test
   public void testSelectTracksWithClearedNullOverride() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
     trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
     trackSelector.clearSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP));
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
-    assertEquals(TRACK_SELECTIONS[0], result.selections.get(0));
-    assertEquals(TRACK_SELECTIONS[1], result.selections.get(1));
+    assertThat(result.selections.get(0)).isEqualTo(TRACK_SELECTIONS[0]);
+    assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
   }
 
   /**
    * Tests that an override is not applied for a different set of available track groups.
    */
+  @Test
   public void testSelectTracksWithNullOverrideForDifferentTracks() throws ExoPlaybackException {
     FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
     trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES,
         new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP, VIDEO_TRACK_GROUP));
-    assertEquals(TRACK_SELECTIONS[0], result.selections.get(0));
-    assertEquals(TRACK_SELECTIONS[1], result.selections.get(1));
+    assertThat(result.selections.get(0)).isEqualTo(TRACK_SELECTIONS[0]);
+    assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
   }
 
   /**
@@ -156,9 +170,9 @@ protected TrackSelection[] selectTracks(RendererCapabilities[] rendererCapabilit
     }
 
     public void assertMappedTrackGroups(int rendererIndex, TrackGroup... expected) {
-      assertEquals(expected.length, lastRendererTrackGroupArrays[rendererIndex].length);
+      assertThat(lastRendererTrackGroupArrays[rendererIndex].length).isEqualTo(expected.length);
       for (int i = 0; i < expected.length; i++) {
-        assertEquals(expected[i], lastRendererTrackGroupArrays[rendererIndex].get(i));
+        assertThat(lastRendererTrackGroupArrays[rendererIndex].get(i)).isEqualTo(expected[i]);
       }
     }
 
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
similarity index 82%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
index b805ccbdd55..a72d0602873 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/ByteArrayDataSourceTest.java
@@ -15,26 +15,37 @@
  */
 package com.google.android.exoplayer2.upstream;
 
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
 import com.google.android.exoplayer2.C;
 import java.io.IOException;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit tests for {@link ByteArrayDataSource}.
  */
-public class ByteArrayDataSourceTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class ByteArrayDataSourceTest {
 
   private static final byte[] TEST_DATA = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9};
   private static final byte[] TEST_DATA_ODD = new byte[] {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
 
+  @Test
   public void testFullReadSingleBytes() {
     readTestData(TEST_DATA, 0, C.LENGTH_UNSET, 1, 0, 1, false);
   }
 
+  @Test
   public void testFullReadAllBytes() {
     readTestData(TEST_DATA, 0, C.LENGTH_UNSET, 100, 0, 100, false);
   }
 
+  @Test
   public void testLimitReadSingleBytes() {
     // Limit set to the length of the data.
     readTestData(TEST_DATA, 0, TEST_DATA.length, 1, 0, 1, false);
@@ -42,6 +53,7 @@ public void testLimitReadSingleBytes() {
     readTestData(TEST_DATA, 0, 6, 1, 0, 1, false);
   }
 
+  @Test
   public void testFullReadTwoBytes() {
     // Try with the total data length an exact multiple of the size of each individual read.
     readTestData(TEST_DATA, 0, C.LENGTH_UNSET, 2, 0, 2, false);
@@ -49,6 +61,7 @@ public void testFullReadTwoBytes() {
     readTestData(TEST_DATA_ODD, 0, C.LENGTH_UNSET, 2, 0, 2, false);
   }
 
+  @Test
   public void testLimitReadTwoBytes() {
     // Try with the limit an exact multiple of the size of each individual read.
     readTestData(TEST_DATA, 0, 6, 2, 0, 2, false);
@@ -56,6 +69,7 @@ public void testLimitReadTwoBytes() {
     readTestData(TEST_DATA, 0, 7, 2, 0, 2, false);
   }
 
+  @Test
   public void testReadFromValidOffsets() {
     // Read from an offset without bound.
     readTestData(TEST_DATA, 1, C.LENGTH_UNSET, 1, 0, 1, false);
@@ -67,6 +81,7 @@ public void testReadFromValidOffsets() {
     readTestData(TEST_DATA, TEST_DATA.length - 1, 1, 1, 0, 1, false);
   }
 
+  @Test
   public void testReadFromInvalidOffsets() {
     // Read from first invalid offset and check failure without bound.
     readTestData(TEST_DATA, TEST_DATA.length, C.LENGTH_UNSET, 1, 0, 1, true);
@@ -74,6 +89,7 @@ public void testReadFromInvalidOffsets() {
     readTestData(TEST_DATA, TEST_DATA.length, 1, 1, 0, 1, true);
   }
 
+  @Test
   public void testReadWithInvalidLength() {
     // Read more data than is available.
     readTestData(TEST_DATA, 0, TEST_DATA.length + 1, 1, 0, 1, true);
@@ -102,10 +118,10 @@ private void readTestData(byte[] testData, int dataOffset, int dataLength, int o
       // Open the source.
       long length = dataSource.open(new DataSpec(null, dataOffset, dataLength, null));
       opened = true;
-      assertFalse(expectFailOnOpen);
+      assertThat(expectFailOnOpen).isFalse();
 
       // Verify the resolved length is as we expect.
-      assertEquals(expectedFinalBytesRead, length);
+      assertThat(length).isEqualTo(expectedFinalBytesRead);
 
       byte[] outputBuffer = new byte[outputBufferLength];
       int accumulatedBytesRead = 0;
@@ -113,26 +129,26 @@ private void readTestData(byte[] testData, int dataOffset, int dataLength, int o
         // Calculate a valid length for the next read, constraining by the specified output buffer
         // length, write offset and maximum write length input parameters.
         int requestedReadLength = Math.min(maxReadLength, outputBufferLength - writeOffset);
-        assertTrue(requestedReadLength > 0);
+        assertThat(requestedReadLength).isGreaterThan(0);
 
         int bytesRead = dataSource.read(outputBuffer, writeOffset, requestedReadLength);
         if (bytesRead != C.RESULT_END_OF_INPUT) {
-          assertTrue(bytesRead > 0);
-          assertTrue(bytesRead <= requestedReadLength);
+          assertThat(bytesRead).isGreaterThan(0);
+          assertThat(bytesRead).isAtMost(requestedReadLength);
           // Check the data read was correct.
           for (int i = 0; i < bytesRead; i++) {
-            assertEquals(testData[dataOffset + accumulatedBytesRead + i],
-                outputBuffer[writeOffset + i]);
+            assertThat(outputBuffer[writeOffset + i])
+                .isEqualTo(testData[dataOffset + accumulatedBytesRead + i]);
           }
           // Check that we haven't read more data than we were expecting.
           accumulatedBytesRead += bytesRead;
-          assertTrue(accumulatedBytesRead <= expectedFinalBytesRead);
+          assertThat(accumulatedBytesRead).isAtMost(expectedFinalBytesRead);
           // If we haven't read all of the bytes the request should have been satisfied in full.
-          assertTrue(accumulatedBytesRead == expectedFinalBytesRead
-              || bytesRead == requestedReadLength);
+          assertThat(accumulatedBytesRead == expectedFinalBytesRead
+              || bytesRead == requestedReadLength).isTrue();
         } else {
           // We're done. Check we read the expected number of bytes.
-          assertEquals(expectedFinalBytesRead, accumulatedBytesRead);
+          assertThat(accumulatedBytesRead).isEqualTo(expectedFinalBytesRead);
           return;
         }
       }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
similarity index 61%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
index 5ba9e18e7d9..85c43412322 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSchemeDataSourceTest.java
@@ -15,50 +15,65 @@
  */
 package com.google.android.exoplayer2.upstream;
 
+import static com.google.android.exoplayer2.C.RESULT_END_OF_INPUT;
+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.TestUtil;
 import java.io.IOException;
-import junit.framework.TestCase;
+import java.nio.charset.Charset;
+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 DataSchemeDataSource}.
  */
-public final class DataSchemeDataSourceTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class DataSchemeDataSourceTest {
 
   private DataSource schemeDataDataSource;
 
-  @Override
+  @Before
   public void setUp() {
     schemeDataDataSource = new DataSchemeDataSource();
   }
 
+  @Test
   public void testBase64Data() throws IOException {
     DataSpec dataSpec = buildDataSpec("data:text/plain;base64,eyJwcm92aWRlciI6IndpZGV2aW5lX3Rlc3QiL"
         + "CJjb250ZW50X2lkIjoiTWpBeE5WOTBaV0Z5Y3c9PSIsImtleV9pZHMiOlsiMDAwMDAwMDAwMDAwMDAwMDAwMDAwM"
         + "DAwMDAwMDAwMDAiXX0=");
-    TestUtil.assertDataSourceContent(schemeDataDataSource, dataSpec,
+    DataSourceAsserts.assertDataSourceContent(schemeDataDataSource, dataSpec,
         ("{\"provider\":\"widevine_test\",\"content_id\":\"MjAxNV90ZWFycw==\",\"key_ids\":"
-        + "[\"00000000000000000000000000000000\"]}").getBytes());
+        + "[\"00000000000000000000000000000000\"]}").getBytes(Charset.forName(C.UTF8_NAME)));
   }
 
+  @Test
   public void testAsciiData() throws IOException {
-    TestUtil.assertDataSourceContent(schemeDataDataSource, buildDataSpec("data:,A%20brief%20note"),
-        "A brief note".getBytes());
+    DataSourceAsserts.assertDataSourceContent(schemeDataDataSource,
+        buildDataSpec("data:,A%20brief%20note"),
+        "A brief note".getBytes(Charset.forName(C.UTF8_NAME)));
   }
 
+  @Test
   public void testPartialReads() throws IOException {
     byte[] buffer = new byte[18];
     DataSpec dataSpec = buildDataSpec("data:,012345678901234567");
-    assertEquals(18, schemeDataDataSource.open(dataSpec));
-    assertEquals(9, schemeDataDataSource.read(buffer, 0, 9));
-    assertEquals(0, schemeDataDataSource.read(buffer, 3, 0));
-    assertEquals(9, schemeDataDataSource.read(buffer, 9, 15));
-    assertEquals(0, schemeDataDataSource.read(buffer, 1, 0));
-    assertEquals(C.RESULT_END_OF_INPUT, schemeDataDataSource.read(buffer, 1, 1));
-    assertEquals("012345678901234567", new String(buffer, 0, 18));
+    assertThat(schemeDataDataSource.open(dataSpec)).isEqualTo(18);
+    assertThat(schemeDataDataSource.read(buffer, 0, 9)).isEqualTo(9);
+    assertThat(schemeDataDataSource.read(buffer, 3, 0)).isEqualTo(0);
+    assertThat(schemeDataDataSource.read(buffer, 9, 15)).isEqualTo(9);
+    assertThat(schemeDataDataSource.read(buffer, 1, 0)).isEqualTo(0);
+    assertThat(schemeDataDataSource.read(buffer, 1, 1)).isEqualTo(RESULT_END_OF_INPUT);
+    assertThat(new String(buffer, 0, 18, C.UTF8_NAME)).isEqualTo("012345678901234567");
   }
 
+  @Test
   public void testIncorrectScheme() {
     try {
       schemeDataDataSource.open(buildDataSpec("http://www.google.com"));
@@ -68,6 +83,7 @@ public void testIncorrectScheme() {
     }
   }
 
+  @Test
   public void testMalformedData() {
     try {
       schemeDataDataSource.open(buildDataSpec("data:text/plain;base64,,This%20is%20Content"));
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceAsserts.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceAsserts.java
new file mode 100644
index 00000000000..eff32459233
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceAsserts.java
@@ -0,0 +1,50 @@
+/*
+ * 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.android.exoplayer2.testutil.TestUtil;
+import java.io.IOException;
+
+/**
+ * Assertions for data source tests.
+ */
+/* package */ final class DataSourceAsserts {
+
+  /**
+   * Asserts that data read from a {@link DataSource} matches {@code expected}.
+   *
+   * @param dataSource The {@link DataSource} through which to read.
+   * @param dataSpec The {@link DataSpec} to use when opening the {@link DataSource}.
+   * @param expectedData The expected data.
+   * @throws IOException If an error occurs reading fom the {@link DataSource}.
+   */
+  public static void assertDataSourceContent(DataSource dataSource, DataSpec dataSpec,
+      byte[] expectedData) throws IOException {
+    try {
+      long length = dataSource.open(dataSpec);
+      assertThat(length).isEqualTo(expectedData.length);
+      byte[] readData = TestUtil.readToEnd(dataSource);
+      assertThat(readData).isEqualTo(expectedData);
+    } finally {
+      dataSource.close();
+    }
+  }
+
+  private DataSourceAsserts() {}
+
+}
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
similarity index 65%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
index 38797ede66a..8cd6c23fb1d 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/DataSourceInputStreamTest.java
@@ -15,75 +15,84 @@
  */
 package com.google.android.exoplayer2.upstream;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.net.Uri;
-import android.test.MoreAsserts;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.IOException;
 import java.util.Arrays;
-import junit.framework.TestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit tests for {@link DataSourceInputStream}.
  */
-public class DataSourceInputStreamTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class DataSourceInputStreamTest {
 
   private static final byte[] TEST_DATA = TestUtil.buildTestData(16);
 
+  @Test
   public void testReadSingleBytes() throws IOException {
     DataSourceInputStream inputStream = buildTestInputStream();
     // No bytes read yet.
-    assertEquals(0, inputStream.bytesRead());
+    assertThat(inputStream.bytesRead()).isEqualTo(0);
     // Read bytes.
     for (int i = 0; i < TEST_DATA.length; i++) {
       int readByte = inputStream.read();
-      assertTrue(0 <= readByte && readByte < 256);
-      assertEquals(TEST_DATA[i] & 0xFF, readByte);
-      assertEquals(i + 1, inputStream.bytesRead());
+      assertThat(0 <= readByte && readByte < 256).isTrue();
+      assertThat(readByte).isEqualTo(TEST_DATA[i] & 0xFF);
+      assertThat(inputStream.bytesRead()).isEqualTo(i + 1);
     }
     // Check end of stream.
-    assertEquals(-1, inputStream.read());
-    assertEquals(TEST_DATA.length, inputStream.bytesRead());
+    assertThat(inputStream.read()).isEqualTo(-1);
+    assertThat(inputStream.bytesRead()).isEqualTo(TEST_DATA.length);
     // Check close succeeds.
     inputStream.close();
   }
 
+  @Test
   public void testRead() throws IOException {
     DataSourceInputStream inputStream = buildTestInputStream();
     // Read bytes.
     byte[] readBytes = new byte[TEST_DATA.length];
     int totalBytesRead = 0;
     while (totalBytesRead < TEST_DATA.length) {
-      long bytesRead = inputStream.read(readBytes, totalBytesRead,
+      int bytesRead = inputStream.read(readBytes, totalBytesRead,
           TEST_DATA.length - totalBytesRead);
-      assertTrue(bytesRead > 0);
+      assertThat(bytesRead).isGreaterThan(0);
       totalBytesRead += bytesRead;
-      assertEquals(totalBytesRead, inputStream.bytesRead());
+      assertThat(inputStream.bytesRead()).isEqualTo(totalBytesRead);
     }
     // Check the read data.
-    MoreAsserts.assertEquals(TEST_DATA, readBytes);
+    assertThat(readBytes).isEqualTo(TEST_DATA);
     // Check end of stream.
-    assertEquals(TEST_DATA.length, inputStream.bytesRead());
-    assertEquals(TEST_DATA.length, totalBytesRead);
-    assertEquals(-1, inputStream.read());
+    assertThat(inputStream.bytesRead()).isEqualTo(TEST_DATA.length);
+    assertThat(totalBytesRead).isEqualTo(TEST_DATA.length);
+    assertThat(inputStream.read()).isEqualTo(-1);
     // Check close succeeds.
     inputStream.close();
   }
 
+  @Test
   public void testSkip() throws IOException {
     DataSourceInputStream inputStream = buildTestInputStream();
     // Skip bytes.
     long totalBytesSkipped = 0;
     while (totalBytesSkipped < TEST_DATA.length) {
       long bytesSkipped = inputStream.skip(Long.MAX_VALUE);
-      assertTrue(bytesSkipped > 0);
+      assertThat(bytesSkipped > 0).isTrue();
       totalBytesSkipped += bytesSkipped;
-      assertEquals(totalBytesSkipped, inputStream.bytesRead());
+      assertThat(inputStream.bytesRead()).isEqualTo(totalBytesSkipped);
     }
     // Check end of stream.
-    assertEquals(TEST_DATA.length, inputStream.bytesRead());
-    assertEquals(TEST_DATA.length, totalBytesSkipped);
-    assertEquals(-1, inputStream.read());
+    assertThat(inputStream.bytesRead()).isEqualTo(TEST_DATA.length);
+    assertThat(totalBytesSkipped).isEqualTo(TEST_DATA.length);
+    assertThat(inputStream.read()).isEqualTo(-1);
     // Check close succeeds.
     inputStream.close();
   }
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
new file mode 100644
index 00000000000..aa98ad3179b
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheAsserts.java
@@ -0,0 +1,115 @@
+/*
+ * 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.DataSourceInputStream;
+import com.google.android.exoplayer2.upstream.DataSpec;
+import com.google.android.exoplayer2.upstream.DummyDataSource;
+import java.io.ByteArrayOutputStream;
+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}. */
+  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}.
+   */
+  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}.
+   */
+  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}. */
+  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}. */
+  public static void assertDataCached(Cache cache, Uri uri, byte[] expected) throws IOException {
+    CacheDataSource dataSource = new CacheDataSource(cache, DummyDataSource.INSTANCE, 0);
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    DataSourceInputStream inputStream = new DataSourceInputStream(dataSource,
+        new DataSpec(uri, DataSpec.FLAG_ALLOW_CACHING_UNKNOWN_LENGTH));
+    try {
+      inputStream.open();
+      byte[] buffer = new byte[1024];
+      int bytesRead;
+      while ((bytesRead = inputStream.read(buffer)) != -1) {
+        outputStream.write(buffer, 0, bytesRead);
+      }
+    } catch (IOException e) {
+      // Ignore
+    } finally {
+      inputStream.close();
+    }
+    assertWithMessage("Cached data doesn't match expected for '" + uri + "'")
+        .that(outputStream.toByteArray()).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)))).isNull();
+    }
+  }
+
+  /** 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/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
similarity index 77%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
index e7ff2a68115..e92f072dc2e 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
@@ -15,11 +15,16 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
+import static android.net.Uri.EMPTY;
+import static com.google.android.exoplayer2.C.LENGTH_UNSET;
+import static com.google.android.exoplayer2.upstream.cache.CacheAsserts.assertCacheEmpty;
+import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
+import static java.util.Arrays.copyOf;
+import static java.util.Arrays.copyOfRange;
+import static org.junit.Assert.fail;
 
 import android.net.Uri;
-import android.test.InstrumentationTestCase;
-import android.test.MoreAsserts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSet.FakeData;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
@@ -28,12 +33,21 @@
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
+import org.junit.After;
+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 CacheDataSource}.
  */
-public class CacheDataSourceTest extends InstrumentationTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+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;
@@ -43,47 +57,52 @@ public class CacheDataSourceTest extends InstrumentationTestCase {
   private File tempFolder;
   private SimpleCache cache;
 
-  @Override
+  @Before
   public void setUp() throws Exception {
-    super.setUp();
-    tempFolder = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
+    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
   }
 
-  @Override
+  @After
   public void tearDown() throws Exception {
     Util.recursiveDelete(tempFolder);
-    super.tearDown();
   }
 
+  @Test
   public void testMaxCacheFileSize() throws Exception {
     CacheDataSource cacheDataSource = createCacheDataSource(false, false);
     assertReadDataContentLength(cacheDataSource, false, false);
     for (String key : cache.getKeys()) {
       for (CacheSpan cacheSpan : cache.getCachedSpans(key)) {
-        assertTrue(cacheSpan.length <= MAX_CACHE_FILE_SIZE);
-        assertTrue(cacheSpan.file.length() <= MAX_CACHE_FILE_SIZE);
+        assertThat(cacheSpan.length <= MAX_CACHE_FILE_SIZE).isTrue();
+        assertThat(cacheSpan.file.length() <= MAX_CACHE_FILE_SIZE).isTrue();
       }
     }
   }
 
+  @Test
   public void testCacheAndRead() throws Exception {
     assertCacheAndRead(false, false);
   }
 
+  @Test
   public void testCacheAndReadUnboundedRequest() throws Exception {
     assertCacheAndRead(true, false);
   }
 
+  @Test
   public void testCacheAndReadUnknownLength() throws Exception {
     assertCacheAndRead(false, true);
   }
 
   // Disabled test as we don't support caching of definitely unknown length content
+  @Ignore
+  @Test
   public void disabledTestCacheAndReadUnboundedRequestUnknownLength() throws Exception {
     assertCacheAndRead(true, true);
   }
 
+  @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
@@ -104,11 +123,12 @@ public void testUnsatisfiableRange() throws Exception {
     }
   }
 
+  @Test
   public void testContentLengthEdgeCases() throws Exception {
     // 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);
-    assertEquals(C.LENGTH_UNSET, cache.getContentLength(KEY_1));
+    assertThat(cache.getContentLength(KEY_1)).isEqualTo(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.
@@ -116,21 +136,23 @@ public void testContentLengthEdgeCases() throws Exception {
     assertReadDataContentLength(cacheDataSource, true, true);
 
     // Now the length set correctly do an unbounded request with offset
-    assertEquals(2, cacheDataSource.open(new DataSpec(Uri.EMPTY, TEST_DATA.length - 2,
-        C.LENGTH_UNSET, KEY_1)));
+    assertThat(cacheDataSource.open(new DataSpec(EMPTY, TEST_DATA.length - 2,
+        LENGTH_UNSET, KEY_1))).isEqualTo(2);
 
     // An unbounded request with offset for not cached content
-    assertEquals(C.LENGTH_UNSET, cacheDataSource.open(new DataSpec(Uri.EMPTY, TEST_DATA.length - 2,
-        C.LENGTH_UNSET, KEY_2)));
+    assertThat(cacheDataSource.open(new DataSpec(EMPTY, TEST_DATA.length - 2,
+        LENGTH_UNSET, KEY_2))).isEqualTo(LENGTH_UNSET);
   }
 
+  @Test
   public void testIgnoreCacheForUnsetLengthRequests() throws Exception {
     CacheDataSource cacheDataSource = createCacheDataSource(false, true,
         CacheDataSource.FLAG_IGNORE_CACHE_FOR_UNSET_LENGTH_REQUESTS);
     assertReadData(cacheDataSource, true, 0, C.LENGTH_UNSET);
-    MoreAsserts.assertEmpty(cache.getKeys());
+    assertThat(cache.getKeys()).isEmpty();
   }
 
+  @Test
   public void testReadOnlyCache() throws Exception {
     CacheDataSource cacheDataSource = createCacheDataSource(false, false, 0, null);
     assertReadDataContentLength(cacheDataSource, false, false);
@@ -157,9 +179,9 @@ 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);
-    assertEquals("When the range specified, CacheDataSource doesn't reach EOS so shouldn't cache "
-        + "content length", !unboundedRequest ? C.LENGTH_UNSET : TEST_DATA.length,
-        cache.getContentLength(KEY_1));
+    assertWithMessage("When the range specified, CacheDataSource doesn't reach EOS so shouldn't "
+        + "cache content length").that(cache.getContentLength(KEY_1))
+        .isEqualTo(!unboundedRequest ? C.LENGTH_UNSET : TEST_DATA.length);
   }
 
   private void assertReadData(CacheDataSource cacheDataSource, boolean unknownLength, int position,
@@ -168,8 +190,8 @@ private void assertReadData(CacheDataSource cacheDataSource, boolean unknownLeng
     if (length != C.LENGTH_UNSET) {
       testDataLength = Math.min(testDataLength, length);
     }
-    assertEquals(unknownLength ? length : testDataLength,
-        cacheDataSource.open(new DataSpec(Uri.EMPTY, position, length, KEY_1)));
+    assertThat(cacheDataSource.open(new DataSpec(EMPTY, position, length, KEY_1)))
+        .isEqualTo(unknownLength ? length : testDataLength);
 
     byte[] buffer = new byte[100];
     int totalBytesRead = 0;
@@ -180,9 +202,9 @@ private void assertReadData(CacheDataSource cacheDataSource, boolean unknownLeng
       }
       totalBytesRead += read;
     }
-    assertEquals(testDataLength, totalBytesRead);
-    MoreAsserts.assertEquals(Arrays.copyOfRange(TEST_DATA, position, position + testDataLength),
-        Arrays.copyOf(buffer, totalBytesRead));
+    assertThat(totalBytesRead).isEqualTo(testDataLength);
+    assertThat(copyOf(buffer, totalBytesRead))
+        .isEqualTo(copyOfRange(TEST_DATA, position, position + testDataLength));
 
     cacheDataSource.close();
   }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
similarity index 86%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
index 7e8088f3bef..3b8276c731f 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest2.java
@@ -15,10 +15,12 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
+import static com.google.common.truth.Truth.assertThat;
+import static java.util.Arrays.copyOf;
+import static java.util.Arrays.copyOfRange;
+
 import android.content.Context;
 import android.net.Uri;
-import android.test.AndroidTestCase;
-import android.test.MoreAsserts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
 import com.google.android.exoplayer2.testutil.TestUtil;
@@ -32,13 +34,19 @@
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.Random;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.annotation.Config;
 
 /**
  * Additional tests for {@link CacheDataSource}.
  */
-public class CacheDataSourceTest2 extends AndroidTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class CacheDataSourceTest2 {
 
   private static final String EXO_CACHE_DIR = "exo";
   private static final int EXO_CACHE_MAX_FILESIZE = 128;
@@ -64,17 +72,20 @@ public class CacheDataSourceTest2 extends AndroidTestCase {
   private static final DataSpec START_OFF_BOUNDARY = new DataSpec(URI, OFFSET_OFF_BOUNDARY,
       DATA.length - OFFSET_OFF_BOUNDARY, KEY);
 
+  @Test
   public void testWithoutEncryption() throws IOException {
     testReads(false);
   }
 
+  @Test
   public void testWithEncryption() throws IOException {
     testReads(true);
   }
 
   private void testReads(boolean useEncryption) throws IOException {
     FakeDataSource upstreamSource = buildFakeUpstreamSource();
-    CacheDataSource source = buildCacheDataSource(getContext(), upstreamSource, useEncryption);
+    CacheDataSource source =
+        buildCacheDataSource(RuntimeEnvironment.application, upstreamSource, useEncryption);
     // First read, should arrive from upstream.
     testRead(END_ON_BOUNDARY, source);
     assertSingleOpen(upstreamSource, 0, OFFSET_ON_BOUNDARY);
@@ -110,8 +121,8 @@ private void testRead(DataSpec dataSpec, CacheDataSource source) throws IOExcept
       int maxBytesToRead = random.nextInt(scratch.length) + 1;
       bytesRead = source.read(scratch, 0, maxBytesToRead);
       if (bytesRead != C.RESULT_END_OF_INPUT) {
-        MoreAsserts.assertEquals(Arrays.copyOfRange(DATA, position, position + bytesRead),
-            Arrays.copyOf(scratch, bytesRead));
+        assertThat(copyOf(scratch, bytesRead))
+            .isEqualTo(copyOfRange(DATA, position, position + bytesRead));
         position += bytesRead;
       }
     }
@@ -124,10 +135,10 @@ private void testRead(DataSpec dataSpec, CacheDataSource source) throws IOExcept
    */
   private void assertSingleOpen(FakeDataSource upstreamSource, int start, int end) {
     DataSpec[] openedDataSpecs = upstreamSource.getAndClearOpenedDataSpecs();
-    assertEquals(1, openedDataSpecs.length);
-    assertEquals(start, openedDataSpecs[0].position);
-    assertEquals(start, openedDataSpecs[0].absoluteStreamPosition);
-    assertEquals(end - start, openedDataSpecs[0].length);
+    assertThat(openedDataSpecs).hasLength(1);
+    assertThat(openedDataSpecs[0].position).isEqualTo(start);
+    assertThat(openedDataSpecs[0].absoluteStreamPosition).isEqualTo(start);
+    assertThat(openedDataSpecs[0].length).isEqualTo(end - start);
   }
 
   /**
@@ -135,7 +146,7 @@ private void assertSingleOpen(FakeDataSource upstreamSource, int start, int end)
    */
   private void assertNoOpen(FakeDataSource upstreamSource) {
     DataSpec[] openedDataSpecs = upstreamSource.getAndClearOpenedDataSpecs();
-    assertEquals(0, openedDataSpecs.length);
+    assertThat(openedDataSpecs).hasLength(0);
   }
 
   private static FakeDataSource buildFakeUpstreamSource() {
@@ -177,7 +188,7 @@ private static void emptyCache(Cache cache) throws CacheException {
       }
     }
     // Sanity check that the cache really is empty now.
-    assertTrue(cache.getKeys().isEmpty());
+    assertThat(cache.getKeys().isEmpty()).isTrue();
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
similarity index 83%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
index df9975d43b6..c8231ec4ace 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
@@ -15,11 +15,17 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCacheEmpty;
-import static com.google.android.exoplayer2.testutil.CacheAsserts.assertCachedData;
+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.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;
 
 import android.net.Uri;
-import android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
 import com.google.android.exoplayer2.testutil.FakeDataSource;
@@ -29,13 +35,23 @@
 import com.google.android.exoplayer2.util.Util;
 import java.io.EOFException;
 import java.io.File;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+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;
+import org.robolectric.annotation.Config;
 
 /**
  * Tests {@link CacheUtil}.
  */
-public class CacheUtilTest extends InstrumentationTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class CacheUtilTest {
 
   /**
    * Abstract fake Cache implementation used by the test. This class must be public so Mockito can
@@ -78,45 +94,46 @@ public long getContentLength(String key) {
   private File tempFolder;
   private SimpleCache cache;
 
-  @Override
+  @Before
   public void setUp() throws Exception {
-    super.setUp();
-    TestUtil.setUpMockito(this);
+    MockitoAnnotations.initMocks(this);
     mockCache.init();
-    tempFolder = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
+    tempFolder = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
   }
 
-  @Override
+  @After
   public void tearDown() throws Exception {
     Util.recursiveDelete(tempFolder);
-    super.tearDown();
   }
 
+  @Test
   public void testGenerateKey() throws Exception {
-    assertNotNull(CacheUtil.generateKey(Uri.EMPTY));
+    assertThat(generateKey(EMPTY)).isNotNull();
 
     Uri testUri = Uri.parse("test");
     String key = CacheUtil.generateKey(testUri);
-    assertNotNull(key);
+    assertThat(key).isNotNull();
 
     // Should generate the same key for the same input
-    assertEquals(key, CacheUtil.generateKey(testUri));
+    assertThat(generateKey(testUri)).isEqualTo(key);
 
     // Should generate different key for different input
-    assertFalse(key.equals(CacheUtil.generateKey(Uri.parse("test2"))));
+    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
-    assertEquals(key, CacheUtil.getKey(new DataSpec(testUri, 0, C.LENGTH_UNSET, key)));
+    assertThat(getKey(new DataSpec(testUri, 0, LENGTH_UNSET, key))).isEqualTo(key);
     // If not generates a new one using DataSpec.uri
-    assertEquals(CacheUtil.generateKey(testUri),
-        CacheUtil.getKey(new DataSpec(testUri, 0, C.LENGTH_UNSET, null)));
+    assertThat(getKey(new DataSpec(testUri, 0, LENGTH_UNSET, null)))
+        .isEqualTo(generateKey(testUri));
   }
 
+  @Test
   public void testGetCachedNoData() throws Exception {
     CachingCounters counters = new CachingCounters();
     CacheUtil.getCached(new DataSpec(Uri.parse("test")), mockCache, counters);
@@ -124,6 +141,7 @@ public void testGetCachedNoData() throws Exception {
     assertCounters(counters, 0, 0, C.LENGTH_UNSET);
   }
 
+  @Test
   public void testGetCachedDataUnknownLength() throws Exception {
     // Mock there is 100 bytes cached at the beginning
     mockCache.spansAndGaps = new int[] {100};
@@ -133,6 +151,7 @@ public void testGetCachedDataUnknownLength() throws Exception {
     assertCounters(counters, 100, 0, C.LENGTH_UNSET);
   }
 
+  @Test
   public void testGetCachedNoDataKnownLength() throws Exception {
     mockCache.contentLength = 1000;
     CachingCounters counters = new CachingCounters();
@@ -141,6 +160,7 @@ public void testGetCachedNoDataKnownLength() throws Exception {
     assertCounters(counters, 0, 0, 1000);
   }
 
+  @Test
   public void testGetCached() throws Exception {
     mockCache.contentLength = 1000;
     mockCache.spansAndGaps = new int[] {100, 100, 200};
@@ -150,6 +170,7 @@ public void testGetCached() throws Exception {
     assertCounters(counters, 300, 0, 1000);
   }
 
+  @Test
   public void testCache() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
@@ -161,6 +182,7 @@ public void testCache() throws Exception {
     assertCachedData(cache, fakeDataSet);
   }
 
+  @Test
   public void testCacheSetOffsetAndLength() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
@@ -178,6 +200,7 @@ public void testCacheSetOffsetAndLength() throws Exception {
     assertCachedData(cache, fakeDataSet);
   }
 
+  @Test
   public void testCacheUnknownLength() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().newData("test_data")
         .setSimulateUnknownLength(true)
@@ -192,6 +215,7 @@ public void testCacheUnknownLength() throws Exception {
     assertCachedData(cache, fakeDataSet);
   }
 
+  @Test
   public void testCacheUnknownLengthPartialCaching() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().newData("test_data")
         .setSimulateUnknownLength(true)
@@ -211,6 +235,7 @@ public void testCacheUnknownLengthPartialCaching() throws Exception {
     assertCachedData(cache, fakeDataSet);
   }
 
+  @Test
   public void testCacheLengthExceedsActualDataLength() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
@@ -224,6 +249,7 @@ public void testCacheLengthExceedsActualDataLength() throws Exception {
     assertCachedData(cache, fakeDataSet);
   }
 
+  @Test
   public void testCacheThrowEOFException() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
@@ -241,6 +267,7 @@ public void testCacheThrowEOFException() throws Exception {
     }
   }
 
+  @Test
   public void testCachePolling() throws Exception {
     final CachingCounters counters = new CachingCounters();
     FakeDataSet fakeDataSet = new FakeDataSet().newData("test_data")
@@ -267,6 +294,7 @@ public void run() {
     assertCachedData(cache, fakeDataSet);
   }
 
+  @Test
   public void testRemove() throws Exception {
     FakeDataSet fakeDataSet = new FakeDataSet().setRandomData("test_data", 100);
     FakeDataSource dataSource = new FakeDataSource(fakeDataSet);
@@ -283,9 +311,9 @@ public void testRemove() throws Exception {
 
   private static void assertCounters(CachingCounters counters, int alreadyCachedBytes,
       int newlyCachedBytes, int contentLength) {
-    assertEquals(alreadyCachedBytes, counters.alreadyCachedBytes);
-    assertEquals(newlyCachedBytes, counters.newlyCachedBytes);
-    assertEquals(contentLength, counters.contentLength);
+    assertThat(counters.alreadyCachedBytes).isEqualTo(alreadyCachedBytes);
+    assertThat(counters.newlyCachedBytes).isEqualTo(newlyCachedBytes);
+    assertThat(counters.contentLength).isEqualTo(contentLength);
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
similarity index 69%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
index 1a6beeb6ba7..ed550458358 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/SimpleCacheTest.java
@@ -15,8 +15,10 @@
  */
 package com.google.android.exoplayer2.upstream.cache;
 
-import android.test.InstrumentationTestCase;
-import android.test.MoreAsserts;
+import static com.google.android.exoplayer2.C.LENGTH_UNSET;
+import static com.google.android.exoplayer2.util.Util.toByteArray;
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
@@ -26,60 +28,71 @@
 import java.util.NavigableSet;
 import java.util.Random;
 import java.util.Set;
+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;
+import org.robolectric.annotation.Config;
 
 /**
  * Unit tests for {@link SimpleCache}.
  */
-public class SimpleCacheTest extends InstrumentationTestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class SimpleCacheTest {
 
   private static final String KEY_1 = "key1";
 
   private File cacheDir;
 
-  @Override
-  protected void setUp() throws Exception {
-    cacheDir = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
+  @Before
+  public void setUp() throws Exception {
+    cacheDir = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
   }
 
-  @Override
-  protected void tearDown() throws Exception {
+  @After
+  public void tearDown() throws Exception {
     Util.recursiveDelete(cacheDir);
   }
 
+  @Test
   public void testCommittingOneFile() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
 
     CacheSpan cacheSpan1 = simpleCache.startReadWrite(KEY_1, 0);
-    assertFalse(cacheSpan1.isCached);
-    assertTrue(cacheSpan1.isOpenEnded());
+    assertThat(cacheSpan1.isCached).isFalse();
+    assertThat(cacheSpan1.isOpenEnded()).isTrue();
 
-    assertNull(simpleCache.startReadWriteNonBlocking(KEY_1, 0));
+    assertThat(simpleCache.startReadWriteNonBlocking(KEY_1, 0)).isNull();
 
-    assertEquals(0, simpleCache.getKeys().size());
+    assertThat(simpleCache.getKeys()).isEmpty();
     NavigableSet<CacheSpan> cachedSpans = simpleCache.getCachedSpans(KEY_1);
-    assertTrue(cachedSpans == null || cachedSpans.size() == 0);
-    assertEquals(0, simpleCache.getCacheSpace());
-    assertEquals(0, cacheDir.listFiles().length);
+    assertThat(cachedSpans == null || cachedSpans.isEmpty()).isTrue();
+    assertThat(simpleCache.getCacheSpace()).isEqualTo(0);
+    assertThat(cacheDir.listFiles()).hasLength(0);
 
     addCache(simpleCache, KEY_1, 0, 15);
 
     Set<String> cachedKeys = simpleCache.getKeys();
-    assertEquals(1, cachedKeys.size());
-    assertTrue(cachedKeys.contains(KEY_1));
+    assertThat(cachedKeys).hasSize(1);
+    assertThat(cachedKeys.contains(KEY_1)).isTrue();
     cachedSpans = simpleCache.getCachedSpans(KEY_1);
-    assertEquals(1, cachedSpans.size());
-    assertTrue(cachedSpans.contains(cacheSpan1));
-    assertEquals(15, simpleCache.getCacheSpace());
+    assertThat(cachedSpans).hasSize(1);
+    assertThat(cachedSpans.contains(cacheSpan1)).isTrue();
+    assertThat(simpleCache.getCacheSpace()).isEqualTo(15);
 
     simpleCache.releaseHoleSpan(cacheSpan1);
 
     CacheSpan cacheSpan2 = simpleCache.startReadWrite(KEY_1, 0);
-    assertTrue(cacheSpan2.isCached);
-    assertFalse(cacheSpan2.isOpenEnded());
-    assertEquals(15, cacheSpan2.length);
+    assertThat(cacheSpan2.isCached).isTrue();
+    assertThat(cacheSpan2.isOpenEnded()).isFalse();
+    assertThat(cacheSpan2.length).isEqualTo(15);
     assertCachedDataReadCorrect(cacheSpan2);
   }
 
+  @Test
   public void testReadCacheWithoutReleasingWriteCacheSpan() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
 
@@ -90,19 +103,20 @@ public void testReadCacheWithoutReleasingWriteCacheSpan() throws Exception {
     simpleCache.releaseHoleSpan(cacheSpan1);
   }
 
+  @Test
   public void testSetGetLength() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
 
-    assertEquals(C.LENGTH_UNSET, simpleCache.getContentLength(KEY_1));
+    assertThat(simpleCache.getContentLength(KEY_1)).isEqualTo(LENGTH_UNSET);
     simpleCache.setContentLength(KEY_1, 15);
-    assertEquals(15, simpleCache.getContentLength(KEY_1));
+    assertThat(simpleCache.getContentLength(KEY_1)).isEqualTo(15);
 
     simpleCache.startReadWrite(KEY_1, 0);
 
     addCache(simpleCache, KEY_1, 0, 15);
 
     simpleCache.setContentLength(KEY_1, 150);
-    assertEquals(150, simpleCache.getContentLength(KEY_1));
+    assertThat(simpleCache.getContentLength(KEY_1)).isEqualTo(150);
 
     addCache(simpleCache, KEY_1, 140, 10);
 
@@ -110,19 +124,20 @@ public void testSetGetLength() throws Exception {
     SimpleCache simpleCache2 = getSimpleCache();
     Set<String> keys = simpleCache.getKeys();
     Set<String> keys2 = simpleCache2.getKeys();
-    assertEquals(keys, keys2);
+    assertThat(keys2).isEqualTo(keys);
     for (String key : keys) {
-      assertEquals(simpleCache.getContentLength(key), simpleCache2.getContentLength(key));
-      assertEquals(simpleCache.getCachedSpans(key), simpleCache2.getCachedSpans(key));
+      assertThat(simpleCache2.getContentLength(key)).isEqualTo(simpleCache.getContentLength(key));
+      assertThat(simpleCache2.getCachedSpans(key)).isEqualTo(simpleCache.getCachedSpans(key));
     }
 
     // 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 = getSimpleCache();
-    assertEquals(150, simpleCache2.getContentLength(KEY_1));
+    assertThat(simpleCache2.getContentLength(KEY_1)).isEqualTo(150);
   }
 
+  @Test
   public void testReloadCache() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
 
@@ -139,6 +154,7 @@ public void testReloadCache() throws Exception {
     assertCachedDataReadCorrect(cacheSpan2);
   }
 
+  @Test
   public void testEncryptedIndex() throws Exception {
     byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
     SimpleCache simpleCache = getEncryptedSimpleCache(key);
@@ -156,6 +172,7 @@ public void testEncryptedIndex() throws Exception {
     assertCachedDataReadCorrect(cacheSpan2);
   }
 
+  @Test
   public void testEncryptedIndexWrongKey() throws Exception {
     byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
     SimpleCache simpleCache = getEncryptedSimpleCache(key);
@@ -170,10 +187,11 @@ public void testEncryptedIndexWrongKey() throws Exception {
     simpleCache = getEncryptedSimpleCache(key2);
 
     // Cache should be cleared
-    assertEquals(0, simpleCache.getKeys().size());
-    assertEquals(0, cacheDir.listFiles().length);
+    assertThat(simpleCache.getKeys()).isEmpty();
+    assertThat(cacheDir.listFiles()).hasLength(0);
   }
 
+  @Test
   public void testEncryptedIndexLostKey() throws Exception {
     byte[] key = "Bar12345Bar12345".getBytes(C.UTF8_NAME); // 128 bit key
     SimpleCache simpleCache = getEncryptedSimpleCache(key);
@@ -187,41 +205,42 @@ public void testEncryptedIndexLostKey() throws Exception {
     simpleCache = getSimpleCache();
 
     // Cache should be cleared
-    assertEquals(0, simpleCache.getKeys().size());
-    assertEquals(0, cacheDir.listFiles().length);
+    assertThat(simpleCache.getKeys()).isEmpty();
+    assertThat(cacheDir.listFiles()).hasLength(0);
   }
 
 
+  @Test
   public void testGetCachedBytes() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
     CacheSpan cacheSpan = simpleCache.startReadWrite(KEY_1, 0);
 
     // No cached bytes, returns -'length'
-    assertEquals(-100, simpleCache.getCachedBytes(KEY_1, 0, 100));
+    assertThat(simpleCache.getCachedBytes(KEY_1, 0, 100)).isEqualTo(-100);
 
     // Position value doesn't affect the return value
-    assertEquals(-100, simpleCache.getCachedBytes(KEY_1, 20, 100));
+    assertThat(simpleCache.getCachedBytes(KEY_1, 20, 100)).isEqualTo(-100);
 
     addCache(simpleCache, KEY_1, 0, 15);
 
     // Returns the length of a single span
-    assertEquals(15, simpleCache.getCachedBytes(KEY_1, 0, 100));
+    assertThat(simpleCache.getCachedBytes(KEY_1, 0, 100)).isEqualTo(15);
 
     // Value is capped by the 'length'
-    assertEquals(10, simpleCache.getCachedBytes(KEY_1, 0, 10));
+    assertThat(simpleCache.getCachedBytes(KEY_1, 0, 10)).isEqualTo(10);
 
     addCache(simpleCache, KEY_1, 15, 35);
 
     // Returns the length of two adjacent spans
-    assertEquals(50, simpleCache.getCachedBytes(KEY_1, 0, 100));
+    assertThat(simpleCache.getCachedBytes(KEY_1, 0, 100)).isEqualTo(50);
 
     addCache(simpleCache, KEY_1, 60, 10);
 
     // Not adjacent span doesn't affect return value
-    assertEquals(50, simpleCache.getCachedBytes(KEY_1, 0, 100));
+    assertThat(simpleCache.getCachedBytes(KEY_1, 0, 100)).isEqualTo(50);
 
     // Returns length of hole up to the next cached span
-    assertEquals(-5, simpleCache.getCachedBytes(KEY_1, 55, 100));
+    assertThat(simpleCache.getCachedBytes(KEY_1, 55, 100)).isEqualTo(-5);
 
     simpleCache.releaseHoleSpan(cacheSpan);
   }
@@ -247,11 +266,11 @@ private static void addCache(SimpleCache simpleCache, String key, int position,
   }
 
   private static void assertCachedDataReadCorrect(CacheSpan cacheSpan) throws IOException {
-    assertTrue(cacheSpan.isCached);
+    assertThat(cacheSpan.isCached).isTrue();
     byte[] expected = generateData(cacheSpan.key, (int) cacheSpan.position, (int) cacheSpan.length);
     FileInputStream inputStream = new FileInputStream(cacheSpan.file);
     try {
-      MoreAsserts.assertEquals(expected, Util.toByteArray(inputStream));
+      assertThat(toByteArray(inputStream)).isEqualTo(expected);
     } finally {
       inputStream.close();
     }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java b/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
similarity index 77%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
rename to library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
index b4e7e6e7f60..833a7e10c14 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
@@ -15,16 +15,25 @@
  */
 package com.google.android.exoplayer2.upstream.crypto;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import com.google.android.exoplayer2.testutil.TestUtil;
 import com.google.android.exoplayer2.util.Util;
 import java.util.Random;
 import javax.crypto.Cipher;
-import junit.framework.TestCase;
+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 AesFlushingCipher}.
  */
-public class AesFlushingCipherTest extends TestCase {
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class AesFlushingCipherTest {
 
   private static final int DATA_LENGTH = 65536;
   private static final byte[] KEY = Util.getUtf8Bytes("testKey:12345678");
@@ -35,26 +44,26 @@ public class AesFlushingCipherTest extends TestCase {
   private AesFlushingCipher encryptCipher;
   private AesFlushingCipher decryptCipher;
 
-  @Override
-  protected void setUp() {
+  @Before
+  public void setUp() {
     encryptCipher = new AesFlushingCipher(Cipher.ENCRYPT_MODE, KEY, NONCE, START_OFFSET);
     decryptCipher = new AesFlushingCipher(Cipher.DECRYPT_MODE, KEY, NONCE, START_OFFSET);
   }
 
-  @Override
-  protected void tearDown() {
+  @After
+  public void tearDown() {
     encryptCipher = null;
     decryptCipher = null;
   }
 
-  private long getMaxUnchangedBytesAllowedPostEncryption(long length) {
+  private static long getMaxUnchangedBytesAllowedPostEncryption(long length) {
     // Assuming that not more than 10% of the resultant bytes should be identical.
     // The value of 10% is arbitrary, ciphers standards do not name a value.
     return length / 10;
   }
 
   // Count the number of bytes that do not match.
-  private int getDifferingByteCount(byte[] data1, byte[] data2, int startOffset) {
+  private static int getDifferingByteCount(byte[] data1, byte[] data2, int startOffset) {
     int count = 0;
     for (int i = startOffset; i < data1.length; i++) {
       if (data1[i] != data2[i]) {
@@ -65,25 +74,28 @@ private int getDifferingByteCount(byte[] data1, byte[] data2, int startOffset) {
   }
 
   // Count the number of bytes that do not match.
-  private int getDifferingByteCount(byte[] data1, byte[] data2) {
+  private static int getDifferingByteCount(byte[] data1, byte[] data2) {
     return getDifferingByteCount(data1, data2, 0);
   }
 
-  // Test a single encrypt and decrypt call
+  // Test a single encrypt and decrypt call.
+  @Test
   public void testSingle() {
     byte[] reference = TestUtil.buildTestData(DATA_LENGTH);
     byte[] data = reference.clone();
 
     encryptCipher.updateInPlace(data, 0, data.length);
     int unchangedByteCount = data.length - getDifferingByteCount(reference, data);
-    assertTrue(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length));
+    assertThat(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length))
+        .isTrue();
 
     decryptCipher.updateInPlace(data, 0, data.length);
     int differingByteCount = getDifferingByteCount(reference, data);
-    assertEquals(0, differingByteCount);
+    assertThat(differingByteCount).isEqualTo(0);
   }
 
-  // Test several encrypt and decrypt calls, each aligned on a 16 byte block size
+  // Test several encrypt and decrypt calls, each aligned on a 16 byte block size.
+  @Test
   public void testAligned() {
     byte[] reference = TestUtil.buildTestData(DATA_LENGTH);
     byte[] data = reference.clone();
@@ -93,28 +105,30 @@ public void testAligned() {
     while (offset < data.length) {
       int bytes = (1 + random.nextInt(50)) * 16;
       bytes = Math.min(bytes, data.length - offset);
-      assertEquals(0, bytes % 16);
+      assertThat(bytes % 16).isEqualTo(0);
       encryptCipher.updateInPlace(data, offset, bytes);
       offset += bytes;
     }
 
     int unchangedByteCount = data.length - getDifferingByteCount(reference, data);
-    assertTrue(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length));
+    assertThat(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length))
+        .isTrue();
 
     offset = 0;
     while (offset < data.length) {
       int bytes = (1 + random.nextInt(50)) * 16;
       bytes = Math.min(bytes, data.length - offset);
-      assertEquals(0, bytes % 16);
+      assertThat(bytes % 16).isEqualTo(0);
       decryptCipher.updateInPlace(data, offset, bytes);
       offset += bytes;
     }
 
     int differingByteCount = getDifferingByteCount(reference, data);
-    assertEquals(0, differingByteCount);
+    assertThat(differingByteCount).isEqualTo(0);
   }
 
-  // Test several encrypt and decrypt calls, not aligned on block boundary
+  // Test several encrypt and decrypt calls, not aligned on block boundary.
+  @Test
   public void testUnAligned() {
     byte[] reference = TestUtil.buildTestData(DATA_LENGTH);
     byte[] data = reference.clone();
@@ -130,7 +144,8 @@ public void testUnAligned() {
     }
 
     int unchangedByteCount = data.length - getDifferingByteCount(reference, data);
-    assertTrue(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length));
+    assertThat(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length))
+        .isTrue();
 
     offset = 0;
     while (offset < data.length) {
@@ -141,10 +156,11 @@ public void testUnAligned() {
     }
 
     int differingByteCount = getDifferingByteCount(reference, data);
-    assertEquals(0, differingByteCount);
+    assertThat(differingByteCount).isEqualTo(0);
   }
 
-  // Test decryption starting from the middle of an encrypted block
+  // Test decryption starting from the middle of an encrypted block.
+  @Test
   public void testMidJoin() {
     byte[] reference = TestUtil.buildTestData(DATA_LENGTH);
     byte[] data = reference.clone();
@@ -161,7 +177,8 @@ public void testMidJoin() {
 
     // Verify
     int unchangedByteCount = data.length - getDifferingByteCount(reference, data);
-    assertTrue(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length));
+    assertThat(unchangedByteCount <= getMaxUnchangedBytesAllowedPostEncryption(data.length))
+        .isTrue();
 
     // Setup decryption from random location
     offset = random.nextInt(4096);
@@ -180,7 +197,7 @@ public void testMidJoin() {
 
     // Verify
     int differingByteCount = getDifferingByteCount(reference, data, originalOffset);
-    assertEquals(0, differingByteCount);
+    assertThat(differingByteCount).isEqualTo(0);
   }
 
 }
diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/MockitoUtil.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/MockitoUtil.java
new file mode 100644
index 00000000000..e7cd9baf59d
--- /dev/null
+++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/MockitoUtil.java
@@ -0,0 +1,38 @@
+/*
+ * 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;
+
+import android.test.InstrumentationTestCase;
+import org.mockito.MockitoAnnotations;
+
+/**
+ * Utility for setting up Mockito for instrumentation tests.
+ */
+public final class MockitoUtil {
+
+  /**
+   * Sets up Mockito for an instrumentation test.
+   */
+  public static void setUpMockito(InstrumentationTestCase instrumentationTestCase) {
+    // Workaround for https://code.google.com/p/dexmaker/issues/detail?id=2.
+    System.setProperty("dexmaker.dexcache",
+        instrumentationTestCase.getInstrumentation().getTargetContext().getCacheDir().getPath());
+    MockitoAnnotations.initMocks(instrumentationTestCase);
+  }
+
+  private MockitoUtil() {}
+
+}
diff --git a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
index f5e00d2cec4..8532e65a685 100644
--- a/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
+++ b/library/dash/src/androidTest/java/com/google/android/exoplayer2/source/dash/offline/DashDownloaderTest.java
@@ -27,6 +27,7 @@
 import com.google.android.exoplayer2.offline.DownloadException;
 import com.google.android.exoplayer2.offline.Downloader.ProgressListener;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
+import com.google.android.exoplayer2.source.dash.MockitoUtil;
 import com.google.android.exoplayer2.source.dash.manifest.DashManifest;
 import com.google.android.exoplayer2.source.dash.manifest.RepresentationKey;
 import com.google.android.exoplayer2.testutil.FakeDataSet;
@@ -54,7 +55,7 @@ public class DashDownloaderTest extends InstrumentationTestCase {
   @Override
   public void setUp() throws Exception {
     super.setUp();
-    TestUtil.setUpMockito(this);
+    MockitoUtil.setUpMockito(this);
     tempFolder = Util.createTempDirectory(getInstrumentation().getContext(), "ExoPlayerTest");
     cache = new SimpleCache(tempFolder, new NoOpCacheEvictor());
   }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/OggTestData.java
similarity index 99%
rename from library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java
rename to testutils/src/main/java/com/google/android/exoplayer2/testutil/OggTestData.java
index cef033bf17e..88b5de7f65d 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/extractor/ogg/TestData.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/OggTestData.java
@@ -13,19 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.extractor.ogg;
+package com.google.android.exoplayer2.testutil;
 
-import com.google.android.exoplayer2.testutil.FakeExtractorInput;
-import com.google.android.exoplayer2.testutil.TestUtil;
 
 /**
  * Provides ogg/vorbis test data in bytes for unit tests.
  */
-/* package */ final class TestData {
+public final class OggTestData {
 
-  /* package */ static FakeExtractorInput createInput(byte[] data, boolean simulateUnkownLength) {
+  public static FakeExtractorInput createInput(byte[] data, boolean simulateUnknownLength) {
     return new FakeExtractorInput.Builder().setData(data).setSimulateIOErrors(true)
-        .setSimulateUnknownLength(simulateUnkownLength).setSimulatePartialReads(true).build();
+        .setSimulateUnknownLength(simulateUnknownLength).setSimulatePartialReads(true).build();
   }
 
   public static byte[] buildOggHeader(int headerType, long granule, int pageSequenceCounter,
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 2e59b33c0b6..0f737ec23a1 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
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.app.Instrumentation;
-import android.test.InstrumentationTestCase;
 import android.test.MoreAsserts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
@@ -33,7 +32,6 @@
 import java.util.Arrays;
 import java.util.Random;
 import junit.framework.Assert;
-import org.mockito.MockitoAnnotations;
 
 /**
  * Utility methods for tests.
@@ -121,13 +119,6 @@ public static byte[] joinByteArrays(byte[]... byteArrays) {
     return joined;
   }
 
-  public static void setUpMockito(InstrumentationTestCase instrumentationTestCase) {
-    // Workaround for https://code.google.com/p/dexmaker/issues/detail?id=2.
-    System.setProperty("dexmaker.dexcache",
-        instrumentationTestCase.getInstrumentation().getTargetContext().getCacheDir().getPath());
-    MockitoAnnotations.initMocks(instrumentationTestCase);
-  }
-
   public static byte[] getByteArray(Instrumentation instrumentation, String fileName)
       throws IOException {
     return Util.toByteArray(getInputStream(instrumentation, fileName));

From b2627d63fdb0215f65096ef2fe0c8e47c341e4a2 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 8 Sep 2017 04:05:38 -0700
Subject: [PATCH 206/421] Allow ExoPlayerTestRunner to end when Player.stop()
 is called.

In this case the playback state transitions to IDLE, which isn't
caught so far. (This code is equivalent to the one in ExoHostedTest.java)

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

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 2b5ea11d943..f65cb39bfc5 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
@@ -212,6 +212,7 @@ public SimpleExoPlayer createExoPlayer(RenderersFactory renderersFactory,
   private Exception exception;
   private TrackGroupArray trackGroups;
   private int positionDiscontinuityCount;
+  private boolean playerWasPrepared;
 
   private ExoPlayerTestRunner(PlayerFactory playerFactory, MediaSource mediaSource,
       RenderersFactory renderersFactory, MappingTrackSelector trackSelector,
@@ -350,7 +351,9 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     if (periodIndices.isEmpty() && playbackState == Player.STATE_READY) {
       periodIndices.add(player.getCurrentPeriodIndex());
     }
-    if (playbackState == Player.STATE_ENDED) {
+    playerWasPrepared |= playbackState != Player.STATE_IDLE;
+    if (playbackState == Player.STATE_ENDED
+        || (playbackState == Player.STATE_IDLE && playerWasPrepared)) {
       endedCountDownLatch.countDown();
     }
   }

From 8f43dcd424c02ae15ceae578764d620409506a06 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 8 Sep 2017 07:34:07 -0700
Subject: [PATCH 207/421] Clear buffer in fake renderer in each iteration.

This simulates reading from the buffer (which is what actual
renderers would do). Otherwise the buffer always gets expanded
and might cause memory issues.

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

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java
index a66043b77ff..c4270eb9c47 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeRenderer.java
@@ -59,6 +59,7 @@ protected void onPositionReset(long positionUs, boolean joining) throws ExoPlayb
   @Override
   public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackException {
     if (!isEnded) {
+      buffer.clear();
       // Verify the format matches the expected format.
       FormatHolder formatHolder = new FormatHolder();
       int result = readSource(formatHolder, buffer, false);

From ec38d0d8ab8cc0d810d16d052fbf700b8fc603d8 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 8 Sep 2017 07:54:10 -0700
Subject: [PATCH 208/421] Check thread is still alive before sending message in
 Loader.

The release callback handler in Loader might not be alive
anymore. Catch this case to prevent warnings about sending
messages on dead threads.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=167996538
---
 .../java/com/google/android/exoplayer2/upstream/Loader.java   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 02ccfafa898..02e9a321164 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
@@ -420,7 +420,9 @@ public ReleaseTask(ReleaseCallback callback) {
 
     @Override
     public void run() {
-      sendEmptyMessage(0);
+      if (getLooper().getThread().isAlive()) {
+        sendEmptyMessage(0);
+      }
     }
 
     @Override

From 40d443dc027c7a3e6ba45dd62ef6777906197dc1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 8 Sep 2017 09:42:13 -0700
Subject: [PATCH 209/421] Enable rtmp in external demo app with extensions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168007345
---
 demos/main/build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/demos/main/build.gradle b/demos/main/build.gradle
index 099741d167b..adad8f0e58f 100644
--- a/demos/main/build.gradle
+++ b/demos/main/build.gradle
@@ -62,4 +62,5 @@ dependencies {
     withExtensionsCompile project(path: modulePrefix + 'extension-ima')
     withExtensionsCompile project(path: modulePrefix + 'extension-opus')
     withExtensionsCompile project(path: modulePrefix + 'extension-vp9')
+    withExtensionsCompile project(path: modulePrefix + 'extension-rtmp')
 }

From 5a4155f09fee738da4ebd024a4f1b0a071d0fd42 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 8 Sep 2017 11:14:53 -0700
Subject: [PATCH 210/421] Destroy EGLSurface during DummySurface cleanup

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168020525
---
 .../android/exoplayer2/video/DummySurface.java       | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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 20fe862dd2b..450b4af38cf 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
@@ -35,6 +35,7 @@
 import static android.opengl.EGL14.eglCreateContext;
 import static android.opengl.EGL14.eglCreatePbufferSurface;
 import static android.opengl.EGL14.eglDestroyContext;
+import static android.opengl.EGL14.eglDestroySurface;
 import static android.opengl.EGL14.eglGetDisplay;
 import static android.opengl.EGL14.eglInitialize;
 import static android.opengl.EGL14.eglMakeCurrent;
@@ -175,8 +176,9 @@ private static class DummySurfaceThread extends HandlerThread implements OnFrame
     private static final int MSG_RELEASE = 3;
 
     private final int[] textureIdHolder;
-    private EGLContext context;
     private EGLDisplay display;
+    private EGLContext context;
+    private EGLSurface pbuffer;
     private Handler handler;
     private SurfaceTexture surfaceTexture;
 
@@ -315,7 +317,7 @@ private void initInternal(boolean secure) {
             EGL_HEIGHT, 1,
             EGL_NONE};
       }
-      EGLSurface pbuffer = eglCreatePbufferSurface(display, config, pbufferAttributes, 0);
+      pbuffer = eglCreatePbufferSurface(display, config, pbufferAttributes, 0);
       Assertions.checkState(pbuffer != null, "eglCreatePbufferSurface failed");
 
       boolean eglMadeCurrent = eglMakeCurrent(display, pbuffer, pbuffer, context);
@@ -334,11 +336,15 @@ private void releaseInternal() {
           glDeleteTextures(1, textureIdHolder, 0);
         }
       } finally {
+        if (pbuffer != null) {
+          eglDestroySurface(display, pbuffer);
+        }
         if (context != null) {
           eglDestroyContext(display, context);
         }
-        display = null;
+        pbuffer = null;
         context = null;
+        display = null;
         surface = null;
         surfaceTexture = null;
       }

From 340d0be40a6a1d744c79245289075b97db26f78e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sun, 10 Sep 2017 08:39:15 -0700
Subject: [PATCH 211/421] Bump to 2.5.2

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168155713
---
 RELEASENOTES.md                               | 26 +++++++++++++++++++
 constants.gradle                              |  2 +-
 demos/cast/src/main/AndroidManifest.xml       |  4 +--
 demos/main/src/main/AndroidManifest.xml       |  4 +--
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 ++---
 .../trackselection/DefaultTrackSelector.java  |  7 ++---
 6 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 8ad866395e8..b6941435426 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,31 @@
 # Release notes #
 
+### r2.5.2 ###
+
+* IMA extension: Fix issue where ad playback could end prematurely for some
+  content types ([#3180](https://github.com/google/ExoPlayer/issues/3180)).
+* RTMP extension: Fix SIGABRT on fast RTMP stream restart
+  ([#3156](https://github.com/google/ExoPlayer/issues/3156)).
+* UI: Allow app to manually specify ad markers
+  ([#3184](https://github.com/google/ExoPlayer/issues/3184)).
+* DASH: Expose segment indices to subclasses of DefaultDashChunkSource
+  ([#3037](https://github.com/google/ExoPlayer/issues/3037)).
+* Captions: Added robustness against malformed WebVTT captions
+  ([#3228](https://github.com/google/ExoPlayer/issues/3228)).
+* DRM: Support forcing a specific license URL.
+* Fix playback error when seeking in media loaded through content:// URIs
+  ([#3216](https://github.com/google/ExoPlayer/issues/3216)).
+* Fix issue playing MP4s in which the last atom specifies a size of zero
+  ([#3191](https://github.com/google/ExoPlayer/issues/3191)).
+* Workaround playback failures on some Xiaomi devices
+  ([#3171](https://github.com/google/ExoPlayer/issues/3171)).
+* Workaround SIGSEGV issue on some devices when setting and swapping surface for
+  secure playbacks ([#3215](https://github.com/google/ExoPlayer/issues/3215)).
+* Workaround for Nexus 7 issue when swapping output surface
+  ([#3236](https://github.com/google/ExoPlayer/issues/3236)).
+* Workaround for SimpleExoPlayerView's surface not being hidden properly
+  ([#3160](https://github.com/google/ExoPlayer/issues/3160)).
+
 ### r2.5.1 ###
 
 * Fix an issue that could cause the reported playback position to stop advancing
diff --git a/constants.gradle b/constants.gradle
index dcec53efbaf..7bdd50e8291 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -28,7 +28,7 @@ project.ext {
     junitVersion = '4.12'
     truthVersion = '0.35'
     robolectricVersion = '3.4.2'
-    releaseVersion = 'r2.5.1'
+    releaseVersion = 'r2.5.2'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index eeb28438bd3..ee3177323e1 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.castdemo"
-    android:versionCode="0001"
-    android:versionName="0.0.1">
+    android:versionCode="2502"
+    android:versionName="2.5.2">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 4f90cef623d..50a39f11a6c 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
-    android:versionCode="2501"
-    android:versionName="2.5.1">
+    android:versionCode="2502"
+    android:versionName="2.5.2">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
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 33f992964a6..98eeb99ad8a 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
@@ -31,13 +31,13 @@ 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.5.1";
+  public static final String VERSION = "2.5.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.5.1";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.2";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -47,7 +47,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 = 2005001;
+  public static final int VERSION_INT = 2005002;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}
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 fe2b9209338..ba0f63b0bb5 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
@@ -767,7 +767,8 @@ private static int compareFormatValues(int first, int second) {
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
   protected TrackSelection selectAudioTrack(TrackGroupArray groups, int[][] formatSupport,
-      Parameters params, TrackSelection.Factory adaptiveTrackSelectionFactory) {
+      Parameters params, TrackSelection.Factory adaptiveTrackSelectionFactory)
+      throws ExoPlaybackException {
     int selectedGroupIndex = C.INDEX_UNSET;
     int selectedTrackIndex = C.INDEX_UNSET;
     int selectedTrackScore = 0;
@@ -893,7 +894,7 @@ private static boolean isSupportedAdaptiveAudioTrack(Format format, int formatSu
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
   protected TrackSelection selectTextTrack(TrackGroupArray groups, int[][] formatSupport,
-      Parameters params) {
+      Parameters params) throws ExoPlaybackException {
     TrackGroup selectedGroup = null;
     int selectedTrackIndex = 0;
     int selectedTrackScore = 0;
@@ -960,7 +961,7 @@ protected TrackSelection selectTextTrack(TrackGroupArray groups, int[][] formatS
    * @throws ExoPlaybackException If an error occurs while selecting the tracks.
    */
   protected TrackSelection selectOtherTrack(int trackType, TrackGroupArray groups,
-      int[][] formatSupport, Parameters params) {
+      int[][] formatSupport, Parameters params) throws ExoPlaybackException {
     TrackGroup selectedGroup = null;
     int selectedTrackIndex = 0;
     int selectedTrackScore = 0;

From 75d5adce6fd5ce9b45b74236fb7f9cd93990e8f2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Sep 2017 00:25:36 -0700
Subject: [PATCH 212/421] Update dependency versions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168194589
---
 README.md                      | 8 +++-----
 build.gradle                   | 8 ++------
 constants.gradle               | 4 ++--
 extensions/gvr/build.gradle    | 2 +-
 extensions/ima/build.gradle    | 6 +++---
 extensions/okhttp/build.gradle | 2 +-
 6 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index bd261e75ff6..3902ec5cbd4 100644
--- a/README.md
+++ b/README.md
@@ -28,15 +28,13 @@ 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 Maven
-repositories included in the `build.gradle` file in the root of your project:
+dependency. You need to make sure you have the JCenter and Google repositories
+included in the `build.gradle` file in the root of your project:
 
 ```gradle
 repositories {
     jcenter()
-    maven {
-        url "https://maven.google.com"
-    }
+    google()
 }
 ```
 
diff --git a/build.gradle b/build.gradle
index 8ec24a6e82e..e95dd83d906 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,9 +14,7 @@
 buildscript {
     repositories {
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.0-beta4'
@@ -34,9 +32,7 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
-        maven {
-            url "https://maven.google.com"
-        }
+        google()
     }
     project.ext {
         exoplayerPublishEnabled = true
diff --git a/constants.gradle b/constants.gradle
index 7bdd50e8291..78dd343a945 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -21,8 +21,8 @@ project.ext {
     targetSdkVersion = 26
     buildToolsVersion = '26'
     testSupportLibraryVersion = '0.5'
-    supportLibraryVersion = '26.0.1'
-    playServicesLibraryVersion = '11.0.2'
+    supportLibraryVersion = '26.0.2'
+    playServicesLibraryVersion = '11.2.0'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     junitVersion = '4.12'
diff --git a/extensions/gvr/build.gradle b/extensions/gvr/build.gradle
index 66665576bb2..82360245124 100644
--- a/extensions/gvr/build.gradle
+++ b/extensions/gvr/build.gradle
@@ -26,7 +26,7 @@ android {
 
 dependencies {
     compile project(modulePrefix + 'library-core')
-    compile 'com.google.vr:sdk-audio:1.60.1'
+    compile 'com.google.vr:sdk-audio:1.80.0'
 }
 
 ext {
diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index cb69e929909..90c0a911d9d 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -29,9 +29,9 @@ dependencies {
     compile project(modulePrefix + 'library-core')
     // This dependency is necessary to force the supportLibraryVersion of
     // com.android.support:support-v4 to be used. Else an older version (25.2.0) is included via:
-    // com.google.android.gms:play-services-ads:11.0.2
-    // |-- com.google.android.gms:play-services-ads-lite:[11.0.2] -> 11.0.2
-    //   |-- com.google.android.gms:play-services-basement:[11.0.2] -> 11.0.2
+    // com.google.android.gms:play-services-ads:11.2.0
+    // |-- com.google.android.gms:play-services-ads-lite:11.2.0
+    //   |-- com.google.android.gms:play-services-basement:11.2.0
     //     |-- com.android.support:support-v4:25.2.0
     compile 'com.android.support:support-v4:' + supportLibraryVersion
     compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
diff --git a/extensions/okhttp/build.gradle b/extensions/okhttp/build.gradle
index bc9e0eba3ef..13bcff8a4e1 100644
--- a/extensions/okhttp/build.gradle
+++ b/extensions/okhttp/build.gradle
@@ -31,7 +31,7 @@ android {
 
 dependencies {
     compile project(modulePrefix + 'library-core')
-    compile('com.squareup.okhttp3:okhttp:3.8.1') {
+    compile('com.squareup.okhttp3:okhttp:3.9.0') {
         exclude group: 'org.json'
     }
 }

From 9a91482a1b3ded48c2c163c53e198dbc870ebd75 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 11 Sep 2017 01:50:04 -0700
Subject: [PATCH 213/421] Release streams in fake adaptive media period.

Releasing the media period should also release the sample streams
to allow resources to be cleaned up.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168201377
---
 .../exoplayer2/testutil/FakeAdaptiveMediaPeriod.java      | 8 ++++++++
 1 file changed, 8 insertions(+)

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 c8757e69cdf..3dcf5519439 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
@@ -53,6 +53,14 @@ public FakeAdaptiveMediaPeriod(TrackGroupArray trackGroupArray, EventDispatcher
     this.durationUs = durationUs;
   }
 
+  @Override
+  public void release() {
+    super.release();
+    for (ChunkSampleStream<FakeChunkSource> sampleStream : sampleStreams) {
+      sampleStream.release();
+    }
+  }
+
   @Override
   public void prepare(Callback callback, long positionUs) {
     super.prepare(callback, positionUs);

From c1810575506764f7aa8ba0a4ec03f9ea2aa51a24 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 11 Sep 2017 01:57:00 -0700
Subject: [PATCH 214/421] Fix bug in ActionSchedule.

When having a repeat() action and another subsequent action,
the next action should only be scheduled once (and not repeatedly).
Thus, the "next" pointer in the repeated action needs to be nulled
in the first iteration to prevent repeated scheduling of the next action.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168202212
---
 .../android/exoplayer2/testutil/ActionSchedule.java   | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

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 28e62f30570..ba76c58d11d 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
@@ -18,7 +18,6 @@
 import android.os.Handler;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
@@ -211,7 +210,7 @@ public Builder prepareSource(MediaSource mediaSource) {
 
     /**
      * Schedules a new source preparation action to be executed.
-     * @see ExoPlayer#prepare(MediaSource, boolean, boolean).
+     * @see com.google.android.exoplayer2.ExoPlayer#prepare(MediaSource, boolean, boolean).
      *
      * @return The builder, for convenience.
      */
@@ -350,7 +349,13 @@ public void schedule(SimpleExoPlayer player, MappingTrackSelector trackSelector,
     public void run() {
       action.doActionAndScheduleNext(player, trackSelector, surface, mainHandler, next);
       if (repeatIntervalMs != C.TIME_UNSET) {
-        clock.postDelayed(mainHandler, this, repeatIntervalMs);
+        clock.postDelayed(mainHandler, new Runnable() {
+            @Override
+            public void run() {
+              action.doActionAndScheduleNext(player, trackSelector, surface, mainHandler, null);
+              clock.postDelayed(mainHandler, this, repeatIntervalMs);
+            }
+          }, repeatIntervalMs);
       }
     }
 

From c4bf83dd1a713376e2ba5658de3b1b782a1717ec Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 11 Sep 2017 03:03:05 -0700
Subject: [PATCH 215/421] Support stop() in FakeExoPlayer and release media
 properly.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168209817
---
 .../testutil/FakeSimpleExoPlayer.java         | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
index 67a83b84e13..b56c299e78b 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -69,8 +69,8 @@ protected ExoPlayer createExoPlayerImpl(Renderer[] renderers, TrackSelector trac
     return player;
   }
 
-  private class FakeExoPlayer implements ExoPlayer, MediaSource.Listener, MediaPeriod.Callback,
-      Runnable {
+  private static class FakeExoPlayer implements ExoPlayer, MediaSource.Listener,
+      MediaPeriod.Callback, Runnable {
 
     private final Renderer[] renderers;
     private final TrackSelector trackSelector;
@@ -201,12 +201,20 @@ public PlaybackParameters getPlaybackParameters() {
 
     @Override
     public void stop() {
-      throw new UnsupportedOperationException();
+      playbackHandler.post(new Runnable() {
+        @Override
+        public void run () {
+          playbackHandler.removeCallbacksAndMessages(null);
+          releaseMedia();
+          changePlaybackState(Player.STATE_IDLE);
+        }
+      });
     }
 
     @Override
     public void release() {
-      playbackThread.quit();
+      stop();
+      playbackThread.quitSafely();
     }
 
     @Override
@@ -536,6 +544,17 @@ public void run() {
       });
     }
 
+    private void releaseMedia() {
+      if (mediaSource != null) {
+        if (mediaPeriod != null) {
+          mediaSource.releasePeriod(mediaPeriod);
+          mediaPeriod = null;
+        }
+        mediaSource.releaseSource();
+        mediaSource = null;
+      }
+    }
+
   }
 
 }

From f9661b5373f0a88b131b2bddf84b0acbb8454a25 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 11 Sep 2017 03:40:58 -0700
Subject: [PATCH 216/421] Use Handler callback instead of sleep() to catch
 InteruptedException.

The sleep used to simulate data load times is ignoring InterruptedExceptions.
(This is intended and in line with SystemClock.sleep()). However, when a
Loader cancels an ongoing load, it uses interrupts. To be able to catch these
and to immediately return from the reading data source, a handler callback
is used instead of the sleep() method which allows interuptable waiting.

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

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
index aacd265e45c..2675e1f0d7d 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeDataSource.java
@@ -217,7 +217,7 @@ public final DataSpec[] getAndClearOpenedDataSpecs() {
     return dataSpecs;
   }
 
-  protected void onDataRead(int bytesRead) {
+  protected void onDataRead(int bytesRead) throws IOException {
     // Do nothing. Can be overridden.
   }
 

From 0adb4502f6476f83cdbfcc8cfb9e4ba4fbde28ce Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 11 Sep 2017 11:34:44 -0700
Subject: [PATCH 217/421] Ignore all-zero defaultKid

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168259911
---
 .../exoplayer2/source/dash/manifest/DashManifestParser.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 c973db79d7d..72faf21b579 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
@@ -355,7 +355,7 @@ protected Pair<String, SchemeData> parseContentProtection(XmlPullParser xpp)
     if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) {
       schemeType = xpp.getAttributeValue(null, "value");
       String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
-      if (defaultKid != null) {
+      if (defaultKid != null && !"00000000-0000-0000-0000-000000000000".equals(defaultKid)) {
         UUID keyId = UUID.fromString(defaultKid);
         data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null);
         uuid = C.COMMON_PSSH_UUID;

From f257300d8e770b57a22cc4a9cbf1120943be7e91 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 12 Sep 2017 06:18:03 -0700
Subject: [PATCH 218/421] Add tv module for USB tuner support + demo app

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168366847
---
 .gitignore                                    |  1 +
 demos/tv/README.md                            |  4 ++
 demos/tv/build.gradle                         | 49 +++++++++++++++++++
 extensions/tv/README.md                       | 41 ++++++++++++++++
 extensions/tv/build.gradle                    | 39 +++++++++++++++
 .../exoplayer2/util/ParsableBitArray.java     | 11 +++++
 6 files changed, 145 insertions(+)
 create mode 100644 demos/tv/README.md
 create mode 100644 demos/tv/build.gradle
 create mode 100644 extensions/tv/README.md
 create mode 100644 extensions/tv/build.gradle

diff --git a/.gitignore b/.gitignore
index 1146c064562..1a946e2ade5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ proguard-project.txt
 
 # Other
 .DS_Store
+cmake-build-debug
 dist
 tmp
 
diff --git a/demos/tv/README.md b/demos/tv/README.md
new file mode 100644
index 00000000000..8a1ab807a05
--- /dev/null
+++ b/demos/tv/README.md
@@ -0,0 +1,4 @@
+# TV tuner demo application #
+
+This folder contains a demo application that uses ExoPlayer to play broadcast
+TV from USB tuners.
diff --git a/demos/tv/build.gradle b/demos/tv/build.gradle
new file mode 100644
index 00000000000..9e87d5e06b9
--- /dev/null
+++ b/demos/tv/build.gradle
@@ -0,0 +1,49 @@
+// 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.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion 21
+        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 {
+    compile project(modulePrefix + 'library-core')
+    compile project(modulePrefix + 'library-ui')
+    compile project(modulePrefix + 'internal-extension-tv')
+    compile project(modulePrefix + 'extension-ffmpeg')
+}
diff --git a/extensions/tv/README.md b/extensions/tv/README.md
new file mode 100644
index 00000000000..0deb33794ff
--- /dev/null
+++ b/extensions/tv/README.md
@@ -0,0 +1,41 @@
+# ExoPlayer TV tuner extension #
+
+Provides components for broadcast TV playback with ExoPlayer.
+
+## Links ##
+
+* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.tv.*`
+  belong to this extension.
+
+[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
+
+## Build Instructions ##
+
+* Checkout ExoPlayer:
+
+```
+git clone https://github.com/google/ExoPlayer.git
+```
+
+* Set the following environment variables:
+
+```
+cd "<path to exoplayer checkout>"
+EXOPLAYER_ROOT="$(pwd)"
+TV_MODULE_PATH="${EXOPLAYER_ROOT}/extensions/tv/src/main"
+```
+
+* Download the [Android NDK][] and set its location in an environment variable:
+
+[Android NDK]: https://developer.android.com/tools/sdk/ndk/index.html
+
+```
+NDK_PATH="<path to Android NDK>"
+```
+
+* Build the JNI native libraries from the command line:
+
+```
+cd "${TV_MODULE_PATH}"/jni && \
+${NDK_PATH}/ndk-build APP_ABI=all -j<N>
+```
diff --git a/extensions/tv/build.gradle b/extensions/tv/build.gradle
new file mode 100644
index 00000000000..ee549266509
--- /dev/null
+++ b/extensions/tv/build.gradle
@@ -0,0 +1,39 @@
+// 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.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion project.ext.targetSdkVersion
+    }
+
+    sourceSets.main {
+        jniLibs.srcDir 'src/main/libs'
+        jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
+    }
+}
+
+dependencies {
+    compile project(modulePrefix + 'library-core')
+}
+
+ext {
+    javadocTitle = 'TV tuner extension'
+}
+apply from: '../../javadoc_library.gradle'
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
index fdee7fb5e67..19b303484f9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ParsableBitArray.java
@@ -62,6 +62,17 @@ public void reset(byte[] data) {
     reset(data, data.length);
   }
 
+  /**
+   * Sets this instance's data, position and limit to match the provided {@code parsableByteArray}.
+   * Any modifications to the underlying data array will be visible in both instances
+   *
+   * @param parsableByteArray The {@link ParsableByteArray}.
+   */
+  public void reset(ParsableByteArray parsableByteArray) {
+    reset(parsableByteArray.data, parsableByteArray.limit());
+    setPosition(parsableByteArray.getPosition() * 8);
+  }
+
   /**
    * Updates the instance to wrap {@code data}, and resets the position to zero.
    *

From 39dbb9a7fcaac16704c196187d937b99ba442fd6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 12 Sep 2017 08:21:43 -0700
Subject: [PATCH 219/421] De-dupe ACTION_DOWN events

Issue: #3259

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168378650
---
 .../exoplayer2/ui/PlaybackControlView.java    | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 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 9bbb2fa27be..16f555ffbc4 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
@@ -986,30 +986,30 @@ public boolean dispatchMediaKeyEvent(KeyEvent event) {
       return false;
     }
     if (event.getAction() == KeyEvent.ACTION_DOWN) {
-      switch (keyCode) {
-        case KeyEvent.KEYCODE_MEDIA_FAST_FORWARD:
-          fastForward();
-          break;
-        case KeyEvent.KEYCODE_MEDIA_REWIND:
-          rewind();
-          break;
-        case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
-          controlDispatcher.dispatchSetPlayWhenReady(player, !player.getPlayWhenReady());
-          break;
-        case KeyEvent.KEYCODE_MEDIA_PLAY:
-          controlDispatcher.dispatchSetPlayWhenReady(player, true);
-          break;
-        case KeyEvent.KEYCODE_MEDIA_PAUSE:
-          controlDispatcher.dispatchSetPlayWhenReady(player, false);
-          break;
-        case KeyEvent.KEYCODE_MEDIA_NEXT:
-          next();
-          break;
-        case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
-          previous();
-          break;
-        default:
-          break;
+      if (keyCode == KeyEvent.KEYCODE_MEDIA_FAST_FORWARD) {
+        fastForward();
+      } else if (keyCode == KeyEvent.KEYCODE_MEDIA_REWIND) {
+        rewind();
+      } else if (event.getRepeatCount() == 0) {
+        switch (keyCode) {
+          case KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE:
+            controlDispatcher.dispatchSetPlayWhenReady(player, !player.getPlayWhenReady());
+            break;
+          case KeyEvent.KEYCODE_MEDIA_PLAY:
+            controlDispatcher.dispatchSetPlayWhenReady(player, true);
+            break;
+          case KeyEvent.KEYCODE_MEDIA_PAUSE:
+            controlDispatcher.dispatchSetPlayWhenReady(player, false);
+            break;
+          case KeyEvent.KEYCODE_MEDIA_NEXT:
+            next();
+            break;
+          case KeyEvent.KEYCODE_MEDIA_PREVIOUS:
+            previous();
+            break;
+          default:
+            break;
+        }
       }
     }
     return true;

From 5019da3e7b499f50dadfe691af807327e79b5d7c Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Wed, 13 Sep 2017 07:25:41 -0700
Subject: [PATCH 220/421] Update ABR logic in AdaptiveTrackSelection for live
 streaming case

In live streaming, if the playback position is very close to live edge,
the buffered duration will never reach minDurationForQualityIncreaseMs,
which prevents switching from ever happening. So we will provide the
durationToLiveEdgeUs to AdaptiveTrackSelection in live streaming case,
so it can handle this edge case.

GitHub: #3017

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168535969
---
 .../AdaptiveTrackSelection.java               | 70 +++++++++++++++++--
 .../trackselection/FixedTrackSelection.java   |  2 +-
 .../trackselection/RandomTrackSelection.java  |  2 +-
 .../trackselection/TrackSelection.java        | 13 ++--
 .../source/dash/DefaultDashChunkSource.java   | 35 ++++++++--
 .../exoplayer2/source/hls/HlsChunkSource.java | 19 ++++-
 .../source/hls/HlsSampleStreamWrapper.java    |  4 +-
 .../smoothstreaming/DefaultSsChunkSource.java | 19 ++++-
 .../exoplayer2/testutil/FakeChunkSource.java  |  3 +-
 9 files changed, 141 insertions(+), 26 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 12f5952dd06..b999164f00f 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
@@ -40,6 +40,7 @@ public static final class Factory implements TrackSelection.Factory {
     private final int maxDurationForQualityDecreaseMs;
     private final int minDurationToRetainAfterDiscardMs;
     private final float bandwidthFraction;
+    private final float bufferedFractionToLiveEdgeForQualityIncrease;
 
     /**
      * @param bandwidthMeter Provides an estimate of the currently available bandwidth.
@@ -48,7 +49,9 @@ public Factory(BandwidthMeter bandwidthMeter) {
       this (bandwidthMeter, DEFAULT_MAX_INITIAL_BITRATE,
           DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS,
           DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
-          DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS, DEFAULT_BANDWIDTH_FRACTION);
+          DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
+          DEFAULT_BANDWIDTH_FRACTION,
+          DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE);
     }
 
     /**
@@ -70,19 +73,53 @@ public Factory(BandwidthMeter bandwidthMeter) {
     public Factory(BandwidthMeter bandwidthMeter, int maxInitialBitrate,
         int minDurationForQualityIncreaseMs, int maxDurationForQualityDecreaseMs,
         int minDurationToRetainAfterDiscardMs, float bandwidthFraction) {
+      this (bandwidthMeter, maxInitialBitrate, minDurationForQualityIncreaseMs,
+          maxDurationForQualityDecreaseMs, minDurationToRetainAfterDiscardMs,
+          bandwidthFraction, DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE);
+    }
+
+    /**
+     * @param bandwidthMeter Provides an estimate of the currently available bandwidth.
+     * @param maxInitialBitrate The maximum bitrate in bits per second that should be assumed
+     *     when a bandwidth estimate is unavailable.
+     * @param minDurationForQualityIncreaseMs The minimum duration of buffered data required for
+     *     the selected track to switch to one of higher quality.
+     * @param maxDurationForQualityDecreaseMs The maximum duration of buffered data required for
+     *     the selected track to switch to one of lower quality.
+     * @param minDurationToRetainAfterDiscardMs When switching to a track of significantly higher
+     *     quality, the selection may indicate that media already buffered at the lower quality can
+     *     be discarded to speed up the switch. This is the minimum duration of media that must be
+     *     retained at the lower quality.
+     * @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 bufferedFractionToLiveEdgeForQualityIncrease For live streaming, the fraction of
+     *     the duration from current playback position to the live edge that has to be buffered
+     *     before the selected track can be switched to one of higher quality. This parameter is
+     *     only applied when the playback position is closer to the live edge than
+     *     {@code minDurationForQualityIncreaseMs}, which would otherwise prevent switching to a
+     *     higher quality from happening.
+     */
+    public Factory(BandwidthMeter bandwidthMeter, int maxInitialBitrate,
+        int minDurationForQualityIncreaseMs, int maxDurationForQualityDecreaseMs,
+        int minDurationToRetainAfterDiscardMs, float bandwidthFraction,
+        float bufferedFractionToLiveEdgeForQualityIncrease) {
       this.bandwidthMeter = bandwidthMeter;
       this.maxInitialBitrate = maxInitialBitrate;
       this.minDurationForQualityIncreaseMs = minDurationForQualityIncreaseMs;
       this.maxDurationForQualityDecreaseMs = maxDurationForQualityDecreaseMs;
       this.minDurationToRetainAfterDiscardMs = minDurationToRetainAfterDiscardMs;
       this.bandwidthFraction = bandwidthFraction;
+      this.bufferedFractionToLiveEdgeForQualityIncrease =
+          bufferedFractionToLiveEdgeForQualityIncrease;
     }
 
     @Override
     public AdaptiveTrackSelection createTrackSelection(TrackGroup group, int... tracks) {
       return new AdaptiveTrackSelection(group, tracks, bandwidthMeter, maxInitialBitrate,
           minDurationForQualityIncreaseMs, maxDurationForQualityDecreaseMs,
-          minDurationToRetainAfterDiscardMs, bandwidthFraction);
+          minDurationToRetainAfterDiscardMs, bandwidthFraction,
+          bufferedFractionToLiveEdgeForQualityIncrease);
     }
 
   }
@@ -92,6 +129,7 @@ public AdaptiveTrackSelection createTrackSelection(TrackGroup group, int... trac
   public static final int DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS = 25000;
   public static final int DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS = 25000;
   public static final float DEFAULT_BANDWIDTH_FRACTION = 0.75f;
+  public static final float DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE = 0.75f;
 
   private final BandwidthMeter bandwidthMeter;
   private final int maxInitialBitrate;
@@ -99,6 +137,7 @@ public AdaptiveTrackSelection createTrackSelection(TrackGroup group, int... trac
   private final long maxDurationForQualityDecreaseUs;
   private final long minDurationToRetainAfterDiscardUs;
   private final float bandwidthFraction;
+  private final float bufferedFractionToLiveEdgeForQualityIncrease;
 
   private int selectedIndex;
   private int reason;
@@ -114,7 +153,9 @@ public AdaptiveTrackSelection(TrackGroup group, int[] tracks,
     this (group, tracks, bandwidthMeter, DEFAULT_MAX_INITIAL_BITRATE,
         DEFAULT_MIN_DURATION_FOR_QUALITY_INCREASE_MS,
         DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
-        DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS, DEFAULT_BANDWIDTH_FRACTION);
+        DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,
+        DEFAULT_BANDWIDTH_FRACTION,
+        DEFAULT_BUFFERED_FRACTION_TO_LIVE_EDGE_FOR_QUALITY_INCREASE);
   }
 
   /**
@@ -135,11 +176,17 @@ public AdaptiveTrackSelection(TrackGroup group, int[] tracks,
    * @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 bufferedFractionToLiveEdgeForQualityIncrease For live streaming, the fraction of
+   *     the duration from current playback position to the live edge that has to be buffered
+   *     before the selected track can be switched to one of higher quality. This parameter is
+   *     only applied when the playback position is closer to the live edge than
+   *     {@code minDurationForQualityIncreaseMs}, which would otherwise prevent switching to a
+   *     higher quality from happening.
    */
   public AdaptiveTrackSelection(TrackGroup group, int[] tracks, BandwidthMeter bandwidthMeter,
       int maxInitialBitrate, long minDurationForQualityIncreaseMs,
       long maxDurationForQualityDecreaseMs, long minDurationToRetainAfterDiscardMs,
-      float bandwidthFraction) {
+      float bandwidthFraction, float bufferedFractionToLiveEdgeForQualityIncrease) {
     super(group, tracks);
     this.bandwidthMeter = bandwidthMeter;
     this.maxInitialBitrate = maxInitialBitrate;
@@ -147,12 +194,14 @@ public AdaptiveTrackSelection(TrackGroup group, int[] tracks, BandwidthMeter ban
     this.maxDurationForQualityDecreaseUs = maxDurationForQualityDecreaseMs * 1000L;
     this.minDurationToRetainAfterDiscardUs = minDurationToRetainAfterDiscardMs * 1000L;
     this.bandwidthFraction = bandwidthFraction;
+    this.bufferedFractionToLiveEdgeForQualityIncrease =
+        bufferedFractionToLiveEdgeForQualityIncrease;
     selectedIndex = determineIdealSelectedIndex(Long.MIN_VALUE);
     reason = C.SELECTION_REASON_INITIAL;
   }
 
   @Override
-  public void updateSelectedTrack(long bufferedDurationUs) {
+  public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
     long nowMs = SystemClock.elapsedRealtime();
     // Stash the current selection, then make a new one.
     int currentSelectedIndex = selectedIndex;
@@ -160,12 +209,13 @@ public void updateSelectedTrack(long bufferedDurationUs) {
     if (selectedIndex == currentSelectedIndex) {
       return;
     }
+
     if (!isBlacklisted(currentSelectedIndex, nowMs)) {
       // Revert back to the current selection if conditions are not suitable for switching.
       Format currentFormat = getFormat(currentSelectedIndex);
       Format selectedFormat = getFormat(selectedIndex);
       if (selectedFormat.bitrate > currentFormat.bitrate
-          && bufferedDurationUs < minDurationForQualityIncreaseUs) {
+          && bufferedDurationUs < minDurationForQualityIncreaseUs(availableDurationUs)) {
         // The selected track is a higher quality, but we have insufficient buffer to safely switch
         // up. Defer switching up for now.
         selectedIndex = currentSelectedIndex;
@@ -251,4 +301,12 @@ private int determineIdealSelectedIndex(long nowMs) {
     return lowestBitrateNonBlacklistedIndex;
   }
 
+  private long minDurationForQualityIncreaseUs(long availableDurationUs) {
+    boolean isAvailableDurationTooShort = availableDurationUs != C.TIME_UNSET
+        && availableDurationUs <= minDurationForQualityIncreaseUs;
+    return isAvailableDurationTooShort
+        ? (long) (availableDurationUs * bufferedFractionToLiveEdgeForQualityIncrease)
+        : minDurationForQualityIncreaseUs;
+  }
+
 }
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 de1b500c617..ca43258e3fe 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
@@ -78,7 +78,7 @@ public FixedTrackSelection(TrackGroup group, int track, int reason, Object data)
   }
 
   @Override
-  public void updateSelectedTrack(long bufferedDurationUs) {
+  public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
     // Do nothing.
   }
 
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 5c7625d6b4c..b70cc8e0d5f 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
@@ -88,7 +88,7 @@ public RandomTrackSelection(TrackGroup group, int[] tracks, Random random) {
   }
 
   @Override
-  public void updateSelectedTrack(long bufferedDurationUs) {
+  public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
     // Count the number of non-blacklisted formats.
     long nowMs = SystemClock.elapsedRealtime();
     int nonBlacklistedFormatCount = 0;
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 fe66946a65d..aeb1d1d6e3d 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
@@ -26,7 +26,7 @@
  * {@link 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)}.
+ * track may change as a result of calling {@link #updateSelectedTrack(long, long)}.
  */
 public interface TrackSelection {
 
@@ -126,8 +126,11 @@ interface Factory {
    * Updates the selected track.
    *
    * @param bufferedDurationUs The duration of media currently buffered in microseconds.
+   * @param availableDurationUs The duration of media available for buffering from the current
+   *     playback position, in microseconds, or {@link C#TIME_UNSET} if media can be buffered
+   *     to the end of the current period.
    */
-  void updateSelectedTrack(long bufferedDurationUs);
+  void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs);
 
   /**
    * May be called periodically by sources that load media in discrete {@link MediaChunk}s and
@@ -148,10 +151,10 @@ interface Factory {
 
   /**
    * Attempts to blacklist the track at the specified index in the selection, making it ineligible
-   * for selection by calls to {@link #updateSelectedTrack(long)} for the specified period of time.
-   * Blacklisting will fail if all other tracks are currently blacklisted. If blacklisting the
+   * for selection by calls to {@link #updateSelectedTrack(long, long)} for the specified period of
+   * time. Blacklisting will fail if all other tracks are currently blacklisted. If blacklisting the
    * currently selected track, note that it will remain selected until the next call to
-   * {@link #updateSelectedTrack(long)}.
+   * {@link #updateSelectedTrack(long, long)}.
    *
    * @param index The index of the track in the selection.
    * @param blacklistDurationMs The duration of time for which the track should be blacklisted, in
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 c6c1461001c..cd7ef6a2bff 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
@@ -95,6 +95,7 @@ public DashChunkSource createDashChunkSource(LoaderErrorThrower manifestLoaderEr
   private int periodIndex;
   private IOException fatalError;
   private boolean missingLastSegment;
+  private long liveEdgeTimeUs;
 
   /**
    * @param manifestLoaderErrorThrower Throws errors affecting loading of manifests.
@@ -130,6 +131,7 @@ public DefaultDashChunkSource(LoaderErrorThrower manifestLoaderErrorThrower,
     this.maxSegmentsPerLoad = maxSegmentsPerLoad;
 
     long periodDurationUs = manifest.getPeriodDurationUs(periodIndex);
+    liveEdgeTimeUs = C.TIME_UNSET;
     List<Representation> representations = getRepresentations();
     representationHolders = new RepresentationHolder[trackSelection.length()];
     for (int i = 0; i < representationHolders.length; i++) {
@@ -179,7 +181,8 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
     }
 
     long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
-    trackSelection.updateSelectedTrack(bufferedDurationUs);
+    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs, previous == null);
+    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
 
     RepresentationHolder representationHolder =
         representationHolders[trackSelection.getSelectedIndex()];
@@ -203,7 +206,6 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
       }
     }
 
-    long nowUs = getNowUnixTimeUs();
     int availableSegmentCount = representationHolder.getSegmentCount();
     if (availableSegmentCount == 0) {
       // The index doesn't define any segments.
@@ -216,21 +218,23 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
     if (availableSegmentCount == DashSegmentIndex.INDEX_UNBOUNDED) {
       // The index is itself unbounded. We need to use the current time to calculate the range of
       // available segments.
-      long liveEdgeTimeUs = nowUs - manifest.availabilityStartTime * 1000;
-      long periodStartUs = manifest.getPeriod(periodIndex).startMs * 1000;
+      long liveEdgeTimeUs = getNowUnixTimeUs() - C.msToUs(manifest.availabilityStartTime);
+      long periodStartUs = C.msToUs(manifest.getPeriod(periodIndex).startMs);
       long liveEdgeTimeInPeriodUs = liveEdgeTimeUs - periodStartUs;
       if (manifest.timeShiftBufferDepth != C.TIME_UNSET) {
-        long bufferDepthUs = manifest.timeShiftBufferDepth * 1000;
+        long bufferDepthUs = C.msToUs(manifest.timeShiftBufferDepth);
         firstAvailableSegmentNum = Math.max(firstAvailableSegmentNum,
             representationHolder.getSegmentNum(liveEdgeTimeInPeriodUs - bufferDepthUs));
       }
-      // getSegmentNum(liveEdgeTimestampUs) will not be completed yet, so subtract one to get the
+      // getSegmentNum(liveEdgeTimeInPeriodUs) will not be completed yet, so subtract one to get the
       // index of the last completed segment.
       lastAvailableSegmentNum = representationHolder.getSegmentNum(liveEdgeTimeInPeriodUs) - 1;
     } else {
       lastAvailableSegmentNum = firstAvailableSegmentNum + availableSegmentCount - 1;
     }
 
+    updateLiveEdgeTimeUs(representationHolder, lastAvailableSegmentNum);
+
     int segmentNum;
     if (previous == null) {
       segmentNum = Util.constrainValue(representationHolder.getSegmentNum(playbackPositionUs),
@@ -311,6 +315,19 @@ private ArrayList<Representation> getRepresentations() {
     return representations;
   }
 
+  private void updateLiveEdgeTimeUs(RepresentationHolder representationHolder,
+      int lastAvailableSegmentNum) {
+    if (manifest.dynamic) {
+      DashSegmentIndex segmentIndex = representationHolder.representation.getIndex();
+      long lastSegmentDurationUs = segmentIndex.getDurationUs(lastAvailableSegmentNum,
+          manifest.getPeriodDurationUs(periodIndex));
+      liveEdgeTimeUs = segmentIndex.getTimeUs(lastAvailableSegmentNum)
+          + lastSegmentDurationUs;
+    } else {
+      liveEdgeTimeUs = C.TIME_UNSET;
+    }
+  }
+
   private long getNowUnixTimeUs() {
     if (elapsedRealtimeOffsetMs != 0) {
       return (SystemClock.elapsedRealtime() + elapsedRealtimeOffsetMs) * 1000;
@@ -375,6 +392,12 @@ private static Chunk newMediaChunk(RepresentationHolder representationHolder,
     }
   }
 
+  private long resolveTimeToLiveEdgeUs(long playbackPositionUs, boolean isAfterPositionReset) {
+    boolean resolveTimeToLiveEdgePossible = manifest.dynamic
+        && !isAfterPositionReset && liveEdgeTimeUs != C.TIME_UNSET;
+    return resolveTimeToLiveEdgePossible ? liveEdgeTimeUs - playbackPositionUs : C.TIME_UNSET;
+  }
+
   // Protected classes.
 
   /**
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 d0161d839c8..0ad9dd1a6ec 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
@@ -103,6 +103,7 @@ public void clear() {
   // the way in which HlsSampleStreamWrapper generates track groups. Use only index based methods
   // in TrackSelection to avoid unexpected behavior.
   private TrackSelection trackSelection;
+  private long liveEdgeTimeUs;
 
   /**
    * @param playlistTracker The {@link HlsPlaylistTracker} from which to obtain media playlists.
@@ -122,6 +123,7 @@ public HlsChunkSource(HlsPlaylistTracker playlistTracker, HlsUrl[] variants,
     this.variants = variants;
     this.timestampAdjusterProvider = timestampAdjusterProvider;
     this.muxedCaptionFormats = muxedCaptionFormats;
+    liveEdgeTimeUs = C.TIME_UNSET;
     Format[] variantFormats = new Format[variants.length];
     int[] initialTrackSelection = new int[variants.length];
     for (int i = 0; i < variants.length; i++) {
@@ -214,7 +216,8 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
         (independentSegments ? previous.endTimeUs : previous.startTimeUs) - playbackPositionUs);
 
     // Select the variant.
-    trackSelection.updateSelectedTrack(bufferedDurationUs);
+    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs, previous == null);
+    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
     int selectedVariantIndex = trackSelection.getSelectedIndexInTrackGroup();
 
     boolean switchingVariant = oldVariantIndex != selectedVariantIndex;
@@ -228,6 +231,8 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     HlsMediaPlaylist mediaPlaylist = playlistTracker.getPlaylistSnapshot(selectedUrl);
     independentSegments = mediaPlaylist.hasIndependentSegmentsTag;
 
+    updateLiveEdgeTimeUs(mediaPlaylist);
+
     // Select the chunk.
     int chunkMediaSequence;
     if (previous == null || switchingVariant) {
@@ -360,6 +365,16 @@ public void onPlaylistBlacklisted(HlsUrl url, long blacklistMs) {
 
   // Private methods.
 
+  private long resolveTimeToLiveEdgeUs(long playbackPositionUs, boolean isAfterPositionReset) {
+    final boolean resolveTimeToLiveEdgePossible = !isAfterPositionReset
+        && liveEdgeTimeUs != C.TIME_UNSET;
+    return resolveTimeToLiveEdgePossible ? liveEdgeTimeUs - playbackPositionUs : C.TIME_UNSET;
+  }
+
+  private void updateLiveEdgeTimeUs(HlsMediaPlaylist mediaPlaylist) {
+    liveEdgeTimeUs = mediaPlaylist.hasEndTag ? C.TIME_UNSET : mediaPlaylist.getEndTimeUs();
+  }
+
   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);
@@ -409,7 +424,7 @@ public InitializationTrackSelection(TrackGroup group, int[] tracks) {
     }
 
     @Override
-    public void updateSelectedTrack(long bufferedDurationUs) {
+    public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
       long nowMs = SystemClock.elapsedRealtime();
       if (!isBlacklisted(selectedIndex, nowMs)) {
         return;
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 00a3cd4a85c..b844988588b 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
@@ -92,7 +92,6 @@ public interface Callback extends SequenceableLoader.Callback<HlsSampleStreamWra
   private boolean prepared;
   private int enabledTrackCount;
   private Format downstreamTrackFormat;
-  private int upstreamChunkUid;
   private boolean released;
 
   // Tracks are complicated in HLS. See documentation of buildTracks for details.
@@ -255,7 +254,7 @@ public boolean selectTracks(TrackSelection[] selections, boolean[] mayRetainStre
         // may need to be discarded.
         boolean primarySampleQueueDirty = false;
         if (!seenFirstTrackSelection) {
-          primaryTrackSelection.updateSelectedTrack(0);
+          primaryTrackSelection.updateSelectedTrack(0, C.TIME_UNSET);
           int chunkIndex = chunkSource.getTrackGroup().indexOf(mediaChunks.getLast().trackFormat);
           if (primaryTrackSelection.getSelectedIndexInTrackGroup() != chunkIndex) {
             // This is the first selection and the chunk loaded during preparation does not match
@@ -553,7 +552,6 @@ public int onLoadError(Chunk loadable, long elapsedRealtimeMs, long loadDuration
    *     samples already queued to the wrapper.
    */
   public void init(int chunkUid, boolean shouldSpliceIn) {
-    upstreamChunkUid = chunkUid;
     for (SampleQueue sampleQueue : sampleQueues) {
       sampleQueue.sourceId(chunkUid);
     }
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 10695279899..ae7dfc32e85 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
@@ -155,7 +155,8 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
     }
 
     long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
-    trackSelection.updateSelectedTrack(bufferedDurationUs);
+    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
+    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
 
     StreamElement streamElement = manifest.streamElements[elementIndex];
     if (streamElement.chunkCount == 0) {
@@ -222,4 +223,20 @@ private static MediaChunk newMediaChunk(Format format, DataSource dataSource, Ur
         extractorWrapper);
   }
 
+  private long resolveTimeToLiveEdgeUs(long playbackPositionUs) {
+    if (!manifest.isLive) {
+      return C.TIME_UNSET;
+    }
+
+    StreamElement currentElement = manifest.streamElements[elementIndex];
+    if (currentElement.chunkCount == 0) {
+      return C.TIME_UNSET;
+    }
+
+    int lastChunkIndex = currentElement.chunkCount - 1;
+    long lastChunkEndTimeUs = currentElement.getStartTimeUs(lastChunkIndex)
+        + currentElement.getChunkDurationUs(lastChunkIndex);
+    return lastChunkEndTimeUs - playbackPositionUs;
+  }
+
 }
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 41fda178d7a..40c91a5a816 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,6 +16,7 @@
 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.Chunk;
 import com.google.android.exoplayer2.source.chunk.ChunkHolder;
@@ -83,7 +84,7 @@ public int getPreferredQueueSize(long playbackPositionUs, List<? extends MediaCh
   @Override
   public void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHolder out) {
     long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
-    trackSelection.updateSelectedTrack(bufferedDurationUs);
+    trackSelection.updateSelectedTrack(bufferedDurationUs, C.TIME_UNSET);
     int chunkIndex = previous == null ? dataSet.getChunkIndexByPosition(playbackPositionUs)
         : previous.getNextChunkIndex();
     if (chunkIndex >= dataSet.getChunkCount()) {

From c9591d76179c1fd9f4bd49ab442c5f7f484ee64a Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Wed, 13 Sep 2017 08:54:43 -0700
Subject: [PATCH 221/421] Added support for No-Sample Renderer.

Currently our Renderer is always associated with and consume data from
some SampleStreams, which were constructed from the provided MediaSource.
There are use-cases, in which the users want to have simple Renderer
implementation that does not consume data from SampleStream at all, but
render using their custom logic at each rendering position - they mostly just
need ExoPlayer to keep track of the playback position and enable/disable the
renderer.
This CL adds support for such Renderer by adding a TRACK_TYPE_NONE.
Renderer of such type will be:
- Associated with null TrackSelection as the result of track-selection
operation.
- Associated with EmptySampleStream.

GitHub: #3212

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168545749
---
 .../java/com/google/android/exoplayer2/C.java |   4 +
 .../exoplayer2/ExoPlayerImplInternal.java     | 143 ++++++---
 .../android/exoplayer2/NoSampleRenderer.java  | 278 ++++++++++++++++++
 .../trackselection/MappingTrackSelector.java  |  20 +-
 .../trackselection/TrackSelectorResult.java   |  23 +-
 .../MappingTrackSelectorTest.java             | 164 ++++++++++-
 6 files changed, 568 insertions(+), 64 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.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 e25538a062a..9d4049ada9e 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
@@ -519,6 +519,10 @@ private C() {}
    * A type constant for metadata tracks.
    */
   public static final int TRACK_TYPE_METADATA = 4;
+  /**
+   * A type constant for a dummy or empty track.
+   */
+  public static final int TRACK_TYPE_NONE = 5;
   /**
    * Applications or extensions may define custom {@code TRACK_TYPE_*} constants greater than or
    * equal to this value.
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 5d55652f616..c0fc36964c1 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,11 +21,13 @@
 import android.os.Message;
 import android.os.Process;
 import android.os.SystemClock;
+import android.support.annotation.NonNull;
 import android.util.Log;
 import android.util.Pair;
 import com.google.android.exoplayer2.ExoPlayer.ExoPlayerMessage;
 import com.google.android.exoplayer2.MediaPeriodInfoSequence.MediaPeriodInfo;
 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;
@@ -1343,24 +1345,22 @@ private void updatePeriods() throws ExoPlaybackException, IOException {
           readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET;
       for (int i = 0; i < renderers.length; i++) {
         Renderer renderer = renderers[i];
-        TrackSelection oldSelection = oldTrackSelectorResult.selections.get(i);
-        if (oldSelection == null) {
-          // The renderer has no current stream and will be enabled when we play the next period.
+        boolean rendererWasEnabled = oldTrackSelectorResult.renderersEnabled[i];
+        if (!rendererWasEnabled) {
+          // The renderer was disabled and will be enabled when we play the next period.
         } else if (initialDiscontinuity) {
           // The new period starts with a discontinuity, so the renderer will play out all data then
           // be disabled and re-enabled when it starts playing the next period.
           renderer.setCurrentStreamFinal();
         } else if (!renderer.isCurrentStreamFinal()) {
           TrackSelection newSelection = newTrackSelectorResult.selections.get(i);
+          boolean newRendererEnabled = newTrackSelectorResult.renderersEnabled[i];
           RendererConfiguration oldConfig = oldTrackSelectorResult.rendererConfigurations[i];
           RendererConfiguration newConfig = newTrackSelectorResult.rendererConfigurations[i];
-          if (newSelection != null && newConfig.equals(oldConfig)) {
+          if (newRendererEnabled && newConfig.equals(oldConfig)) {
             // Replace the renderer's SampleStream so the transition to playing the next period can
             // be seamless.
-            Format[] formats = new Format[newSelection.length()];
-            for (int j = 0; j < formats.length; j++) {
-              formats[j] = newSelection.getFormat(j);
-            }
+            Format[] formats = getFormats(newSelection);
             renderer.replaceStream(formats, readingPeriodHolder.sampleStreams[i],
                 readingPeriodHolder.getRendererOffset());
           } else {
@@ -1461,11 +1461,10 @@ private void setPlayingPeriodHolder(MediaPeriodHolder periodHolder) throws ExoPl
     for (int i = 0; i < renderers.length; i++) {
       Renderer renderer = renderers[i];
       rendererWasEnabledFlags[i] = renderer.getState() != Renderer.STATE_DISABLED;
-      TrackSelection newSelection = periodHolder.trackSelectorResult.selections.get(i);
-      if (newSelection != null) {
+      if (periodHolder.trackSelectorResult.renderersEnabled[i]) {
         enabledRendererCount++;
       }
-      if (rendererWasEnabledFlags[i] && (newSelection == null
+      if (rendererWasEnabledFlags[i] && (!periodHolder.trackSelectorResult.renderersEnabled[i]
           || (renderer.isCurrentStreamFinal()
           && renderer.getStream() == playingPeriodHolder.sampleStreams[i]))) {
         // The renderer should be disabled before playing the next period, either because it's not
@@ -1487,49 +1486,63 @@ private void setPlayingPeriodHolder(MediaPeriodHolder periodHolder) throws ExoPl
     enableRenderers(rendererWasEnabledFlags, enabledRendererCount);
   }
 
-  private void enableRenderers(boolean[] rendererWasEnabledFlags, int enabledRendererCount)
+  private void enableRenderers(boolean[] rendererWasEnabledFlags, int totalEnabledRendererCount)
       throws ExoPlaybackException {
-    enabledRenderers = new Renderer[enabledRendererCount];
-    enabledRendererCount = 0;
+    enabledRenderers = new Renderer[totalEnabledRendererCount];
+    int enabledRendererCount = 0;
     for (int i = 0; i < renderers.length; i++) {
-      Renderer renderer = renderers[i];
-      TrackSelection newSelection = playingPeriodHolder.trackSelectorResult.selections.get(i);
-      if (newSelection != null) {
-        enabledRenderers[enabledRendererCount++] = renderer;
-        if (renderer.getState() == Renderer.STATE_DISABLED) {
-          RendererConfiguration rendererConfiguration =
-              playingPeriodHolder.trackSelectorResult.rendererConfigurations[i];
-          // The renderer needs enabling with its new track selection.
-          boolean playing = playWhenReady && state == Player.STATE_READY;
-          // Consider as joining only if the renderer was previously disabled.
-          boolean joining = !rendererWasEnabledFlags[i] && playing;
-          // Build an array of formats contained by the selection.
-          Format[] formats = new Format[newSelection.length()];
-          for (int j = 0; j < formats.length; j++) {
-            formats[j] = newSelection.getFormat(j);
-          }
-          // Enable the renderer.
-          renderer.enable(rendererConfiguration, formats, playingPeriodHolder.sampleStreams[i],
-              rendererPositionUs, joining, playingPeriodHolder.getRendererOffset());
-          MediaClock mediaClock = renderer.getMediaClock();
-          if (mediaClock != null) {
-            if (rendererMediaClock != null) {
-              throw ExoPlaybackException.createForUnexpected(
-                  new IllegalStateException("Multiple renderer media clocks enabled."));
-            }
-            rendererMediaClock = mediaClock;
-            rendererMediaClockSource = renderer;
-            rendererMediaClock.setPlaybackParameters(playbackParameters);
-          }
-          // Start the renderer if playing.
-          if (playing) {
-            renderer.start();
-          }
+      if (playingPeriodHolder.trackSelectorResult.renderersEnabled[i]) {
+        enableRenderer(i, rendererWasEnabledFlags[i], enabledRendererCount++);
+      }
+    }
+  }
+
+  private void enableRenderer(int rendererIndex, boolean wasRendererEnabled,
+      int enabledRendererIndex) throws ExoPlaybackException {
+    Renderer renderer = renderers[rendererIndex];
+    enabledRenderers[enabledRendererIndex] = renderer;
+    if (renderer.getState() == Renderer.STATE_DISABLED) {
+      RendererConfiguration rendererConfiguration =
+          playingPeriodHolder.trackSelectorResult.rendererConfigurations[rendererIndex];
+      TrackSelection newSelection = playingPeriodHolder.trackSelectorResult.selections.get(
+          rendererIndex);
+      Format[] formats = getFormats(newSelection);
+      // The renderer needs enabling with its new track selection.
+      boolean playing = playWhenReady && state == Player.STATE_READY;
+      // Consider as joining only if the renderer was previously disabled.
+      boolean joining = !wasRendererEnabled && playing;
+      // Enable the renderer.
+      renderer.enable(rendererConfiguration, formats,
+          playingPeriodHolder.sampleStreams[rendererIndex], rendererPositionUs,
+          joining, playingPeriodHolder.getRendererOffset());
+      MediaClock mediaClock = renderer.getMediaClock();
+      if (mediaClock != null) {
+        if (rendererMediaClock != null) {
+          throw ExoPlaybackException.createForUnexpected(
+              new IllegalStateException("Multiple renderer media clocks enabled."));
         }
+        rendererMediaClock = mediaClock;
+        rendererMediaClockSource = renderer;
+        rendererMediaClock.setPlaybackParameters(playbackParameters);
+      }
+      // Start the renderer if playing.
+      if (playing) {
+        renderer.start();
       }
     }
   }
 
+  @NonNull
+  private static Format[] getFormats(TrackSelection newSelection) {
+    // Build an array of formats contained by the selection.
+    int length = newSelection != null ? newSelection.length() : 0;
+    Format[] formats = new Format[length];
+    for (int i = 0; i < length; i++) {
+      formats[i] = newSelection.getFormat(i);
+    }
+    return formats;
+  }
+
   /**
    * Holds a {@link MediaPeriod} with information required to play it as part of a timeline.
    */
@@ -1656,17 +1669,24 @@ public long updatePeriodTrackSelection(long positionUs, boolean forceRecreateStr
             && trackSelectorResult.isEquivalent(periodTrackSelectorResult, 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);
       // Disable streams on the period and get new streams for updated/newly-enabled tracks.
       positionUs = mediaPeriod.selectTracks(trackSelections.getAll(), mayRetainStreamFlags,
           sampleStreams, streamResetFlags, positionUs);
+      associateNoSampleRenderersWithEmptySampleStream(sampleStreams);
       periodTrackSelectorResult = trackSelectorResult;
 
       // Update whether we have enabled tracks and sanity check the expected streams are non-null.
       hasEnabledTracks = false;
       for (int i = 0; i < sampleStreams.length; i++) {
         if (sampleStreams[i] != null) {
-          Assertions.checkState(trackSelections.get(i) != null);
-          hasEnabledTracks = true;
+          Assertions.checkState(trackSelectorResult.renderersEnabled[i]);
+          // hasEnabledTracks should be true only when non-empty streams exists.
+          if (rendererCapabilities[i].getTrackType() != C.TRACK_TYPE_NONE) {
+            hasEnabledTracks = true;
+          }
         } else {
           Assertions.checkState(trackSelections.get(i) == null);
         }
@@ -1690,6 +1710,31 @@ public void release() {
       }
     }
 
+    /**
+     * 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) {
+      for (int i = 0; i < rendererCapabilities.length; i++) {
+        if (rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE) {
+          sampleStreams[i] = null;
+        }
+      }
+    }
+
+    /**
+     * 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) {
+      for (int i = 0; i < rendererCapabilities.length; i++) {
+        if (rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE
+            && trackSelectorResult.renderersEnabled[i]) {
+          sampleStreams[i] = new EmptySampleStream();
+        }
+      }
+    }
+
   }
 
   private static final class SeekPosition {
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
new file mode 100644
index 00000000000..978f4f7a974
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/NoSampleRenderer.java
@@ -0,0 +1,278 @@
+/*
+ * 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;
+
+import com.google.android.exoplayer2.source.SampleStream;
+import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.MediaClock;
+import java.io.IOException;
+
+/**
+ * A {@link Renderer} implementation whose track type is {@link C#TRACK_TYPE_NONE} and does not
+ * consume data from its {@link SampleStream}.
+ */
+public abstract class NoSampleRenderer implements Renderer, RendererCapabilities {
+
+  private RendererConfiguration configuration;
+  private int index;
+  private int state;
+  private SampleStream stream;
+  private boolean streamIsFinal;
+
+  @Override
+  public final int getTrackType() {
+    return C.TRACK_TYPE_NONE;
+  }
+
+  @Override
+  public final RendererCapabilities getCapabilities() {
+    return this;
+  }
+
+  @Override
+  public final void setIndex(int index) {
+    this.index = index;
+  }
+
+  @Override
+  public MediaClock getMediaClock() {
+    return null;
+  }
+
+  @Override
+  public final int getState() {
+    return state;
+  }
+
+  /**
+   * Replaces the {@link SampleStream} that will be associated with this renderer.
+   * <p>
+   * This method may be called when the renderer is in the following states:
+   * {@link #STATE_DISABLED}.
+   *
+   * @param configuration The renderer configuration.
+   * @param formats The enabled formats. Should be empty.
+   * @param stream The {@link SampleStream} from which the renderer should consume.
+   * @param positionUs The player's current position.
+   * @param joining Whether this renderer is being enabled to join an ongoing playback.
+   * @param offsetUs The offset that should be subtracted from {@code positionUs}
+   *     to get the playback position with respect to the media.
+   * @throws ExoPlaybackException If an error occurs.
+   */
+  @Override
+  public final void enable(RendererConfiguration configuration, Format[] formats,
+      SampleStream stream, long positionUs, boolean joining, long offsetUs)
+      throws ExoPlaybackException {
+    Assertions.checkState(state == STATE_DISABLED);
+    this.configuration = configuration;
+    state = STATE_ENABLED;
+    onEnabled(joining);
+    replaceStream(formats, stream, offsetUs);
+    onPositionReset(positionUs, joining);
+  }
+
+  @Override
+  public final void start() throws ExoPlaybackException {
+    Assertions.checkState(state == STATE_ENABLED);
+    state = STATE_STARTED;
+    onStarted();
+  }
+
+  /**
+   * Replaces the {@link SampleStream} that will be associated with this renderer.
+   * <p>
+   * This method may be called when the renderer is in the following states:
+   * {@link #STATE_ENABLED}, {@link #STATE_STARTED}.
+   *
+   * @param formats The enabled formats. Should be empty.
+   * @param stream The {@link SampleStream} to be associated with this renderer.
+   * @param offsetUs The offset that should be subtracted from {@code positionUs} in
+   *     {@link #render(long, long)} to get the playback position with respect to the media.
+   * @throws ExoPlaybackException If an error occurs.
+   */
+  @Override
+  public final void replaceStream(Format[] formats, SampleStream stream, long offsetUs)
+      throws ExoPlaybackException {
+    Assertions.checkState(!streamIsFinal);
+    this.stream = stream;
+    onRendererOffsetChanged(offsetUs);
+  }
+
+  @Override
+  public final SampleStream getStream() {
+    return stream;
+  }
+
+  @Override
+  public final boolean hasReadStreamToEnd() {
+    return true;
+  }
+
+  @Override
+  public final void setCurrentStreamFinal() {
+    streamIsFinal = true;
+  }
+
+  @Override
+  public final boolean isCurrentStreamFinal() {
+    return streamIsFinal;
+  }
+
+  @Override
+  public final void maybeThrowStreamError() throws IOException {
+  }
+
+  @Override
+  public final void resetPosition(long positionUs) throws ExoPlaybackException {
+    streamIsFinal = false;
+    onPositionReset(positionUs, false);
+  }
+
+  @Override
+  public final void stop() throws ExoPlaybackException {
+    Assertions.checkState(state == STATE_STARTED);
+    state = STATE_ENABLED;
+    onStopped();
+  }
+
+  @Override
+  public final void disable() {
+    Assertions.checkState(state == STATE_ENABLED);
+    state = STATE_DISABLED;
+    stream = null;
+    streamIsFinal = false;
+    onDisabled();
+  }
+
+  @Override
+  public boolean isReady() {
+    return true;
+  }
+
+  @Override
+  public boolean isEnded() {
+    return true;
+  }
+
+  // RendererCapabilities implementation.
+
+  @Override
+  public int supportsFormat(Format format) throws ExoPlaybackException {
+    return FORMAT_UNSUPPORTED_TYPE;
+  }
+
+  @Override
+  public int supportsMixedMimeTypeAdaptation() throws ExoPlaybackException {
+    return ADAPTIVE_NOT_SUPPORTED;
+  }
+
+  // ExoPlayerComponent implementation.
+
+  @Override
+  public void handleMessage(int what, Object object) throws ExoPlaybackException {
+    // Do nothing.
+  }
+
+  // Methods to be overridden by subclasses.
+
+  /**
+   * Called when the renderer is enabled.
+   * <p>
+   * The default implementation is a no-op.
+   *
+   * @param joining Whether this renderer is being enabled to join an ongoing playback.
+   * @throws ExoPlaybackException If an error occurs.
+   */
+  protected void onEnabled(boolean joining) throws ExoPlaybackException {
+    // Do nothing.
+  }
+
+  /**
+   * Called when the renderer's offset has been changed.
+   * <p>
+   * The default implementation is a no-op.
+   *
+   * @param offsetUs The offset that should be subtracted from {@code positionUs} in
+   *     {@link #render(long, long)} to get the playback position with respect to the media.
+   * @throws ExoPlaybackException If an error occurs.
+   */
+  protected void onRendererOffsetChanged(long offsetUs) throws ExoPlaybackException {
+    // Do nothing.
+  }
+
+  /**
+   * Called when the position is reset. This occurs when the renderer is enabled after
+   * {@link #onRendererOffsetChanged(long)} has been called, and also when a position
+   * discontinuity is encountered.
+   * <p>
+   * The default implementation is a no-op.
+   *
+   * @param positionUs The new playback position in microseconds.
+   * @param joining Whether this renderer is being enabled to join an ongoing playback.
+   * @throws ExoPlaybackException If an error occurs.
+   */
+  protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
+    // Do nothing.
+  }
+
+  /**
+   * Called when the renderer is started.
+   * <p>
+   * The default implementation is a no-op.
+   *
+   * @throws ExoPlaybackException If an error occurs.
+   */
+  protected void onStarted() throws ExoPlaybackException {
+    // Do nothing.
+  }
+
+  /**
+   * Called when the renderer is stopped.
+   * <p>
+   * The default implementation is a no-op.
+   *
+   * @throws ExoPlaybackException If an error occurs.
+   */
+  protected void onStopped() throws ExoPlaybackException {
+    // Do nothing.
+  }
+
+  /**
+   * Called when the renderer is disabled.
+   * <p>
+   * The default implementation is a no-op.
+   */
+  protected void onDisabled() {
+    // Do nothing.
+  }
+
+  // Methods to be called by subclasses.
+
+  /**
+   * Returns the configuration set when the renderer was most recently enabled.
+   */
+  protected final RendererConfiguration getConfiguration() {
+    return configuration;
+  }
+
+  /**
+   * Returns the index of the renderer within the player.
+   */
+  protected final int getIndex() {
+    return index;
+  }
+
+}
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 d518b5a6bea..5d120990fc6 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
@@ -573,6 +573,8 @@ public final TrackSelectorResult selectTracks(RendererCapabilities[] rendererCap
       }
     }
 
+    boolean[] rendererEnabled = determineEnabledRenderers(rendererCapabilities, trackSelections);
+
     // Package up the track information and selections.
     MappedTrackInfo mappedTrackInfo = new MappedTrackInfo(rendererTrackTypes,
         rendererTrackGroupArrays, mixedMimeTypeAdaptationSupport, rendererFormatSupports,
@@ -583,14 +585,26 @@ public final TrackSelectorResult selectTracks(RendererCapabilities[] rendererCap
     RendererConfiguration[] rendererConfigurations =
         new RendererConfiguration[rendererCapabilities.length];
     for (int i = 0; i < rendererCapabilities.length; i++) {
-      rendererConfigurations[i] = trackSelections[i] != null ? RendererConfiguration.DEFAULT : null;
+      rendererConfigurations[i] = rendererEnabled[i] ? RendererConfiguration.DEFAULT : null;
     }
     // Configure audio and video renderers to use tunneling if appropriate.
     maybeConfigureRenderersForTunneling(rendererCapabilities, rendererTrackGroupArrays,
         rendererFormatSupports, rendererConfigurations, trackSelections, tunnelingAudioSessionId);
 
-    return new TrackSelectorResult(trackGroups, new TrackSelectionArray(trackSelections),
-        mappedTrackInfo, rendererConfigurations);
+    return new TrackSelectorResult(trackGroups, rendererEnabled,
+        new TrackSelectionArray(trackSelections), mappedTrackInfo, rendererConfigurations);
+  }
+
+  private boolean[] determineEnabledRenderers(RendererCapabilities[] rendererCapabilities,
+      TrackSelection[] trackSelections) {
+    boolean[] rendererEnabled = new boolean[trackSelections.length];
+    for (int i = 0; i < rendererEnabled.length; i++) {
+      boolean forceRendererDisabled = rendererDisabledFlags.get(i);
+      rendererEnabled[i] = !forceRendererDisabled
+          && (rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE
+          || trackSelections[i] != null);
+    }
+    return rendererEnabled;
   }
 
   @Override
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 cab9a689bee..801f5b9584f 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
@@ -28,6 +28,10 @@ public final class TrackSelectorResult {
    * The track groups that were provided to the {@link TrackSelector}.
    */
   public final TrackGroupArray groups;
+  /**
+   * An array containing whether each renderer is enabled after the track selection operation.
+   */
+  public final boolean[] renderersEnabled;
   /**
    * A {@link TrackSelectionArray} containing the track selection for each renderer.
    */
@@ -38,21 +42,25 @@ public final class TrackSelectorResult {
    */
   public final Object info;
   /**
-   * A {@link RendererConfiguration} for each renderer, to be used with the selections.
+   * A {@link RendererConfiguration} for each enabled renderer, to be used with the selections.
    */
   public final RendererConfiguration[] rendererConfigurations;
 
   /**
    * @param groups The track groups provided to the {@link TrackSelector}.
+   * @param renderersEnabled An array containing whether each renderer is enabled after the track
+   *     selection operation.
    * @param selections A {@link TrackSelectionArray} containing the selection for each renderer.
    * @param info An opaque object that will be returned to
    *     {@link TrackSelector#onSelectionActivated(Object)} should the selection be activated.
-   * @param rendererConfigurations A {@link RendererConfiguration} for each renderer, to be used
-   *     with the selections.
+   * @param rendererConfigurations A {@link RendererConfiguration} for each enabled renderer,
+   *     to be used with the selections.
    */
-  public TrackSelectorResult(TrackGroupArray groups, TrackSelectionArray selections, Object info,
+  public TrackSelectorResult(TrackGroupArray groups, boolean[] renderersEnabled,
+      TrackSelectionArray selections, Object info,
       RendererConfiguration[] rendererConfigurations) {
     this.groups = groups;
+    this.renderersEnabled = renderersEnabled;
     this.selections = selections;
     this.info = info;
     this.rendererConfigurations = rendererConfigurations;
@@ -79,8 +87,8 @@ public boolean isEquivalent(TrackSelectorResult other) {
 
   /**
    * Returns whether this result is equivalent to {@code other} for the renderer at the given index.
-   * The results are equivalent if they have equal track selections and configurations for the
-   * renderer.
+   * The results are equivalent if they have equal renderersEnabled array, track selections, and
+   * configurations for the renderer.
    *
    * @param other The other {@link TrackSelectorResult}. May be null, in which case {@code false}
    *     will be returned.
@@ -92,7 +100,8 @@ public boolean isEquivalent(TrackSelectorResult other, int index) {
     if (other == null) {
       return false;
     }
-    return Util.areEqual(selections.get(index), other.selections.get(index))
+    return renderersEnabled[index] == other.renderersEnabled[index]
+        && Util.areEqual(selections.get(index), other.selections.get(index))
         && Util.areEqual(rendererConfigurations[index], other.rendererConfigurations[index]);
   }
 
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 cffc5303545..b9ea0087c77 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
@@ -15,15 +15,18 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
+import static com.google.android.exoplayer2.RendererConfiguration.DEFAULT;
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.android.exoplayer2.C;
 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.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.Arrays;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
@@ -40,9 +43,15 @@ public final class MappingTrackSelectorTest {
       new FakeRendererCapabilities(C.TRACK_TYPE_VIDEO);
   private static final RendererCapabilities AUDIO_CAPABILITIES =
       new FakeRendererCapabilities(C.TRACK_TYPE_AUDIO);
+  private static final RendererCapabilities NO_SAMPLE_CAPABILITIES =
+      new FakeRendererCapabilities(C.TRACK_TYPE_NONE);
   private static final RendererCapabilities[] RENDERER_CAPABILITIES = new RendererCapabilities[] {
       VIDEO_CAPABILITIES, AUDIO_CAPABILITIES
   };
+  private static final RendererCapabilities[] RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER =
+      new RendererCapabilities[] {
+          VIDEO_CAPABILITIES, AUDIO_CAPABILITIES, NO_SAMPLE_CAPABILITIES
+      };
 
   private static final TrackGroup VIDEO_TRACK_GROUP = new TrackGroup(
       Format.createVideoSampleFormat("video", MimeTypes.VIDEO_H264, null, Format.NO_VALUE,
@@ -58,6 +67,13 @@ public final class MappingTrackSelectorTest {
       new FixedTrackSelection(AUDIO_TRACK_GROUP, 0)
   };
 
+  private static final TrackSelection[] TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER =
+      new TrackSelection[] {
+          new FixedTrackSelection(VIDEO_TRACK_GROUP, 0),
+          new FixedTrackSelection(AUDIO_TRACK_GROUP, 0),
+          null
+      };
+
   /**
    * Tests that the video and audio track groups are mapped onto the correct renderers.
    */
@@ -104,10 +120,14 @@ public void testMappingMulti() throws ExoPlaybackException {
    */
   @Test
   public void testSelectTracks() throws ExoPlaybackException {
-    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(
+        TRACK_SELECTIONS);
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
     assertThat(result.selections.get(0)).isEqualTo(TRACK_SELECTIONS[0]);
     assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
+    assertThat(new boolean[] {true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
   }
 
   /**
@@ -115,11 +135,15 @@ public void testSelectTracks() throws ExoPlaybackException {
    */
   @Test
   public void testSelectTracksWithNullOverride() throws ExoPlaybackException {
-    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(
+        TRACK_SELECTIONS);
     trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
     assertThat(result.selections.get(0)).isNull();
     assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
+    assertThat(new boolean[] {false, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {null, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
   }
 
   /**
@@ -127,12 +151,16 @@ public void testSelectTracksWithNullOverride() throws ExoPlaybackException {
    */
   @Test
   public void testSelectTracksWithClearedNullOverride() throws ExoPlaybackException {
-    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(
+        TRACK_SELECTIONS);
     trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
     trackSelector.clearSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP));
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES, TRACK_GROUPS);
     assertThat(result.selections.get(0)).isEqualTo(TRACK_SELECTIONS[0]);
     assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
+    assertThat(new boolean[] {true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
   }
 
   /**
@@ -140,12 +168,133 @@ public void testSelectTracksWithClearedNullOverride() throws ExoPlaybackExceptio
    */
   @Test
   public void testSelectTracksWithNullOverrideForDifferentTracks() throws ExoPlaybackException {
-    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(TRACK_SELECTIONS);
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(
+        TRACK_SELECTIONS);
     trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
     TrackSelectorResult result = trackSelector.selectTracks(RENDERER_CAPABILITIES,
         new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP, VIDEO_TRACK_GROUP));
     assertThat(result.selections.get(0)).isEqualTo(TRACK_SELECTIONS[0]);
     assertThat(result.selections.get(1)).isEqualTo(TRACK_SELECTIONS[1]);
+    assertThat(new boolean[] {true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
+  }
+
+  /**
+   * Tests the result of {@link MappingTrackSelector#selectTracks(RendererCapabilities[],
+   * TrackGroupArray[], int[][][])} is propagated correctly to the result of
+   * {@link MappingTrackSelector#selectTracks(RendererCapabilities[], TrackGroupArray)}
+   * when there is no-sample renderer.
+   */
+  @Test
+  public void testSelectTracksWithNoSampleRenderer() throws ExoPlaybackException {
+    TrackSelection[] expectedTrackSelection = TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER;
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(expectedTrackSelection);
+    TrackSelectorResult result = trackSelector.selectTracks(
+        RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS);
+    assertThat(result.selections.get(0)).isEqualTo(expectedTrackSelection[0]);
+    assertThat(result.selections.get(1)).isEqualTo(expectedTrackSelection[1]);
+    assertThat(result.selections.get(2)).isNull();
+    assertThat(new boolean[] {true, true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
+  }
+
+  /**
+   * Tests that a null override clears a track selection when there is no-sample renderer.
+   */
+  @Test
+  public void testSelectTracksWithNoSampleRendererWithNullOverride() throws ExoPlaybackException {
+    TrackSelection[] expectedTrackSelection = TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER;
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(expectedTrackSelection);
+    trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
+    TrackSelectorResult result = trackSelector.selectTracks(
+        RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS);
+    assertThat(result.selections.get(0)).isNull();
+    assertThat(result.selections.get(1)).isEqualTo(expectedTrackSelection[1]);
+    assertThat(result.selections.get(2)).isNull();
+    assertThat(new boolean[] {false, true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {null, DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
+  }
+
+  /**
+   * Tests that a null override can be cleared when there is no-sample renderer.
+   */
+  @Test
+  public void testSelectTracksWithNoSampleRendererWithClearedNullOverride()
+      throws ExoPlaybackException {
+    TrackSelection[] expectedTrackSelection = TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER;
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(expectedTrackSelection);
+    trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
+    trackSelector.clearSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP));
+    TrackSelectorResult result = trackSelector.selectTracks(
+        RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS);
+    assertThat(result.selections.get(0)).isEqualTo(expectedTrackSelection[0]);
+    assertThat(result.selections.get(1)).isEqualTo(expectedTrackSelection[1]);
+    assertThat(result.selections.get(2)).isNull();
+    assertThat(new boolean[] {true, true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
+  }
+
+  /**
+   * Tests that an override is not applied for a different set of available track groups
+   * when there is no-sample renderer.
+   */
+  @Test
+  public void testSelectTracksWithNoSampleRendererWithNullOverrideForDifferentTracks()
+      throws ExoPlaybackException {
+    TrackSelection[] expectedTrackSelection = TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER;
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(expectedTrackSelection);
+    trackSelector.setSelectionOverride(0, new TrackGroupArray(VIDEO_TRACK_GROUP), null);
+    TrackSelectorResult result = trackSelector.selectTracks(
+        RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER,
+        new TrackGroupArray(VIDEO_TRACK_GROUP, AUDIO_TRACK_GROUP, VIDEO_TRACK_GROUP));
+    assertThat(result.selections.get(0)).isEqualTo(expectedTrackSelection[0]);
+    assertThat(result.selections.get(1)).isEqualTo(expectedTrackSelection[1]);
+    assertThat(result.selections.get(2)).isNull();
+    assertThat(new boolean[] {true, true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
+  }
+
+  /**
+   * Tests that disabling another renderer works when there is no-sample renderer.
+   */
+  @Test
+  public void testSelectTracksDisablingNormalRendererWithNoSampleRenderer()
+      throws ExoPlaybackException {
+    TrackSelection[] expectedTrackSelection = TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER;
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(expectedTrackSelection);
+    trackSelector.setRendererDisabled(0, true);
+    TrackSelectorResult result = trackSelector.selectTracks(
+        RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS);
+    assertThat(result.selections.get(0)).isNull();
+    assertThat(result.selections.get(1)).isEqualTo(expectedTrackSelection[1]);
+    assertThat(result.selections.get(2)).isNull();
+    assertThat(new boolean[] {false, true, true}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {null, DEFAULT, DEFAULT})
+        .isEqualTo(result.rendererConfigurations);
+  }
+
+  /**
+   * Tests that disabling no-sample renderer work.
+   */
+  @Test
+  public void testSelectTracksDisablingNoSampleRenderer()
+      throws ExoPlaybackException {
+    TrackSelection[] expectedTrackSelection = TRACK_SELECTIONS_WITH_NO_SAMPLE_RENDERER;
+    FakeMappingTrackSelector trackSelector = new FakeMappingTrackSelector(expectedTrackSelection);
+    trackSelector.setRendererDisabled(2, true);
+    TrackSelectorResult result = trackSelector.selectTracks(
+        RENDERER_CAPABILITIES_WITH_NO_SAMPLE_RENDERER, TRACK_GROUPS);
+    assertThat(result.selections.get(0)).isEqualTo(expectedTrackSelection[0]);
+    assertThat(result.selections.get(1)).isEqualTo(expectedTrackSelection[1]);
+    assertThat(result.selections.get(2)).isNull();
+    assertThat(new boolean[] {true, true, false}).isEqualTo(result.renderersEnabled);
+    assertThat(new RendererConfiguration[] {DEFAULT, DEFAULT, null})
+        .isEqualTo(result.rendererConfigurations);
   }
 
   /**
@@ -166,7 +315,12 @@ protected TrackSelection[] selectTracks(RendererCapabilities[] rendererCapabilit
         TrackGroupArray[] rendererTrackGroupArrays, int[][][] rendererFormatSupports)
         throws ExoPlaybackException {
       lastRendererTrackGroupArrays = rendererTrackGroupArrays;
-      return result == null ? new TrackSelection[rendererCapabilities.length] : result;
+      TrackSelection[] trackSelectionResult = new TrackSelection[rendererCapabilities.length];
+      return result == null ? trackSelectionResult
+          // return a copy of the provided result, because MappingTrackSelector
+          // might modify the returned array here, and we don't want that to affect
+          // the original array.
+          : Arrays.asList(result).toArray(trackSelectionResult);
     }
 
     public void assertMappedTrackGroups(int rendererIndex, TrackGroup... expected) {

From 872cbec9e13391da31135bf6e1fad280f41c5458 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 13 Sep 2017 09:08:43 -0700
Subject: [PATCH 222/421] Add TrimmingAudioProcessor for gapless

Remove gapless functionality that relies on MediaCodec, and implement this in
an AudioProcessor instead.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168547487
---
 .../com/google/android/exoplayer2/Format.java |   2 -
 .../android/exoplayer2/audio/AudioTrack.java  |  60 +++---
 .../audio/ChannelMappingAudioProcessor.java   |   2 +-
 .../audio/MediaCodecAudioRenderer.java        |   9 +-
 .../audio/SimpleDecoderAudioRenderer.java     |   7 +-
 .../audio/TrimmingAudioProcessor.java         | 180 ++++++++++++++++++
 6 files changed, 221 insertions(+), 39 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.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 c6be2e2ebaf..ba68d6de338 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
@@ -529,8 +529,6 @@ public final MediaFormat getFrameworkMediaFormatV16() {
     maybeSetIntegerV16(format, "rotation-degrees", rotationDegrees);
     maybeSetIntegerV16(format, MediaFormat.KEY_CHANNEL_COUNT, channelCount);
     maybeSetIntegerV16(format, MediaFormat.KEY_SAMPLE_RATE, sampleRate);
-    maybeSetIntegerV16(format, "encoder-delay", encoderDelay);
-    maybeSetIntegerV16(format, "encoder-padding", encoderPadding);
     for (int i = 0; i < initializationData.size(); i++) {
       format.setByteBuffer("csd-" + i, ByteBuffer.wrap(initializationData.get(i)));
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
index d7ebd69fbf3..a2d061ac845 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
@@ -40,21 +40,23 @@
  * playback position smoothing, non-blocking writes and reconfiguration.
  * <p>
  * Before starting playback, specify the input format by calling
- * {@link #configure(String, int, int, int, int)}. Optionally call {@link #setAudioSessionId(int)},
- * {@link #setAudioAttributes(AudioAttributes)}, {@link #enableTunnelingV21(int)} and
- * {@link #disableTunneling()} to configure audio playback. These methods may be called after
- * writing data to the track, in which case it will be reinitialized as required.
+ * {@link #configure(String, int, int, int, int, int[], int, int)}. Optionally call
+ * {@link #setAudioSessionId(int)}, {@link #setAudioAttributes(AudioAttributes)},
+ * {@link #enableTunnelingV21(int)} and {@link #disableTunneling()} to configure audio playback.
+ * These methods may be called after writing data to the track, in which case it will be
+ * reinitialized as required.
  * <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(String, int, int, int, int)} whenever the input format changes. The track
- * will be reinitialized on the next call to {@link #handleBuffer(ByteBuffer, long)}.
+ * Call {@link #configure(String, int, int, int, int, int[], int, int)} whenever the input format
+ * changes. The track will be reinitialized on the next call to
+ * {@link #handleBuffer(ByteBuffer, long)}.
  * <p>
  * Calling {@link #reset()} releases the underlying {@link android.media.AudioTrack} (and so does
- * calling {@link #configure(String, int, int, int, int)} unless the format is unchanged). It is
- * safe to call {@link #handleBuffer(ByteBuffer, long)} after {@link #reset()} without calling
- * {@link #configure(String, int, int, int, int)}.
+ * calling {@link #configure(String, int, int, int, int, int[], int, int)} unless the format is
+ * unchanged). It is safe to call {@link #handleBuffer(ByteBuffer, long)} after {@link #reset()}
+ * without calling {@link #configure(String, int, int, int, int, int[], int, int)}.
  * <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
@@ -280,6 +282,7 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
 
   @Nullable private final AudioCapabilities audioCapabilities;
   private final ChannelMappingAudioProcessor channelMappingAudioProcessor;
+  private final TrimmingAudioProcessor trimmingAudioProcessor;
   private final SonicAudioProcessor sonicAudioProcessor;
   private final AudioProcessor[] availableAudioProcessors;
   private final Listener listener;
@@ -375,12 +378,14 @@ public AudioTrack(@Nullable AudioCapabilities audioCapabilities, AudioProcessor[
       audioTrackUtil = new AudioTrackUtil();
     }
     channelMappingAudioProcessor = new ChannelMappingAudioProcessor();
+    trimmingAudioProcessor = new TrimmingAudioProcessor();
     sonicAudioProcessor = new SonicAudioProcessor();
-    availableAudioProcessors = new AudioProcessor[3 + audioProcessors.length];
+    availableAudioProcessors = new AudioProcessor[4 + audioProcessors.length];
     availableAudioProcessors[0] = new ResamplingAudioProcessor();
     availableAudioProcessors[1] = channelMappingAudioProcessor;
-    System.arraycopy(audioProcessors, 0, availableAudioProcessors, 2, audioProcessors.length);
-    availableAudioProcessors[2 + audioProcessors.length] = sonicAudioProcessor;
+    availableAudioProcessors[2] = trimmingAudioProcessor;
+    System.arraycopy(audioProcessors, 0, availableAudioProcessors, 3, audioProcessors.length);
+    availableAudioProcessors[3 + audioProcessors.length] = sonicAudioProcessor;
     playheadOffsets = new long[MAX_PLAYHEAD_OFFSET_COUNT];
     volume = 1.0f;
     startMediaTimeState = START_NOT_SET;
@@ -450,24 +455,6 @@ public long getCurrentPositionUs(boolean sourceEnded) {
     return startMediaTimeUs + applySpeedup(positionUs);
   }
 
-  /**
-   * Configures (or reconfigures) the audio track.
-   *
-   * @param mimeType The mime type.
-   * @param channelCount The number of channels.
-   * @param sampleRate The sample rate in Hz.
-   * @param pcmEncoding For PCM formats, the encoding used. One of {@link C#ENCODING_PCM_16BIT},
-   *     {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT} and
-   *     {@link C#ENCODING_PCM_32BIT}.
-   * @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to infer a
-   *     suitable buffer size automatically.
-   * @throws ConfigurationException If an error occurs configuring the track.
-   */
-  public void configure(String mimeType, int channelCount, int sampleRate,
-      @C.PcmEncoding int pcmEncoding, int specifiedBufferSize) throws ConfigurationException {
-    configure(mimeType, channelCount, sampleRate, pcmEncoding, specifiedBufferSize, null);
-  }
-
   /**
    * Configures (or reconfigures) the audio track.
    *
@@ -484,16 +471,22 @@ public void configure(String mimeType, int channelCount, int sampleRate,
    *     input unchanged. Otherwise, the element at index {@code i} specifies index of the input
    *     channel to map to output channel {@code i} when preprocessing input buffers. After the
    *     map is applied the audio data will have {@code outputChannels.length} channels.
+   * @param trimStartSamples The number of audio samples to trim from the start of data written to
+   *     the track after this call.
+   * @param trimEndSamples The number of audio samples to trim from data written to the track
+   *     immediately preceding the next call to {@link #reset()} or
+   *     {@link #configure(String, int, int, int, int, int[], int, int)}.
    * @throws ConfigurationException If an error occurs configuring the track.
    */
   public void configure(String mimeType, int channelCount, int sampleRate,
-      @C.PcmEncoding int pcmEncoding, int specifiedBufferSize, int[] outputChannels)
-      throws ConfigurationException {
+      @C.PcmEncoding int pcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
+      int trimStartSamples, int trimEndSamples) throws ConfigurationException {
     boolean passthrough = !MimeTypes.AUDIO_RAW.equals(mimeType);
     @C.Encoding int encoding = passthrough ? getEncodingForMimeType(mimeType) : pcmEncoding;
     boolean flush = false;
     if (!passthrough) {
       pcmFrameSize = Util.getPcmFrameSize(pcmEncoding, channelCount);
+      trimmingAudioProcessor.setTrimSampleCount(trimStartSamples, trimEndSamples);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
       for (AudioProcessor audioProcessor : availableAudioProcessors) {
         try {
@@ -689,7 +682,8 @@ public void handleDiscontinuity() {
    * 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 interleaving call to {@link #reset()} (or an interleaving call to
-   * {@link #configure(String, int, int, int, int)} that caused the track to be reset).
+   * {@link #configure(String, int, int, int, int, int[], int, int)} that caused the track to be
+   * reset).
    *
    * @param buffer The buffer containing audio data.
    * @param presentationTimeUs The presentation timestamp of the buffer in microseconds.
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 b755776f1eb..ef85985f1fb 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
@@ -52,7 +52,7 @@ public ChannelMappingAudioProcessor() {
    * Resets the channel mapping. After calling this method, call {@link #configure(int, int, int)}
    * to start using the new channel map.
    *
-   * @see AudioTrack#configure(String, int, int, int, int, int[])
+   * @see AudioTrack#configure(String, int, int, int, int, int[], int, int)
    */
   public void setChannelMap(int[] outputChannels) {
     pendingOutputChannels = outputChannels;
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 7f157e58669..cbb3a4944dd 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
@@ -53,6 +53,8 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   private android.media.MediaFormat passthroughMediaFormat;
   private int pcmEncoding;
   private int channelCount;
+  private int encoderDelay;
+  private int encoderPadding;
   private long currentPositionUs;
   private boolean allowPositionDiscontinuity;
 
@@ -134,8 +136,8 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
       @Nullable AudioRendererEventListener eventListener,
       @Nullable AudioCapabilities audioCapabilities, AudioProcessor... audioProcessors) {
     super(C.TRACK_TYPE_AUDIO, mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys);
-    audioTrack = new AudioTrack(audioCapabilities, audioProcessors, new AudioTrackListener());
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
+    audioTrack = new AudioTrack(audioCapabilities, audioProcessors, new AudioTrackListener());
   }
 
   @Override
@@ -240,6 +242,8 @@ protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackExceptio
     pcmEncoding = MimeTypes.AUDIO_RAW.equals(newFormat.sampleMimeType) ? newFormat.pcmEncoding
         : C.ENCODING_PCM_16BIT;
     channelCount = newFormat.channelCount;
+    encoderDelay = newFormat.encoderDelay != Format.NO_VALUE ? newFormat.encoderDelay : 0;
+    encoderPadding = newFormat.encoderPadding != Format.NO_VALUE ? newFormat.encoderPadding : 0;
   }
 
   @Override
@@ -262,7 +266,8 @@ protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat)
     }
 
     try {
-      audioTrack.configure(mimeType, channelCount, sampleRate, pcmEncoding, 0, channelMap);
+      audioTrack.configure(mimeType, channelCount, sampleRate, pcmEncoding, 0, channelMap,
+          encoderDelay, encoderPadding);
     } catch (AudioTrack.ConfigurationException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
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 012f06da39b..557421e4b3c 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
@@ -78,6 +78,8 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
 
   private DecoderCounters decoderCounters;
   private Format inputFormat;
+  private int encoderDelay;
+  private int encoderPadding;
   private SimpleDecoder<DecoderInputBuffer, ? extends SimpleOutputBuffer,
         ? extends AudioDecoderException> decoder;
   private DecoderInputBuffer inputBuffer;
@@ -308,7 +310,7 @@ private boolean drainOutputBuffer() throws ExoPlaybackException, AudioDecoderExc
     if (audioTrackNeedsConfigure) {
       Format outputFormat = getOutputFormat();
       audioTrack.configure(outputFormat.sampleMimeType, outputFormat.channelCount,
-          outputFormat.sampleRate, outputFormat.pcmEncoding, 0);
+          outputFormat.sampleRate, outputFormat.pcmEncoding, 0, null, encoderDelay, encoderPadding);
       audioTrackNeedsConfigure = false;
     }
 
@@ -587,6 +589,9 @@ private void onInputFormatChanged(Format newFormat) throws ExoPlaybackException
       audioTrackNeedsConfigure = true;
     }
 
+    encoderDelay = newFormat.encoderDelay == Format.NO_VALUE ? 0 : newFormat.encoderDelay;
+    encoderPadding = newFormat.encoderPadding == Format.NO_VALUE ? 0 : newFormat.encoderPadding;
+
     eventDispatcher.inputFormatChanged(newFormat);
   }
 
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
new file mode 100644
index 00000000000..c66cbf48827
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/TrimmingAudioProcessor.java
@@ -0,0 +1,180 @@
+/*
+ * 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.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 {
+
+  private boolean isActive;
+  private int trimStartSamples;
+  private int trimEndSamples;
+  private int channelCount;
+
+  private int pendingTrimStartBytes;
+  private ByteBuffer buffer;
+  private ByteBuffer outputBuffer;
+  private byte[] endBuffer;
+  private int endBufferSize;
+  private boolean inputEnded;
+
+  /**
+   * 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;
+  }
+
+  /**
+   * Sets the number of audio samples to trim from the start and end of audio passed to this
+   * processor. After calling this method, call {@link #configure(int, int, int)} to apply the new
+   * trimming sample counts.
+   *
+   * @param trimStartSamples The number of audio samples to trim from the start of audio.
+   * @param trimEndSamples The number of audio samples to trim from the end of audio.
+   * @see AudioTrack#configure(String, int, int, int, int, int[], int, int)
+   */
+  public void setTrimSampleCount(int trimStartSamples, int trimEndSamples) {
+    this.trimStartSamples = trimStartSamples;
+    this.trimEndSamples = trimEndSamples;
+  }
+
+  @Override
+  public boolean configure(int sampleRateHz, int channelCount, @Encoding int encoding)
+      throws UnhandledFormatException {
+    if (encoding != C.ENCODING_PCM_16BIT) {
+      throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
+    }
+    this.channelCount = channelCount;
+    endBuffer = new byte[trimEndSamples * channelCount * 2];
+    endBufferSize = 0;
+    pendingTrimStartBytes = trimStartSamples * channelCount * 2;
+    boolean wasActive = isActive;
+    isActive = trimStartSamples != 0 || trimEndSamples != 0;
+    return wasActive != isActive;
+  }
+
+  @Override
+  public boolean isActive() {
+    return isActive;
+  }
+
+  @Override
+  public int getOutputChannelCount() {
+    return channelCount;
+  }
+
+  @Override
+  public int getOutputEncoding() {
+    return C.ENCODING_PCM_16BIT;
+  }
+
+  @Override
+  public void queueInput(ByteBuffer inputBuffer) {
+    int position = inputBuffer.position();
+    int limit = inputBuffer.limit();
+    int remaining = limit - position;
+
+    // Trim any pending start bytes from the input buffer.
+    int trimBytes = Math.min(remaining, pendingTrimStartBytes);
+    pendingTrimStartBytes -= trimBytes;
+    inputBuffer.position(position + trimBytes);
+    if (pendingTrimStartBytes > 0) {
+      // Nothing to output yet.
+      return;
+    }
+    remaining -= trimBytes;
+
+    // endBuffer must be kept as full as possible, so that we trim the right amount of media if we
+    // don't receive any more input. After taking into account the number of bytes needed to keep
+    // 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();
+    }
+
+    // Output from endBuffer.
+    int endBufferBytesToOutput = Util.constrainValue(remainingBytesToOutput, 0, endBufferSize);
+    buffer.put(endBuffer, 0, endBufferBytesToOutput);
+    remainingBytesToOutput -= endBufferBytesToOutput;
+
+    // Output from inputBuffer, restoring its limit afterwards.
+    int inputBufferBytesToOutput = Util.constrainValue(remainingBytesToOutput, 0, remaining);
+    inputBuffer.limit(inputBuffer.position() + inputBufferBytesToOutput);
+    buffer.put(inputBuffer);
+    inputBuffer.limit(limit);
+    remaining -= inputBufferBytesToOutput;
+
+    // Compact endBuffer, then repopulate it using the new input.
+    endBufferSize -= endBufferBytesToOutput;
+    System.arraycopy(endBuffer, endBufferBytesToOutput, endBuffer, 0, endBufferSize);
+    inputBuffer.get(endBuffer, endBufferSize, remaining);
+    endBufferSize += remaining;
+
+    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;
+    // 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;
+    endBufferSize = 0;
+  }
+
+  @Override
+  public void reset() {
+    flush();
+    buffer = EMPTY_BUFFER;
+    channelCount = Format.NO_VALUE;
+    endBuffer = null;
+  }
+
+}

From 7d59383cc442d8e443e08732c985b886f8d033a0 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 13 Sep 2017 09:25:46 -0700
Subject: [PATCH 223/421] Add reason to onPositionDiscontinuity.

This allows listeners to easily determine the source of the discontinuity.
Reasons can be period transitions, seeks, and internal reasons.

Listeners still using the deprecated ExoPlayer.EventListener interface were
updated to Player.EventListener.

GitHub: #3252

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168549612
---
 .../android/exoplayer2/demo/EventLogger.java  | 17 ++++++++++--
 .../exoplayer2/demo/PlayerActivity.java       |  2 +-
 .../exoplayer2/ext/cast/CastPlayer.java       |  4 +--
 .../exoplayer2/ext/flac/FlacPlaybackTest.java |  2 +-
 .../exoplayer2/ext/ima/ImaAdsLoader.java      |  2 +-
 .../ext/leanback/LeanbackPlayerAdapter.java   |  3 ++-
 .../mediasession/MediaSessionConnector.java   |  2 +-
 .../exoplayer2/ext/opus/OpusPlaybackTest.java |  2 +-
 .../exoplayer2/ext/vp9/VpxPlaybackTest.java   |  2 +-
 .../android/exoplayer2/ExoPlayerImpl.java     |  6 ++---
 .../com/google/android/exoplayer2/Player.java | 27 +++++++++++++++++--
 .../exoplayer2/ui/DebugTextViewHelper.java    |  2 +-
 .../exoplayer2/ui/PlaybackControlView.java    |  3 +--
 .../exoplayer2/ui/SimpleExoPlayerView.java    |  2 +-
 .../android/exoplayer2/testutil/Action.java   |  4 +--
 .../exoplayer2/testutil/ExoHostedTest.java    |  2 +-
 .../testutil/ExoPlayerTestRunner.java         |  2 +-
 17 files changed, 60 insertions(+), 24 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 533306e0a23..83ba61fff1b 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -105,8 +105,8 @@ public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
   }
 
   @Override
-  public void onPositionDiscontinuity() {
-    Log.d(TAG, "positionDiscontinuity");
+  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
+    Log.d(TAG, "positionDiscontinuity [" + getDiscontinuityReasonString(reason) + "]");
   }
 
   @Override
@@ -484,4 +484,17 @@ private static String getRepeatModeString(@Player.RepeatMode int repeatMode) {
         return "?";
     }
   }
+
+  private static String getDiscontinuityReasonString(@Player.DiscontinuityReason int reason) {
+    switch (reason) {
+      case Player.DISCONTINUITY_REASON_PERIOD_TRANSITION:
+        return "PERIOD_TRANSITION";
+      case Player.DISCONTINUITY_REASON_SEEK:
+        return "SEEK";
+      case Player.DISCONTINUITY_REASON_INTERNAL:
+        return "INTERNAL";
+      default:
+        return "?";
+    }
+  }
 }
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 c2c4df9ea8d..071e724053e 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
@@ -510,7 +510,7 @@ public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
   }
 
   @Override
-  public void onPositionDiscontinuity() {
+  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     if (inErrorState) {
       // This will only occur if the user has performed a seek whilst in the error state. Update the
       // resume position so that if the user then retries, playback will resume from the position to
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 234b8384f93..9d3636f8acf 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
@@ -336,7 +336,7 @@ public void seekTo(int windowIndex, long positionMs) {
       pendingSeekWindowIndex = windowIndex;
       pendingSeekPositionMs = positionMs;
       for (EventListener listener : listeners) {
-        listener.onPositionDiscontinuity();
+        listener.onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
       }
     }
   }
@@ -539,7 +539,7 @@ public void updateInternalState() {
     if (this.currentWindowIndex != currentWindowIndex) {
       this.currentWindowIndex = currentWindowIndex;
       for (EventListener listener : listeners) {
-        listener.onPositionDiscontinuity();
+        listener.onPositionDiscontinuity(DISCONTINUITY_REASON_PERIOD_TRANSITION);
       }
     }
     if (updateTracksAndSelections()) {
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 1257b652eb5..8e1926ab3b7 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
@@ -100,7 +100,7 @@ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray tra
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       // Do nothing.
     }
 
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 87033173def..3ce4202450d 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
@@ -583,7 +583,7 @@ public void onPlayerError(ExoPlaybackException error) {
   }
 
   @Override
-  public void onPositionDiscontinuity() {
+  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     if (adsManager == null) {
       return;
     }
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 f5ef8b2ca4e..93583f7d246 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
@@ -32,6 +32,7 @@
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -278,7 +279,7 @@ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray tra
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
       Callback callback = getCallback();
       callback.onCurrentPositionChanged(LeanbackPlayerAdapter.this);
       callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
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 7304d9cdb6e..61e37727507 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
@@ -686,7 +686,7 @@ public void onPlayerError(ExoPlaybackException error) {
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       if (currentWindowIndex != player.getCurrentWindowIndex()) {
         if (queueNavigator != null) {
           queueNavigator.onCurrentWindowIndexChanged(player);
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 6eeebaef4bb..8f82a9fdc02 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
@@ -100,7 +100,7 @@ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray tra
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       // Do nothing.
     }
 
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 50f4bf394d2..52b6670c09c 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
@@ -132,7 +132,7 @@ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray tra
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       // 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 e574bfc1eed..75e08aadc60 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
@@ -257,7 +257,7 @@ public void seekTo(int windowIndex, long positionMs) {
       maskingWindowPositionMs = positionMs;
       internalPlayer.seekTo(timeline, windowIndex, C.msToUs(positionMs));
       for (Player.EventListener listener : listeners) {
-        listener.onPositionDiscontinuity();
+        listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK);
       }
     }
   }
@@ -484,7 +484,7 @@ public Object getCurrentManifest() {
           }
           if (msg.arg1 != 0) {
             for (Player.EventListener listener : listeners) {
-              listener.onPositionDiscontinuity();
+              listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK);
             }
           }
         }
@@ -494,7 +494,7 @@ public Object getCurrentManifest() {
         if (pendingSeekAcks == 0) {
           playbackInfo = (ExoPlayerImplInternal.PlaybackInfo) msg.obj;
           for (Player.EventListener listener : listeners) {
-            listener.onPositionDiscontinuity();
+            listener.onPositionDiscontinuity(DISCONTINUITY_REASON_PERIOD_TRANSITION);
           }
         }
         break;
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 ae2785f6f8e..795b7249c85 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
@@ -55,7 +55,7 @@ interface EventListener {
      * Note that if the timeline has changed then a position discontinuity may also have occurred.
      * For example, the current period index may have changed as a result of periods being added or
      * removed from the timeline. This will <em>not</em> be reported via a separate call to
-     * {@link #onPositionDiscontinuity()}.
+     * {@link #onPositionDiscontinuity(int)}.
      *
      * @param timeline The latest timeline. Never null, but may be empty.
      * @param manifest The latest manifest. May be null.
@@ -119,8 +119,10 @@ interface EventListener {
      * <p>
      * When a position discontinuity occurs as a result of a change to the timeline this method is
      * <em>not</em> called. {@link #onTimelineChanged(Timeline, Object)} is called in this case.
+     *
+     * @param reason The {@link DiscontinuityReason} responsible for the discontinuity.
      */
-    void onPositionDiscontinuity();
+    void onPositionDiscontinuity(@DiscontinuityReason int reason);
 
     /**
      * Called when the current playback parameters change. The playback parameters may change due to
@@ -172,6 +174,27 @@ interface EventListener {
    */
   int REPEAT_MODE_ALL = 2;
 
+  /**
+   * Reasons for position discontinuities.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({DISCONTINUITY_REASON_PERIOD_TRANSITION, DISCONTINUITY_REASON_SEEK,
+      DISCONTINUITY_REASON_INTERNAL})
+  public @interface DiscontinuityReason {}
+  /**
+   * Automatic playback transition from one period in the timeline to the next. The period index may
+   * be the same as it was before the discontinuity in case the current period is repeated.
+   */
+  int DISCONTINUITY_REASON_PERIOD_TRANSITION = 0;
+  /**
+   * Seek within the current period or to another period.
+   */
+  int DISCONTINUITY_REASON_SEEK = 1;
+  /**
+   * Discontinuity introduced internally by the source.
+   */
+  int DISCONTINUITY_REASON_INTERNAL = 2;
+
   /**
    * Register a listener to receive events from the player. The listener's methods will be called on
    * the thread that was used to construct the player. However, if the thread used to construct the
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 be04ce2fe09..cff860b671f 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
@@ -99,7 +99,7 @@ public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
   }
 
   @Override
-  public void onPositionDiscontinuity() {
+  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     updateAndPost();
   }
 
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 16f555ffbc4..848aabc2588 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
@@ -1090,7 +1090,7 @@ public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       updateNavigation();
       updateProgress();
     }
@@ -1150,4 +1150,3 @@ public void onClick(View view) {
   }
 
 }
-
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 9bc4bb5b871..b7e162d748a 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
@@ -927,7 +927,7 @@ public void onPlayerError(ExoPlaybackException e) {
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       // Do nothing.
     }
 
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 bc16e105da0..b41d44d0162 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
@@ -368,7 +368,7 @@ protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
         final ActionNode nextAction) {
       player.addListener(new PlayerListener() {
         @Override
-        public void onPositionDiscontinuity() {
+        public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
           player.removeListener(this);
           nextAction.schedule(player, trackSelector, surface, handler);
         }
@@ -445,7 +445,7 @@ public void onPlayerError(ExoPlaybackException error) {
     }
 
     @Override
-    public void onPositionDiscontinuity() {
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
 
     }
 
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 c039dd3283d..d3186e475db 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
@@ -248,7 +248,7 @@ public final void onPlayerError(ExoPlaybackException error) {
   }
 
   @Override
-  public final void onPositionDiscontinuity() {
+  public final void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     // Do nothing.
   }
 
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 f65cb39bfc5..b8c0846f8ed 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
@@ -374,7 +374,7 @@ public void onPlayerError(ExoPlaybackException error) {
   }
 
   @Override
-  public void onPositionDiscontinuity() {
+  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     positionDiscontinuityCount++;
     periodIndices.add(player.getCurrentPeriodIndex());
   }

From b3004ab1c302bf9a0e195fc4234b982f2ffee255 Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Thu, 14 Sep 2017 04:28:56 -0700
Subject: [PATCH 224/421] Do not apply SampleStream skip-ahead for
 NoSampleRenderer.

Currently, to make transition to next media period seamless, after the renderer
has read until the end of the current SampleStream, we may send it the next
SampleStream so the renderer may read from the next SampleStream ahead of the
transition.
For NoSampleRenderer, we should avoid doing this: skipping ahead for such
renderer doesn't have any benefit (the renderer does not consume data from
SampleStream), and it will change the provided rendererOffsetUs while the
renderer is still rendering from the playing media period.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168669800
---
 .../android/exoplayer2/ExoPlayerImplInternal.java | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 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 c0fc36964c1..61c5b01cf7f 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
@@ -1355,18 +1355,25 @@ private void updatePeriods() throws ExoPlaybackException, IOException {
         } else if (!renderer.isCurrentStreamFinal()) {
           TrackSelection newSelection = newTrackSelectorResult.selections.get(i);
           boolean newRendererEnabled = newTrackSelectorResult.renderersEnabled[i];
+          boolean isNoSampleRenderer = rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE;
           RendererConfiguration oldConfig = oldTrackSelectorResult.rendererConfigurations[i];
           RendererConfiguration newConfig = newTrackSelectorResult.rendererConfigurations[i];
-          if (newRendererEnabled && newConfig.equals(oldConfig)) {
+          if (newRendererEnabled && newConfig.equals(oldConfig) && !isNoSampleRenderer) {
             // Replace the renderer's SampleStream so the transition to playing the next period can
             // be seamless.
+            // This should be avoided for no-sample renderer, because skipping ahead for such
+            // renderer doesn't have any benefit (the renderer does not consume the sample stream),
+            // and it will change the provided rendererOffsetUs while the renderer is still
+            // rendering from the playing media period.
             Format[] formats = getFormats(newSelection);
             renderer.replaceStream(formats, readingPeriodHolder.sampleStreams[i],
                 readingPeriodHolder.getRendererOffset());
           } else {
-            // The renderer will be disabled when transitioning to playing the next period, either
-            // because there's no new selection or because a configuration change is required. Mark
-            // the SampleStream as final to play out any remaining data.
+            // The renderer will be disabled when transitioning to playing the next period, because
+            // there's no new selection, or because a configuration change is required, or because
+            // it's a no-sample renderer for which rendererOffsetUs should be updated only when
+            // starting to play the next period. Mark the SampleStream as final to play out any
+            // remaining data.
             renderer.setCurrentStreamFinal();
           }
         }

From f2aed7186e9c47ddc55456c5f5bbeb5cb3100988 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 14 Sep 2017 04:31:17 -0700
Subject: [PATCH 225/421] Workaround the skip ad button not being focused

Issue: #3258

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168669969
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 26 +++++++++++++++++++
 .../exoplayer2/ui/SimpleExoPlayerView.java    |  7 +++++
 2 files changed, 33 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 3ce4202450d..e9641fc4d35 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
@@ -20,6 +20,7 @@
 import android.os.SystemClock;
 import android.util.Log;
 import android.view.ViewGroup;
+import android.webkit.WebView;
 import com.google.ads.interactivemedia.v3.api.Ad;
 import com.google.ads.interactivemedia.v3.api.AdDisplayContainer;
 import com.google.ads.interactivemedia.v3.api.AdErrorEvent;
@@ -112,6 +113,14 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
    */
   private static final long END_OF_CONTENT_POSITION_THRESHOLD_MS = 5000;
 
+  /**
+   * The "Skip ad" button rendered in the IMA WebView does not gain focus by default and cannot be
+   * clicked via a keypress event. Workaround this issue by calling focus() on the HTML element in
+   * the WebView directly when an ad starts. See [Internal: b/62371030].
+   */
+  private static final String FOCUS_SKIP_BUTTON_WORKAROUND_JS = "javascript:"
+      + "try{ document.getElementsByClassName(\"videoAdUiSkipButton\")[0].focus(); } catch (e) {}";
+
   private final Uri adTagUri;
   private final Timeline.Period period;
   private final List<VideoAdPlayerCallback> adCallbacks;
@@ -121,6 +130,7 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
 
   private EventListener eventListener;
   private Player player;
+  private ViewGroup adUiViewGroup;
   private VideoProgressUpdate lastContentProgress;
   private VideoProgressUpdate lastAdProgress;
 
@@ -249,6 +259,7 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
       ViewGroup adUiViewGroup) {
     this.player = player;
     this.eventListener = eventListener;
+    this.adUiViewGroup = adUiViewGroup;
     lastAdProgress = null;
     lastContentProgress = null;
     adDisplayContainer.setAdContainer(adUiViewGroup);
@@ -278,6 +289,7 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
     player.removeListener(this);
     player = null;
     eventListener = null;
+    adUiViewGroup = null;
   }
 
   /**
@@ -363,6 +375,11 @@ public void onAdEvent(AdEvent adEvent) {
         imaPausedContent = true;
         pauseContentInternal();
         break;
+      case STARTED:
+        if (ad.isSkippable()) {
+          focusSkipButton();
+        }
+        break;
       case TAPPED:
         if (eventListener != null) {
           eventListener.onAdTapped();
@@ -732,4 +749,13 @@ private static long[] getAdGroupTimesUs(List<Float> cuePoints) {
     return adGroupTimesUs;
   }
 
+  private void focusSkipButton() {
+    if (playingAd && adUiViewGroup != null && adUiViewGroup.getChildCount() > 0
+        && adUiViewGroup.getChildAt(0) instanceof WebView) {
+      WebView webView = (WebView) (adUiViewGroup.getChildAt(0));
+      webView.requestFocus();
+      webView.loadUrl(FOCUS_SKIP_BUTTON_WORKAROUND_JS);
+    }
+  }
+
 }
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 b7e162d748a..b6f0677871b 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
@@ -516,6 +516,13 @@ public void setUseController(boolean useController) {
 
   @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);
+    }
     maybeShowController(true);
     return dispatchMediaKeyEvent(event) || super.dispatchKeyEvent(event);
   }

From 0ad39c642d8ff7881d7b3623a82669461c6deb48 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 14 Sep 2017 09:35:08 -0700
Subject: [PATCH 226/421] Relax test termination for API level 23 and above

This allows test runs to continue when the activity
is paused (but not stopped), which is in line with
what we do in the demo app's PlayerActivity.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168699521
---
 .../google/android/exoplayer2/testutil/HostActivity.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 299cb108157..1ef1acd80bf 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
@@ -31,6 +31,7 @@
 import android.view.SurfaceView;
 import android.view.Window;
 import com.google.android.exoplayer2.util.Assertions;
+import com.google.android.exoplayer2.util.Util;
 
 /**
  * A host activity for performing playback tests.
@@ -179,12 +180,17 @@ public void onStart() {
   @Override
   public void onPause() {
     super.onPause();
-    maybeStopHostedTest();
+    if (Util.SDK_INT <= 23) {
+      maybeStopHostedTest();
+    }
   }
 
   @Override
   public void onStop() {
     super.onStop();
+    if (Util.SDK_INT > 23) {
+      maybeStopHostedTest();
+    }
     wakeLock.release();
     wakeLock = null;
     wifiLock.release();

From 58293abc11a92eb90a0b634e879129d001eec15f Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 14 Sep 2017 10:34:22 -0700
Subject: [PATCH 227/421] Remove IMA dependency and add AdsMediaSource

AdsMediaSource lives in the core library so only ImaAdsLoader remains in
the ima extension. AdsMediaSource takes an AdsLoader implementation.

ImaAdsMediaSource is deprecated rather than removed for now.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168707921
---
 .../exoplayer2/demo/PlayerActivity.java       |  36 +-
 .../exoplayer2/ext/ima/ImaAdsLoader.java      |  66 +---
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java | 282 +-------------
 .../source/ads}/AdPlaybackState.java          |   4 +-
 .../exoplayer2/source/ads/AdsLoader.java      |  96 +++++
 .../exoplayer2/source/ads/AdsMediaSource.java | 349 ++++++++++++++++++
 .../source/ads}/SinglePeriodAdTimeline.java   |   2 +-
 7 files changed, 486 insertions(+), 349 deletions(-)
 rename {extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima => library/core/src/main/java/com/google/android/exoplayer2/source/ads}/AdPlaybackState.java (98%)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
 rename {extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima => library/core/src/main/java/com/google/android/exoplayer2/source/ads}/SinglePeriodAdTimeline.java (98%)

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 071e724053e..0efb04782d3 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
@@ -56,6 +56,8 @@
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
 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.DefaultDashChunkSource;
 import com.google.android.exoplayer2.source.hls.HlsMediaSource;
@@ -73,8 +75,6 @@
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.util.Util;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Method;
 import java.net.CookieHandler;
 import java.net.CookieManager;
 import java.net.CookiePolicy;
@@ -129,9 +129,9 @@ public class PlayerActivity extends Activity implements OnClickListener, EventLi
 
   // Fields used only for ad playback. The ads loader is loaded via reflection.
 
-  private Object imaAdsLoader; // com.google.android.exoplayer2.ext.ima.ImaAdsLoader
+  private AdsLoader adsLoader;
   private Uri loadedAdTagUri;
-  private ViewGroup adOverlayViewGroup;
+  private ViewGroup adUiViewGroup;
 
   // Activity lifecycle
 
@@ -453,32 +453,20 @@ private MediaSource createAdsMediaSource(MediaSource mediaSource, Uri adTagUri)
     // Load the extension source using reflection so the demo app doesn't have to depend on it.
     // The ads loader is reused for multiple playbacks, so that ad playback can resume.
     Class<?> loaderClass = Class.forName("com.google.android.exoplayer2.ext.ima.ImaAdsLoader");
-    if (imaAdsLoader == null) {
-      imaAdsLoader = loaderClass.getConstructor(Context.class, Uri.class)
+    if (adsLoader == null) {
+      adsLoader = (AdsLoader) loaderClass.getConstructor(Context.class, Uri.class)
           .newInstance(this, adTagUri);
-      adOverlayViewGroup = new FrameLayout(this);
+      adUiViewGroup = new FrameLayout(this);
       // The demo app has a non-null overlay frame layout.
-      simpleExoPlayerView.getOverlayFrameLayout().addView(adOverlayViewGroup);
+      simpleExoPlayerView.getOverlayFrameLayout().addView(adUiViewGroup);
     }
-    Class<?> sourceClass =
-        Class.forName("com.google.android.exoplayer2.ext.ima.ImaAdsMediaSource");
-    Constructor<?> constructor = sourceClass.getConstructor(MediaSource.class,
-        DataSource.Factory.class, loaderClass, ViewGroup.class);
-    return (MediaSource) constructor.newInstance(mediaSource, mediaDataSourceFactory, imaAdsLoader,
-        adOverlayViewGroup);
+    return new AdsMediaSource(mediaSource, mediaDataSourceFactory, adsLoader, adUiViewGroup);
   }
 
   private void releaseAdsLoader() {
-    if (imaAdsLoader != null) {
-      try {
-        Class<?> loaderClass = Class.forName("com.google.android.exoplayer2.ext.ima.ImaAdsLoader");
-        Method releaseMethod = loaderClass.getMethod("release");
-        releaseMethod.invoke(imaAdsLoader);
-      } catch (Exception e) {
-        // Should never happen.
-        throw new IllegalStateException(e);
-      }
-      imaAdsLoader = null;
+    if (adsLoader != null) {
+      adsLoader.release();
+      adsLoader = null;
       loadedAdTagUri = null;
       simpleExoPlayerView.getOverlayFrameLayout().removeAllViews();
     }
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 e9641fc4d35..7e5912ed288 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
@@ -29,7 +29,6 @@
 import com.google.ads.interactivemedia.v3.api.AdEvent.AdEventListener;
 import com.google.ads.interactivemedia.v3.api.AdEvent.AdEventType;
 import com.google.ads.interactivemedia.v3.api.AdPodInfo;
-import com.google.ads.interactivemedia.v3.api.AdsLoader;
 import com.google.ads.interactivemedia.v3.api.AdsLoader.AdsLoadedListener;
 import com.google.ads.interactivemedia.v3.api.AdsManager;
 import com.google.ads.interactivemedia.v3.api.AdsManagerLoadedEvent;
@@ -48,6 +47,8 @@
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.source.ads.AdPlaybackState;
+import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
@@ -58,40 +59,9 @@
 /**
  * Loads ads using the IMA SDK. All methods are called on the main thread.
  */
-public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
+public final class ImaAdsLoader implements AdsLoader, Player.EventListener, VideoAdPlayer,
     ContentProgressProvider, AdErrorListener, AdsLoadedListener, AdEventListener {
 
-  /**
-   * Listener for ad loader events. All methods are called on the main thread.
-   */
-  /* package */ interface EventListener {
-
-    /**
-     * Called when the ad playback state has been updated.
-     *
-     * @param adPlaybackState The new ad playback state.
-     */
-    void onAdPlaybackState(AdPlaybackState adPlaybackState);
-
-    /**
-     * Called when there was an error loading ads.
-     *
-     * @param error The error.
-     */
-    void onLoadError(IOException 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();
-
-  }
-
   static {
     ExoPlayerLibraryInfo.registerModule("goog.exo.ima");
   }
@@ -126,7 +96,7 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
   private final List<VideoAdPlayerCallback> adCallbacks;
   private final ImaSdkFactory imaSdkFactory;
   private final AdDisplayContainer adDisplayContainer;
-  private final AdsLoader adsLoader;
+  private final com.google.ads.interactivemedia.v3.api.AdsLoader adsLoader;
 
   private EventListener eventListener;
   private Player player;
@@ -160,7 +130,8 @@ public final class ImaAdsLoader implements Player.EventListener, VideoAdPlayer,
    */
   private boolean imaPausedInAd;
   /**
-   * Whether {@link AdsLoader#contentComplete()} has been called since starting ad playback.
+   * Whether {@link com.google.ads.interactivemedia.v3.api.AdsLoader#contentComplete()} has been
+   * called since starting ad playback.
    */
   private boolean sentContentComplete;
 
@@ -248,15 +219,8 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
     contentDurationMs = C.TIME_UNSET;
   }
 
-  /**
-   * Attaches a player that will play ads loaded using this instance.
-   *
-   * @param player The player instance that will play the loaded ads.
-   * @param eventListener Listener for ads loader events.
-   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
-   */
-  /* package */ void attachPlayer(ExoPlayer player, EventListener eventListener,
-      ViewGroup adUiViewGroup) {
+  @Override
+  public void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGroup adUiViewGroup) {
     this.player = player;
     this.eventListener = eventListener;
     this.adUiViewGroup = adUiViewGroup;
@@ -265,7 +229,7 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
     adDisplayContainer.setAdContainer(adUiViewGroup);
     player.addListener(this);
     if (adPlaybackState != null) {
-      eventListener.onAdPlaybackState(adPlaybackState);
+      eventListener.onAdPlaybackState(adPlaybackState.copy());
       if (imaPausedContent) {
         adsManager.resume();
       }
@@ -274,12 +238,8 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
     }
   }
 
-  /**
-   * Detaches the attached player and event listener. To attach a new player, call
-   * {@link #attachPlayer(ExoPlayer, EventListener, ViewGroup)}. Call {@link #release()} to release
-   * all resources associated with this instance.
-   */
-  /* package */ void detachPlayer() {
+  @Override
+  public void detachPlayer() {
     if (adsManager != null && imaPausedContent) {
       adPlaybackState.setAdResumePositionUs(C.msToUs(player.getCurrentPosition()));
       adsManager.pause();
@@ -292,9 +252,7 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
     adUiViewGroup = null;
   }
 
-  /**
-   * Releases the loader. Must be called when the instance is no longer needed.
-   */
+  @Override
   public void release() {
     released = true;
     if (adsManager != null) {
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 d56a3ad41fa..c3574c414bb 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
@@ -16,83 +16,25 @@
 package com.google.android.exoplayer2.ext.ima;
 
 import android.os.Handler;
-import android.os.Looper;
 import android.support.annotation.Nullable;
-import android.util.Log;
 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.extractor.DefaultExtractorsFactory;
-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.ads.AdsMediaSource;
 import com.google.android.exoplayer2.upstream.Allocator;
 import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
- * A {@link MediaSource} that inserts ads linearly with a provided content media source using the
- * Interactive Media Ads SDK for ad loading and tracking.
+ * 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
 public final class ImaAdsMediaSource implements MediaSource {
 
-  /**
-   * Listener for events relating to ad loading.
-   */
-  public interface AdsListener {
-
-    /**
-     * Called if there was an error loading ads. The media source will load the content without ads
-     * if ads can't be loaded, so listen for this event if you need to implement additional handling
-     * (for example, stopping the player).
-     *
-     * @param error The error.
-     */
-    void onAdLoadError(IOException 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();
-
-  }
-
-  private static final String TAG = "ImaAdsMediaSource";
-
-  private final MediaSource contentMediaSource;
-  private final DataSource.Factory dataSourceFactory;
-  private final ImaAdsLoader imaAdsLoader;
-  private final ViewGroup adUiViewGroup;
-  private final Handler mainHandler;
-  private final AdsLoaderListener adsLoaderListener;
-  private final Map<MediaPeriod, MediaSource> adMediaSourceByMediaPeriod;
-  private final Timeline.Period period;
-  @Nullable
-  private final Handler eventHandler;
-  @Nullable
-  private final AdsListener eventListener;
-
-  private Handler playerHandler;
-  private ExoPlayer player;
-  private volatile boolean released;
-
-  // Accessed on the player thread.
-  private Timeline contentTimeline;
-  private Object contentManifest;
-  private AdPlaybackState adPlaybackState;
-  private MediaSource[][] adGroupMediaSources;
-  private long[][] adDurationsUs;
-  private MediaSource.Listener listener;
+  private final AdsMediaSource adsMediaSource;
 
   /**
    * Constructs a new source that inserts ads linearly with the content specified by
@@ -121,230 +63,34 @@ public ImaAdsMediaSource(MediaSource contentMediaSource, DataSource.Factory data
    */
   public ImaAdsMediaSource(MediaSource contentMediaSource, DataSource.Factory dataSourceFactory,
       ImaAdsLoader imaAdsLoader, ViewGroup adUiViewGroup, @Nullable Handler eventHandler,
-      @Nullable AdsListener eventListener) {
-    this.contentMediaSource = contentMediaSource;
-    this.dataSourceFactory = dataSourceFactory;
-    this.imaAdsLoader = imaAdsLoader;
-    this.adUiViewGroup = adUiViewGroup;
-    this.eventHandler = eventHandler;
-    this.eventListener = eventListener;
-    mainHandler = new Handler(Looper.getMainLooper());
-    adsLoaderListener = new AdsLoaderListener();
-    adMediaSourceByMediaPeriod = new HashMap<>();
-    period = new Timeline.Period();
-    adGroupMediaSources = new MediaSource[0][];
-    adDurationsUs = new long[0][];
+      @Nullable AdsMediaSource.AdsListener eventListener) {
+    adsMediaSource = new AdsMediaSource(contentMediaSource, dataSourceFactory, imaAdsLoader,
+        adUiViewGroup, eventHandler, eventListener);
   }
 
   @Override
   public void prepareSource(final ExoPlayer player, boolean isTopLevelSource, Listener listener) {
-    Assertions.checkArgument(isTopLevelSource);
-    this.listener = listener;
-    this.player = player;
-    playerHandler = new Handler();
-    contentMediaSource.prepareSource(player, false, new Listener() {
-      @Override
-      public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
-        ImaAdsMediaSource.this.onContentSourceInfoRefreshed(timeline, manifest);
-      }
-    });
-    mainHandler.post(new Runnable() {
-      @Override
-      public void run() {
-        imaAdsLoader.attachPlayer(player, adsLoaderListener, adUiViewGroup);
-      }
-    });
+    adsMediaSource.prepareSource(player, isTopLevelSource, listener);
   }
 
   @Override
   public void maybeThrowSourceInfoRefreshError() throws IOException {
-    contentMediaSource.maybeThrowSourceInfoRefreshError();
-    for (MediaSource[] mediaSources : adGroupMediaSources) {
-      for (MediaSource mediaSource : mediaSources) {
-        if (mediaSource != null) {
-          mediaSource.maybeThrowSourceInfoRefreshError();
-        }
-      }
-    }
+    adsMediaSource.maybeThrowSourceInfoRefreshError();
   }
 
   @Override
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
-    if (adPlaybackState.adGroupCount > 0 && id.isAd()) {
-      final int adGroupIndex = id.adGroupIndex;
-      final int adIndexInAdGroup = id.adIndexInAdGroup;
-      if (adGroupMediaSources[adGroupIndex].length <= adIndexInAdGroup) {
-        MediaSource adMediaSource = new ExtractorMediaSource(
-            adPlaybackState.adUris[id.adGroupIndex][id.adIndexInAdGroup], dataSourceFactory,
-            new DefaultExtractorsFactory(), mainHandler, adsLoaderListener);
-        int oldAdCount = adGroupMediaSources[id.adGroupIndex].length;
-        if (adIndexInAdGroup >= oldAdCount) {
-          int adCount = adIndexInAdGroup + 1;
-          adGroupMediaSources[adGroupIndex] =
-              Arrays.copyOf(adGroupMediaSources[adGroupIndex], adCount);
-          adDurationsUs[adGroupIndex] = Arrays.copyOf(adDurationsUs[adGroupIndex], adCount);
-          Arrays.fill(adDurationsUs[adGroupIndex], oldAdCount, adCount, C.TIME_UNSET);
-        }
-        adGroupMediaSources[adGroupIndex][adIndexInAdGroup] = adMediaSource;
-        adMediaSource.prepareSource(player, false, new Listener() {
-          @Override
-          public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
-            onAdSourceInfoRefreshed(adGroupIndex, adIndexInAdGroup, timeline);
-          }
-        });
-      }
-      MediaSource mediaSource = adGroupMediaSources[adGroupIndex][adIndexInAdGroup];
-      MediaPeriod mediaPeriod = mediaSource.createPeriod(new MediaPeriodId(0), allocator);
-      adMediaSourceByMediaPeriod.put(mediaPeriod, mediaSource);
-      return mediaPeriod;
-    } else {
-      return contentMediaSource.createPeriod(id, allocator);
-    }
+    return adsMediaSource.createPeriod(id, allocator);
   }
 
   @Override
   public void releasePeriod(MediaPeriod mediaPeriod) {
-    if (adMediaSourceByMediaPeriod.containsKey(mediaPeriod)) {
-      adMediaSourceByMediaPeriod.remove(mediaPeriod).releasePeriod(mediaPeriod);
-    } else {
-      contentMediaSource.releasePeriod(mediaPeriod);
-    }
+    adsMediaSource.releasePeriod(mediaPeriod);
   }
 
   @Override
   public void releaseSource() {
-    released = true;
-    contentMediaSource.releaseSource();
-    for (MediaSource[] mediaSources : adGroupMediaSources) {
-      for (MediaSource mediaSource : mediaSources) {
-        if (mediaSource != null) {
-          mediaSource.releaseSource();
-        }
-      }
-    }
-    mainHandler.post(new Runnable() {
-      @Override
-      public void run() {
-        imaAdsLoader.detachPlayer();
-      }
-    });
-  }
-
-  // Internal methods.
-
-  private void onAdPlaybackState(AdPlaybackState adPlaybackState) {
-    if (this.adPlaybackState == null) {
-      adGroupMediaSources = new MediaSource[adPlaybackState.adGroupCount][];
-      Arrays.fill(adGroupMediaSources, new MediaSource[0]);
-      adDurationsUs = new long[adPlaybackState.adGroupCount][];
-      Arrays.fill(adDurationsUs, new long[0]);
-    }
-    this.adPlaybackState = adPlaybackState;
-    maybeUpdateSourceInfo();
-  }
-
-  private void onLoadError(final IOException error) {
-    Log.w(TAG, "Ad load error", error);
-    if (eventHandler != null && eventListener != null) {
-      eventHandler.post(new Runnable() {
-        @Override
-        public void run() {
-          if (!released) {
-            eventListener.onAdLoadError(error);
-          }
-        }
-      });
-    }
-  }
-
-  private void onContentSourceInfoRefreshed(Timeline timeline, Object manifest) {
-    contentTimeline = timeline;
-    contentManifest = manifest;
-    maybeUpdateSourceInfo();
-  }
-
-  private void onAdSourceInfoRefreshed(int adGroupIndex, int adIndexInAdGroup, Timeline timeline) {
-    Assertions.checkArgument(timeline.getPeriodCount() == 1);
-    adDurationsUs[adGroupIndex][adIndexInAdGroup] = timeline.getPeriod(0, period).getDurationUs();
-    maybeUpdateSourceInfo();
-  }
-
-  private void maybeUpdateSourceInfo() {
-    if (adPlaybackState != null && contentTimeline != null) {
-      Timeline timeline = adPlaybackState.adGroupCount == 0 ? contentTimeline
-          : new SinglePeriodAdTimeline(contentTimeline, adPlaybackState.adGroupTimesUs,
-              adPlaybackState.adCounts, adPlaybackState.adsLoadedCounts,
-              adPlaybackState.adsPlayedCounts, adDurationsUs, adPlaybackState.adResumePositionUs);
-      listener.onSourceInfoRefreshed(timeline, contentManifest);
-    }
-  }
-
-  /**
-   * Listener for ad loading events. All methods are called on the main thread.
-   */
-  private final class AdsLoaderListener implements ImaAdsLoader.EventListener,
-      ExtractorMediaSource.EventListener {
-
-    @Override
-    public void onAdPlaybackState(final AdPlaybackState adPlaybackState) {
-      if (released) {
-        return;
-      }
-      playerHandler.post(new Runnable() {
-        @Override
-        public void run() {
-          if (released) {
-            return;
-          }
-          ImaAdsMediaSource.this.onAdPlaybackState(adPlaybackState);
-        }
-      });
-    }
-
-    @Override
-    public void onLoadError(final IOException error) {
-      if (released) {
-        return;
-      }
-      playerHandler.post(new Runnable() {
-        @Override
-        public void run() {
-          if (released) {
-            return;
-          }
-          ImaAdsMediaSource.this.onLoadError(error);
-        }
-      });
-    }
-
-    @Override
-    public void onAdClicked() {
-      if (eventHandler != null && eventListener != null) {
-        eventHandler.post(new Runnable() {
-          @Override
-          public void run() {
-            if (!released) {
-              eventListener.onAdClicked();
-            }
-          }
-        });
-      }
-    }
-
-    @Override
-    public void onAdTapped() {
-      if (eventHandler != null && eventListener != null) {
-        eventHandler.post(new Runnable() {
-          @Override
-          public void run() {
-            if (!released) {
-              eventListener.onAdTapped();
-            }
-          }
-        });
-      }
-    }
-
+    adsMediaSource.releaseSource();
   }
 
 }
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdPlaybackState.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
similarity index 98%
rename from extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdPlaybackState.java
rename to library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
index 0edd7d65588..97c97dec8f5 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/AdPlaybackState.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdPlaybackState.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.ext.ima;
+package com.google.android.exoplayer2.source.ads;
 
 import android.net.Uri;
 import com.google.android.exoplayer2.C;
@@ -22,7 +22,7 @@
 /**
  * Represents the structure of ads to play and the state of loaded/played ads.
  */
-/* package */ final class AdPlaybackState {
+public final class AdPlaybackState {
 
   /**
    * The number of ad groups.
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
new file mode 100644
index 00000000000..241750a21fc
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsLoader.java
@@ -0,0 +1,96 @@
+/*
+ * 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.ads;
+
+import android.view.ViewGroup;
+import com.google.android.exoplayer2.ExoPlayer;
+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
+ * 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).
+ * <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, store the current playback position via
+ * {@link AdPlaybackState#setAdResumePositionUs(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.
+ */
+public interface AdsLoader {
+
+  /**
+   * Listener for ad loader events. All methods are called on the main thread.
+   */
+  interface EventListener {
+
+    /**
+     * Called when the ad playback state has been updated.
+     *
+     * @param adPlaybackState The new ad playback state.
+     */
+    void onAdPlaybackState(AdPlaybackState adPlaybackState);
+
+    /**
+     * Called when there was an error loading ads.
+     *
+     * @param error The error.
+     */
+    void onLoadError(IOException 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();
+
+  }
+
+  /**
+   * Attaches a player that will play ads loaded using this instance. Called on the main thread by
+   * {@link AdsMediaSource}.
+   *
+   * @param player The player instance that will play the loaded ads.
+   * @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);
+
+  /**
+   * Detaches the attached player and 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();
+
+}
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
new file mode 100644
index 00000000000..41a856f83fc
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/AdsMediaSource.java
@@ -0,0 +1,349 @@
+/*
+ * 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.ads;
+
+import android.os.Handler;
+import android.os.Looper;
+import android.support.annotation.Nullable;
+import android.util.Log;
+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.extractor.DefaultExtractorsFactory;
+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.upstream.Allocator;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.util.Assertions;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A {@link MediaSource} that inserts ads linearly with a provided content media source.
+ */
+public final class AdsMediaSource implements MediaSource {
+
+  /**
+   * Listener for events relating to ad loading.
+   */
+  public interface AdsListener {
+
+    /**
+     * Called if there was an error loading ads. The media source will load the content without ads
+     * if ads can't be loaded, so listen for this event if you need to implement additional handling
+     * (for example, stopping the player).
+     *
+     * @param error The error.
+     */
+    void onAdLoadError(IOException 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();
+
+  }
+
+  private static final String TAG = "AdsMediaSource";
+
+  private final MediaSource contentMediaSource;
+  private final DataSource.Factory dataSourceFactory;
+  private final AdsLoader adsLoader;
+  private final ViewGroup adUiViewGroup;
+  private final Handler mainHandler;
+  private final ComponentListener componentListener;
+  private final Map<MediaPeriod, MediaSource> adMediaSourceByMediaPeriod;
+  private final Timeline.Period period;
+  @Nullable
+  private final Handler eventHandler;
+  @Nullable
+  private final AdsListener eventListener;
+
+  private Handler playerHandler;
+  private ExoPlayer player;
+  private volatile boolean released;
+
+  // Accessed on the player thread.
+  private Timeline contentTimeline;
+  private Object contentManifest;
+  private AdPlaybackState adPlaybackState;
+  private MediaSource[][] adGroupMediaSources;
+  private long[][] adDurationsUs;
+  private MediaSource.Listener listener;
+
+  /**
+   * 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 adsLoader The loader for ads.
+   * @param adUiViewGroup A {@link ViewGroup} on top of the player that will show any ad UI.
+   */
+  public AdsMediaSource(MediaSource contentMediaSource, DataSource.Factory dataSourceFactory,
+      AdsLoader adsLoader, ViewGroup adUiViewGroup) {
+    this(contentMediaSource, dataSourceFactory, adsLoader, 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 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.
+   */
+  public AdsMediaSource(MediaSource contentMediaSource, DataSource.Factory dataSourceFactory,
+      AdsLoader adsLoader, ViewGroup adUiViewGroup, @Nullable Handler eventHandler,
+      @Nullable AdsListener eventListener) {
+    this.contentMediaSource = contentMediaSource;
+    this.dataSourceFactory = dataSourceFactory;
+    this.adsLoader = adsLoader;
+    this.adUiViewGroup = adUiViewGroup;
+    this.eventHandler = eventHandler;
+    this.eventListener = eventListener;
+    mainHandler = new Handler(Looper.getMainLooper());
+    componentListener = new ComponentListener();
+    adMediaSourceByMediaPeriod = new HashMap<>();
+    period = new Timeline.Period();
+    adGroupMediaSources = new MediaSource[0][];
+    adDurationsUs = new long[0][];
+  }
+
+  @Override
+  public void prepareSource(final ExoPlayer player, boolean isTopLevelSource, Listener listener) {
+    Assertions.checkArgument(isTopLevelSource);
+    this.listener = listener;
+    this.player = player;
+    playerHandler = new Handler();
+    contentMediaSource.prepareSource(player, false, new Listener() {
+      @Override
+      public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+        AdsMediaSource.this.onContentSourceInfoRefreshed(timeline, manifest);
+      }
+    });
+    mainHandler.post(new Runnable() {
+      @Override
+      public void run() {
+        adsLoader.attachPlayer(player, componentListener, adUiViewGroup);
+      }
+    });
+  }
+
+  @Override
+  public void maybeThrowSourceInfoRefreshError() throws IOException {
+    contentMediaSource.maybeThrowSourceInfoRefreshError();
+    for (MediaSource[] mediaSources : adGroupMediaSources) {
+      for (MediaSource mediaSource : mediaSources) {
+        if (mediaSource != null) {
+          mediaSource.maybeThrowSourceInfoRefreshError();
+        }
+      }
+    }
+  }
+
+  @Override
+  public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
+    if (adPlaybackState.adGroupCount > 0 && id.isAd()) {
+      final int adGroupIndex = id.adGroupIndex;
+      final int adIndexInAdGroup = id.adIndexInAdGroup;
+      if (adGroupMediaSources[adGroupIndex].length <= adIndexInAdGroup) {
+        MediaSource adMediaSource = new ExtractorMediaSource(
+            adPlaybackState.adUris[id.adGroupIndex][id.adIndexInAdGroup], dataSourceFactory,
+            new DefaultExtractorsFactory(), mainHandler, componentListener);
+        int oldAdCount = adGroupMediaSources[id.adGroupIndex].length;
+        if (adIndexInAdGroup >= oldAdCount) {
+          int adCount = adIndexInAdGroup + 1;
+          adGroupMediaSources[adGroupIndex] =
+              Arrays.copyOf(adGroupMediaSources[adGroupIndex], adCount);
+          adDurationsUs[adGroupIndex] = Arrays.copyOf(adDurationsUs[adGroupIndex], adCount);
+          Arrays.fill(adDurationsUs[adGroupIndex], oldAdCount, adCount, C.TIME_UNSET);
+        }
+        adGroupMediaSources[adGroupIndex][adIndexInAdGroup] = adMediaSource;
+        adMediaSource.prepareSource(player, false, new Listener() {
+          @Override
+          public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+            onAdSourceInfoRefreshed(adGroupIndex, adIndexInAdGroup, timeline);
+          }
+        });
+      }
+      MediaSource mediaSource = adGroupMediaSources[adGroupIndex][adIndexInAdGroup];
+      MediaPeriod mediaPeriod = mediaSource.createPeriod(new MediaPeriodId(0), allocator);
+      adMediaSourceByMediaPeriod.put(mediaPeriod, mediaSource);
+      return mediaPeriod;
+    } else {
+      return contentMediaSource.createPeriod(id, allocator);
+    }
+  }
+
+  @Override
+  public void releasePeriod(MediaPeriod mediaPeriod) {
+    if (adMediaSourceByMediaPeriod.containsKey(mediaPeriod)) {
+      adMediaSourceByMediaPeriod.remove(mediaPeriod).releasePeriod(mediaPeriod);
+    } else {
+      contentMediaSource.releasePeriod(mediaPeriod);
+    }
+  }
+
+  @Override
+  public void releaseSource() {
+    released = true;
+    contentMediaSource.releaseSource();
+    for (MediaSource[] mediaSources : adGroupMediaSources) {
+      for (MediaSource mediaSource : mediaSources) {
+        if (mediaSource != null) {
+          mediaSource.releaseSource();
+        }
+      }
+    }
+    mainHandler.post(new Runnable() {
+      @Override
+      public void run() {
+        adsLoader.detachPlayer();
+      }
+    });
+  }
+
+  // Internal methods.
+
+  private void onAdPlaybackState(AdPlaybackState adPlaybackState) {
+    if (this.adPlaybackState == null) {
+      adGroupMediaSources = new MediaSource[adPlaybackState.adGroupCount][];
+      Arrays.fill(adGroupMediaSources, new MediaSource[0]);
+      adDurationsUs = new long[adPlaybackState.adGroupCount][];
+      Arrays.fill(adDurationsUs, new long[0]);
+    }
+    this.adPlaybackState = adPlaybackState;
+    maybeUpdateSourceInfo();
+  }
+
+  private void onLoadError(final IOException error) {
+    Log.w(TAG, "Ad load error", error);
+    if (eventHandler != null && eventListener != null) {
+      eventHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          if (!released) {
+            eventListener.onAdLoadError(error);
+          }
+        }
+      });
+    }
+  }
+
+  private void onContentSourceInfoRefreshed(Timeline timeline, Object manifest) {
+    contentTimeline = timeline;
+    contentManifest = manifest;
+    maybeUpdateSourceInfo();
+  }
+
+  private void onAdSourceInfoRefreshed(int adGroupIndex, int adIndexInAdGroup, Timeline timeline) {
+    Assertions.checkArgument(timeline.getPeriodCount() == 1);
+    adDurationsUs[adGroupIndex][adIndexInAdGroup] = timeline.getPeriod(0, period).getDurationUs();
+    maybeUpdateSourceInfo();
+  }
+
+  private void maybeUpdateSourceInfo() {
+    if (adPlaybackState != null && contentTimeline != null) {
+      Timeline timeline = adPlaybackState.adGroupCount == 0 ? contentTimeline
+          : new SinglePeriodAdTimeline(contentTimeline, adPlaybackState.adGroupTimesUs,
+              adPlaybackState.adCounts, adPlaybackState.adsLoadedCounts,
+              adPlaybackState.adsPlayedCounts, adDurationsUs, adPlaybackState.adResumePositionUs);
+      listener.onSourceInfoRefreshed(timeline, contentManifest);
+    }
+  }
+
+  /**
+   * Listener for component events. All methods are called on the main thread.
+   */
+  private final class ComponentListener implements AdsLoader.EventListener,
+      ExtractorMediaSource.EventListener {
+
+    @Override
+    public void onAdPlaybackState(final AdPlaybackState adPlaybackState) {
+      if (released) {
+        return;
+      }
+      playerHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          if (released) {
+            return;
+          }
+          AdsMediaSource.this.onAdPlaybackState(adPlaybackState);
+        }
+      });
+    }
+
+    @Override
+    public void onAdClicked() {
+      if (eventHandler != null && eventListener != null) {
+        eventHandler.post(new Runnable() {
+          @Override
+          public void run() {
+            if (!released) {
+              eventListener.onAdClicked();
+            }
+          }
+        });
+      }
+    }
+
+    @Override
+    public void onAdTapped() {
+      if (eventHandler != null && eventListener != null) {
+        eventHandler.post(new Runnable() {
+          @Override
+          public void run() {
+            if (!released) {
+              eventListener.onAdTapped();
+            }
+          }
+        });
+      }
+    }
+
+    @Override
+    public void onLoadError(final IOException error) {
+      if (released) {
+        return;
+      }
+      playerHandler.post(new Runnable() {
+        @Override
+        public void run() {
+          if (released) {
+            return;
+          }
+          AdsMediaSource.this.onLoadError(error);
+        }
+      });
+    }
+
+  }
+
+}
diff --git a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
similarity index 98%
rename from extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
rename to library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
index 0162d22c344..c2974681dbb 100644
--- a/extensions/ima/src/main/java/com/google/android/exoplayer2/ext/ima/SinglePeriodAdTimeline.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/ads/SinglePeriodAdTimeline.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.google.android.exoplayer2.ext.ima;
+package com.google.android.exoplayer2.source.ads;
 
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;

From a479afff5f45f21810e0345f705fb07a14657ca8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 14 Sep 2017 10:34:30 -0700
Subject: [PATCH 228/421] Fix potential NPE/ThreadSafety issues with MediaDrm
 listener

- MediaDrmEventListener.onEvent is typically called on the
  app's main thread. mediaDrmHandler is instantiated on the
  playback thread. Hence mediaDrmHandler should be volatile
  to ensure visibility.
- Nulling mediaDrmHandler could result in a NPE in onEvent.
  Instantiate mediaDrmHandler (and don't null it again) to
  avoid this. MediaDrmHandler.handleMessage will correctly
  discard any events for sessions that are now closed.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168707938
---
 .../drm/DefaultDrmSessionManager.java         | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 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 029b41fde82..cff9f9da0fd 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
@@ -98,21 +98,22 @@ public interface EventListener {
   /** Releases an existing offline license. */
   public static final int MODE_RELEASE = 3;
 
-  private final Handler eventHandler;
-  private final EventListener eventListener;
+  private final UUID uuid;
   private final ExoMediaDrm<T> mediaDrm;
-  private final HashMap<String, String> optionalKeyRequestParameters;
   private final MediaDrmCallback callback;
-  private final UUID uuid;
+  private final HashMap<String, String> optionalKeyRequestParameters;
+  private final Handler eventHandler;
+  private final EventListener eventListener;
   private final boolean multiSession;
 
+  private final List<DefaultDrmSession<T>> sessions;
+  private final AtomicBoolean provisioningInProgress;
+
   private Looper playbackLooper;
   private int mode;
   private byte[] offlineLicenseKeySetId;
 
-  private final List<DefaultDrmSession<T>> sessions;
-  private final AtomicBoolean provisioningInProgress;
-  /* package */ MediaDrmHandler mediaDrmHandler;
+  /* package */ volatile MediaDrmHandler mediaDrmHandler;
 
   /**
    * Instantiates a new instance using the Widevine scheme.
@@ -226,6 +227,7 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
     if (multiSession) {
       mediaDrm.setPropertyString("sessionSharing", "enable");
     }
+    mediaDrm.setOnEventListener(new MediaDrmEventListener());
   }
 
   /**
@@ -334,8 +336,9 @@ public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitDa
     Assertions.checkState(this.playbackLooper == null || this.playbackLooper == playbackLooper);
     if (sessions.isEmpty()) {
       this.playbackLooper = playbackLooper;
-      mediaDrmHandler = new MediaDrmHandler(playbackLooper);
-      mediaDrm.setOnEventListener(new MediaDrmEventListener());
+      if (mediaDrmHandler == null) {
+        mediaDrmHandler = new MediaDrmHandler(playbackLooper);
+      }
     }
 
     DefaultDrmSession<T> session = null;
@@ -383,13 +386,6 @@ public void releaseSession(DrmSession<T> session) {
     if (drmSession.release()) {
       sessions.remove(drmSession);
     }
-
-    if (sessions.isEmpty()) {
-      mediaDrm.setOnEventListener(null);
-      mediaDrmHandler.removeCallbacksAndMessages(null);
-      mediaDrmHandler = null;
-      playbackLooper = null;
-    }
   }
 
   @Override

From a3a2fb506ce30bd8a3e02eeea5b4503af2d22d44 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 14 Sep 2017 11:09:18 -0700
Subject: [PATCH 229/421] Provisioning: Fix some (admittedly quite theoretical)
 issues:

1. Only tell sessions that want provisioning when provisioning occurs.
2. Also propagate failure to provision to these sessions.
3. If a session responsible for provisioning is released, start
   provisioning using another session instead.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168713918
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 93 +++++++++++--------
 .../drm/DefaultDrmSessionManager.java         | 54 ++++++++---
 2 files changed, 97 insertions(+), 50 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 4f187264a68..e82c7e46b27 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
@@ -32,7 +32,6 @@
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A {@link DrmSession} that supports playbacks using {@link ExoMediaDrm}.
@@ -41,12 +40,29 @@
 /* package */ class DefaultDrmSession<T extends ExoMediaCrypto> implements DrmSession<T> {
 
   /**
-   * Listener of {@link DefaultDrmSession} events.
+   * Manages provisioning requests.
    */
-  public interface EventListener {
+  public interface ProvisioningManager<T extends ExoMediaCrypto> {
 
     /**
-     * Called each time provision is completed.
+     * Called when a session requires provisioning. The manager <em>may</em> call
+     * {@link #provision()} to have this session perform the provisioning operation. The manager
+     * <em>will</em> call {@link DefaultDrmSession#onProvisionCompleted()} when provisioning has
+     * completed, or {@link DefaultDrmSession#onProvisionError} if provisioning fails.
+     *
+     * @param session The session.
+     */
+    void provisionRequired(DefaultDrmSession<T> session);
+
+    /**
+     * Called by a session when it fails to perform a provisioning operation.
+     *
+     * @param error The error that occurred.
+     */
+    void onProvisionError(Exception error);
+
+    /**
+     * Called by a session when it successfully completes a provisioning operation.
      */
     void onProvisionCompleted();
 
@@ -59,14 +75,13 @@ public interface EventListener {
   private static final int MAX_LICENSE_DURATION_TO_RENEW = 60;
 
   private final ExoMediaDrm<T> mediaDrm;
+  private final ProvisioningManager<T> provisioningManager;
   private final byte[] initData;
   private final String mimeType;
   private final @DefaultDrmSessionManager.Mode int mode;
   private final HashMap<String, String> optionalKeyRequestParameters;
   private final Handler eventHandler;
   private final DefaultDrmSessionManager.EventListener eventListener;
-  private final AtomicBoolean provisioningInProgress;
-  private final EventListener sessionEventListener;
 
   /* package */ final MediaDrmCallback callback;
   /* package */ final UUID uuid;
@@ -87,6 +102,7 @@ public interface EventListener {
    *
    * @param uuid The UUID of the drm scheme.
    * @param mediaDrm The media DRM.
+   * @param provisioningManager The manager for provisioning.
    * @param initData The DRM init data.
    * @param mode The DRM mode.
    * @param offlineLicenseKeySetId The offlineLicense KeySetId.
@@ -96,13 +112,14 @@ public interface EventListener {
    * @param eventHandler The handler to post listener events.
    * @param eventListener The DRM session manager event listener.
    */
-  public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm, byte[] initData, String mimeType,
+  public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm,
+      ProvisioningManager<T> provisioningManager, byte[] initData, String mimeType,
       @DefaultDrmSessionManager.Mode int mode, byte[] offlineLicenseKeySetId,
       HashMap<String, String> optionalKeyRequestParameters, MediaDrmCallback callback,
       Looper playbackLooper, Handler eventHandler,
-      DefaultDrmSessionManager.EventListener eventListener, AtomicBoolean provisioningInProgress,
-      EventListener sessionEventListener) {
+      DefaultDrmSessionManager.EventListener eventListener) {
     this.uuid = uuid;
+    this.provisioningManager = provisioningManager;
     this.mediaDrm = mediaDrm;
     this.mode = mode;
     this.offlineLicenseKeySetId = offlineLicenseKeySetId;
@@ -111,8 +128,6 @@ public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm, byte[] initData, St
 
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
-    this.provisioningInProgress = provisioningInProgress;
-    this.sessionEventListener = sessionEventListener;
     state = STATE_OPENING;
 
     postResponseHandler = new PostResponseHandler(playbackLooper);
@@ -164,7 +179,7 @@ public boolean release() {
     return false;
   }
 
-  public boolean canReuse(byte[] initData) {
+  public boolean hasInitData(byte[] initData) {
     return Arrays.equals(this.initData, initData);
   }
 
@@ -172,7 +187,24 @@ public boolean hasSessionId(byte[] sessionId) {
     return Arrays.equals(this.sessionId, sessionId);
   }
 
-  // DrmSession Implementation.
+  // Provisioning implementation.
+
+  public void provision() {
+    ProvisionRequest request = mediaDrm.getProvisionRequest();
+    postRequestHandler.obtainMessage(MSG_PROVISION, request).sendToTarget();
+  }
+
+  public void onProvisionCompleted() {
+    if (openInternal(false)) {
+      doLicense();
+    }
+  }
+
+  public void onProvisionError(Exception error) {
+    onError(error);
+  }
+
+  // DrmSession implementation.
 
   @Override
   @DrmSession.State
@@ -221,7 +253,7 @@ private boolean openInternal(boolean allowProvisioning) {
       return true;
     } catch (NotProvisionedException e) {
       if (allowProvisioning) {
-        postProvisionRequest();
+        provisioningManager.provisionRequired(this);
       } else {
         onError(e);
       }
@@ -232,42 +264,25 @@ private boolean openInternal(boolean allowProvisioning) {
     return false;
   }
 
-  private void postProvisionRequest() {
-    if (provisioningInProgress.getAndSet(true)) {
+  private void onProvisionResponse(Object response) {
+    if (state != STATE_OPENING && !isOpen()) {
+      // This event is stale.
       return;
     }
-    ProvisionRequest request = mediaDrm.getProvisionRequest();
-    postRequestHandler.obtainMessage(MSG_PROVISION, request).sendToTarget();
-  }
 
-  private void onProvisionResponse(Object response) {
-    provisioningInProgress.set(false);
     if (response instanceof Exception) {
-      onError((Exception) response);
+      provisioningManager.onProvisionError((Exception) response);
       return;
     }
 
     try {
       mediaDrm.provideProvisionResponse((byte[]) response);
     } catch (DeniedByServerException e) {
-      onError(e);
+      provisioningManager.onProvisionError(e);
       return;
     }
 
-    if (sessionEventListener != null) {
-      sessionEventListener.onProvisionCompleted();
-    }
-  }
-
-  public void onProvisionCompleted() {
-    if (state != STATE_OPENING && !isOpen()) {
-      // This event is stale.
-      return;
-    }
-
-    if (openInternal(false)) {
-      doLicense();
-    }
+    provisioningManager.onProvisionCompleted();
   }
 
   private void doLicense() {
@@ -405,7 +420,7 @@ private void onKeysExpired() {
 
   private void onKeysError(Exception e) {
     if (e instanceof NotProvisionedException) {
-      postProvisionRequest();
+      provisioningManager.provisionRequired(this);
     } else {
       onError(e);
     }
@@ -447,7 +462,7 @@ public void onMediaDrmEvent(int what) {
         break;
       case ExoMediaDrm.EVENT_PROVISION_REQUIRED:
         state = STATE_OPENED;
-        postProvisionRequest();
+        provisioningManager.provisionRequired(this);
         break;
       default:
         break;
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 cff9f9da0fd..a0d5a932f27 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
@@ -24,6 +24,7 @@
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.OnEventListener;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
@@ -36,14 +37,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.UUID;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * A {@link DrmSessionManager} that supports playbacks using {@link ExoMediaDrm}.
  */
 @TargetApi(18)
 public class DefaultDrmSessionManager<T extends ExoMediaCrypto> implements DrmSessionManager<T>,
-    DefaultDrmSession.EventListener {
+    ProvisioningManager<T> {
 
   /**
    * Listener of {@link DefaultDrmSessionManager} events.
@@ -107,7 +107,7 @@ public interface EventListener {
   private final boolean multiSession;
 
   private final List<DefaultDrmSession<T>> sessions;
-  private final AtomicBoolean provisioningInProgress;
+  private final List<DefaultDrmSession<T>> provisioningSessions;
 
   private Looper playbackLooper;
   private int mode;
@@ -223,7 +223,7 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
     this.multiSession = multiSession;
     mode = MODE_PLAYBACK;
     sessions = new ArrayList<>();
-    provisioningInProgress = new AtomicBoolean(false);
+    provisioningSessions = new ArrayList<>();
     if (multiSession) {
       mediaDrm.setPropertyString("sessionSharing", "enable");
     }
@@ -363,17 +363,21 @@ public void run() {
       }
     }
 
-    for (DefaultDrmSession<T> s : sessions) {
-      if (!multiSession || s.canReuse(initData)) {
-        session = s;
-        break;
+    if (!multiSession) {
+      // Look for an existing session to use.
+      for (DefaultDrmSession<T> existingSession : sessions) {
+        if (existingSession.hasInitData(initData)) {
+          session = existingSession;
+          break;
+        }
       }
     }
 
     if (session == null) {
-      session = new DefaultDrmSession<T>(uuid, mediaDrm, initData, mimeType, mode,
+      // Create a new session.
+      session = new DefaultDrmSession<>(uuid, mediaDrm, this, initData, mimeType, mode,
           offlineLicenseKeySetId, optionalKeyRequestParameters, callback, playbackLooper,
-          eventHandler, eventListener, provisioningInProgress, this);
+          eventHandler, eventListener);
       sessions.add(session);
     }
     session.acquire();
@@ -385,16 +389,44 @@ public void releaseSession(DrmSession<T> session) {
     DefaultDrmSession<T> drmSession = (DefaultDrmSession<T>) session;
     if (drmSession.release()) {
       sessions.remove(drmSession);
+      if (provisioningSessions.size() > 1 && provisioningSessions.get(0) == drmSession) {
+        // Other sessions were waiting for the released session to complete a provision operation.
+        // We need to have one of those sessions perform the provision operation instead.
+        provisioningSessions.get(1).provision();
+      }
+      provisioningSessions.remove(drmSession);
+    }
+  }
+
+  // ProvisioningManager implementation.
+
+  @Override
+  public void provisionRequired(DefaultDrmSession<T> session) {
+    provisioningSessions.add(session);
+    if (provisioningSessions.size() == 1) {
+      // This is the first session requesting provisioning, so have it perform the operation.
+      session.provision();
     }
   }
 
   @Override
   public void onProvisionCompleted() {
-    for (DefaultDrmSession<T> session : sessions) {
+    for (DefaultDrmSession<T> session : provisioningSessions) {
       session.onProvisionCompleted();
     }
+    provisioningSessions.clear();
+  }
+
+  @Override
+  public void onProvisionError(Exception error) {
+    for (DefaultDrmSession<T> session : provisioningSessions) {
+      session.onProvisionError(error);
+    }
+    provisioningSessions.clear();
   }
 
+  // Internal methods.
+
   /**
    * Extracts {@link SchemeData} suitable for the given DRM scheme {@link UUID}.
    *

From 6592a6474e99d0710b0b03454bde750221a73d64 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 15 Sep 2017 03:44:41 -0700
Subject: [PATCH 230/421] Improve documentation for SCTE35-related metadata

Also expose break_durations in microseconds instead of 90kHz.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168816992
---
 .../metadata/scte35/PrivateCommand.java       |  9 +++
 .../metadata/scte35/SpliceInsertCommand.java  | 65 ++++++++++++++++---
 .../scte35/SpliceScheduleCommand.java         | 62 +++++++++++++++---
 .../metadata/scte35/TimeSignalCommand.java    |  6 ++
 .../scte35/SpliceInfoDecoderTest.java         |  4 +-
 5 files changed, 127 insertions(+), 19 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
index beb4cb9b88e..4334fa99cb2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/PrivateCommand.java
@@ -24,8 +24,17 @@
  */
 public final class PrivateCommand extends SpliceCommand {
 
+  /**
+   * The {@code pts_adjustment} as defined in SCTE35, Section 9.2.
+   */
   public final long ptsAdjustment;
+  /**
+   * The identifier as defined in SCTE35, Section 9.3.6.
+   */
   public final long identifier;
+  /**
+   * The private bytes as defined in SCTE35, Section 9.3.6.
+   */
   public final byte[] commandBytes;
 
   private PrivateCommand(long identifier, byte[] commandBytes, long ptsAdjustment) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
index 7ce8b47e2a9..6f56d3b68c0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceInsertCommand.java
@@ -29,24 +29,72 @@
  */
 public final class SpliceInsertCommand extends SpliceCommand {
 
+  /**
+   * The splice event id.
+   */
   public final long spliceEventId;
+  /**
+   * True if the event with id {@link #spliceEventId} has been canceled.
+   */
   public final boolean spliceEventCancelIndicator;
+  /**
+   * If true, the splice event is an opportunity to exit from the network feed. If false, indicates
+   * an opportunity to return to the network feed.
+   */
   public final boolean outOfNetworkIndicator;
+  /**
+   * Whether the splice mode is program splice mode, whereby all PIDs/components are to be spliced.
+   * If false, splicing is done per PID/component.
+   */
   public final boolean programSpliceFlag;
+  /**
+   * Whether splicing should be done at the nearest opportunity. If false, splicing should be done
+   * at the moment indicated by {@link #programSplicePlaybackPositionUs} or
+   * {@link ComponentSplice#componentSplicePlaybackPositionUs}, depending on
+   * {@link #programSpliceFlag}.
+   */
   public final boolean spliceImmediateFlag;
+  /**
+   * If {@link #programSpliceFlag} is true, the PTS at which the program splice should occur.
+   * {@link C#TIME_UNSET} otherwise.
+   */
   public final long programSplicePts;
+  /**
+   * Equivalent to {@link #programSplicePts} but in the playback timebase.
+   */
   public final long programSplicePlaybackPositionUs;
+  /**
+   * If {@link #programSpliceFlag} is false, a non-empty list containing the
+   * {@link ComponentSplice}s. Otherwise, an empty list.
+   */
   public final List<ComponentSplice> componentSpliceList;
+  /**
+   * If {@link #breakDurationUs} is not {@link C#TIME_UNSET}, defines whether
+   * {@link #breakDurationUs} should be used to know when to return to the network feed. If
+   * {@link #breakDurationUs} is {@link C#TIME_UNSET}, the value is undefined.
+   */
   public final boolean autoReturn;
-  public final long breakDuration;
+  /**
+   * The duration of the splice in microseconds, or {@link C#TIME_UNSET} if no duration is present.
+   */
+  public final long breakDurationUs;
+  /**
+   * The unique program id as defined in SCTE35, Section 9.3.3.
+   */
   public final int uniqueProgramId;
+  /**
+   * Holds the value of {@code avail_num} as defined in SCTE35, Section 9.3.3.
+   */
   public final int availNum;
+  /**
+   * Holds the value of {@code avails_expected} as defined in SCTE35, Section 9.3.3.
+   */
   public final int availsExpected;
 
   private SpliceInsertCommand(long spliceEventId, boolean spliceEventCancelIndicator,
       boolean outOfNetworkIndicator, boolean programSpliceFlag, boolean spliceImmediateFlag,
       long programSplicePts, long programSplicePlaybackPositionUs,
-      List<ComponentSplice> componentSpliceList, boolean autoReturn, long breakDuration,
+      List<ComponentSplice> componentSpliceList, boolean autoReturn, long breakDurationUs,
       int uniqueProgramId, int availNum, int availsExpected) {
     this.spliceEventId = spliceEventId;
     this.spliceEventCancelIndicator = spliceEventCancelIndicator;
@@ -57,7 +105,7 @@ private SpliceInsertCommand(long spliceEventId, boolean spliceEventCancelIndicat
     this.programSplicePlaybackPositionUs = programSplicePlaybackPositionUs;
     this.componentSpliceList = Collections.unmodifiableList(componentSpliceList);
     this.autoReturn = autoReturn;
-    this.breakDuration = breakDuration;
+    this.breakDurationUs = breakDurationUs;
     this.uniqueProgramId = uniqueProgramId;
     this.availNum = availNum;
     this.availsExpected = availsExpected;
@@ -78,7 +126,7 @@ private SpliceInsertCommand(Parcel in) {
     }
     this.componentSpliceList = Collections.unmodifiableList(componentSpliceList);
     autoReturn = in.readByte() == 1;
-    breakDuration = in.readLong();
+    breakDurationUs = in.readLong();
     uniqueProgramId = in.readInt();
     availNum = in.readInt();
     availsExpected = in.readInt();
@@ -98,7 +146,7 @@ private SpliceInsertCommand(Parcel in) {
     int availNum = 0;
     int availsExpected = 0;
     boolean autoReturn = false;
-    long duration = C.TIME_UNSET;
+    long breakDurationUs = C.TIME_UNSET;
     if (!spliceEventCancelIndicator) {
       int headerByte = sectionData.readUnsignedByte();
       outOfNetworkIndicator = (headerByte & 0x80) != 0;
@@ -124,7 +172,8 @@ private SpliceInsertCommand(Parcel in) {
       if (durationFlag) {
         long firstByte = sectionData.readUnsignedByte();
         autoReturn = (firstByte & 0x80) != 0;
-        duration = ((firstByte & 0x01) << 32) | sectionData.readUnsignedInt();
+        long breakDuration90khz = ((firstByte & 0x01) << 32) | sectionData.readUnsignedInt();
+        breakDurationUs = breakDuration90khz * 1000 / 90;
       }
       uniqueProgramId = sectionData.readUnsignedShort();
       availNum = sectionData.readUnsignedByte();
@@ -133,7 +182,7 @@ private SpliceInsertCommand(Parcel in) {
     return new SpliceInsertCommand(spliceEventId, spliceEventCancelIndicator, outOfNetworkIndicator,
         programSpliceFlag, spliceImmediateFlag, programSplicePts,
         timestampAdjuster.adjustTsTimestamp(programSplicePts), componentSplices, autoReturn,
-        duration, uniqueProgramId, availNum, availsExpected);
+        breakDurationUs, uniqueProgramId, availNum, availsExpected);
   }
 
   /**
@@ -181,7 +230,7 @@ public void writeToParcel(Parcel dest, int flags) {
       componentSpliceList.get(i).writeToParcel(dest);
     }
     dest.writeByte((byte) (autoReturn ? 1 : 0));
-    dest.writeLong(breakDuration);
+    dest.writeLong(breakDurationUs);
     dest.writeInt(uniqueProgramId);
     dest.writeInt(availNum);
     dest.writeInt(availsExpected);
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
index 9b391cea6cc..8696909c977 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/SpliceScheduleCommand.java
@@ -33,22 +33,62 @@ public final class SpliceScheduleCommand extends SpliceCommand {
    */
   public static final class Event {
 
+    /**
+     * The splice event id.
+     */
     public final long spliceEventId;
+    /**
+     * True if the event with id {@link #spliceEventId} has been canceled.
+     */
     public final boolean spliceEventCancelIndicator;
+    /**
+     * If true, the splice event is an opportunity to exit from the network feed. If false,
+     * indicates an opportunity to return to the network feed.
+     */
     public final boolean outOfNetworkIndicator;
+    /**
+     * Whether the splice mode is program splice mode, whereby all PIDs/components are to be
+     * spliced. If false, splicing is done per PID/component.
+     */
     public final boolean programSpliceFlag;
+    /**
+     * Represents the time of the signaled splice event as the number of seconds since 00 hours UTC,
+     * January 6th, 1980, with the count of intervening leap seconds included.
+     */
     public final long utcSpliceTime;
+    /**
+     * If {@link #programSpliceFlag} is false, a non-empty list containing the
+     * {@link ComponentSplice}s. Otherwise, an empty list.
+     */
     public final List<ComponentSplice> componentSpliceList;
+    /**
+     * If {@link #breakDurationUs} is not {@link C#TIME_UNSET}, defines whether
+     * {@link #breakDurationUs} should be used to know when to return to the network feed. If
+     * {@link #breakDurationUs} is {@link C#TIME_UNSET}, the value is undefined.
+     */
     public final boolean autoReturn;
-    public final long breakDuration;
+    /**
+     * The duration of the splice in microseconds, or {@link C#TIME_UNSET} if no duration is
+     * present.
+     */
+    public final long breakDurationUs;
+    /**
+     * The unique program id as defined in SCTE35, Section 9.3.2.
+     */
     public final int uniqueProgramId;
+    /**
+     * Holds the value of {@code avail_num} as defined in SCTE35, Section 9.3.2.
+     */
     public final int availNum;
+    /**
+     * Holds the value of {@code avails_expected} as defined in SCTE35, Section 9.3.2.
+     */
     public final int availsExpected;
 
     private Event(long spliceEventId, boolean spliceEventCancelIndicator,
         boolean outOfNetworkIndicator, boolean programSpliceFlag,
         List<ComponentSplice> componentSpliceList, long utcSpliceTime, boolean autoReturn,
-        long breakDuration, int uniqueProgramId, int availNum, int availsExpected) {
+        long breakDurationUs, int uniqueProgramId, int availNum, int availsExpected) {
       this.spliceEventId = spliceEventId;
       this.spliceEventCancelIndicator = spliceEventCancelIndicator;
       this.outOfNetworkIndicator = outOfNetworkIndicator;
@@ -56,7 +96,7 @@ private Event(long spliceEventId, boolean spliceEventCancelIndicator,
       this.componentSpliceList = Collections.unmodifiableList(componentSpliceList);
       this.utcSpliceTime = utcSpliceTime;
       this.autoReturn = autoReturn;
-      this.breakDuration = breakDuration;
+      this.breakDurationUs = breakDurationUs;
       this.uniqueProgramId = uniqueProgramId;
       this.availNum = availNum;
       this.availsExpected = availsExpected;
@@ -75,7 +115,7 @@ private Event(Parcel in) {
       this.componentSpliceList = Collections.unmodifiableList(componentSpliceList);
       this.utcSpliceTime = in.readLong();
       this.autoReturn = in.readByte() == 1;
-      this.breakDuration = in.readLong();
+      this.breakDurationUs = in.readLong();
       this.uniqueProgramId = in.readInt();
       this.availNum = in.readInt();
       this.availsExpected = in.readInt();
@@ -93,7 +133,7 @@ private static Event parseFromSection(ParsableByteArray sectionData) {
       int availNum = 0;
       int availsExpected = 0;
       boolean autoReturn = false;
-      long duration = C.TIME_UNSET;
+      long breakDurationUs = C.TIME_UNSET;
       if (!spliceEventCancelIndicator) {
         int headerByte = sectionData.readUnsignedByte();
         outOfNetworkIndicator = (headerByte & 0x80) != 0;
@@ -114,15 +154,16 @@ private static Event parseFromSection(ParsableByteArray sectionData) {
         if (durationFlag) {
           long firstByte = sectionData.readUnsignedByte();
           autoReturn = (firstByte & 0x80) != 0;
-          duration = ((firstByte & 0x01) << 32) | sectionData.readUnsignedInt();
+          long breakDuration90khz = ((firstByte & 0x01) << 32) | sectionData.readUnsignedInt();
+          breakDurationUs = breakDuration90khz * 1000 / 90;
         }
         uniqueProgramId = sectionData.readUnsignedShort();
         availNum = sectionData.readUnsignedByte();
         availsExpected = sectionData.readUnsignedByte();
       }
       return new Event(spliceEventId, spliceEventCancelIndicator, outOfNetworkIndicator,
-          programSpliceFlag, componentSplices, utcSpliceTime, autoReturn, duration, uniqueProgramId,
-          availNum, availsExpected);
+          programSpliceFlag, componentSplices, utcSpliceTime, autoReturn, breakDurationUs,
+          uniqueProgramId, availNum, availsExpected);
     }
 
     private void writeToParcel(Parcel dest) {
@@ -137,7 +178,7 @@ private void writeToParcel(Parcel dest) {
       }
       dest.writeLong(utcSpliceTime);
       dest.writeByte((byte) (autoReturn ? 1 : 0));
-      dest.writeLong(breakDuration);
+      dest.writeLong(breakDurationUs);
       dest.writeInt(uniqueProgramId);
       dest.writeInt(availNum);
       dest.writeInt(availsExpected);
@@ -173,6 +214,9 @@ private void writeToParcel(Parcel dest) {
 
   }
 
+  /**
+   * The list of scheduled events.
+   */
   public final List<Event> events;
 
   private SpliceScheduleCommand(List<Event> events) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
index f756b72d6d9..e233a276ed8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/metadata/scte35/TimeSignalCommand.java
@@ -25,7 +25,13 @@
  */
 public final class TimeSignalCommand extends SpliceCommand {
 
+  /**
+   * A PTS value, as defined in SCTE35, Section 9.3.4.
+   */
   public final long ptsTime;
+  /**
+   * Equivalent to {@link #ptsTime} but in the playback timebase.
+   */
   public final long playbackPositionUs;
 
   private TimeSignalCommand(long ptsTime, long playbackPositionUs) {
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 15cb9b23c52..8cd90c7a648 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
@@ -109,7 +109,7 @@ public void test2SpliceInsertCommands() throws MetadataDecoderException {
     assertThat(command.programSpliceFlag).isTrue();
     assertThat(command.spliceImmediateFlag).isFalse();
     assertThat(command.programSplicePlaybackPositionUs).isEqualTo(3000000);
-    assertThat(command.breakDuration).isEqualTo(TIME_UNSET);
+    assertThat(command.breakDurationUs).isEqualTo(TIME_UNSET);
     assertThat(command.uniqueProgramId).isEqualTo(16);
     assertThat(command.availNum).isEqualTo(1);
     assertThat(command.availsExpected).isEqualTo(2);
@@ -155,7 +155,7 @@ public void test2SpliceInsertCommands() throws MetadataDecoderException {
     assertThat(command.programSpliceFlag).isFalse();
     assertThat(command.spliceImmediateFlag).isFalse();
     assertThat(command.programSplicePlaybackPositionUs).isEqualTo(TIME_UNSET);
-    assertThat(command.breakDuration).isEqualTo(TIME_UNSET);
+    assertThat(command.breakDurationUs).isEqualTo(TIME_UNSET);
     List<SpliceInsertCommand.ComponentSplice> componentSplices = command.componentSpliceList;
     assertThat(componentSplices).hasSize(2);
     assertThat(componentSplices.get(0).componentTag).isEqualTo(16);

From b2bc4450df84c8c6f6720a508dc08d5249761886 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 15 Sep 2017 07:51:51 -0700
Subject: [PATCH 231/421] Run cbc1/cbcs tests from API 25 onwards

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=168834998
---
 .../playbacktests/gts/CommonEncryptionDrmTest.java        | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

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 c6dd72debdc..15acae96fd5 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
@@ -74,7 +74,9 @@ public void testCencSchemeType() {
   }
 
   public void testCbc1SchemeType() {
-    if (Util.SDK_INT < 24) {
+    if (Util.SDK_INT < 25) {
+      // cbc1 support was added in API 24, but it is stable from API 25 onwards.
+      // See [internal: b/65634809].
       // Pass.
       return;
     }
@@ -82,7 +84,9 @@ public void testCbc1SchemeType() {
   }
 
   public void testCbcsSchemeType() {
-    if (Util.SDK_INT < 24) {
+    if (Util.SDK_INT < 25) {
+      // cbcs support was added in API 24, but it is stable from API 25 onwards.
+      // See [internal: b/65634809].
       // Pass.
       return;
     }

From 457d0ba1b9b9b4995e25d028655867fb4e5821e7 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Fri, 15 Sep 2017 09:28:28 -0700
Subject: [PATCH 232/421] Work around broken AAC decoders on Galaxy S6

Issue: #3249

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

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 2cd336e9ef5..f75ce5a9e56 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
@@ -325,6 +325,21 @@ private static boolean isCodecUsableDecoder(android.media.MediaCodecInfo info, S
       return false;
     }
 
+    // Work around https://github.com/google/ExoPlayer/issues/3249.
+    if (Util.SDK_INT < 24
+        && ("OMX.SEC.aac.dec".equals(name) || "OMX.Exynos.AAC.Decoder".equals(name))
+        && Util.MANUFACTURER.equals("samsung")
+        && (Util.DEVICE.startsWith("zeroflte") // Galaxy S6
+            || Util.DEVICE.startsWith("zerolte") // Galaxy S6 Edge
+            || Util.DEVICE.startsWith("zenlte") // Galaxy S6 Edge+
+            || Util.DEVICE.equals("SC-05G") // Galaxy S6
+            || Util.DEVICE.equals("marinelteatt") // Galaxy S6 Active
+            || Util.DEVICE.equals("404SC") // Galaxy S6 Edge
+            || Util.DEVICE.equals("SC-04G")
+            || Util.DEVICE.equals("SCV31"))) {
+      return false;
+    }
+
     // 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

From 8d739067ece566284c76e2e0ac7248c790a602bb Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 18 Sep 2017 02:42:26 -0700
Subject: [PATCH 233/421] Add HlsDownloadTest

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169064003
---
 .../exoplayer2/playbacktests/gts/DashDownloadTest.java      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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 66884f3e5be..7818ddcf122 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
@@ -17,6 +17,7 @@
 
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
+import android.util.Log;
 import com.google.android.exoplayer2.offline.Downloader;
 import com.google.android.exoplayer2.offline.Downloader.ProgressListener;
 import com.google.android.exoplayer2.offline.DownloaderConstructorHelper;
@@ -178,8 +179,9 @@ private TestProgressListener(float stopAt) {
     @Override
     public void onDownloadProgress(Downloader downloader, float downloadPercentage,
         long downloadedBytes) {
-      System.out.printf("onDownloadProgress downloadPercentage = [%g], downloadedData = [%d]%n",
-          downloadPercentage, downloadedBytes);
+      Log.d("DashDownloadTest",
+          String.format("onDownloadProgress downloadPercentage = [%g], downloadedData = [%d]%n",
+          downloadPercentage, downloadedBytes));
       if (downloadPercentage >= stopAt) {
         Thread.currentThread().interrupt();
       }

From 5e2c7d967a74fe0ce67b9c57bb391c40935566d1 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 18 Sep 2017 05:44:31 -0700
Subject: [PATCH 234/421] Fix 2 CEA decoder bugs

1- Avoid dropped buffers by using a PriorityQueue instead of a set.
2- Process the end of stream after non-EOS buffers.

Issue:#3250

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169077365
---
 .../exoplayer2/text/SubtitleInputBuffer.java       |  3 +++
 .../android/exoplayer2/text/TextRenderer.java      |  8 ++++----
 .../android/exoplayer2/text/cea/CeaDecoder.java    | 14 ++++++--------
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java b/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
index 28e67e8623a..4b3b61bddf3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/SubtitleInputBuffer.java
@@ -37,6 +37,9 @@ public SubtitleInputBuffer() {
 
   @Override
   public int compareTo(@NonNull SubtitleInputBuffer other) {
+    if (isEndOfStream() != other.isEndOfStream()) {
+      return isEndOfStream() ? 1 : -1;
+    }
     long delta = timeUs - other.timeUs;
     if (delta == 0) {
       return 0;
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 c3dc2383efc..c6d7f6f163a 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
@@ -37,7 +37,7 @@
  * <p>
  * {@link Subtitle}s are decoded from sample data using {@link SubtitleDecoder} instances obtained
  * from a {@link SubtitleDecoderFactory}. The actual rendering of the subtitle {@link Cue}s is
- * delegated to an {@link TextOutput}.
+ * delegated to a {@link TextOutput}.
  */
 public final class TextRenderer extends BaseRenderer implements Callback {
 
@@ -291,9 +291,9 @@ private void replaceDecoder() {
   }
 
   private long getNextEventTime() {
-    return ((nextSubtitleEventIndex == C.INDEX_UNSET)
-        || (nextSubtitleEventIndex >= subtitle.getEventTimeCount())) ? Long.MAX_VALUE
-        : (subtitle.getEventTime(nextSubtitleEventIndex));
+    return nextSubtitleEventIndex == C.INDEX_UNSET
+        || nextSubtitleEventIndex >= subtitle.getEventTimeCount()
+        ? Long.MAX_VALUE : subtitle.getEventTime(nextSubtitleEventIndex);
   }
 
   private void updateOutput(List<Cue> cues) {
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 fac0982e659..bb13a7d1432 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
@@ -24,7 +24,7 @@
 import com.google.android.exoplayer2.text.SubtitleOutputBuffer;
 import com.google.android.exoplayer2.util.Assertions;
 import java.util.LinkedList;
-import java.util.TreeSet;
+import java.util.PriorityQueue;
 
 /**
  * Base class for subtitle parsers for CEA captions.
@@ -36,7 +36,7 @@
 
   private final LinkedList<SubtitleInputBuffer> availableInputBuffers;
   private final LinkedList<SubtitleOutputBuffer> availableOutputBuffers;
-  private final TreeSet<SubtitleInputBuffer> queuedInputBuffers;
+  private final PriorityQueue<SubtitleInputBuffer> queuedInputBuffers;
 
   private SubtitleInputBuffer dequeuedInputBuffer;
   private long playbackPositionUs;
@@ -50,7 +50,7 @@ public CeaDecoder() {
     for (int i = 0; i < NUM_OUTPUT_BUFFERS; i++) {
       availableOutputBuffers.add(new CeaOutputBuffer(this));
     }
-    queuedInputBuffers = new TreeSet<>();
+    queuedInputBuffers = new PriorityQueue<>();
   }
 
   @Override
@@ -73,7 +73,6 @@ public SubtitleInputBuffer dequeueInputBuffer() throws SubtitleDecoderException
 
   @Override
   public void queueInputBuffer(SubtitleInputBuffer inputBuffer) throws SubtitleDecoderException {
-    Assertions.checkArgument(inputBuffer != null);
     Assertions.checkArgument(inputBuffer == dequeuedInputBuffer);
     if (inputBuffer.isDecodeOnly()) {
       // We can drop this buffer early (i.e. before it would be decoded) as the CEA formats allow
@@ -90,13 +89,12 @@ public SubtitleOutputBuffer dequeueOutputBuffer() throws SubtitleDecoderExceptio
     if (availableOutputBuffers.isEmpty()) {
       return null;
     }
-
     // iterate through all available input buffers whose timestamps are less than or equal
     // to the current playback position; processing input buffers for future content should
     // be deferred until they would be applicable
     while (!queuedInputBuffers.isEmpty()
-        && queuedInputBuffers.first().timeUs <= playbackPositionUs) {
-      SubtitleInputBuffer inputBuffer = queuedInputBuffers.pollFirst();
+        && queuedInputBuffers.peek().timeUs <= playbackPositionUs) {
+      SubtitleInputBuffer inputBuffer = queuedInputBuffers.poll();
 
       // If the input buffer indicates we've reached the end of the stream, we can
       // return immediately with an output buffer propagating that
@@ -142,7 +140,7 @@ protected void releaseOutputBuffer(SubtitleOutputBuffer outputBuffer) {
   public void flush() {
     playbackPositionUs = 0;
     while (!queuedInputBuffers.isEmpty()) {
-      releaseInputBuffer(queuedInputBuffers.pollFirst());
+      releaseInputBuffer(queuedInputBuffers.poll());
     }
     if (dequeuedInputBuffer != null) {
       releaseInputBuffer(dequeuedInputBuffer);

From 9bdf1ee944ad8d021cf5a03bbdb399ff768d57d3 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Mon, 18 Sep 2017 09:39:09 -0700
Subject: [PATCH 235/421] Check if the cache is already empty before trying to
 evict more span

This case may happen if the max span size is more than the max size the
evictor is configured.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169101093
---
 .../cache/LeastRecentlyUsedCacheEvictor.java  |  2 +-
 .../LeastRecentlyUsedCacheEvictorTest.java    | 46 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java

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 d2a84f65f4a..79d23dd1b03 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
@@ -74,7 +74,7 @@ public int compare(CacheSpan lhs, CacheSpan rhs) {
   }
 
   private void evictCache(Cache cache, long requiredSpace) {
-    while (currentSize + requiredSpace > maxBytes) {
+    while (currentSize + requiredSpace > maxBytes && !leastRecentlyUsed.isEmpty()) {
       try {
         cache.removeSpan(leastRecentlyUsed.first());
       } catch (CacheException e) {
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
new file mode 100644
index 00000000000..6f7f567ae7f
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/LeastRecentlyUsedCacheEvictorTest.java
@@ -0,0 +1,46 @@
+/*
+ * 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 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.annotation.Config;
+
+/**
+ * Unit tests for {@link LeastRecentlyUsedCacheEvictor}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class LeastRecentlyUsedCacheEvictorTest {
+
+  @Before
+  public void setUp() throws Exception {
+    MockitoAnnotations.initMocks(this);
+  }
+
+  @Test
+  public void testContentBiggerThanMaxSizeDoesNotThrowException() throws Exception {
+    int maxBytes = 100;
+    LeastRecentlyUsedCacheEvictor evictor = new LeastRecentlyUsedCacheEvictor(maxBytes);
+    evictor.onCacheInitialized();
+    evictor.onStartFile(Mockito.mock(Cache.class), "key", 0, maxBytes + 1);
+  }
+
+}

From 5b0e693419c189f76cd0822fb6168311c660658b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Sep 2017 07:44:46 -0700
Subject: [PATCH 236/421] Fix DefaultDashChunkSource.updateLiveEdgeTimeUs

Very subtle, but lastAvailableSegmentNum is shifted by
RepresentationHolder.segmentNumShift. When accessing the
index directly it's necessary to unshift. The easiest way
to do this is to call through the holder, which does this
for you.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169239928
---
 .../source/dash/DefaultDashChunkSource.java           | 11 ++---------
 1 file changed, 2 insertions(+), 9 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 cd7ef6a2bff..eba36e90577 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
@@ -317,15 +317,8 @@ private ArrayList<Representation> getRepresentations() {
 
   private void updateLiveEdgeTimeUs(RepresentationHolder representationHolder,
       int lastAvailableSegmentNum) {
-    if (manifest.dynamic) {
-      DashSegmentIndex segmentIndex = representationHolder.representation.getIndex();
-      long lastSegmentDurationUs = segmentIndex.getDurationUs(lastAvailableSegmentNum,
-          manifest.getPeriodDurationUs(periodIndex));
-      liveEdgeTimeUs = segmentIndex.getTimeUs(lastAvailableSegmentNum)
-          + lastSegmentDurationUs;
-    } else {
-      liveEdgeTimeUs = C.TIME_UNSET;
-    }
+    liveEdgeTimeUs = manifest.dynamic
+        ? representationHolder.getSegmentEndTimeUs(lastAvailableSegmentNum) : C.TIME_UNSET;
   }
 
   private long getNowUnixTimeUs() {

From fed2a1a6eaf8025bc6ff8ff92c78ce7dcabc17d1 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 19 Sep 2017 08:46:04 -0700
Subject: [PATCH 237/421] Fix PTS wraparound in HLS+Webvtt

Issue:#2928

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169246424
---
 .../android/exoplayer2/source/hls/WebvttExtractor.java     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
index 12ea2c16c71..0b8f7f36a6d 100644
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/WebvttExtractor.java
@@ -141,8 +141,7 @@ private void processSample() throws ParserException {
           throw new ParserException("X-TIMESTAMP-MAP doesn't contain media timestamp: " + line);
         }
         vttTimestampUs = WebvttParserUtil.parseTimestampUs(localTimestampMatcher.group(1));
-        tsTimestampUs = TimestampAdjuster.ptsToUs(
-            Long.parseLong(mediaTimestampMatcher.group(1)));
+        tsTimestampUs = TimestampAdjuster.ptsToUs(Long.parseLong(mediaTimestampMatcher.group(1)));
       }
     }
 
@@ -155,8 +154,8 @@ private void processSample() throws ParserException {
     }
 
     long firstCueTimeUs = WebvttParserUtil.parseTimestampUs(cueHeaderMatcher.group(1));
-    long sampleTimeUs = timestampAdjuster.adjustSampleTimestamp(
-        firstCueTimeUs + tsTimestampUs - vttTimestampUs);
+    long sampleTimeUs = timestampAdjuster.adjustTsTimestamp(
+        TimestampAdjuster.usToPts(firstCueTimeUs + tsTimestampUs - vttTimestampUs));
     long subsampleOffsetUs = sampleTimeUs - firstCueTimeUs;
     // Output the track.
     TrackOutput trackOutput = buildTrackOutput(subsampleOffsetUs);

From 8a0e148041ad4368276c407afcc841c6848f8099 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 19 Sep 2017 09:07:04 -0700
Subject: [PATCH 238/421] Workaround a cipher issue in Android 4.3

[]

Issue: #2755

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169249093
---
 .../upstream/cache/CachedContentIndex.java         | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 e1c2c13865a..f043771e30e 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
@@ -99,7 +99,7 @@ public CachedContentIndex(File cacheDir, byte[] secretKey, boolean encrypt) {
     if (secretKey != null) {
       Assertions.checkArgument(secretKey.length == 16);
       try {
-        cipher = Cipher.getInstance("AES/CBC/PKCS5PADDING");
+        cipher = getCipher();
         secretKeySpec = new SecretKeySpec(secretKey, "AES");
       } catch (NoSuchAlgorithmException | NoSuchPaddingException e) {
         throw new IllegalStateException(e); // Should never happen.
@@ -354,6 +354,18 @@ private CachedContent addNew(String key, long length) {
     return cachedContent;
   }
 
+  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");
+  }
+
   /**
    * 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

From 09248608c08ebd349b5805a9e4685b147c41e55f Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 19 Sep 2017 09:10:35 -0700
Subject: [PATCH 239/421] Notify span listeners even if index store fails in
 SimpleCache.removeSpan

This fixes infinite loop in LeastRecentlyUsedCacheEvictor.evictCache when index store fails.

Also made CachedContentIndex not final so it can be mocked and added a package protected SimpleCache
constructor so mock index can be injected.

Issue: #3260

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169249517
---
 .../upstream/cache/CachedContentIndex.java    |  2 +-
 .../upstream/cache/SimpleCache.java           | 27 ++++++++---
 .../upstream/cache/SimpleCacheTest.java       | 45 ++++++++++++++++++-
 3 files changed, 66 insertions(+), 8 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 f043771e30e..5d92c51dcc8 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
@@ -49,7 +49,7 @@
 /**
  * This class maintains the index of cached content.
  */
-/*package*/ final 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 bb1ac83698a..2fe16287db4 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
@@ -47,7 +47,7 @@ public final class SimpleCache implements Cache {
    * @param evictor The evictor to be used.
    */
   public SimpleCache(File cacheDir, CacheEvictor evictor) {
-    this(cacheDir, evictor, null);
+    this(cacheDir, evictor, null, false);
   }
 
   /**
@@ -74,10 +74,22 @@ public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey) {
    * @param encrypt When false, a plaintext index will be written.
    */
   public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey, boolean encrypt) {
+    this(cacheDir, evictor, new CachedContentIndex(cacheDir, secretKey, encrypt));
+  }
+
+  /**
+   * 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 index The CachedContentIndex to be used.
+   */
+  /*package*/ SimpleCache(File cacheDir, CacheEvictor evictor, CachedContentIndex index) {
     this.cacheDir = cacheDir;
     this.evictor = evictor;
     this.lockedSpans = new HashMap<>();
-    this.index = new CachedContentIndex(cacheDir, secretKey, encrypt);
+    this.index = index;
     this.listeners = new HashMap<>();
     // Start cache initialization.
     final ConditionVariable conditionVariable = new ConditionVariable();
@@ -304,11 +316,14 @@ private void removeSpan(CacheSpan span, boolean removeEmptyCachedContent) throws
       return;
     }
     totalSpace -= span.length;
-    if (removeEmptyCachedContent && cachedContent.isEmpty()) {
-      index.removeEmpty(cachedContent.key);
-      index.store();
+    try {
+      if (removeEmptyCachedContent && cachedContent.isEmpty()) {
+        index.removeEmpty(cachedContent.key);
+        index.store();
+      }
+    } finally {
+      notifySpanRemoved(span);
     }
-    notifySpanRemoved(span);
   }
 
   @Override
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 ed550458358..d5894895b1f 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
@@ -18,8 +18,10 @@
 import static com.google.android.exoplayer2.C.LENGTH_UNSET;
 import static com.google.android.exoplayer2.util.Util.toByteArray;
 import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.doAnswer;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.upstream.cache.Cache.CacheException;
 import com.google.android.exoplayer2.util.Util;
 import java.io.File;
 import java.io.FileInputStream;
@@ -29,9 +31,14 @@
 import java.util.Random;
 import java.util.Set;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+import org.mockito.invocation.InvocationOnMock;
+import org.mockito.stubbing.Answer;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -49,6 +56,7 @@ public class SimpleCacheTest {
 
   @Before
   public void setUp() throws Exception {
+    MockitoAnnotations.initMocks(this);
     cacheDir = Util.createTempDirectory(RuntimeEnvironment.application, "ExoPlayerTest");
   }
 
@@ -209,7 +217,6 @@ public void testEncryptedIndexLostKey() throws Exception {
     assertThat(cacheDir.listFiles()).hasLength(0);
   }
 
-
   @Test
   public void testGetCachedBytes() throws Exception {
     SimpleCache simpleCache = getSimpleCache();
@@ -245,6 +252,42 @@ public void testGetCachedBytes() throws Exception {
     simpleCache.releaseHoleSpan(cacheSpan);
   }
 
+  /* Tests https://github.com/google/ExoPlayer/issues/3260 case. */
+  @Test
+  public void testExceptionDuringEvictionByLeastRecentlyUsedCacheEvictorNotHang() throws Exception {
+    CachedContentIndex index = Mockito.spy(new CachedContentIndex(cacheDir));
+    SimpleCache simpleCache =
+        new SimpleCache(cacheDir, new LeastRecentlyUsedCacheEvictor(20), index);
+
+    // Add some content.
+    CacheSpan cacheSpan = simpleCache.startReadWrite(KEY_1, 0);
+    addCache(simpleCache, KEY_1, 0, 15);
+
+    // Make index.store() throw exception from now on.
+    doAnswer(new Answer<Object>() {
+      @Override
+      public Object answer(InvocationOnMock invocation) throws Throwable {
+        throw new Cache.CacheException("SimpleCacheTest");
+      }
+    }).when(index).store();
+
+    // Adding more content will make LeastRecentlyUsedCacheEvictor evict previous content.
+    try {
+      addCache(simpleCache, KEY_1, 15, 15);
+      Assert.fail("Exception was expected");
+    } catch (CacheException e) {
+      // do nothing.
+    }
+
+    simpleCache.releaseHoleSpan(cacheSpan);
+
+    // Although store() has failed, it should remove the first span and add the new one.
+    NavigableSet<CacheSpan> cachedSpans = simpleCache.getCachedSpans(KEY_1);
+    assertThat(cachedSpans).isNotNull();
+    assertThat(cachedSpans).hasSize(1);
+    assertThat(cachedSpans.pollFirst().position).isEqualTo(15);
+  }
+
   private SimpleCache getSimpleCache() {
     return new SimpleCache(cacheDir, new NoOpCacheEvictor());
   }

From 89f66924d514732ffa74689d22c97b0fe3c16a38 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Sep 2017 09:48:28 -0700
Subject: [PATCH 240/421] Use IntDef for MediaCodecRenderer internal states

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169254794
---
 .../exoplayer2/mediacodec/MediaCodecRenderer.java | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 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 d6725e373a2..761b23fe58e 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
@@ -23,6 +23,7 @@
 import android.media.MediaFormat;
 import android.os.Looper;
 import android.os.SystemClock;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.BaseRenderer;
@@ -42,6 +43,8 @@
 import com.google.android.exoplayer2.util.NalUnitUtil;
 import com.google.android.exoplayer2.util.TraceUtil;
 import com.google.android.exoplayer2.util.Util;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.List;
@@ -126,6 +129,10 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
    */
   private static final long MAX_CODEC_HOTSWAP_TIME_MS = 1000;
 
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({RECONFIGURATION_STATE_NONE, RECONFIGURATION_STATE_WRITE_PENDING,
+      RECONFIGURATION_STATE_QUEUE_PENDING})
+  private @interface ReconfigurationState {}
   /**
    * There is no pending adaptive reconfiguration work.
    */
@@ -140,6 +147,10 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
    */
   private static final int RECONFIGURATION_STATE_QUEUE_PENDING = 2;
 
+  @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.
    */
@@ -198,8 +209,8 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
   private int outputIndex;
   private boolean shouldSkipOutputBuffer;
   private boolean codecReconfigured;
-  private int codecReconfigurationState;
-  private int codecReinitializationState;
+  private @ReconfigurationState int codecReconfigurationState;
+  private @ReinitializationState int codecReinitializationState;
   private boolean codecReceivedBuffers;
   private boolean codecReceivedEos;
 

From d346266dc9631a985c662c6c1e444f47bbb12caa Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Sep 2017 09:57:07 -0700
Subject: [PATCH 241/421] Workaround Samsung tablet reboot playing adaptive
 secure content

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169256059
---
 .../mediacodec/MediaCodecRenderer.java        | 57 ++++++++++++++-----
 1 file changed, 42 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 761b23fe58e..1ad6c1eed7b 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
@@ -168,9 +168,26 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
    */
   private static final int REINITIALIZATION_STATE_WAIT_END_OF_STREAM = 2;
 
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({ADAPTATION_WORKAROUND_MODE_NEVER, ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION,
+      ADAPTATION_WORKAROUND_MODE_ALWAYS})
+  private @interface AdaptationWorkaroundMode {}
+  /**
+   * The adaptation workaround is never used.
+   */
+  private static final int ADAPTATION_WORKAROUND_MODE_NEVER = 0;
+  /**
+   * The adaptation workaround is used when adapting between formats of the same resolution only.
+   */
+  private static final int ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION = 1;
+  /**
+   * The adaptation workaround is always used when adapting between formats.
+   */
+  private static final int ADAPTATION_WORKAROUND_MODE_ALWAYS = 2;
+
   /**
    * H.264/AVC buffer to queue when using the adaptation workaround (see
-   * {@link #codecNeedsAdaptationWorkaround(String)}. Consists of three NAL units with start codes:
+   * {@link #codecAdaptationWorkaroundMode(String)}. Consists of three NAL units with start codes:
    * Baseline sequence/picture parameter sets and a 32 * 32 pixel IDR slice. This stream can be
    * queued to force a resolution change when adapting to a new format.
    */
@@ -193,9 +210,9 @@ private static String buildCustomDiagnosticInfo(int errorCode) {
   private DrmSession<FrameworkMediaCrypto> pendingDrmSession;
   private MediaCodec codec;
   private MediaCodecInfo codecInfo;
+  private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode;
   private boolean codecNeedsDiscardToSpsWorkaround;
   private boolean codecNeedsFlushWorkaround;
-  private boolean codecNeedsAdaptationWorkaround;
   private boolean codecNeedsEosPropagationWorkaround;
   private boolean codecNeedsEosFlushWorkaround;
   private boolean codecNeedsEosOutputExceptionWorkaround;
@@ -361,9 +378,9 @@ protected final void maybeInitCodec() throws ExoPlaybackException {
     }
 
     String codecName = codecInfo.name;
+    codecAdaptationWorkaroundMode = codecAdaptationWorkaroundMode(codecName);
     codecNeedsDiscardToSpsWorkaround = codecNeedsDiscardToSpsWorkaround(codecName, format);
     codecNeedsFlushWorkaround = codecNeedsFlushWorkaround(codecName);
-    codecNeedsAdaptationWorkaround = codecNeedsAdaptationWorkaround(codecName);
     codecNeedsEosPropagationWorkaround = codecNeedsEosPropagationWorkaround(codecName);
     codecNeedsEosFlushWorkaround = codecNeedsEosFlushWorkaround(codecName);
     codecNeedsEosOutputExceptionWorkaround = codecNeedsEosOutputExceptionWorkaround(codecName);
@@ -464,7 +481,7 @@ protected void releaseCodec() {
     codecReceivedBuffers = false;
     codecNeedsDiscardToSpsWorkaround = false;
     codecNeedsFlushWorkaround = false;
-    codecNeedsAdaptationWorkaround = false;
+    codecAdaptationWorkaroundMode = ADAPTATION_WORKAROUND_MODE_NEVER;
     codecNeedsEosPropagationWorkaround = false;
     codecNeedsEosFlushWorkaround = false;
     codecNeedsMonoChannelCountWorkaround = false;
@@ -808,8 +825,10 @@ protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackExceptio
         && canReconfigureCodec(codec, codecInfo.adaptive, oldFormat, format)) {
       codecReconfigured = true;
       codecReconfigurationState = RECONFIGURATION_STATE_WRITE_PENDING;
-      codecNeedsAdaptationWorkaroundBuffer = codecNeedsAdaptationWorkaround
-          && format.width == oldFormat.width && format.height == oldFormat.height;
+      codecNeedsAdaptationWorkaroundBuffer =
+          codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_ALWAYS
+          || (codecAdaptationWorkaroundMode == ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION
+              && format.width == oldFormat.width && format.height == oldFormat.height);
     } else {
       if (codecReceivedBuffers) {
         // Signal end of stream and wait for any final output buffers before re-initialization.
@@ -995,7 +1014,7 @@ private boolean drainOutputBuffer(long positionUs, long elapsedRealtimeUs)
    */
   private void processOutputFormat() throws ExoPlaybackException {
     MediaFormat format = codec.getOutputFormat();
-    if (codecNeedsAdaptationWorkaround
+    if (codecAdaptationWorkaroundMode != ADAPTATION_WORKAROUND_MODE_NEVER
         && format.getInteger(MediaFormat.KEY_WIDTH) == ADAPTATION_WORKAROUND_SLICE_WIDTH_HEIGHT
         && format.getInteger(MediaFormat.KEY_HEIGHT) == ADAPTATION_WORKAROUND_SLICE_WIDTH_HEIGHT) {
       // We assume this format changed event was caused by the adaptation workaround.
@@ -1109,22 +1128,30 @@ private static boolean codecNeedsFlushWorkaround(String name) {
   }
 
   /**
-   * Returns whether the decoder is known to get stuck during some adaptations where the resolution
-   * does not change.
+   * Returns a mode that specifies when the adaptation workaround should be enabled.
    * <p>
-   * If true is returned, the renderer will work around the issue by queueing and discarding a blank
-   * frame at a different resolution, which resets the codec's internal state.
+   * When enabled, the workaround queues and discards a blank frame with a resolution whose width
+   * and height both equal {@link #ADAPTATION_WORKAROUND_SLICE_WIDTH_HEIGHT}, to reset the codec's
+   * internal state when a format change occurs.
    * <p>
    * See [Internal: b/27807182].
+   * See <a href="https://github.com/google/ExoPlayer/issues/3257">GitHub issue #3257</a>.
    *
    * @param name The name of the decoder.
-   * @return True if the decoder is known to get stuck during some adaptations.
+   * @return The mode specifying when the adaptation workaround should be enabled.
    */
-  private static boolean codecNeedsAdaptationWorkaround(String name) {
-    return Util.SDK_INT < 24
+  private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode(String name) {
+    if (Util.SDK_INT <= 24 && "OMX.Exynos.avc.dec.secure".equals(name)
+        && Util.MODEL.startsWith("SM-T585")) {
+      return ADAPTATION_WORKAROUND_MODE_ALWAYS;
+    } else if (Util.SDK_INT < 24
         && ("OMX.Nvidia.h264.decode".equals(name) || "OMX.Nvidia.h264.decode.secure".equals(name))
         && ("flounder".equals(Util.DEVICE) || "flounder_lte".equals(Util.DEVICE)
-        || "grouper".equals(Util.DEVICE) || "tilapia".equals(Util.DEVICE));
+        || "grouper".equals(Util.DEVICE) || "tilapia".equals(Util.DEVICE))) {
+      return ADAPTATION_WORKAROUND_MODE_SAME_RESOLUTION;
+    } else {
+      return ADAPTATION_WORKAROUND_MODE_NEVER;
+    }
   }
 
   /**

From ed76882271e45f1098ad69f8e796f836d6d193f0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 19 Sep 2017 10:04:50 -0700
Subject: [PATCH 242/421] Bump version + release notes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169257339
---
 RELEASENOTES.md                                 | 17 +++++++++++++++++
 constants.gradle                                |  2 +-
 demos/cast/src/main/AndroidManifest.xml         |  4 ++--
 demos/main/src/main/AndroidManifest.xml         |  4 ++--
 .../exoplayer2/ExoPlayerLibraryInfo.java        |  6 +++---
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b6941435426..db57428701c 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,22 @@
 # Release notes #
 
+### r2.5.3 ###
+
+* IMA extension: Support skipping of skippable ads on AndroidTV and other
+  non-touch devices ([#3258](https://github.com/google/ExoPlayer/issues/3258)).
+* HLS: Fix broken WebVTT captions when PTS wraps around
+  ([#2928](https://github.com/google/ExoPlayer/issues/2928)).
+* Captions: Fix issues rendering CEA-608 captions
+  ([#3250](https://github.com/google/ExoPlayer/issues/3250)).
+* Fix adaptive switching for live playbacks close to the live edge
+  ([#3017](https://github.com/google/ExoPlayer/issues/3017)).
+* Workaround broken AAC decoders on Galaxy S6
+  ([#3249](https://github.com/google/ExoPlayer/issues/3249)).
+* Caching: Fix infinite loop when cache eviction fails
+  ([#3260](https://github.com/google/ExoPlayer/issues/3260)).
+* Caching: Force use of BouncyCastle on JellyBean to fix decryption issue
+  ([#2755](https://github.com/google/ExoPlayer/issues/2755)).
+
 ### r2.5.2 ###
 
 * IMA extension: Fix issue where ad playback could end prematurely for some
diff --git a/constants.gradle b/constants.gradle
index 78dd343a945..73d6aa5c560 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -28,7 +28,7 @@ project.ext {
     junitVersion = '4.12'
     truthVersion = '0.35'
     robolectricVersion = '3.4.2'
-    releaseVersion = 'r2.5.2'
+    releaseVersion = 'r2.5.3'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index ee3177323e1..95dfb5f8e03 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.castdemo"
-    android:versionCode="2502"
-    android:versionName="2.5.2">
+    android:versionCode="2503"
+    android:versionName="2.5.3">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 50a39f11a6c..4a9eec40025 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
-    android:versionCode="2502"
-    android:versionName="2.5.2">
+    android:versionCode="2503"
+    android:versionName="2.5.3">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
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 98eeb99ad8a..90385ed6c0d 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
@@ -31,13 +31,13 @@ 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.5.2";
+  public static final String VERSION = "2.5.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.5.2";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.3";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -47,7 +47,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 = 2005002;
+  public static final int VERSION_INT = 2005003;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From 67567ffa6c5d3b5c532eaf2d78874a7ab9932209 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Sep 2017 03:36:32 -0700
Subject: [PATCH 243/421] TsExtractor: Do less work if payload reader does not
 exist

There's no reason to perform the discontinuity check or skip
the adaptation field if we don't have a payload reader for
the packet.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169374609
---
 .../exoplayer2/extractor/ts/TsExtractor.java  | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

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 90506ab2f62..213d30d47d4 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
@@ -263,20 +263,24 @@ public int read(ExtractorInput input, PositionHolder seekPosition)
     boolean adaptationFieldExists = (tsPacketHeader & 0x20) != 0;
     boolean payloadExists = (tsPacketHeader & 0x10) != 0;
 
+    TsPayloadReader payloadReader = payloadExists ? tsPayloadReaders.get(pid) : null;
+    if (payloadReader == null) {
+      tsPacketBuffer.setPosition(endOfPacket);
+      return RESULT_CONTINUE;
+    }
+
     // Discontinuity check.
-    boolean discontinuityFound = false;
     if (mode != MODE_HLS) {
       int continuityCounter = tsPacketHeader & 0xF;
       int previousCounter = continuityCounters.get(pid, continuityCounter - 1);
       continuityCounters.put(pid, continuityCounter);
       if (previousCounter == continuityCounter) {
-        if (payloadExists) {
-          // Duplicate packet found.
-          tsPacketBuffer.setPosition(endOfPacket);
-          return RESULT_CONTINUE;
-        }
+        // Duplicate packet found.
+        tsPacketBuffer.setPosition(endOfPacket);
+        return RESULT_CONTINUE;
       } else if (continuityCounter != ((previousCounter + 1) & 0xF)) {
-        discontinuityFound = true;
+        // Discontinuity found.
+        payloadReader.seek();
       }
     }
 
@@ -287,17 +291,9 @@ public int read(ExtractorInput input, PositionHolder seekPosition)
     }
 
     // Read the payload.
-    if (payloadExists) {
-      TsPayloadReader payloadReader = tsPayloadReaders.get(pid);
-      if (payloadReader != null) {
-        if (discontinuityFound) {
-          payloadReader.seek();
-        }
-        tsPacketBuffer.setLimit(endOfPacket);
-        payloadReader.consume(tsPacketBuffer, payloadUnitStartIndicator);
-        tsPacketBuffer.setLimit(limit);
-      }
-    }
+    tsPacketBuffer.setLimit(endOfPacket);
+    payloadReader.consume(tsPacketBuffer, payloadUnitStartIndicator);
+    tsPacketBuffer.setLimit(limit);
 
     tsPacketBuffer.setPosition(endOfPacket);
     return RESULT_CONTINUE;

From 26d789e6d3e1160d14cde0d06a7cb0ddbe82a4c7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Sep 2017 03:37:59 -0700
Subject: [PATCH 244/421] Tweak release notes for 2.5.3

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

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index db57428701c..c63a20ba946 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -8,8 +8,6 @@
   ([#2928](https://github.com/google/ExoPlayer/issues/2928)).
 * Captions: Fix issues rendering CEA-608 captions
   ([#3250](https://github.com/google/ExoPlayer/issues/3250)).
-* Fix adaptive switching for live playbacks close to the live edge
-  ([#3017](https://github.com/google/ExoPlayer/issues/3017)).
 * Workaround broken AAC decoders on Galaxy S6
   ([#3249](https://github.com/google/ExoPlayer/issues/3249)).
 * Caching: Fix infinite loop when cache eviction fails

From 6314a0ec82343ee79075e7f8794a69471599b019 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 20 Sep 2017 05:38:24 -0700
Subject: [PATCH 245/421] Add support for Widevine encrypted HLS

This includes both cbcs and cenc. Will only work for streams that require a single
pssh.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169382884
---
 .../android/exoplayer2/drm/DrmInitData.java   | 10 ++-
 .../extractor/mp4/FragmentedMp4Extractor.java | 16 +++--
 .../playlist/HlsMediaPlaylistParserTest.java  | 17 ++---
 .../exoplayer2/source/hls/HlsChunkSource.java |  8 +--
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 36 +++++-----
 .../source/hls/offline/HlsDownloader.java     |  5 +-
 .../source/hls/playlist/HlsMediaPlaylist.java | 45 ++++++-------
 .../hls/playlist/HlsPlaylistParser.java       | 65 ++++++++++++++-----
 .../smoothstreaming/DefaultSsChunkSource.java |  2 +-
 9 files changed, 122 insertions(+), 82 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 c8e76ec2914..e346ab800f2 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
@@ -58,7 +58,15 @@ public DrmInitData(List<SchemeData> schemeDatas) {
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
   public DrmInitData(SchemeData... schemeDatas) {
-    this(null, true, schemeDatas);
+    this(null, schemeDatas);
+  }
+
+  /**
+   * @param schemeType The protection scheme type, or null if not applicable or unknown.
+   * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
+   */
+  public DrmInitData(@Nullable String schemeType, SchemeData... schemeDatas) {
+    this(schemeType, true, schemeDatas);
   }
 
   private DrmInitData(@Nullable String schemeType, boolean cloneSchemeDatas,
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 d9ab47546a7..4807e052772 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
@@ -120,6 +120,9 @@ public Extractor[] createExtractors() {
   @Flags private final int flags;
   private final Track sideloadedTrack;
 
+  // Manifest DRM data.
+  private final DrmInitData sideloadedDrmInitData;
+
   // Track-linked data bundle, accessible as a whole through trackID.
   private final SparseArray<TrackBundle> trackBundles;
 
@@ -179,7 +182,7 @@ public FragmentedMp4Extractor(@Flags int flags) {
    * @param timestampAdjuster Adjusts sample timestamps. May be null if no adjustment is needed.
    */
   public FragmentedMp4Extractor(@Flags int flags, TimestampAdjuster timestampAdjuster) {
-    this(flags, timestampAdjuster, null);
+    this(flags, timestampAdjuster, null, null);
   }
 
   /**
@@ -187,12 +190,14 @@ public FragmentedMp4Extractor(@Flags int flags, TimestampAdjuster timestampAdjus
    * @param timestampAdjuster Adjusts sample timestamps. May be null if no adjustment is needed.
    * @param sideloadedTrack Sideloaded track information, in the case that the extractor
    *     will not receive a moov box in the input data.
+   * @param sideloadedDrmInitData The {@link DrmInitData} to use for encrypted tracks.
    */
   public FragmentedMp4Extractor(@Flags int flags, TimestampAdjuster timestampAdjuster,
-      Track sideloadedTrack) {
+      Track sideloadedTrack, DrmInitData sideloadedDrmInitData) {
     this.flags = flags | (sideloadedTrack != null ? FLAG_SIDELOADED : 0);
     this.timestampAdjuster = timestampAdjuster;
     this.sideloadedTrack = sideloadedTrack;
+    this.sideloadedDrmInitData = sideloadedDrmInitData;
     atomHeader = new ParsableByteArray(Atom.LONG_HEADER_SIZE);
     nalStartCode = new ParsableByteArray(NalUnitUtil.NAL_START_CODE);
     nalPrefix = new ParsableByteArray(5);
@@ -402,7 +407,8 @@ private void onContainerAtomRead(ContainerAtom container) throws ParserException
   private void onMoovContainerAtomRead(ContainerAtom moov) throws ParserException {
     Assertions.checkState(sideloadedTrack == null, "Unexpected moov box.");
 
-    DrmInitData drmInitData = getDrmInitDataFromAtoms(moov.leafChildren);
+    DrmInitData drmInitData = sideloadedDrmInitData != null ? sideloadedDrmInitData
+        : getDrmInitDataFromAtoms(moov.leafChildren);
 
     // Read declaration of track fragments in the Moov box.
     ContainerAtom mvex = moov.getContainerAtomOfType(Atom.TYPE_mvex);
@@ -456,7 +462,9 @@ private void onMoovContainerAtomRead(ContainerAtom moov) throws ParserException
 
   private void onMoofContainerAtomRead(ContainerAtom moof) throws ParserException {
     parseMoof(moof, trackBundles, flags, extendedTypeScratch);
-    DrmInitData drmInitData = getDrmInitDataFromAtoms(moof.leafChildren);
+    // If drm init data is sideloaded, we ignore pssh boxes.
+    DrmInitData drmInitData = sideloadedDrmInitData != null ? null
+        : getDrmInitDataFromAtoms(moof.leafChildren);
     if (drmInitData != null) {
       int trackCount = trackBundles.size();
       for (int i = 0; i < trackCount; i++) {
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
index e2eb173df8a..b036f13a0f7 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
@@ -85,9 +85,8 @@ public void testParseMediaPlaylist() {
       Segment segment = segments.get(0);
       assertEquals(4, mediaPlaylist.discontinuitySequence + segment.relativeDiscontinuitySequence);
       assertEquals(7975000, segment.durationUs);
-      assertFalse(segment.isEncrypted);
-      assertEquals(null, segment.encryptionKeyUri);
-      assertEquals(null, segment.encryptionIV);
+      assertNull(segment.fullSegmentEncryptionKeyUri);
+      assertNull(segment.encryptionIV);
       assertEquals(51370, segment.byterangeLength);
       assertEquals(0, segment.byterangeOffset);
       assertEquals("https://priv.example.com/fileSequence2679.ts", segment.url);
@@ -95,8 +94,7 @@ public void testParseMediaPlaylist() {
       segment = segments.get(1);
       assertEquals(0, segment.relativeDiscontinuitySequence);
       assertEquals(7975000, segment.durationUs);
-      assertTrue(segment.isEncrypted);
-      assertEquals("https://priv.example.com/key.php?r=2680", segment.encryptionKeyUri);
+      assertEquals("https://priv.example.com/key.php?r=2680", segment.fullSegmentEncryptionKeyUri);
       assertEquals("0x1566B", segment.encryptionIV);
       assertEquals(51501, segment.byterangeLength);
       assertEquals(2147483648L, segment.byterangeOffset);
@@ -105,8 +103,7 @@ public void testParseMediaPlaylist() {
       segment = segments.get(2);
       assertEquals(0, segment.relativeDiscontinuitySequence);
       assertEquals(7941000, segment.durationUs);
-      assertFalse(segment.isEncrypted);
-      assertEquals(null, segment.encryptionKeyUri);
+      assertNull(segment.fullSegmentEncryptionKeyUri);
       assertEquals(null, segment.encryptionIV);
       assertEquals(51501, segment.byterangeLength);
       assertEquals(2147535149L, segment.byterangeOffset);
@@ -115,8 +112,7 @@ public void testParseMediaPlaylist() {
       segment = segments.get(3);
       assertEquals(1, segment.relativeDiscontinuitySequence);
       assertEquals(7975000, segment.durationUs);
-      assertTrue(segment.isEncrypted);
-      assertEquals("https://priv.example.com/key.php?r=2682", segment.encryptionKeyUri);
+      assertEquals("https://priv.example.com/key.php?r=2682", segment.fullSegmentEncryptionKeyUri);
       // 0xA7A == 2682.
       assertNotNull(segment.encryptionIV);
       assertEquals("A7A", segment.encryptionIV.toUpperCase(Locale.getDefault()));
@@ -127,8 +123,7 @@ public void testParseMediaPlaylist() {
       segment = segments.get(4);
       assertEquals(1, segment.relativeDiscontinuitySequence);
       assertEquals(7975000, segment.durationUs);
-      assertTrue(segment.isEncrypted);
-      assertEquals("https://priv.example.com/key.php?r=2682", segment.encryptionKeyUri);
+      assertEquals("https://priv.example.com/key.php?r=2682", segment.fullSegmentEncryptionKeyUri);
       // 0xA7B == 2683.
       assertNotNull(segment.encryptionIV);
       assertEquals("A7B", segment.encryptionIV.toUpperCase(Locale.getDefault()));
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 0ad9dd1a6ec..a5688e8bc55 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
@@ -276,9 +276,9 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     // Handle encryption.
     HlsMediaPlaylist.Segment segment = mediaPlaylist.segments.get(chunkIndex);
 
-    // Check if encryption is specified.
-    if (segment.isEncrypted) {
-      Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.encryptionKeyUri);
+    // 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,
@@ -314,7 +314,7 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     out.chunk = new HlsMediaChunk(mediaDataSource, dataSpec, initDataSpec, selectedUrl,
         muxedCaptionFormats, trackSelection.getSelectionReason(), trackSelection.getSelectionData(),
         startTimeUs, startTimeUs + segment.durationUs, chunkMediaSequence, discontinuitySequence,
-        isTimestampMaster, timestampAdjuster, previous, segment.keyFormat, encryptionKey,
+        isTimestampMaster, timestampAdjuster, previous, mediaPlaylist.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 e3e1bab48d6..91513b536e3 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
@@ -18,6 +18,7 @@
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
 import com.google.android.exoplayer2.extractor.Extractor;
 import com.google.android.exoplayer2.extractor.ExtractorInput;
@@ -32,7 +33,6 @@
 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.MimeTypes;
@@ -88,6 +88,7 @@
   private final boolean shouldSpliceIn;
   private final boolean needNewExtractor;
   private final List<Format> muxedCaptionFormats;
+  private final DrmInitData drmInitData;
 
   private final boolean isPackedAudio;
   private final Id3Decoder id3Decoder;
@@ -117,20 +118,21 @@
    * @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 keyFormat A string describing the format for {@code keyData}, or null if the chunk is
-   *     not encrypted.
-   * @param keyData Data specifying how to obtain the keys to decrypt the chunk, or null if the
-   *     chunk is not encrypted.
-   * @param encryptionIv The AES initialization vector, or null if the chunk is not encrypted.
+   * @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(DataSource dataSource, DataSpec dataSpec, DataSpec initDataSpec,
       HlsUrl hlsUrl, List<Format> muxedCaptionFormats, int trackSelectionReason,
       Object trackSelectionData, long startTimeUs, long endTimeUs, int chunkIndex,
       int discontinuitySequenceNumber, boolean isMasterTimestampSource,
-      TimestampAdjuster timestampAdjuster, HlsMediaChunk previousChunk, String keyFormat,
-      byte[] keyData, byte[] encryptionIv) {
-    super(buildDataSource(dataSource, keyFormat, keyData, encryptionIv), dataSpec, hlsUrl.format,
-        trackSelectionReason, trackSelectionData, startTimeUs, endTimeUs, chunkIndex);
+      TimestampAdjuster timestampAdjuster, HlsMediaChunk previousChunk, DrmInitData drmInitData,
+      byte[] fullSegmentEncryptionKey, byte[] encryptionIv) {
+    super(buildDataSource(dataSource, fullSegmentEncryptionKey, encryptionIv), dataSpec,
+        hlsUrl.format, trackSelectionReason, trackSelectionData, startTimeUs, endTimeUs,
+        chunkIndex);
     this.discontinuitySequenceNumber = discontinuitySequenceNumber;
     this.initDataSpec = initDataSpec;
     this.hlsUrl = hlsUrl;
@@ -139,6 +141,7 @@ public HlsMediaChunk(DataSource dataSource, DataSpec dataSpec, DataSpec initData
     this.timestampAdjuster = timestampAdjuster;
     // Note: this.dataSource and dataSource may be different.
     this.isEncrypted = this.dataSource instanceof Aes128DataSource;
+    this.drmInitData = drmInitData;
     lastPathSegment = dataSpec.uri.getLastPathSegment();
     isPackedAudio = lastPathSegment.endsWith(AAC_FILE_EXTENSION)
         || lastPathSegment.endsWith(AC3_FILE_EXTENSION)
@@ -331,14 +334,13 @@ private long peekId3PrivTimestamp(ExtractorInput input) throws IOException, Inte
   // Internal factory methods.
 
   /**
-   * If the content is encrypted using the "identity" key format, returns an
-   * {@link Aes128DataSource} that wraps the original in order to decrypt the loaded data. Else
-   * returns the original.
+   * If the segment is fully encrypted, returns an {@link Aes128DataSource} that wraps the original
+   * in order to decrypt the loaded data. Else returns the original.
    */
-  private static DataSource buildDataSource(DataSource dataSource, String keyFormat, byte[] keyData,
+  private static DataSource buildDataSource(DataSource dataSource, byte[] fullSegmentEncryptionKey,
       byte[] encryptionIv) {
-    if (HlsMediaPlaylist.KEYFORMAT_IDENTITY.equals(keyFormat)) {
-      return new Aes128DataSource(dataSource, keyData, encryptionIv);
+    if (fullSegmentEncryptionKey != null) {
+      return new Aes128DataSource(dataSource, fullSegmentEncryptionKey, encryptionIv);
     }
     return dataSource;
   }
@@ -357,7 +359,7 @@ private Extractor createExtractor() {
       extractor = previousExtractor;
     } else if (lastPathSegment.endsWith(MP4_FILE_EXTENSION)
         || lastPathSegment.startsWith(M4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 4)) {
-      extractor = new FragmentedMp4Extractor(0, timestampAdjuster);
+      extractor = new FragmentedMp4Extractor(0, timestampAdjuster, null, drmInitData);
     } else {
       // MPEG-2 TS segments, but we need a new extractor.
       // This flag ensures the change of pid between streams does not affect the sample queues.
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 ac8ec5ee5e9..5ac61294a47 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
@@ -117,8 +117,9 @@ private static void addSegment(ArrayList<Segment> segments, HlsMediaPlaylist med
       HlsMediaPlaylist.Segment hlsSegment, HashSet<Uri> encryptionKeyUris)
       throws IOException, InterruptedException {
     long startTimeUs = mediaPlaylist.startTimeUs + hlsSegment.relativeStartTimeUs;
-    if (hlsSegment.isEncrypted) {
-      Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, hlsSegment.encryptionKeyUri);
+    if (hlsSegment.fullSegmentEncryptionKeyUri != null) {
+      Uri keyUri = UriUtil.resolveToUri(mediaPlaylist.baseUri,
+          hlsSegment.fullSegmentEncryptionKeyUri);
       if (encryptionKeyUris.add(keyUri)) {
         segments.add(new Segment(startTimeUs, new DataSpec(keyUri)));
       }
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 1b573f41c2d..b21ecb02d50 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
@@ -18,6 +18,7 @@
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.drm.DrmInitData;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.util.Collections;
@@ -50,17 +51,10 @@ public static final class Segment implements Comparable<Long> {
      */
     public final long relativeStartTimeUs;
     /**
-     * Whether the segment is encrypted, as defined by #EXT-X-KEY.
+     * 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 boolean isEncrypted;
-    /**
-     * The key format as defined by #EXT-X-KEY, or null if the segment is not encrypted.
-     */
-    public final String keyFormat;
-    /**
-     * The encryption key uri as defined by #EXT-X-KEY, or null if the segment is not encrypted.
-     */
-    public final String encryptionKeyUri;
+    public final String fullSegmentEncryptionKeyUri;
     /**
      * The encryption initialization vector as defined by #EXT-X-KEY, or null if the segment is not
      * encrypted.
@@ -77,7 +71,7 @@ public static final class Segment implements Comparable<Long> {
     public final long byterangeLength;
 
     public Segment(String uri, long byterangeOffset, long byterangeLength) {
-      this(uri, 0, -1, C.TIME_UNSET, false, null, null, null, byterangeOffset, byterangeLength);
+      this(uri, 0, -1, C.TIME_UNSET, null, null, byterangeOffset, byterangeLength);
     }
 
     /**
@@ -85,23 +79,19 @@ public Segment(String uri, long byterangeOffset, long byterangeLength) {
      * @param durationUs See {@link #durationUs}.
      * @param relativeDiscontinuitySequence See {@link #relativeDiscontinuitySequence}.
      * @param relativeStartTimeUs See {@link #relativeStartTimeUs}.
-     * @param isEncrypted See {@link #isEncrypted}.
-     * @param keyFormat See {@link #keyFormat}.
-     * @param encryptionKeyUri See {@link #encryptionKeyUri}.
+     * @param fullSegmentEncryptionKeyUri See {@link #fullSegmentEncryptionKeyUri}.
      * @param encryptionIV See {@link #encryptionIV}.
      * @param byterangeOffset See {@link #byterangeOffset}.
      * @param byterangeLength See {@link #byterangeLength}.
      */
     public Segment(String url, long durationUs, int relativeDiscontinuitySequence,
-        long relativeStartTimeUs, boolean isEncrypted, String keyFormat, String encryptionKeyUri,
+        long relativeStartTimeUs, String fullSegmentEncryptionKeyUri,
         String encryptionIV, long byterangeOffset, long byterangeLength) {
       this.url = url;
       this.durationUs = durationUs;
       this.relativeDiscontinuitySequence = relativeDiscontinuitySequence;
       this.relativeStartTimeUs = relativeStartTimeUs;
-      this.isEncrypted = isEncrypted;
-      this.keyFormat = keyFormat;
-      this.encryptionKeyUri = encryptionKeyUri;
+      this.fullSegmentEncryptionKeyUri = fullSegmentEncryptionKeyUri;
       this.encryptionIV = encryptionIV;
       this.byterangeOffset = byterangeOffset;
       this.byterangeLength = byterangeLength;
@@ -115,11 +105,6 @@ public int compareTo(@NonNull Long relativeStartTimeUs) {
 
   }
 
-  /**
-   * The identity key format, as defined by #EXT-X-KEY.
-   */
-  public static final String KEYFORMAT_IDENTITY = "identity";
-
   /**
    * Type of the playlist, as defined by #EXT-X-PLAYLIST-TYPE.
    */
@@ -176,6 +161,11 @@ public int compareTo(@NonNull Long relativeStartTimeUs) {
    * Whether the playlist contains a #EXT-X-PROGRAM-DATE-TIME tag.
    */
   public final boolean hasProgramDateTime;
+  /**
+   * DRM initialization data for sample decryption, or null if none of the segment uses sample
+   * encryption.
+   */
+  public final DrmInitData drmInitData;
   /**
    * The initialization segment, as defined by #EXT-X-MAP.
    */
@@ -203,6 +193,7 @@ public int compareTo(@NonNull Long relativeStartTimeUs) {
    * @param hasIndependentSegmentsTag See {@link #hasIndependentSegmentsTag}.
    * @param hasEndTag See {@link #hasEndTag}.
    * @param hasProgramDateTime See {@link #hasProgramDateTime}.
+   * @param drmInitData See {@link #drmInitData}.
    * @param initializationSegment See {@link #initializationSegment}.
    * @param segments See {@link #segments}.
    */
@@ -210,7 +201,7 @@ public HlsMediaPlaylist(@PlaylistType int playlistType, String baseUri, List<Str
       long startOffsetUs, long startTimeUs, boolean hasDiscontinuitySequence,
       int discontinuitySequence, int mediaSequence, int version, long targetDurationUs,
       boolean hasIndependentSegmentsTag, boolean hasEndTag, boolean hasProgramDateTime,
-      Segment initializationSegment, List<Segment> segments) {
+      DrmInitData drmInitData, Segment initializationSegment, List<Segment> segments) {
     super(baseUri, tags);
     this.playlistType = playlistType;
     this.startTimeUs = startTimeUs;
@@ -222,6 +213,7 @@ public HlsMediaPlaylist(@PlaylistType int playlistType, String baseUri, List<Str
     this.hasIndependentSegmentsTag = hasIndependentSegmentsTag;
     this.hasEndTag = hasEndTag;
     this.hasProgramDateTime = hasProgramDateTime;
+    this.drmInitData = drmInitData;
     this.initializationSegment = initializationSegment;
     this.segments = Collections.unmodifiableList(segments);
     if (!segments.isEmpty()) {
@@ -273,7 +265,7 @@ public long getEndTimeUs() {
   public HlsMediaPlaylist copyWith(long startTimeUs, int discontinuitySequence) {
     return new HlsMediaPlaylist(playlistType, baseUri, tags, startOffsetUs, startTimeUs, true,
         discontinuitySequence, mediaSequence, version, targetDurationUs, hasIndependentSegmentsTag,
-        hasEndTag, hasProgramDateTime, initializationSegment, segments);
+        hasEndTag, hasProgramDateTime, drmInitData, initializationSegment, segments);
   }
 
   /**
@@ -288,7 +280,8 @@ public HlsMediaPlaylist copyWithEndTag() {
     }
     return new HlsMediaPlaylist(playlistType, baseUri, tags, startOffsetUs, startTimeUs,
         hasDiscontinuitySequence, discontinuitySequence, mediaSequence, version, targetDurationUs,
-        hasIndependentSegmentsTag, true, hasProgramDateTime, initializationSegment, segments);
+        hasIndependentSegmentsTag, true, hasProgramDateTime, drmInitData, initializationSegment,
+        segments);
   }
 
 }
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 dc5fd96f352..c18f31f47e9 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,9 +16,12 @@
 package com.google.android.exoplayer2.source.hls.playlist;
 
 import android.net.Uri;
+import android.util.Base64;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 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.source.UnrecognizedInputFormatException;
 import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist.Segment;
 import com.google.android.exoplayer2.upstream.ParsingLoadable;
@@ -28,6 +31,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -71,6 +75,11 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   private static final String METHOD_NONE = "NONE";
   private static final String METHOD_AES_128 = "AES-128";
   private static final String METHOD_SAMPLE_AES = "SAMPLE-AES";
+  private static final String METHOD_SAMPLE_AES_CENC = "SAMPLE-AES-CENC";
+  private static final String KEYFORMAT_IDENTITY = "identity";
+  private static final String KEYFORMAT_WIDEVINE_PSSH_BINARY =
+      "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed";
+  private static final String KEYFORMAT_WIDEVINE_PSSH_JSON = "com.widevine";
 
   private static final String BOOLEAN_TRUE = "YES";
   private static final String BOOLEAN_FALSE = "NO";
@@ -315,10 +324,9 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
     long segmentByteRangeLength = C.LENGTH_UNSET;
     int segmentMediaSequence = 0;
 
-    boolean isEncrypted = false;
-    String keyFormat = null;
     String encryptionKeyUri = null;
     String encryptionIV = null;
+    DrmInitData drmInitData = null;
 
     String line;
     while (iterator.hasNext()) {
@@ -363,18 +371,26 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
             (long) (parseDoubleAttr(line, REGEX_MEDIA_DURATION) * C.MICROS_PER_SECOND);
       } else if (line.startsWith(TAG_KEY)) {
         String method = parseStringAttr(line, REGEX_METHOD);
-        isEncrypted = METHOD_AES_128.equals(method) || METHOD_SAMPLE_AES.equals(method);
-        if (isEncrypted) {
-          keyFormat = parseOptionalStringAttr(line, REGEX_KEYFORMAT);
-          if (keyFormat == null) {
-            keyFormat = HlsMediaPlaylist.KEYFORMAT_IDENTITY;
-          }
-          encryptionKeyUri = parseStringAttr(line, REGEX_URI);
+        String keyFormat = parseOptionalStringAttr(line, REGEX_KEYFORMAT);
+        encryptionKeyUri = null;
+        encryptionIV = null;
+        if (!METHOD_NONE.equals(method)) {
           encryptionIV = parseOptionalStringAttr(line, REGEX_IV);
-        } else {
-          keyFormat = null;
-          encryptionKeyUri = null;
-          encryptionIV = null;
+          if (KEYFORMAT_IDENTITY.equals(keyFormat) || keyFormat == null) {
+            if (METHOD_AES_128.equals(method)) {
+              // The segment is fully encrypted using an identity key.
+              encryptionKeyUri = parseStringAttr(line, REGEX_URI);
+            } else {
+              // Do nothing. Samples are encrypted using an identity key, but this is not supported.
+              // Hopefully, a traditional DRM alternative is also provided.
+            }
+          } else {
+            SchemeData schemeData = parseWidevineSchemeData(line, keyFormat);
+            if (schemeData != null) {
+              drmInitData = new DrmInitData(METHOD_SAMPLE_AES_CENC.equals(method)
+                  ? C.CENC_TYPE_cenc : C.CENC_TYPE_cbcs, schemeData);
+            }
+          }
         }
       } else if (line.startsWith(TAG_BYTERANGE)) {
         String byteRange = parseStringAttr(line, REGEX_BYTERANGE);
@@ -396,7 +412,7 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
         }
       } else if (!line.startsWith("#")) {
         String segmentEncryptionIV;
-        if (!isEncrypted) {
+        if (encryptionKeyUri == null) {
           segmentEncryptionIV = null;
         } else if (encryptionIV != null) {
           segmentEncryptionIV = encryptionIV;
@@ -408,7 +424,7 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
           segmentByteRangeOffset = 0;
         }
         segments.add(new Segment(line, segmentDurationUs, relativeDiscontinuitySequence,
-            segmentStartTimeUs, isEncrypted, keyFormat, encryptionKeyUri, segmentEncryptionIV,
+            segmentStartTimeUs, encryptionKeyUri, segmentEncryptionIV,
             segmentByteRangeOffset, segmentByteRangeLength));
         segmentStartTimeUs += segmentDurationUs;
         segmentDurationUs = 0;
@@ -425,7 +441,24 @@ private static HlsMediaPlaylist parseMediaPlaylist(LineIterator iterator, String
     return new HlsMediaPlaylist(playlistType, baseUri, tags, startOffsetUs, playlistStartTimeUs,
         hasDiscontinuitySequence, playlistDiscontinuitySequence, mediaSequence, version,
         targetDurationUs, hasIndependentSegmentsTag, hasEndTag, playlistStartTimeUs != 0,
-        initializationSegment, segments);
+        drmInitData, initializationSegment, segments);
+  }
+
+  private static SchemeData parseWidevineSchemeData(String line, String keyFormat)
+      throws ParserException {
+    if (KEYFORMAT_WIDEVINE_PSSH_BINARY.equals(keyFormat)) {
+     String uriString = parseStringAttr(line, REGEX_URI);
+     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);
+      }
+    }
+    return null;
   }
 
   private static int parseIntAttr(String line, Pattern pattern) throws ParserException {
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 ae7dfc32e85..cbd6db04af6 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
@@ -101,7 +101,7 @@ public DefaultSsChunkSource(LoaderErrorThrower manifestLoaderErrorThrower, SsMan
           trackEncryptionBoxes, nalUnitLengthFieldLength, null, null);
       FragmentedMp4Extractor extractor = new FragmentedMp4Extractor(
           FragmentedMp4Extractor.FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME
-          | FragmentedMp4Extractor.FLAG_WORKAROUND_IGNORE_TFDT_BOX, null, track);
+          | FragmentedMp4Extractor.FLAG_WORKAROUND_IGNORE_TFDT_BOX, null, track, null);
       extractorWrappers[i] = new ChunkExtractorWrapper(extractor, streamElement.type, format);
     }
   }

From ce7aaab3c6adc8d8b0d6723c0e59441fcca9bce2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 20 Sep 2017 11:21:15 -0700
Subject: [PATCH 246/421] Handle bracket params on the end of SmoothStreaming
 URLs

Issue: #3230

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169421873
---
 .../com/google/android/exoplayer2/util/Util.java    |  3 +--
 .../google/android/exoplayer2/util/UtilTest.java    | 13 +++++++++++++
 .../source/smoothstreaming/SsMediaSource.java       |  4 ++--
 3 files changed, 16 insertions(+), 4 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 519919f129c..5d93f413d51 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
@@ -900,8 +900,7 @@ public static int inferContentType(String fileName) {
       return C.TYPE_DASH;
     } else if (fileName.endsWith(".m3u8")) {
       return C.TYPE_HLS;
-    } else if (fileName.endsWith(".ism") || fileName.endsWith(".isml")
-        || fileName.endsWith(".ism/manifest") || fileName.endsWith(".isml/manifest")) {
+    } else if (fileName.matches(".*\\.ism(l)?(/manifest(\\(.+\\))?)?")) {
       return C.TYPE_SS;
     } else {
       return C.TYPE_OTHER;
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 70caff9bf15..1afe3804835 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
@@ -23,6 +23,7 @@
 import static com.google.android.exoplayer2.util.Util.unescapeFileName;
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.util.ArrayList;
 import java.util.List;
@@ -39,6 +40,18 @@
 @Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
 public class UtilTest {
 
+  @Test
+  public void testInferContentType() {
+    assertThat(Util.inferContentType("http://a.b/c.ism")).isEqualTo(C.TYPE_SS);
+    assertThat(Util.inferContentType("http://a.b/c.isml")).isEqualTo(C.TYPE_SS);
+    assertThat(Util.inferContentType("http://a.b/c.ism/Manifest")).isEqualTo(C.TYPE_SS);
+    assertThat(Util.inferContentType("http://a.b/c.isml/manifest")).isEqualTo(C.TYPE_SS);
+    assertThat(Util.inferContentType("http://a.b/c.isml/manifest(filter=x)")).isEqualTo(C.TYPE_SS);
+
+    assertThat(Util.inferContentType("http://a.b/c.ism/prefix-manifest")).isEqualTo(C.TYPE_OTHER);
+    assertThat(Util.inferContentType("http://a.b/c.ism/manifest-suffix")).isEqualTo(C.TYPE_OTHER);
+  }
+
   @Test
   public void testArrayBinarySearchFloor() {
     long[] values = new long[0];
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 885d5bd2273..236bee83ab8 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
@@ -193,8 +193,8 @@ private SsMediaSource(SsManifest manifest, Uri manifestUri,
     Assertions.checkState(manifest == null || !manifest.isLive);
     this.manifest = manifest;
     this.manifestUri = manifestUri == null ? null
-        : Util.toLowerInvariant(manifestUri.getLastPathSegment()).equals("manifest") ? manifestUri
-            : Uri.withAppendedPath(manifestUri, "Manifest");
+        : Util.toLowerInvariant(manifestUri.getLastPathSegment()).matches("manifest(\\(.+\\))?")
+            ? manifestUri : Uri.withAppendedPath(manifestUri, "Manifest");
     this.manifestDataSourceFactory = manifestDataSourceFactory;
     this.manifestParser = manifestParser;
     this.chunkSourceFactory = chunkSourceFactory;

From ff2ece56dd9afa7eaf03bdb994e1ef9387fe44a6 Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Thu, 21 Sep 2017 12:01:25 +0900
Subject: [PATCH 247/421] fix primarySnapshotAccessAgeMs

---
 .../exoplayer2/source/hls/playlist/HlsPlaylistTracker.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 567dbd4af67..dfa544dfcd5 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
@@ -351,7 +351,7 @@ private void maybeSetPrimaryUrl(HlsUrl url) {
     }
     MediaPlaylistBundle currentPrimaryBundle = playlistBundles.get(primaryHlsUrl);
     long primarySnapshotAccessAgeMs =
-        currentPrimaryBundle.lastSnapshotAccessTimeMs - SystemClock.elapsedRealtime();
+        SystemClock.elapsedRealtime() - currentPrimaryBundle.lastSnapshotAccessTimeMs;
     if (primarySnapshotAccessAgeMs > PRIMARY_URL_KEEPALIVE_MS) {
       primaryHlsUrl = url;
       playlistBundles.get(primaryHlsUrl).loadPlaylist();

From cac16f1647be29828c1b404e5de0b6e2577d2e61 Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Thu, 21 Sep 2017 14:18:59 +0900
Subject: [PATCH 248/421] remove keep alive check for updating primary url to
 avoid redundant playlist loading

---
 .../source/hls/playlist/HlsPlaylistTracker.java | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

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 dfa544dfcd5..9b777bccf85 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
@@ -112,11 +112,6 @@ public interface PlaylistEventListener {
    * which an unchanging playlist is considered stuck.
    */
   private static final double PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT = 3.5;
-  /**
-   * The minimum number of milliseconds that a url is kept as primary url, if no
-   * {@link #getPlaylistSnapshot} call is made for that url.
-   */
-  private static final long PRIMARY_URL_KEEPALIVE_MS = 15000;
 
   private final Uri initialPlaylistUri;
   private final HlsDataSourceFactory dataSourceFactory;
@@ -205,7 +200,7 @@ public HlsMasterPlaylist getMasterPlaylist() {
    */
   public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url) {
     HlsMediaPlaylist snapshot = playlistBundles.get(url).getPlaylistSnapshot();
-    if (snapshot != null) {
+    if (url != primaryHlsUrl && snapshot != null ) {
       maybeSetPrimaryUrl(url);
     }
     return snapshot;
@@ -349,13 +344,9 @@ private void maybeSetPrimaryUrl(HlsUrl url) {
       // the last primary snapshot contains an end tag.
       return;
     }
-    MediaPlaylistBundle currentPrimaryBundle = playlistBundles.get(primaryHlsUrl);
-    long primarySnapshotAccessAgeMs =
-        SystemClock.elapsedRealtime() - currentPrimaryBundle.lastSnapshotAccessTimeMs;
-    if (primarySnapshotAccessAgeMs > PRIMARY_URL_KEEPALIVE_MS) {
-      primaryHlsUrl = url;
-      playlistBundles.get(primaryHlsUrl).loadPlaylist();
-    }
+
+    primaryHlsUrl = url;
+    playlistBundles.get(primaryHlsUrl).loadPlaylist();
   }
 
   private void createBundles(List<HlsUrl> urls) {

From 455f9fb9f0fb422652ed3e1771f843db0c1383a1 Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Thu, 21 Sep 2017 16:01:32 +0900
Subject: [PATCH 249/421] remove space

---
 .../exoplayer2/source/hls/playlist/HlsPlaylistTracker.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 9b777bccf85..d9ab410fb98 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
@@ -200,7 +200,7 @@ public HlsMasterPlaylist getMasterPlaylist() {
    */
   public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url) {
     HlsMediaPlaylist snapshot = playlistBundles.get(url).getPlaylistSnapshot();
-    if (url != primaryHlsUrl && snapshot != null ) {
+    if (url != primaryHlsUrl && snapshot != null) {
       maybeSetPrimaryUrl(url);
     }
     return snapshot;

From d71400d28023ef36e8ac049113c688fec4bc0240 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 21 Sep 2017 03:42:48 -0700
Subject: [PATCH 250/421] Add DashDownloadActionTest

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169522830
---
 library/dash/build.gradle                     |  5 ++++
 .../dash/manifest/RepresentationKey.java      | 23 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/library/dash/build.gradle b/library/dash/build.gradle
index 48e9b9b97e2..99441a28496 100644
--- a/library/dash/build.gradle
+++ b/library/dash/build.gradle
@@ -39,6 +39,11 @@ dependencies {
     androidTestCompile 'com.google.dexmaker:dexmaker:' + dexmakerVersion
     androidTestCompile 'com.google.dexmaker:dexmaker-mockito:' + dexmakerVersion
     androidTestCompile 'org.mockito:mockito-core:' + mockitoVersion
+    testCompile project(modulePrefix + 'testutils')
+    testCompile 'com.google.truth:truth:' + truthVersion
+    testCompile 'junit:junit:' + junitVersion
+    testCompile 'org.mockito:mockito-core:' + mockitoVersion
+    testCompile 'org.robolectric:robolectric:' + robolectricVersion
 }
 
 ext {
diff --git a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java
index cf17a081d72..4ce1d067009 100644
--- a/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java
+++ b/library/dash/src/main/java/com/google/android/exoplayer2/source/dash/manifest/RepresentationKey.java
@@ -80,4 +80,27 @@ public int compareTo(@NonNull RepresentationKey o) {
     return result;
   }
 
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+
+    RepresentationKey that = (RepresentationKey) o;
+    return periodIndex == that.periodIndex
+        && adaptationSetIndex == that.adaptationSetIndex
+        && representationIndex == that.representationIndex;
+  }
+
+  @Override
+  public int hashCode() {
+    int result = periodIndex;
+    result = 31 * result + adaptationSetIndex;
+    result = 31 * result + representationIndex;
+    return result;
+  }
+
 }

From 324339b88f18da30817e69218bc93be8dea51661 Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Tue, 7 Mar 2017 05:42:33 +0000
Subject: [PATCH 251/421] Tweak live-streaming track selection logic.

Follow-up on the update to ABR logic in AdaptiveTrackSelection for live
streaming case:
- Do not reset liveEdgeTimeUs when user seek to a different position.
- For HlsChunkSource, for non-independent segments, currently the
bufferedDuration calculate will subtract previousChunk's duration. So to make
it work with live-streaming ABR logic, we subtract timeToLiveEdgeUs a similar
amount to compensate for that operation.
- Minor update to DefaultSSChunkSource, only perform TrackSelection when needed
(after checking necessary conditions).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169531275
---
 .../source/dash/DefaultDashChunkSource.java   |  7 +++--
 .../exoplayer2/source/hls/HlsChunkSource.java | 27 ++++++++++++-------
 .../smoothstreaming/DefaultSsChunkSource.java | 12 +++------
 3 files changed, 25 insertions(+), 21 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 eba36e90577..732934515bb 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
@@ -181,7 +181,7 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
     }
 
     long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
-    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs, previous == null);
+    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
     trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
 
     RepresentationHolder representationHolder =
@@ -385,9 +385,8 @@ private static Chunk newMediaChunk(RepresentationHolder representationHolder,
     }
   }
 
-  private long resolveTimeToLiveEdgeUs(long playbackPositionUs, boolean isAfterPositionReset) {
-    boolean resolveTimeToLiveEdgePossible = manifest.dynamic
-        && !isAfterPositionReset && liveEdgeTimeUs != C.TIME_UNSET;
+  private long resolveTimeToLiveEdgeUs(long playbackPositionUs) {
+    boolean resolveTimeToLiveEdgePossible = manifest.dynamic && liveEdgeTimeUs != C.TIME_UNSET;
     return resolveTimeToLiveEdgePossible ? liveEdgeTimeUs - playbackPositionUs : C.TIME_UNSET;
   }
 
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 a5688e8bc55..8aa4e057a23 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
@@ -209,14 +209,24 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     int oldVariantIndex = previous == null ? C.INDEX_UNSET
         : trackGroup.indexOf(previous.trackFormat);
     expectedPlaylistUrl = null;
-    // Unless segments are known to be independent, switching variant will require downloading
-    // overlapping segments. Hence we use the start time of the previous chunk rather than its end
-    // time for this case.
-    long bufferedDurationUs = previous == null ? 0 : Math.max(0,
-        (independentSegments ? previous.endTimeUs : previous.startTimeUs) - playbackPositionUs);
+    long bufferedDurationUs = previous == null ? 0 : previous.endTimeUs - playbackPositionUs;
+
+    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
+    if (previous != null && !independentSegments) {
+      // Unless segments are known to be independent, switching variant will require downloading
+      // overlapping segments. Hence we will subtract previous chunk's duration from buffered
+      // duration.
+      // This may affect the live-streaming adaptive track selection logic, when we are comparing
+      // buffered duration to time to live edge to decide whether to switch. Therefore,
+      // we will subtract this same amount from timeToLiveEdgeUs as well.
+      long subtractedDurationUs = previous.getDurationUs();
+      bufferedDurationUs = Math.max(0, bufferedDurationUs - subtractedDurationUs);
+      if (timeToLiveEdgeUs != C.TIME_UNSET) {
+        timeToLiveEdgeUs = Math.max(0, timeToLiveEdgeUs - subtractedDurationUs);
+      }
+    }
 
     // Select the variant.
-    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs, previous == null);
     trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
     int selectedVariantIndex = trackSelection.getSelectedIndexInTrackGroup();
 
@@ -365,9 +375,8 @@ public void onPlaylistBlacklisted(HlsUrl url, long blacklistMs) {
 
   // Private methods.
 
-  private long resolveTimeToLiveEdgeUs(long playbackPositionUs, boolean isAfterPositionReset) {
-    final boolean resolveTimeToLiveEdgePossible = !isAfterPositionReset
-        && liveEdgeTimeUs != C.TIME_UNSET;
+  private long resolveTimeToLiveEdgeUs(long playbackPositionUs) {
+    final boolean resolveTimeToLiveEdgePossible = liveEdgeTimeUs != C.TIME_UNSET;
     return resolveTimeToLiveEdgePossible ? liveEdgeTimeUs - playbackPositionUs : C.TIME_UNSET;
   }
 
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 cbd6db04af6..d9743649c57 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
@@ -154,10 +154,6 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
       return;
     }
 
-    long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
-    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
-    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
-
     StreamElement streamElement = manifest.streamElements[elementIndex];
     if (streamElement.chunkCount == 0) {
       // There aren't any chunks for us to load.
@@ -183,6 +179,10 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
       return;
     }
 
+    long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
+    long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
+    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
+
     long chunkStartTimeUs = streamElement.getStartTimeUs(chunkIndex);
     long chunkEndTimeUs = chunkStartTimeUs + streamElement.getChunkDurationUs(chunkIndex);
     int currentAbsoluteChunkIndex = chunkIndex + currentManifestChunkOffset;
@@ -229,10 +229,6 @@ private long resolveTimeToLiveEdgeUs(long playbackPositionUs) {
     }
 
     StreamElement currentElement = manifest.streamElements[elementIndex];
-    if (currentElement.chunkCount == 0) {
-      return C.TIME_UNSET;
-    }
-
     int lastChunkIndex = currentElement.chunkCount - 1;
     long lastChunkEndTimeUs = currentElement.getStartTimeUs(lastChunkIndex)
         + currentElement.getChunkDurationUs(lastChunkIndex);

From 25a9177ce36aee20dfa95447695969e98a52b0c0 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 21 Sep 2017 09:18:43 -0700
Subject: [PATCH 252/421] Deduplicate DefaultTrackSelector javadocs

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169552239
---
 .../trackselection/DefaultTrackSelector.java  | 55 ++++---------------
 1 file changed, 11 insertions(+), 44 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 ba0f63b0bb5..6c6d02a1fbd 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
@@ -193,11 +193,7 @@ public Parameters(String preferredAudioLanguage, String preferredTextLanguage,
     }
 
     /**
-     * Returns an instance with the provided preferred language for audio and forced text tracks.
-     *
-     * @param preferredAudioLanguage The preferred language as defined by RFC 5646. {@code null} to
-     *     select the default track, or first track if there's no default.
-     * @return An instance with the provided preferred language for audio and forced text tracks.
+     * Returns an instance with the provided {@link #preferredAudioLanguage}.
      */
     public Parameters withPreferredAudioLanguage(String preferredAudioLanguage) {
       preferredAudioLanguage = Util.normalizeLanguageCode(preferredAudioLanguage);
@@ -211,11 +207,7 @@ public Parameters withPreferredAudioLanguage(String preferredAudioLanguage) {
     }
 
     /**
-     * Returns an instance with the provided preferred language for text tracks.
-     *
-     * @param preferredTextLanguage The preferred language as defined by RFC 5646. {@code null} to
-     *     select the default track, or no track if there's no default.
-     * @return An instance with the provided preferred language for text tracks.
+     * Returns an instance with the provided {@link #preferredTextLanguage}.
      */
     public Parameters withPreferredTextLanguage(String preferredTextLanguage) {
       preferredTextLanguage = Util.normalizeLanguageCode(preferredTextLanguage);
@@ -229,10 +221,7 @@ public Parameters withPreferredTextLanguage(String preferredTextLanguage) {
     }
 
     /**
-     * Returns an instance with the provided mixed mime adaptiveness allowance.
-     *
-     * @param allowMixedMimeAdaptiveness Whether to allow selections to contain mixed mime types.
-     * @return An instance with the provided mixed mime adaptiveness allowance.
+     * Returns an instance with the provided {@link #allowMixedMimeAdaptiveness}.
      */
     public Parameters withAllowMixedMimeAdaptiveness(boolean allowMixedMimeAdaptiveness) {
       if (allowMixedMimeAdaptiveness == this.allowMixedMimeAdaptiveness) {
@@ -245,10 +234,7 @@ public Parameters withAllowMixedMimeAdaptiveness(boolean allowMixedMimeAdaptiven
     }
 
     /**
-     * Returns an instance with the provided seamless adaptiveness allowance.
-     *
-     * @param allowNonSeamlessAdaptiveness Whether non-seamless adaptation is allowed.
-     * @return An instance with the provided seamless adaptiveness allowance.
+     * Returns an instance with the provided {@link #allowNonSeamlessAdaptiveness}.
      */
     public Parameters withAllowNonSeamlessAdaptiveness(boolean allowNonSeamlessAdaptiveness) {
       if (allowNonSeamlessAdaptiveness == this.allowNonSeamlessAdaptiveness) {
@@ -261,11 +247,7 @@ public Parameters withAllowNonSeamlessAdaptiveness(boolean allowNonSeamlessAdapt
     }
 
     /**
-     * Returns an instance with the provided max video size.
-     *
-     * @param maxVideoWidth The max video width.
-     * @param maxVideoHeight The max video width.
-     * @return An instance with the provided max video size.
+     * Returns an instance with the provided {@link #maxVideoWidth} and {@link #maxVideoHeight}.
      */
     public Parameters withMaxVideoSize(int maxVideoWidth, int maxVideoHeight) {
       if (maxVideoWidth == this.maxVideoWidth && maxVideoHeight == this.maxVideoHeight) {
@@ -278,10 +260,7 @@ public Parameters withMaxVideoSize(int maxVideoWidth, int maxVideoHeight) {
     }
 
     /**
-     * Returns an instance with the provided max video bitrate.
-     *
-     * @param maxVideoBitrate The max video bitrate.
-     * @return An instance with the provided max video bitrate.
+     * Returns an instance with the provided {@link #maxVideoBitrate}.
      */
     public Parameters withMaxVideoBitrate(int maxVideoBitrate) {
       if (maxVideoBitrate == this.maxVideoBitrate) {
@@ -312,11 +291,7 @@ public Parameters withoutVideoSizeConstraints() {
     }
 
     /**
-     * Returns an instance with the provided {@code exceedVideoConstraintsIfNecessary} value.
-     *
-     * @param exceedVideoConstraintsIfNecessary Whether to exceed video constraints when no
-     *     selection can be made otherwise.
-     * @return An instance with the provided {@code exceedVideoConstraintsIfNecessary} value.
+     * Returns an instance with the provided {@link #exceedVideoConstraintsIfNecessary}.
      */
     public Parameters withExceedVideoConstraintsIfNecessary(
         boolean exceedVideoConstraintsIfNecessary) {
@@ -330,11 +305,7 @@ public Parameters withExceedVideoConstraintsIfNecessary(
     }
 
     /**
-     * Returns an instance with the provided {@code exceedRendererCapabilitiesIfNecessary} value.
-     *
-     * @param exceedRendererCapabilitiesIfNecessary Whether to exceed renderer capabilities when no
-     *     selection can be made otherwise.
-     * @return An instance with the provided {@code exceedRendererCapabilitiesIfNecessary} value.
+     * Returns an instance with the provided {@link #exceedRendererCapabilitiesIfNecessary}.
      */
     public Parameters withExceedRendererCapabilitiesIfNecessary(
         boolean exceedRendererCapabilitiesIfNecessary) {
@@ -348,12 +319,8 @@ public Parameters withExceedRendererCapabilitiesIfNecessary(
     }
 
     /**
-     * Returns an instance with the provided viewport size.
-     *
-     * @param viewportWidth Viewport width in pixels.
-     * @param viewportHeight Viewport height in pixels.
-     * @param viewportOrientationMayChange Whether orientation may change during playback.
-     * @return An instance with the provided viewport size.
+     * Returns an instance with the provided {@link #viewportWidth}, {@link #viewportHeight} and
+     * {@link #viewportOrientationMayChange}.
      */
     public Parameters withViewportSize(int viewportWidth, int viewportHeight,
         boolean viewportOrientationMayChange) {
@@ -371,7 +338,7 @@ public Parameters withViewportSize(int viewportWidth, int viewportHeight,
      * Returns an instance where the viewport size is obtained from the provided {@link Context}.
      *
      * @param context The context to obtain the viewport size from.
-     * @param viewportOrientationMayChange Whether orientation may change during playback.
+     * @param viewportOrientationMayChange See {@link #viewportOrientationMayChange}.
      * @return An instance where the viewport size is obtained from the provided {@link Context}.
      */
     public Parameters withViewportSizeFromContext(Context context,

From 4fb18453e1dd02e301fa99e73b01c19b58c862a2 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 22 Sep 2017 03:22:02 -0700
Subject: [PATCH 253/421] Add a "forceLowestBitrate" option to
 DefaultTrackSelector

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169668371
---
 .../trackselection/DefaultTrackSelector.java  | 90 ++++++++++++-------
 1 file changed, 60 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 6c6d02a1fbd..0ab4f62866f 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
@@ -127,6 +127,11 @@ public static final class Parameters {
     public final boolean viewportOrientationMayChange;
 
     // General
+    /**
+     * Whether to force selection of the single lowest bitrate audio and video tracks that comply
+     * with all other constraints.
+     */
+    public final boolean forceLowestBitrate;
     /**
      * Whether to allow adaptive selections containing mixed mime types.
      */
@@ -145,6 +150,7 @@ public static final class Parameters {
      * <ul>
      *   <li>No preferred audio language is set.</li>
      *   <li>No preferred text language is set.</li>
+     *   <li>Lowest bitrate track selections are not forced.</li>
      *   <li>Adaptation between different mime types is not allowed.</li>
      *   <li>Non seamless adaptation is allowed.</li>
      *   <li>No max limit for video width/height.</li>
@@ -155,13 +161,14 @@ public static final class Parameters {
      * </ul>
      */
     public Parameters() {
-      this(null, null, false, true, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE, true,
-          true, Integer.MAX_VALUE, Integer.MAX_VALUE, true);
+      this(null, null, false, false, true, Integer.MAX_VALUE, Integer.MAX_VALUE, Integer.MAX_VALUE,
+          true, true, Integer.MAX_VALUE, Integer.MAX_VALUE, true);
     }
 
     /**
      * @param preferredAudioLanguage See {@link #preferredAudioLanguage}
      * @param preferredTextLanguage See {@link #preferredTextLanguage}
+     * @param forceLowestBitrate See {@link #forceLowestBitrate}.
      * @param allowMixedMimeAdaptiveness See {@link #allowMixedMimeAdaptiveness}
      * @param allowNonSeamlessAdaptiveness See {@link #allowNonSeamlessAdaptiveness}
      * @param maxVideoWidth See {@link #maxVideoWidth}
@@ -174,12 +181,14 @@ public Parameters() {
      * @param viewportOrientationMayChange See {@link #viewportOrientationMayChange}
      */
     public Parameters(String preferredAudioLanguage, String preferredTextLanguage,
-        boolean allowMixedMimeAdaptiveness, boolean allowNonSeamlessAdaptiveness,
-        int maxVideoWidth, int maxVideoHeight, int maxVideoBitrate,
-        boolean exceedVideoConstraintsIfNecessary, boolean exceedRendererCapabilitiesIfNecessary,
-        int viewportWidth, int viewportHeight, boolean viewportOrientationMayChange) {
+        boolean forceLowestBitrate, boolean allowMixedMimeAdaptiveness,
+        boolean allowNonSeamlessAdaptiveness, int maxVideoWidth, int maxVideoHeight,
+        int maxVideoBitrate, boolean exceedVideoConstraintsIfNecessary,
+        boolean exceedRendererCapabilitiesIfNecessary, int viewportWidth, int viewportHeight,
+        boolean viewportOrientationMayChange) {
       this.preferredAudioLanguage = preferredAudioLanguage;
       this.preferredTextLanguage = preferredTextLanguage;
+      this.forceLowestBitrate = forceLowestBitrate;
       this.allowMixedMimeAdaptiveness = allowMixedMimeAdaptiveness;
       this.allowNonSeamlessAdaptiveness = allowNonSeamlessAdaptiveness;
       this.maxVideoWidth = maxVideoWidth;
@@ -200,7 +209,7 @@ public Parameters withPreferredAudioLanguage(String preferredAudioLanguage) {
       if (TextUtils.equals(preferredAudioLanguage, this.preferredAudioLanguage)) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -214,7 +223,20 @@ public Parameters withPreferredTextLanguage(String preferredTextLanguage) {
       if (TextUtils.equals(preferredTextLanguage, this.preferredTextLanguage)) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
+          allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
+          maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
+          viewportWidth, viewportHeight, viewportOrientationMayChange);
+    }
+
+    /**
+     * Returns an instance with the provided {@link #forceLowestBitrate}.
+     */
+    public Parameters withForceLowestBitrate(boolean forceLowestBitrate) {
+      if (forceLowestBitrate == this.forceLowestBitrate) {
+        return this;
+      }
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -227,7 +249,7 @@ public Parameters withAllowMixedMimeAdaptiveness(boolean allowMixedMimeAdaptiven
       if (allowMixedMimeAdaptiveness == this.allowMixedMimeAdaptiveness) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -240,7 +262,7 @@ public Parameters withAllowNonSeamlessAdaptiveness(boolean allowNonSeamlessAdapt
       if (allowNonSeamlessAdaptiveness == this.allowNonSeamlessAdaptiveness) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -253,7 +275,7 @@ public Parameters withMaxVideoSize(int maxVideoWidth, int maxVideoHeight) {
       if (maxVideoWidth == this.maxVideoWidth && maxVideoHeight == this.maxVideoHeight) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -266,7 +288,7 @@ public Parameters withMaxVideoBitrate(int maxVideoBitrate) {
       if (maxVideoBitrate == this.maxVideoBitrate) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -298,7 +320,7 @@ public Parameters withExceedVideoConstraintsIfNecessary(
       if (exceedVideoConstraintsIfNecessary == this.exceedVideoConstraintsIfNecessary) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -312,7 +334,7 @@ public Parameters withExceedRendererCapabilitiesIfNecessary(
       if (exceedRendererCapabilitiesIfNecessary == this.exceedRendererCapabilitiesIfNecessary) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -328,7 +350,7 @@ public Parameters withViewportSize(int viewportWidth, int viewportHeight,
           && viewportOrientationMayChange == this.viewportOrientationMayChange) {
         return this;
       }
-      return new Parameters(preferredAudioLanguage, preferredTextLanguage,
+      return new Parameters(preferredAudioLanguage, preferredTextLanguage, forceLowestBitrate,
           allowMixedMimeAdaptiveness, allowNonSeamlessAdaptiveness, maxVideoWidth, maxVideoHeight,
           maxVideoBitrate, exceedVideoConstraintsIfNecessary, exceedRendererCapabilitiesIfNecessary,
           viewportWidth, viewportHeight, viewportOrientationMayChange);
@@ -366,7 +388,8 @@ public boolean equals(Object obj) {
         return false;
       }
       Parameters other = (Parameters) obj;
-      return allowMixedMimeAdaptiveness == other.allowMixedMimeAdaptiveness
+      return forceLowestBitrate == other.forceLowestBitrate
+          && allowMixedMimeAdaptiveness == other.allowMixedMimeAdaptiveness
           && allowNonSeamlessAdaptiveness == other.allowNonSeamlessAdaptiveness
           && maxVideoWidth == other.maxVideoWidth && maxVideoHeight == other.maxVideoHeight
           && exceedVideoConstraintsIfNecessary == other.exceedVideoConstraintsIfNecessary
@@ -382,6 +405,7 @@ public boolean equals(Object obj) {
     public int hashCode() {
       int result = preferredAudioLanguage.hashCode();
       result = 31 * result + preferredTextLanguage.hashCode();
+      result = 31 * result + (forceLowestBitrate ? 1 : 0);
       result = 31 * result + (allowMixedMimeAdaptiveness ? 1 : 0);
       result = 31 * result + (allowNonSeamlessAdaptiveness ? 1 : 0);
       result = 31 * result + maxVideoWidth;
@@ -535,7 +559,7 @@ protected TrackSelection selectVideoTrack(RendererCapabilities rendererCapabilit
       TrackGroupArray groups, int[][] formatSupport, Parameters params,
       TrackSelection.Factory adaptiveTrackSelectionFactory) throws ExoPlaybackException {
     TrackSelection selection = null;
-    if (adaptiveTrackSelectionFactory != null) {
+    if (!params.forceLowestBitrate && adaptiveTrackSelectionFactory != null) {
       selection = selectAdaptiveVideoTrack(rendererCapabilities, groups, formatSupport,
           params, adaptiveTrackSelectionFactory);
     }
@@ -676,19 +700,21 @@ private static TrackSelection selectFixedVideoTrack(TrackGroupArray groups,
           }
           boolean selectTrack = trackScore > selectedTrackScore;
           if (trackScore == selectedTrackScore) {
-            // 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 lower
-            // count (or bitrate). If still tied then prefer the first track (i.e. the one that's
-            // already selected).
-            int comparisonResult;
-            int formatPixelCount = format.getPixelCount();
-            if (formatPixelCount != selectedPixelCount) {
-              comparisonResult = compareFormatValues(format.getPixelCount(), selectedPixelCount);
+            if (params.forceLowestBitrate) {
+              // Use bitrate as a tie breaker, preferring the lower bitrate.
+              selectTrack = compareFormatValues(format.bitrate, selectedBitrate) < 0;
             } else {
-              comparisonResult = compareFormatValues(format.bitrate, selectedBitrate);
+              // 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
+              // lower count (or bitrate). If still tied then prefer the first track (i.e. the one
+              // that's already selected).
+              int formatPixelCount = format.getPixelCount();
+              int comparisonResult = formatPixelCount != selectedPixelCount
+                  ? compareFormatValues(formatPixelCount, selectedPixelCount)
+                  : compareFormatValues(format.bitrate, selectedBitrate);
+              selectTrack = isWithinCapabilities && isWithinConstraints
+                  ? comparisonResult > 0 : comparisonResult < 0;
             }
-            selectTrack = isWithinCapabilities && isWithinConstraints
-                ? comparisonResult > 0 : comparisonResult < 0;
           }
           if (selectTrack) {
             selectedGroup = trackGroup;
@@ -739,6 +765,7 @@ protected TrackSelection selectAudioTrack(TrackGroupArray groups, int[][] format
     int selectedGroupIndex = C.INDEX_UNSET;
     int selectedTrackIndex = C.INDEX_UNSET;
     int selectedTrackScore = 0;
+    int selectedBitrate = Format.NO_VALUE;
     for (int groupIndex = 0; groupIndex < groups.length; groupIndex++) {
       TrackGroup trackGroup = groups.get(groupIndex);
       int[] trackFormatSupport = formatSupport[groupIndex];
@@ -748,10 +775,13 @@ protected TrackSelection selectAudioTrack(TrackGroupArray groups, int[][] format
           Format format = trackGroup.getFormat(trackIndex);
           int trackScore = getAudioTrackScore(trackFormatSupport[trackIndex],
               params.preferredAudioLanguage, format);
-          if (trackScore > selectedTrackScore) {
+          if (trackScore > selectedTrackScore
+              || (trackScore == selectedTrackScore && params.forceLowestBitrate
+                  && compareFormatValues(format.bitrate, selectedBitrate) < 0)) {
             selectedGroupIndex = groupIndex;
             selectedTrackIndex = trackIndex;
             selectedTrackScore = trackScore;
+            selectedBitrate = format.bitrate;
           }
         }
       }
@@ -762,7 +792,7 @@ protected TrackSelection selectAudioTrack(TrackGroupArray groups, int[][] format
     }
 
     TrackGroup selectedGroup = groups.get(selectedGroupIndex);
-    if (adaptiveTrackSelectionFactory != null) {
+    if (!params.forceLowestBitrate && adaptiveTrackSelectionFactory != null) {
       // If the group of the track with the highest score allows it, try to enable adaptation.
       int[] adaptiveTracks = getAdaptiveAudioTracks(selectedGroup,
           formatSupport[selectedGroupIndex], params.allowMixedMimeAdaptiveness);

From 1f8a8dbfa39d8b50a2465d6b04b5508d799f0d68 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 22 Sep 2017 06:27:22 -0700
Subject: [PATCH 254/421] Add version number to serialized DownloadAction data

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169681768
---
 .../exoplayer2/offline/ProgressiveDownloadActionTest.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 95dd2180923..44fe6c069b1 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
@@ -135,7 +135,8 @@ private static void doTestSerializationRoundTrip(ProgressiveDownloadAction actio
 
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 = ProgressiveDownloadAction.DESERIALIZER.readFromStream(input);
+    DownloadAction action2 =
+        ProgressiveDownloadAction.DESERIALIZER.readFromStream(action1.getVersion(), input);
 
     assertThat(action2).isEqualTo(action1);
   }

From 505d5cd0a4953e43094759efdd4c6cbc0749bee7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Sun, 24 Sep 2017 04:57:51 -0700
Subject: [PATCH 255/421] Fix a few lint warnings

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169830938
---
 .../com/google/android/exoplayer2/castdemo/MainActivity.java  | 4 +++-
 .../com/google/android/exoplayer2/castdemo/PlayerManager.java | 4 +---
 .../google/android/exoplayer2/demo/TrackSelectionHelper.java  | 2 +-
 3 files changed, 5 insertions(+), 5 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 e1c7519a053..9a2b76c941a 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 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.Menu;
@@ -129,7 +130,8 @@ public SampleListAdapter() {
     }
 
     @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
+    @NonNull
+    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
       View view = super.getView(position, convertView, parent);
       view.setBackgroundColor(Color.WHITE);
       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 8b461ec65cc..2538b031023 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
@@ -57,7 +57,6 @@
 
   private final SimpleExoPlayerView exoPlayerView;
   private final PlaybackControlView castControlView;
-  private final CastContext castContext;
   private final SimpleExoPlayer exoPlayer;
   private final CastPlayer castPlayer;
 
@@ -73,14 +72,13 @@ public PlayerManager(SimpleExoPlayerView exoPlayerView, PlaybackControlView cast
       Context context) {
     this.exoPlayerView = exoPlayerView;
     this.castControlView = castControlView;
-    castContext = CastContext.getSharedInstance(context);
 
     DefaultTrackSelector trackSelector = new DefaultTrackSelector(BANDWIDTH_METER);
     RenderersFactory renderersFactory = new DefaultRenderersFactory(context, null);
     exoPlayer = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector);
     exoPlayerView.setPlayer(exoPlayer);
 
-    castPlayer = new CastPlayer(castContext);
+    castPlayer = new CastPlayer(CastContext.getSharedInstance(context));
     castPlayer.setSessionAvailabilityListener(this);
     castControlView.setPlayer(castPlayer);
 
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
index fb7217f8fdd..e033b91eef3 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/TrackSelectionHelper.java
@@ -109,7 +109,7 @@ public void showSelectionDialog(Activity activity, CharSequence title, MappedTra
   private View buildView(Context context) {
     LayoutInflater inflater = LayoutInflater.from(context);
     View view = inflater.inflate(R.layout.track_selection_dialog, null);
-    ViewGroup root = (ViewGroup) view.findViewById(R.id.root);
+    ViewGroup root = view.findViewById(R.id.root);
 
     TypedArray attributeArray = context.getTheme().obtainStyledAttributes(
         new int[] {android.R.attr.selectableItemBackground});

From 06f7b6be6ae5e085606cc11e122b861c1bec9d19 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 25 Sep 2017 02:20:14 -0700
Subject: [PATCH 256/421] Use IntDef for AudioTrack.startMediaTimeState

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169880369
---
 .../android/exoplayer2/audio/AudioTrack.java    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
index a2d061ac845..25813aefc08 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
@@ -22,6 +22,7 @@
 import android.media.AudioTimestamp;
 import android.os.ConditionVariable;
 import android.os.SystemClock;
+import android.support.annotation.IntDef;
 import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.C;
@@ -29,6 +30,8 @@
 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.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
@@ -247,6 +250,12 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
    */
   private static final long MAX_LATENCY_US = 5 * C.MICROS_PER_SECOND;
 
+  /**
+   * Represents states of the {@link #startMediaTimeUs} value.
+   */
+  @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;
@@ -299,10 +308,8 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
   private android.media.AudioTrack audioTrack;
   private int sampleRate;
   private int channelConfig;
-  @C.Encoding
-  private int encoding;
-  @C.Encoding
-  private int outputEncoding;
+  private @C.Encoding int encoding;
+  private @C.Encoding int outputEncoding;
   private AudioAttributes audioAttributes;
   private boolean passthrough;
   private int bufferSize;
@@ -331,7 +338,7 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
   private long writtenPcmBytes;
   private long writtenEncodedFrames;
   private int framesPerEncodedSample;
-  private int startMediaTimeState;
+  private @StartMediaTimeState int startMediaTimeState;
   private long startMediaTimeUs;
   private long resumeSystemTimeUs;
   private long latencyUs;

From c6bc30bab73781c3d02f66d4d636045328fd190f Mon Sep 17 00:00:00 2001
From: strobe <strobe@google.com>
Date: Mon, 25 Sep 2017 09:41:58 -0700
Subject: [PATCH 257/421] Add NEON-accelerated HDR conversion routines to VPX.

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

diff --git a/extensions/vp9/src/main/jni/vpx_jni.cc b/extensions/vp9/src/main/jni/vpx_jni.cc
index f0b93b1dc27..5c480d15259 100644
--- a/extensions/vp9/src/main/jni/vpx_jni.cc
+++ b/extensions/vp9/src/main/jni/vpx_jni.cc
@@ -15,6 +15,9 @@
  */
 
 #include <cpu-features.h>
+#ifdef __ARM_NEON__
+#include <arm_neon.h>
+#endif
 #include <jni.h>
 
 #include <android/log.h>
@@ -70,6 +73,216 @@ jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   return JNI_VERSION_1_6;
 }
 
+#ifdef __ARM_NEON__
+static int convert_16_to_8_neon(const vpx_image_t* const img, jbyte* const data,
+                                const int32_t uvHeight, const int32_t yLength,
+                                const int32_t uvLength) {
+  if (!(android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON)) return 0;
+  uint32x2_t lcg_val = vdup_n_u32(random());
+  lcg_val = vset_lane_u32(random(), lcg_val, 1);
+  // LCG values recommended in good ol' "Numerical Recipes"
+  const uint32x2_t LCG_MULT = vdup_n_u32(1664525);
+  const uint32x2_t LCG_INCR = vdup_n_u32(1013904223);
+
+  const uint16_t* srcBase =
+      reinterpret_cast<uint16_t*>(img->planes[VPX_PLANE_Y]);
+  uint8_t* dstBase = reinterpret_cast<uint8_t*>(data);
+  // In units of uint16_t, so /2 from raw stride
+  const int srcStride = img->stride[VPX_PLANE_Y] / 2;
+  const int dstStride = img->stride[VPX_PLANE_Y];
+
+  for (int y = 0; y < img->d_h; y++) {
+    const uint16_t* src = srcBase;
+    uint8_t* dst = dstBase;
+
+    // Each read consumes 4 2-byte samples, but to reduce branches and
+    // random steps we unroll to four rounds, so each loop consumes 16
+    // samples.
+    const int imax = img->d_w & ~15;
+    int i;
+    for (i = 0; i < imax; i += 16) {
+      // Run a round of the RNG.
+      lcg_val = vmla_u32(LCG_INCR, lcg_val, LCG_MULT);
+
+      // The lower two bits of this LCG parameterization are garbage,
+      // leaving streaks on the image. We access the upper bits of each
+      // 16-bit lane by shifting. (We use this both as an 8- and 16-bit
+      // vector, so the choice of which one to keep it as is arbitrary.)
+      uint8x8_t randvec =
+          vreinterpret_u8_u16(vshr_n_u16(vreinterpret_u16_u32(lcg_val), 8));
+
+      // We retrieve the values and shift them so that the bits we'll
+      // shift out (after biasing) are in the upper 8 bits of each 16-bit
+      // lane.
+      uint16x4_t values = vshl_n_u16(vld1_u16(src), 6);
+      src += 4;
+
+      // We add the bias bits in the lower 8 to the shifted values to get
+      // the final values in the upper 8 bits.
+      uint16x4_t added1 = vqadd_u16(values, vreinterpret_u16_u8(randvec));
+
+      // Shifting the randvec bits left by 2 bits, as an 8-bit vector,
+      // should leave us with enough bias to get the needed rounding
+      // operation.
+      randvec = vshl_n_u8(randvec, 2);
+
+      // Retrieve and sum the next 4 pixels.
+      values = vshl_n_u16(vld1_u16(src), 6);
+      src += 4;
+      uint16x4_t added2 = vqadd_u16(values, vreinterpret_u16_u8(randvec));
+
+      // Reinterpret the two added vectors as 8x8, zip them together, and
+      // discard the lower portions.
+      uint8x8_t zipped =
+          vuzp_u8(vreinterpret_u8_u16(added1), vreinterpret_u8_u16(added2))
+              .val[1];
+      vst1_u8(dst, zipped);
+      dst += 8;
+
+      // Run it again with the next two rounds using the remaining
+      // entropy in randvec.
+      randvec = vshl_n_u8(randvec, 2);
+      values = vshl_n_u16(vld1_u16(src), 6);
+      src += 4;
+      added1 = vqadd_u16(values, vreinterpret_u16_u8(randvec));
+      randvec = vshl_n_u8(randvec, 2);
+      values = vshl_n_u16(vld1_u16(src), 6);
+      src += 4;
+      added2 = vqadd_u16(values, vreinterpret_u16_u8(randvec));
+      zipped = vuzp_u8(vreinterpret_u8_u16(added1), vreinterpret_u8_u16(added2))
+                   .val[1];
+      vst1_u8(dst, zipped);
+      dst += 8;
+    }
+
+    uint32_t randval = 0;
+    // For the remaining pixels in each row - usually none, as most
+    // standard sizes are divisible by 32 - convert them "by hand".
+    while (i < img->d_w) {
+      if (!randval) randval = random();
+      dstBase[i] = (srcBase[i] + (randval & 3)) >> 2;
+      i++;
+      randval >>= 2;
+    }
+
+    srcBase += srcStride;
+    dstBase += dstStride;
+  }
+
+  const uint16_t* srcUBase =
+      reinterpret_cast<uint16_t*>(img->planes[VPX_PLANE_U]);
+  const uint16_t* srcVBase =
+      reinterpret_cast<uint16_t*>(img->planes[VPX_PLANE_V]);
+  const int32_t uvWidth = (img->d_w + 1) / 2;
+  uint8_t* dstUBase = reinterpret_cast<uint8_t*>(data + yLength);
+  uint8_t* dstVBase = reinterpret_cast<uint8_t*>(data + yLength + uvLength);
+  const int srcUVStride = img->stride[VPX_PLANE_V] / 2;
+  const int dstUVStride = img->stride[VPX_PLANE_V];
+
+  for (int y = 0; y < uvHeight; y++) {
+    const uint16_t* srcU = srcUBase;
+    const uint16_t* srcV = srcVBase;
+    uint8_t* dstU = dstUBase;
+    uint8_t* dstV = dstVBase;
+
+    // As before, each i++ consumes 4 samples (8 bytes). For simplicity we
+    // don't unroll these loops more than we have to, which is 8 samples.
+    const int imax = uvWidth & ~7;
+    int i;
+    for (i = 0; i < imax; i += 8) {
+      lcg_val = vmla_u32(LCG_INCR, lcg_val, LCG_MULT);
+      uint8x8_t randvec =
+          vreinterpret_u8_u16(vshr_n_u16(vreinterpret_u16_u32(lcg_val), 8));
+      uint16x4_t uVal1 = vqadd_u16(vshl_n_u16(vld1_u16(srcU), 6),
+                                   vreinterpret_u16_u8(randvec));
+      srcU += 4;
+      randvec = vshl_n_u8(randvec, 2);
+      uint16x4_t vVal1 = vqadd_u16(vshl_n_u16(vld1_u16(srcV), 6),
+                                   vreinterpret_u16_u8(randvec));
+      srcV += 4;
+      randvec = vshl_n_u8(randvec, 2);
+      uint16x4_t uVal2 = vqadd_u16(vshl_n_u16(vld1_u16(srcU), 6),
+                                   vreinterpret_u16_u8(randvec));
+      srcU += 4;
+      randvec = vshl_n_u8(randvec, 2);
+      uint16x4_t vVal2 = vqadd_u16(vshl_n_u16(vld1_u16(srcV), 6),
+                                   vreinterpret_u16_u8(randvec));
+      srcV += 4;
+      vst1_u8(dstU,
+              vuzp_u8(vreinterpret_u8_u16(uVal1), vreinterpret_u8_u16(uVal2))
+                  .val[1]);
+      dstU += 8;
+      vst1_u8(dstV,
+              vuzp_u8(vreinterpret_u8_u16(vVal1), vreinterpret_u8_u16(vVal2))
+                  .val[1]);
+      dstV += 8;
+    }
+
+    i *= 4;
+    uint32_t randval = 0;
+    while (i < uvWidth) {
+      if (!randval) randval = random();
+      dstUBase[i] = (srcUBase[i] + (randval & 3)) >> 2;
+      randval >>= 2;
+      dstVBase[i] = (srcVBase[i] + (randval & 3)) >> 2;
+      randval >>= 2;
+      i++;
+    }
+
+    srcUBase += srcUVStride;
+    srcVBase += srcUVStride;
+    dstUBase += dstUVStride;
+    dstVBase += dstUVStride;
+  }
+
+  return 1;
+}
+
+#endif  // __ARM_NEON__
+
+static void convert_16_to_8_standard(const vpx_image_t* const img,
+                                     jbyte* const data, const int32_t uvHeight,
+                                     const int32_t yLength,
+                                     const int32_t uvLength) {
+  // Y
+  int sampleY = 0;
+  for (int y = 0; y < img->d_h; y++) {
+    const uint16_t* srcBase = reinterpret_cast<uint16_t*>(
+        img->planes[VPX_PLANE_Y] + img->stride[VPX_PLANE_Y] * y);
+    int8_t* destBase = data + img->stride[VPX_PLANE_Y] * y;
+    for (int x = 0; x < img->d_w; x++) {
+      // Lightweight dither. Carryover the remainder of each 10->8 bit
+      // conversion to the next pixel.
+      sampleY += *srcBase++;
+      *destBase++ = sampleY >> 2;
+      sampleY = sampleY & 3;  // Remainder.
+    }
+  }
+  // UV
+  int sampleU = 0;
+  int sampleV = 0;
+  const int32_t uvWidth = (img->d_w + 1) / 2;
+  for (int y = 0; y < uvHeight; y++) {
+    const uint16_t* srcUBase = reinterpret_cast<uint16_t*>(
+        img->planes[VPX_PLANE_U] + img->stride[VPX_PLANE_U] * y);
+    const uint16_t* srcVBase = reinterpret_cast<uint16_t*>(
+        img->planes[VPX_PLANE_V] + img->stride[VPX_PLANE_V] * y);
+    int8_t* destUBase = data + yLength + img->stride[VPX_PLANE_U] * y;
+    int8_t* destVBase =
+        data + yLength + uvLength + img->stride[VPX_PLANE_V] * y;
+    for (int x = 0; x < uvWidth; x++) {
+      // Lightweight dither. Carryover the remainder of each 10->8 bit
+      // conversion to the next pixel.
+      sampleU += *srcUBase++;
+      *destUBase++ = sampleU >> 2;
+      sampleU = sampleU & 3;  // Remainder.
+      sampleV += *srcVBase++;
+      *destVBase++ = sampleV >> 2;
+      sampleV = sampleV & 3;  // Remainder.
+    }
+  }
+}
+
 DECODER_FUNC(jlong, vpxInit) {
   vpx_codec_ctx_t* context = new vpx_codec_ctx_t();
   vpx_codec_dec_cfg_t cfg = {0, 0, 0};
@@ -201,47 +414,17 @@ DECODER_FUNC(jint, vpxGetFrame, jlong jContext, jobject jOutputBuffer) {
       // Note: The stride for BT2020 is twice of what we use so this is wasting
       // memory. The long term goal however is to upload half-float/short so
       // it's not important to optimize the stride at this time.
-      // Y
-      int sampleY = 0;
-      for (int y = 0; y < img->d_h; y++) {
-        const uint16_t* srcBase = reinterpret_cast<uint16_t*>(
-            img->planes[VPX_PLANE_Y] + img->stride[VPX_PLANE_Y] * y);
-        int8_t* destBase = data + img->stride[VPX_PLANE_Y] * y;
-        for (int x = 0; x < img->d_w; x++) {
-          // Lightweight dither. Carryover the remainder of each 10->8 bit
-          // conversion to the next pixel.
-          sampleY += *srcBase++;
-          *destBase++ = sampleY >> 2;
-          sampleY = sampleY & 3;  // Remainder.
-        }
-      }
-      // UV
-      int sampleU = 0;
-      int sampleV = 0;
-      const int32_t uvWidth = (img->d_w + 1) / 2;
-      for (int y = 0; y < uvHeight; y++) {
-        const uint16_t* srcUBase = reinterpret_cast<uint16_t*>(
-            img->planes[VPX_PLANE_U] + img->stride[VPX_PLANE_U] * y);
-        const uint16_t* srcVBase = reinterpret_cast<uint16_t*>(
-            img->planes[VPX_PLANE_V] + img->stride[VPX_PLANE_V] * y);
-        int8_t* destUBase = data + yLength + img->stride[VPX_PLANE_U] * y;
-        int8_t* destVBase = data + yLength + uvLength
-            + img->stride[VPX_PLANE_V] * y;
-        for (int x = 0; x < uvWidth; x++) {
-          // Lightweight dither. Carryover the remainder of each 10->8 bit
-          // conversion to the next pixel.
-          sampleU += *srcUBase++;
-          *destUBase++ = sampleU >> 2;
-          sampleU = sampleU & 3;  // Remainder.
-          sampleV += *srcVBase++;
-          *destVBase++ = sampleV >> 2;
-          sampleV = sampleV & 3;  // Remainder.
-        }
+      int converted = 0;
+#ifdef __ARM_NEON__
+      converted = convert_16_to_8_neon(img, data, uvHeight, yLength, uvLength);
+#endif  // __ARM_NEON__
+      if (!converted) {
+        convert_16_to_8_standard(img, data, uvHeight, yLength, uvLength);
       }
     } else {
-      // TODO: This copy can be eliminated by using external frame buffers. This
-      // is insignificant for smaller videos but takes ~1.5ms for 1080p clips.
-      // So this should eventually be gotten rid of.
+      // TODO: This copy can be eliminated by using external frame
+      // buffers. This is insignificant for smaller videos but takes ~1.5ms
+      // for 1080p clips. So this should eventually be gotten rid of.
       memcpy(data, img->planes[VPX_PLANE_Y], yLength);
       memcpy(data + yLength, img->planes[VPX_PLANE_U], uvLength);
       memcpy(data + yLength + uvLength, img->planes[VPX_PLANE_V], uvLength);
@@ -255,9 +438,7 @@ DECODER_FUNC(jstring, vpxGetErrorMessage, jlong jContext) {
   return env->NewStringUTF(vpx_codec_error(context));
 }
 
-DECODER_FUNC(jint, vpxGetErrorCode, jlong jContext) {
-  return errorCode;
-}
+DECODER_FUNC(jint, vpxGetErrorCode, jlong jContext) { return errorCode; }
 
 LIBRARY_FUNC(jstring, vpxIsSecureDecodeSupported) {
   // Doesn't support

From b17a6ba51dbdfc5808330ebf0b370e920beee085 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 25 Sep 2017 10:44:28 -0700
Subject: [PATCH 258/421] Add TODO to respect FLAG_ALLOW_GZIP in
 CronetDataSource

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=169927989
---
 .../android/exoplayer2/ext/cronet/CronetDataSource.java     | 6 ++++++
 1 file changed, 6 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 204a2756bb6..cdc8eb7b35f 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
@@ -460,6 +460,12 @@ private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
       }
       requestBuilder.addHeader("Range", rangeValue.toString());
     }
+    // TODO: Uncomment when https://bugs.chromium.org/p/chromium/issues/detail?id=767025 is fixed
+    // (adjusting the code as necessary).
+    // Force identity encoding unless gzip is allowed.
+    // if (!dataSpec.isFlagSet(DataSpec.FLAG_ALLOW_GZIP)) {
+    //   requestBuilder.addHeader("Accept-Encoding", "identity");
+    // }
     // Set the method and (if non-empty) the body.
     if (dataSpec.postBody != null) {
       requestBuilder.setHttpMethod("POST");

From 792f046c02b45fee7a4f6f0f8ce8de41e081334d Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 26 Sep 2017 17:06:36 +0100
Subject: [PATCH 259/421] Clean up HlsPlaylistTracker

---
 .../hls/playlist/HlsPlaylistTracker.java       | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

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 d9ab410fb98..f259a63420b 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
@@ -200,7 +200,7 @@ public HlsMasterPlaylist getMasterPlaylist() {
    */
   public HlsMediaPlaylist getPlaylistSnapshot(HlsUrl url) {
     HlsMediaPlaylist snapshot = playlistBundles.get(url).getPlaylistSnapshot();
-    if (url != primaryHlsUrl && snapshot != null) {
+    if (snapshot != null) {
       maybeSetPrimaryUrl(url);
     }
     return snapshot;
@@ -338,23 +338,22 @@ private boolean maybeSelectNewPrimaryUrl() {
   }
 
   private void maybeSetPrimaryUrl(HlsUrl url) {
-    if (!masterPlaylist.variants.contains(url)
+    if (url == primaryHlsUrl
+        || !masterPlaylist.variants.contains(url)
         || (primaryUrlSnapshot != null && primaryUrlSnapshot.hasEndTag)) {
-      // Only allow variant urls to be chosen as primary. Also prevent changing the primary url if
-      // the last primary snapshot contains an end tag.
+      // 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.
       return;
     }
-
     primaryHlsUrl = url;
     playlistBundles.get(primaryHlsUrl).loadPlaylist();
   }
 
   private void createBundles(List<HlsUrl> urls) {
     int listSize = urls.size();
-    long currentTimeMs = SystemClock.elapsedRealtime();
     for (int i = 0; i < listSize; i++) {
       HlsUrl url = urls.get(i);
-      MediaPlaylistBundle bundle = new MediaPlaylistBundle(url, currentTimeMs);
+      MediaPlaylistBundle bundle = new MediaPlaylistBundle(url);
       playlistBundles.put(url, bundle);
     }
   }
@@ -470,14 +469,12 @@ private final class MediaPlaylistBundle implements Loader.Callback<ParsingLoadab
     private HlsMediaPlaylist playlistSnapshot;
     private long lastSnapshotLoadMs;
     private long lastSnapshotChangeMs;
-    private long lastSnapshotAccessTimeMs;
     private long blacklistUntilMs;
     private boolean pendingRefresh;
     private IOException playlistError;
 
-    public MediaPlaylistBundle(HlsUrl playlistUrl, long initialLastSnapshotAccessTimeMs) {
+    public MediaPlaylistBundle(HlsUrl playlistUrl) {
       this.playlistUrl = playlistUrl;
-      lastSnapshotAccessTimeMs = initialLastSnapshotAccessTimeMs;
       mediaPlaylistLoader = new Loader("HlsPlaylistTracker:MediaPlaylist");
       mediaPlaylistLoadable = new ParsingLoadable<>(
           dataSourceFactory.createDataSource(C.DATA_TYPE_MANIFEST),
@@ -486,7 +483,6 @@ public MediaPlaylistBundle(HlsUrl playlistUrl, long initialLastSnapshotAccessTim
     }
 
     public HlsMediaPlaylist getPlaylistSnapshot() {
-      lastSnapshotAccessTimeMs = SystemClock.elapsedRealtime();
       return playlistSnapshot;
     }
 

From a3be9376509b9802171ae9b1b088b8f17ec2f999 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 26 Sep 2017 11:09:45 -0700
Subject: [PATCH 260/421] Prevent unnecessary consecutive playlist loads

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170078933
---
 .../hls/playlist/HlsPlaylistTracker.java      | 69 ++++++++++++-------
 1 file changed, 43 insertions(+), 26 deletions(-)

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 f259a63420b..d3682217d8e 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
@@ -363,9 +363,8 @@ private void createBundles(List<HlsUrl> urls) {
    *
    * @param url The url of the playlist.
    * @param newSnapshot The new snapshot.
-   * @return True if a refresh should be scheduled.
    */
-  private boolean onPlaylistUpdated(HlsUrl url, HlsMediaPlaylist newSnapshot) {
+  private void onPlaylistUpdated(HlsUrl url, HlsMediaPlaylist newSnapshot) {
     if (url == primaryHlsUrl) {
       if (primaryUrlSnapshot == null) {
         // This is the first primary url snapshot.
@@ -378,8 +377,6 @@ private boolean onPlaylistUpdated(HlsUrl url, HlsMediaPlaylist newSnapshot) {
     for (int i = 0; i < listenersSize; i++) {
       listeners.get(i).onPlaylistChanged();
     }
-    // If the primary playlist is not the final one, we should schedule a refresh.
-    return url == primaryHlsUrl && !newSnapshot.hasEndTag;
   }
 
   private void notifyPlaylistBlacklisting(HlsUrl url, long blacklistMs) {
@@ -469,8 +466,9 @@ private final class MediaPlaylistBundle implements Loader.Callback<ParsingLoadab
     private HlsMediaPlaylist playlistSnapshot;
     private long lastSnapshotLoadMs;
     private long lastSnapshotChangeMs;
+    private long earliestNextLoadTimeMs;
     private long blacklistUntilMs;
-    private boolean pendingRefresh;
+    private boolean loadPending;
     private IOException playlistError;
 
     public MediaPlaylistBundle(HlsUrl playlistUrl) {
@@ -504,8 +502,16 @@ public void release() {
 
     public void loadPlaylist() {
       blacklistUntilMs = 0;
-      if (!pendingRefresh && !mediaPlaylistLoader.isLoading()) {
-        mediaPlaylistLoader.startLoading(mediaPlaylistLoadable, this, minRetryCount);
+      if (loadPending || mediaPlaylistLoader.isLoading()) {
+        // Load already pending or in progress. Do nothing.
+        return;
+      }
+      long currentTimeMs = SystemClock.elapsedRealtime();
+      if (currentTimeMs < earliestNextLoadTimeMs) {
+        loadPending = true;
+        playlistRefreshHandler.postDelayed(this, earliestNextLoadTimeMs - currentTimeMs);
+      } else {
+        loadPlaylistImmediately();
       }
     }
 
@@ -549,8 +555,7 @@ public int onLoadError(ParsingLoadable<HlsPlaylist> loadable, long elapsedRealti
       }
       boolean shouldRetry = true;
       if (ChunkedTrackBlacklistUtil.shouldBlacklist(error)) {
-        blacklistPlaylist();
-        shouldRetry = primaryHlsUrl == playlistUrl && !maybeSelectNewPrimaryUrl();
+        shouldRetry = blacklistPlaylist();
       }
       return shouldRetry ? Loader.RETRY : Loader.DONT_RETRY;
     }
@@ -559,48 +564,60 @@ public int onLoadError(ParsingLoadable<HlsPlaylist> loadable, long elapsedRealti
 
     @Override
     public void run() {
-      pendingRefresh = false;
-      loadPlaylist();
+      loadPending = false;
+      loadPlaylistImmediately();
     }
 
     // Internal methods.
 
+    private void loadPlaylistImmediately() {
+      mediaPlaylistLoader.startLoading(mediaPlaylistLoadable, this, minRetryCount);
+    }
+
     private void processLoadedPlaylist(HlsMediaPlaylist loadedPlaylist) {
       HlsMediaPlaylist oldPlaylist = playlistSnapshot;
       long currentTimeMs = SystemClock.elapsedRealtime();
       lastSnapshotLoadMs = currentTimeMs;
       playlistSnapshot = getLatestPlaylistSnapshot(oldPlaylist, loadedPlaylist);
-      long refreshDelayUs = C.TIME_UNSET;
       if (playlistSnapshot != oldPlaylist) {
         playlistError = null;
         lastSnapshotChangeMs = currentTimeMs;
-        if (onPlaylistUpdated(playlistUrl, playlistSnapshot)) {
-          refreshDelayUs = playlistSnapshot.targetDurationUs;
-        }
+        onPlaylistUpdated(playlistUrl, playlistSnapshot);
       } else if (!playlistSnapshot.hasEndTag) {
-        if (currentTimeMs - lastSnapshotChangeMs
+        if (loadedPlaylist.mediaSequence + loadedPlaylist.segments.size()
+            < playlistSnapshot.mediaSequence) {
+          // The media sequence jumped backwards. The server has probably reset.
+          playlistError = new PlaylistResetException(playlistUrl.url);
+        } else if (currentTimeMs - lastSnapshotChangeMs
             > C.usToMs(playlistSnapshot.targetDurationUs)
                 * PLAYLIST_STUCK_TARGET_DURATION_COEFFICIENT) {
-          // The playlist seems to be stuck, we blacklist it.
+          // The playlist seems to be stuck. Blacklist it.
           playlistError = new PlaylistStuckException(playlistUrl.url);
           blacklistPlaylist();
-        } else if (loadedPlaylist.mediaSequence + loadedPlaylist.segments.size()
-            < playlistSnapshot.mediaSequence) {
-          // The media sequence has jumped backwards. The server has likely reset.
-          playlistError = new PlaylistResetException(playlistUrl.url);
         }
-        refreshDelayUs = playlistSnapshot.targetDurationUs / 2;
       }
-      if (refreshDelayUs != C.TIME_UNSET) {
-        // See HLS spec v20, section 6.3.4 for more information on media playlist refreshing.
-        pendingRefresh = playlistRefreshHandler.postDelayed(this, C.usToMs(refreshDelayUs));
+      // Do not allow the playlist to load again within the target duration if we obtained a new
+      // snapshot, or half the target duration otherwise.
+      earliestNextLoadTimeMs = currentTimeMs + C.usToMs(playlistSnapshot != oldPlaylist
+          ? playlistSnapshot.targetDurationUs : (playlistSnapshot.targetDurationUs / 2));
+      // 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) {
+        loadPlaylist();
       }
     }
 
-    private void blacklistPlaylist() {
+    /**
+     * Blacklists the playlist.
+     *
+     * @return Whether the playlist is the primary, despite being blacklisted.
+     */
+    private boolean blacklistPlaylist() {
       blacklistUntilMs = SystemClock.elapsedRealtime()
           + ChunkedTrackBlacklistUtil.DEFAULT_TRACK_BLACKLIST_MS;
       notifyPlaylistBlacklisting(playlistUrl, ChunkedTrackBlacklistUtil.DEFAULT_TRACK_BLACKLIST_MS);
+      return primaryHlsUrl == playlistUrl && !maybeSelectNewPrimaryUrl();
     }
 
   }

From 55f696e11d6aa3fef22539d2eb998bb19bd0eeb5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 27 Sep 2017 03:14:20 -0700
Subject: [PATCH 261/421] Fix spurious failures due to late decoding.

By default, if a codec is instantiated during an ongoing
playback, ExoPlayer will render the first frame that it
receives (so that there's "something other than black"
drawn to the surface). This frame is the key-frame before
the current playback position, and may be as much as 5
seconds behind the current position. ExoPlayer then drops
subsequent frames that are late until it's caught up to
the current position again.

For GTS tests that are counting dropped frames, this is
not desirable behavior, since it will cause spurious test
failures in cases where DummySurface is not supported.
This change overrides the default behavior so that the
player instead skips (rather than drops) frames until it's
caught up to the current playback position, and only then
renders the first frame.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170175944
---
 .../testutil/DebugRenderersFactory.java       | 47 +++++++++++++++++++
 1 file changed, 47 insertions(+)

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 af7c1a3e2a2..b63afd3984a 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
@@ -17,6 +17,8 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.media.MediaCodec;
+import android.media.MediaCrypto;
 import android.os.Handler;
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -25,9 +27,12 @@
 import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
+import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
 import com.google.android.exoplayer2.mediacodec.MediaCodecSelector;
+import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
 import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
 import com.google.android.exoplayer2.video.VideoRendererEventListener;
+import java.nio.ByteBuffer;
 import java.util.ArrayList;
 
 /**
@@ -66,6 +71,7 @@ private static class DebugMediaCodecVideoRenderer extends MediaCodecVideoRendere
     private int queueSize;
     private int bufferCount;
     private int minimumInsertIndex;
+    private boolean skipToPositionBeforeRenderingFirstFrame;
 
     public DebugMediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCodecSelector,
         long allowedJoiningTimeMs, DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
@@ -75,10 +81,23 @@ public DebugMediaCodecVideoRenderer(Context context, MediaCodecSelector mediaCod
           eventHandler, eventListener, maxDroppedFrameCountToNotify);
     }
 
+    @Override
+    protected void configureCodec(MediaCodecInfo codecInfo, MediaCodec codec, Format format,
+        MediaCrypto crypto) throws DecoderQueryException {
+      // If the codec is being initialized whilst the renderer is started, default behavior is to
+      // render the first frame (i.e. the keyframe before the current position), then drop frames up
+      // to the current playback position. For test runs that place a maximum limit on the number of
+      // dropped frames allowed, this is not desired behavior. Hence we skip (rather than drop)
+      // frames up to the current playback position [Internal: b/66494991].
+      skipToPositionBeforeRenderingFirstFrame = getState() == Renderer.STATE_STARTED;
+      super.configureCodec(codecInfo, codec, format, crypto);
+    }
+
     @Override
     protected void releaseCodec() {
       super.releaseCodec();
       clearTimestamps();
+      skipToPositionBeforeRenderingFirstFrame = false;
     }
 
     @Override
@@ -102,6 +121,34 @@ protected void onQueueInputBuffer(DecoderInputBuffer buffer) {
       maybeShiftTimestampsList();
     }
 
+    @Override
+    protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, MediaCodec codec,
+        ByteBuffer buffer, int bufferIndex, int bufferFlags, long bufferPresentationTimeUs,
+        boolean shouldSkip) {
+      if (skipToPositionBeforeRenderingFirstFrame && bufferPresentationTimeUs < positionUs) {
+        // After the codec has been initialized, don't render the first frame until we've caught up
+        // to the playback position. Else test runs on devices that do not support dummy surface
+        // will drop frames between rendering the first one and catching up [Internal: b/66494991].
+        shouldSkip = true;
+      }
+      return super.processOutputBuffer(positionUs, elapsedRealtimeUs, codec, buffer, bufferIndex,
+          bufferFlags, bufferPresentationTimeUs, shouldSkip);
+    }
+
+    @Override
+    protected void renderOutputBuffer(MediaCodec codec, int index, long presentationTimeUs) {
+      skipToPositionBeforeRenderingFirstFrame = false;
+      super.renderOutputBuffer(codec, index, presentationTimeUs);
+    }
+
+    @TargetApi(21)
+    @Override
+    protected void renderOutputBufferV21(MediaCodec codec, int index, long presentationTimeUs,
+        long releaseTimeNs) {
+      skipToPositionBeforeRenderingFirstFrame = false;
+      super.renderOutputBufferV21(codec, index, presentationTimeUs, releaseTimeNs);
+    }
+
     @Override
     protected void onProcessedOutputBuffer(long presentationTimeUs) {
       super.onProcessedOutputBuffer(presentationTimeUs);

From 52de36c5ebd52b61f01347ca258fe5336b04b815 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 27 Sep 2017 03:43:18 -0700
Subject: [PATCH 262/421] Add abstract, default Player event listener.

This allows simplified listener implementations as most listeners
will not listen to all possible notifications.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170177821
---
 .../exoplayer2/demo/PlayerActivity.java       | 192 ++++++++----------
 .../exoplayer2/ext/flac/FlacPlaybackTest.java |  59 +-----
 .../exoplayer2/ext/ima/ImaAdsLoader.java      |  32 +--
 .../ext/leanback/LeanbackPlayerAdapter.java   |  30 +--
 .../mediasession/MediaSessionConnector.java   |  14 +-
 .../exoplayer2/ext/opus/OpusPlaybackTest.java |  59 +-----
 .../exoplayer2/ext/vp9/VpxPlaybackTest.java   |  59 +-----
 .../com/google/android/exoplayer2/Player.java |  52 +++++
 .../exoplayer2/ui/DebugTextViewHelper.java    |  42 +---
 .../exoplayer2/ui/PlaybackControlView.java    |  28 +--
 .../exoplayer2/ui/SimpleExoPlayerView.java    |  42 +---
 .../android/exoplayer2/testutil/Action.java   |  60 +-----
 .../exoplayer2/testutil/ExoHostedTest.java    |  41 +---
 .../testutil/ExoPlayerTestRunner.java         |  23 +--
 14 files changed, 176 insertions(+), 557 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 0efb04782d3..c0838390edb 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
@@ -37,11 +37,8 @@
 import com.google.android.exoplayer2.DefaultRenderersFactory;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Player.EventListener;
 import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.drm.DefaultDrmSessionManager;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -83,7 +80,7 @@
 /**
  * An activity that plays media using {@link SimpleExoPlayer}.
  */
-public class PlayerActivity extends Activity implements OnClickListener, EventListener,
+public class PlayerActivity extends Activity implements OnClickListener,
     PlaybackControlView.VisibilityListener {
 
   public static final String DRM_SCHEME_UUID_EXTRA = "drm_scheme_uuid";
@@ -294,7 +291,7 @@ private void initializePlayer() {
           drmSessionManager, extensionRendererMode);
 
       player = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector);
-      player.addListener(this);
+      player.addListener(new PlayerEventListener());
       player.addListener(eventLogger);
       player.addMetadataOutput(eventLogger);
       player.setAudioDebugListener(eventLogger);
@@ -472,110 +469,6 @@ private void releaseAdsLoader() {
     }
   }
 
-  // Player.EventListener implementation
-
-  @Override
-  public void onLoadingChanged(boolean isLoading) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-    if (playbackState == Player.STATE_ENDED) {
-      showControls();
-    }
-    updateButtonVisibilities();
-  }
-
-  @Override
-  public void onRepeatModeChanged(int repeatMode) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-    if (inErrorState) {
-      // This will only occur if the user has performed a seek whilst in the error state. Update the
-      // resume position so that if the user then retries, playback will resume from the position to
-      // which they seeked.
-      updateResumePosition();
-    }
-  }
-
-  @Override
-  public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onTimelineChanged(Timeline timeline, Object manifest) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onPlayerError(ExoPlaybackException e) {
-    String errorString = null;
-    if (e.type == ExoPlaybackException.TYPE_RENDERER) {
-      Exception cause = e.getRendererException();
-      if (cause instanceof DecoderInitializationException) {
-        // Special case for decoder initialization failures.
-        DecoderInitializationException decoderInitializationException =
-            (DecoderInitializationException) cause;
-        if (decoderInitializationException.decoderName == null) {
-          if (decoderInitializationException.getCause() instanceof DecoderQueryException) {
-            errorString = getString(R.string.error_querying_decoders);
-          } else if (decoderInitializationException.secureDecoderRequired) {
-            errorString = getString(R.string.error_no_secure_decoder,
-                decoderInitializationException.mimeType);
-          } else {
-            errorString = getString(R.string.error_no_decoder,
-                decoderInitializationException.mimeType);
-          }
-        } else {
-          errorString = getString(R.string.error_instantiating_decoder,
-              decoderInitializationException.decoderName);
-        }
-      }
-    }
-    if (errorString != null) {
-      showToast(errorString);
-    }
-    inErrorState = true;
-    if (isBehindLiveWindow(e)) {
-      clearResumePosition();
-      initializePlayer();
-    } else {
-      updateResumePosition();
-      updateButtonVisibilities();
-      showControls();
-    }
-  }
-
-  @Override
-  @SuppressWarnings("ReferenceEquality")
-  public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-    updateButtonVisibilities();
-    if (trackGroups != lastSeenTrackGroupArray) {
-      MappedTrackInfo mappedTrackInfo = trackSelector.getCurrentMappedTrackInfo();
-      if (mappedTrackInfo != null) {
-        if (mappedTrackInfo.getTrackTypeRendererSupport(C.TRACK_TYPE_VIDEO)
-            == MappedTrackInfo.RENDERER_SUPPORT_UNSUPPORTED_TRACKS) {
-          showToast(R.string.error_unsupported_video);
-        }
-        if (mappedTrackInfo.getTrackTypeRendererSupport(C.TRACK_TYPE_AUDIO)
-            == MappedTrackInfo.RENDERER_SUPPORT_UNSUPPORTED_TRACKS) {
-          showToast(R.string.error_unsupported_audio);
-        }
-      }
-      lastSeenTrackGroupArray = trackGroups;
-    }
-  }
-
   // User controls
 
   private void updateButtonVisibilities() {
@@ -645,4 +538,85 @@ private static boolean isBehindLiveWindow(ExoPlaybackException e) {
     return false;
   }
 
+  private class PlayerEventListener extends Player.DefaultEventListener {
+
+    @Override
+    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+      if (playbackState == Player.STATE_ENDED) {
+        showControls();
+      }
+      updateButtonVisibilities();
+    }
+
+    @Override
+    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
+      if (inErrorState) {
+        // This will only occur if the user has performed a seek whilst in the error state. Update
+        // the resume position so that if the user then retries, playback will resume from the
+        // position to which they seeked.
+        updateResumePosition();
+      }
+    }
+
+    @Override
+    public void onPlayerError(ExoPlaybackException e) {
+      String errorString = null;
+      if (e.type == ExoPlaybackException.TYPE_RENDERER) {
+        Exception cause = e.getRendererException();
+        if (cause instanceof DecoderInitializationException) {
+          // Special case for decoder initialization failures.
+          DecoderInitializationException decoderInitializationException =
+              (DecoderInitializationException) cause;
+          if (decoderInitializationException.decoderName == null) {
+            if (decoderInitializationException.getCause() instanceof DecoderQueryException) {
+              errorString = getString(R.string.error_querying_decoders);
+            } else if (decoderInitializationException.secureDecoderRequired) {
+              errorString = getString(R.string.error_no_secure_decoder,
+                  decoderInitializationException.mimeType);
+            } else {
+              errorString = getString(R.string.error_no_decoder,
+                  decoderInitializationException.mimeType);
+            }
+          } else {
+            errorString = getString(R.string.error_instantiating_decoder,
+                decoderInitializationException.decoderName);
+          }
+        }
+      }
+      if (errorString != null) {
+        showToast(errorString);
+      }
+      inErrorState = true;
+      if (isBehindLiveWindow(e)) {
+        clearResumePosition();
+        initializePlayer();
+      } else {
+        updateResumePosition();
+        updateButtonVisibilities();
+        showControls();
+      }
+    }
+
+    @Override
+    @SuppressWarnings("ReferenceEquality")
+    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+      updateButtonVisibilities();
+      if (trackGroups != lastSeenTrackGroupArray) {
+        MappedTrackInfo mappedTrackInfo = trackSelector.getCurrentMappedTrackInfo();
+        if (mappedTrackInfo != null) {
+          if (mappedTrackInfo.getTrackTypeRendererSupport(C.TRACK_TYPE_VIDEO)
+              == MappedTrackInfo.RENDERER_SUPPORT_UNSUPPORTED_TRACKS) {
+            showToast(R.string.error_unsupported_video);
+          }
+          if (mappedTrackInfo.getTrackTypeRendererSupport(C.TRACK_TYPE_AUDIO)
+              == MappedTrackInfo.RENDERER_SUPPORT_UNSUPPORTED_TRACKS) {
+            showToast(R.string.error_unsupported_audio);
+          }
+        }
+        lastSeenTrackGroupArray = trackGroups;
+      }
+    }
+
+  }
+
 }
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 8e1926ab3b7..65fb4c81954 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
@@ -22,15 +22,11 @@
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
-import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 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;
 
 /**
@@ -45,20 +41,22 @@ public void testBasicPlayback() throws ExoPlaybackException {
   }
 
   private void playUri(String uri) throws ExoPlaybackException {
-    TestPlaybackThread thread = new TestPlaybackThread(Uri.parse(uri),
+    TestPlaybackRunnable testPlaybackRunnable = new TestPlaybackRunnable(Uri.parse(uri),
         getInstrumentation().getContext());
+    Thread thread = new Thread(testPlaybackRunnable);
     thread.start();
     try {
       thread.join();
     } catch (InterruptedException e) {
       fail(); // Should never happen.
     }
-    if (thread.playbackException != null) {
-      throw thread.playbackException;
+    if (testPlaybackRunnable.playbackException != null) {
+      throw testPlaybackRunnable.playbackException;
     }
   }
 
-  private static class TestPlaybackThread extends Thread implements Player.EventListener {
+  private static class TestPlaybackRunnable extends Player.DefaultEventListener
+      implements Runnable {
 
     private final Context context;
     private final Uri uri;
@@ -66,7 +64,7 @@ private static class TestPlaybackThread extends Thread implements Player.EventLi
     private ExoPlayer player;
     private ExoPlaybackException playbackException;
 
-    public TestPlaybackThread(Uri uri, Context context) {
+    public TestPlaybackRunnable(Uri uri, Context context) {
       this.uri = uri;
       this.context = context;
     }
@@ -89,31 +87,6 @@ public void run() {
       Looper.loop();
     }
 
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTimelineChanged(Timeline timeline, Object manifest) {
-      // Do nothing.
-    }
-
     @Override
     public void onPlayerError(ExoPlaybackException error) {
       playbackException = error;
@@ -123,25 +96,11 @@ public void onPlayerError(ExoPlaybackException error) {
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
       if (playbackState == Player.STATE_ENDED
           || (playbackState == Player.STATE_IDLE && playbackException != null)) {
-        releasePlayerAndQuitLooper();
+        player.release();
+        Looper.myLooper().quit();
       }
     }
 
-    @Override
-    public void onRepeatModeChanged(int repeatMode) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-      // Do nothing.
-    }
-
-    private void releasePlayerAndQuitLooper() {
-      player.release();
-      Looper.myLooper().quit();
-    }
-
   }
 
 }
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 7e5912ed288..a411da01331 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
@@ -43,13 +43,10 @@
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.source.ads.AdPlaybackState;
 import com.google.android.exoplayer2.source.ads.AdsLoader;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -59,8 +56,8 @@
 /**
  * Loads ads using the IMA SDK. All methods are called on the main thread.
  */
-public final class ImaAdsLoader implements AdsLoader, Player.EventListener, VideoAdPlayer,
-    ContentProgressProvider, AdErrorListener, AdsLoadedListener, AdEventListener {
+public final class ImaAdsLoader extends Player.DefaultEventListener implements AdsLoader,
+    VideoAdPlayer, ContentProgressProvider, AdErrorListener, AdsLoadedListener, AdEventListener {
 
   static {
     ExoPlayerLibraryInfo.registerModule("goog.exo.ima");
@@ -511,16 +508,6 @@ public void onTimelineChanged(Timeline timeline, Object manifest) {
     updateImaStateForPlayerState();
   }
 
-  @Override
-  public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onLoadingChanged(boolean isLoading) {
-    // Do nothing.
-  }
-
   @Override
   public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     if (adsManager == null) {
@@ -538,16 +525,6 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     }
   }
 
-  @Override
-  public void onRepeatModeChanged(int repeatMode) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-    // Do nothing.
-  }
-
   @Override
   public void onPlayerError(ExoPlaybackException error) {
     if (playingAd) {
@@ -584,11 +561,6 @@ public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     }
   }
 
-  @Override
-  public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-    // Do nothing.
-  }
-
   // Internal methods.
 
   private void requestAds() {
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 93583f7d246..510ed9cf4f0 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
@@ -30,13 +30,10 @@
 import com.google.android.exoplayer2.DefaultControlDispatcher;
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
 
 /**
@@ -221,7 +218,7 @@ private void maybeNotifyPreparedStateChanged(Callback callback) {
     }
   }
 
-  private final class ComponentListener implements Player.EventListener,
+  private final class ComponentListener extends Player.DefaultEventListener implements
       SimpleExoPlayer.VideoListener, SurfaceHolder.Callback {
 
     // SurfaceHolder.Callback implementation.
@@ -260,11 +257,6 @@ public void onPlayerError(ExoPlaybackException exception) {
       }
     }
 
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-      // Do nothing.
-    }
-
     @Override
     public void onTimelineChanged(Timeline timeline, Object manifest) {
       Callback callback = getCallback();
@@ -273,11 +265,6 @@ public void onTimelineChanged(Timeline timeline, Object manifest) {
       callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
     }
 
-    @Override
-    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-      // Do nothing.
-    }
-
     @Override
     public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
       Callback callback = getCallback();
@@ -285,21 +272,6 @@ public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
       callback.onBufferedPositionChanged(LeanbackPlayerAdapter.this);
     }
 
-    @Override
-    public void onPlaybackParametersChanged(PlaybackParameters params) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onRepeatModeChanged(int repeatMode) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-      // Do nothing.
-    }
-
     // SimpleExoplayerView.Callback implementation.
 
     @Override
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 61e37727507..565b9c0084b 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
@@ -36,8 +36,6 @@
 import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.ErrorMessageProvider;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 import java.util.Collections;
@@ -624,7 +622,7 @@ private boolean canDispatchToQueueEditor(long action) {
         & QueueEditor.ACTIONS & action) != 0;
   }
 
-  private class ExoPlayerEventListener implements Player.EventListener {
+  private class ExoPlayerEventListener extends Player.DefaultEventListener {
 
     private int currentWindowIndex;
     private int currentWindowCount;
@@ -649,16 +647,6 @@ public void onTimelineChanged(Timeline timeline, Object manifest) {
       updateMediaSessionMetadata();
     }
 
-    @Override
-    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-      // Do nothing.
-    }
-
     @Override
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
       updateMediaSessionPlaybackState();
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 8f82a9fdc02..591f43f38a1 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
@@ -22,15 +22,11 @@
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
-import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 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;
 
 /**
@@ -45,20 +41,22 @@ public void testBasicPlayback() throws ExoPlaybackException {
   }
 
   private void playUri(String uri) throws ExoPlaybackException {
-    TestPlaybackThread thread = new TestPlaybackThread(Uri.parse(uri),
+    TestPlaybackRunnable testPlaybackRunnable = new TestPlaybackRunnable(Uri.parse(uri),
         getInstrumentation().getContext());
+    Thread thread = new Thread(testPlaybackRunnable);
     thread.start();
     try {
       thread.join();
     } catch (InterruptedException e) {
       fail(); // Should never happen.
     }
-    if (thread.playbackException != null) {
-      throw thread.playbackException;
+    if (testPlaybackRunnable.playbackException != null) {
+      throw testPlaybackRunnable.playbackException;
     }
   }
 
-  private static class TestPlaybackThread extends Thread implements Player.EventListener {
+  private static class TestPlaybackRunnable extends Player.DefaultEventListener
+      implements Runnable {
 
     private final Context context;
     private final Uri uri;
@@ -66,7 +64,7 @@ private static class TestPlaybackThread extends Thread implements Player.EventLi
     private ExoPlayer player;
     private ExoPlaybackException playbackException;
 
-    public TestPlaybackThread(Uri uri, Context context) {
+    public TestPlaybackRunnable(Uri uri, Context context) {
       this.uri = uri;
       this.context = context;
     }
@@ -89,31 +87,6 @@ public void run() {
       Looper.loop();
     }
 
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTimelineChanged(Timeline timeline, Object manifest) {
-      // Do nothing.
-    }
-
     @Override
     public void onPlayerError(ExoPlaybackException error) {
       playbackException = error;
@@ -123,25 +96,11 @@ public void onPlayerError(ExoPlaybackException error) {
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
       if (playbackState == Player.STATE_ENDED
           || (playbackState == Player.STATE_IDLE && playbackException != null)) {
-        releasePlayerAndQuitLooper();
+        player.release();
+        Looper.myLooper().quit();
       }
     }
 
-    @Override
-    public void onRepeatModeChanged(int repeatMode) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-      // Do nothing.
-    }
-
-    private void releasePlayerAndQuitLooper() {
-      player.release();
-      Looper.myLooper().quit();
-    }
-
   }
 
 }
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 52b6670c09c..c2c1867a900 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
@@ -23,15 +23,11 @@
 import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
-import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.extractor.mkv.MatroskaExtractor;
 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;
 
 /**
@@ -74,20 +70,22 @@ public void testInvalidBitstream() {
   }
 
   private void playUri(String uri) throws ExoPlaybackException {
-    TestPlaybackThread thread = new TestPlaybackThread(Uri.parse(uri),
+    TestPlaybackRunnable testPlaybackRunnable = new TestPlaybackRunnable(Uri.parse(uri),
         getInstrumentation().getContext());
+    Thread thread = new Thread(testPlaybackRunnable);
     thread.start();
     try {
       thread.join();
     } catch (InterruptedException e) {
       fail(); // Should never happen.
     }
-    if (thread.playbackException != null) {
-      throw thread.playbackException;
+    if (testPlaybackRunnable.playbackException != null) {
+      throw testPlaybackRunnable.playbackException;
     }
   }
 
-  private static class TestPlaybackThread extends Thread implements Player.EventListener {
+  private static class TestPlaybackRunnable extends Player.DefaultEventListener
+      implements Runnable {
 
     private final Context context;
     private final Uri uri;
@@ -95,7 +93,7 @@ private static class TestPlaybackThread extends Thread implements Player.EventLi
     private ExoPlayer player;
     private ExoPlaybackException playbackException;
 
-    public TestPlaybackThread(Uri uri, Context context) {
+    public TestPlaybackRunnable(Uri uri, Context context) {
       this.uri = uri;
       this.context = context;
     }
@@ -121,31 +119,6 @@ public void run() {
       Looper.loop();
     }
 
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTimelineChanged(Timeline timeline, Object manifest) {
-      // Do nothing.
-    }
-
     @Override
     public void onPlayerError(ExoPlaybackException error) {
       playbackException = error;
@@ -155,25 +128,11 @@ public void onPlayerError(ExoPlaybackException error) {
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
       if (playbackState == Player.STATE_ENDED
           || (playbackState == Player.STATE_IDLE && playbackException != null)) {
-        releasePlayerAndQuitLooper();
+        player.release();
+        Looper.myLooper().quit();
       }
     }
 
-    @Override
-    public void onRepeatModeChanged(int repeatMode) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-      // Do nothing.
-    }
-
-    private void releasePlayerAndQuitLooper() {
-      player.release();
-      Looper.myLooper().quit();
-    }
-
   }
 
 }
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 795b7249c85..3dd702b85f9 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
@@ -136,6 +136,58 @@ interface EventListener {
 
   }
 
+  /**
+   * {@link EventListener} allowing selective overrides. All methods are implemented as no-ops.
+   */
+  abstract class DefaultEventListener implements EventListener {
+
+    @Override
+    public void onTimelineChanged(Timeline timeline, Object manifest) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onLoadingChanged(boolean isLoading) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onRepeatModeChanged(int repeatMode) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onPlayerError(ExoPlaybackException error) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onPositionDiscontinuity(int reason) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
+      // Do nothing.
+    }
+
+  }
+
   /**
    * The player does not have any media to play.
    */
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 cff860b671f..f443c2a06fe 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
@@ -17,22 +17,17 @@
 
 import android.annotation.SuppressLint;
 import android.widget.TextView;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import java.util.Locale;
 
 /**
  * A helper class for periodically updating a {@link TextView} with debug information obtained from
  * a {@link SimpleExoPlayer}.
  */
-public final class DebugTextViewHelper implements Runnable, Player.EventListener {
+public final class DebugTextViewHelper extends Player.DefaultEventListener implements Runnable {
 
   private static final int REFRESH_INTERVAL_MS = 1000;
 
@@ -78,51 +73,16 @@ public void stop() {
 
   // Player.EventListener implementation.
 
-  @Override
-  public void onLoadingChanged(boolean isLoading) {
-    // Do nothing.
-  }
-
   @Override
   public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     updateAndPost();
   }
 
-  @Override
-  public void onRepeatModeChanged(int repeatMode) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-    // Do nothing.
-  }
-
   @Override
   public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     updateAndPost();
   }
 
-  @Override
-  public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onTimelineChanged(Timeline timeline, Object manifest) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onPlayerError(ExoPlaybackException error) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onTracksChanged(TrackGroupArray tracks, TrackSelectionArray selections) {
-    // Do nothing.
-  }
-
   // Runnable implementation.
 
   @Override
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 848aabc2588..f47ac8695c1 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
@@ -30,13 +30,9 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayerLibraryInfo;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.RepeatModeUtil;
 import com.google.android.exoplayer2.util.Util;
@@ -1046,8 +1042,8 @@ private static boolean canShowMultiWindowTimeBar(Timeline timeline, Timeline.Win
     return true;
   }
 
-  private final class ComponentListener implements Player.EventListener, TimeBar.OnScrubListener,
-      OnClickListener {
+  private final class ComponentListener extends Player.DefaultEventListener implements
+      TimeBar.OnScrubListener, OnClickListener {
 
     @Override
     public void onScrubStart(TimeBar timeBar, long position) {
@@ -1095,11 +1091,6 @@ public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
       updateProgress();
     }
 
-    @Override
-    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-      // Do nothing.
-    }
-
     @Override
     public void onTimelineChanged(Timeline timeline, Object manifest) {
       updateNavigation();
@@ -1107,21 +1098,6 @@ public void onTimelineChanged(Timeline timeline, Object manifest) {
       updateProgress();
     }
 
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTracksChanged(TrackGroupArray tracks, TrackSelectionArray selections) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPlayerError(ExoPlaybackException error) {
-      // Do nothing.
-    }
-
     @Override
     public void onClick(View view) {
       if (player != null) {
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 b6f0677871b..053bc26a6e0 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
@@ -36,11 +36,8 @@
 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.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -871,8 +868,8 @@ private static void setResizeModeRaw(AspectRatioFrameLayout aspectRatioFrame, in
     aspectRatioFrame.setResizeMode(resizeMode);
   }
 
-  private final class ComponentListener implements TextOutput, SimpleExoPlayer.VideoListener,
-      Player.EventListener {
+  private final class ComponentListener extends Player.DefaultEventListener implements TextOutput,
+      SimpleExoPlayer.VideoListener {
 
     // TextOutput implementation
 
@@ -908,46 +905,11 @@ public void onTracksChanged(TrackGroupArray tracks, TrackSelectionArray selectio
 
     // Player.EventListener implementation
 
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-      // Do nothing.
-    }
-
     @Override
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
       maybeShowController(false);
     }
 
-    @Override
-    public void onRepeatModeChanged(int repeatMode) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPlayerError(ExoPlaybackException e) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onTimelineChanged(Timeline timeline, Object manifest) {
-      // Do nothing.
-    }
-
   }
 
 }
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 b41d44d0162..76e39525b49 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
@@ -18,17 +18,13 @@
 import android.os.Handler;
 import android.util.Log;
 import android.view.Surface;
-import com.google.android.exoplayer2.ExoPlaybackException;
 import com.google.android.exoplayer2.ExoPlayer;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.testutil.ActionSchedule.ActionNode;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 
 /**
  * Base class for actions to perform during playback tests.
@@ -326,7 +322,7 @@ public WaitForTimelineChanged(String tag, Timeline expectedTimeline) {
     protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
         final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
         final ActionNode nextAction) {
-      PlayerListener listener = new PlayerListener() {
+      Player.EventListener listener = new Player.DefaultEventListener() {
         @Override
         public void onTimelineChanged(Timeline timeline, Object manifest) {
           if (timeline.equals(expectedTimeline)) {
@@ -351,7 +347,7 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
   }
 
   /**
-   * Waits for {@link Player.EventListener#onPositionDiscontinuity()}.
+   * Waits for {@link Player.EventListener#onPositionDiscontinuity(int)}.
    */
   public static final class WaitForPositionDiscontinuity extends Action {
 
@@ -366,7 +362,7 @@ public WaitForPositionDiscontinuity(String tag) {
     protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
         final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
         final ActionNode nextAction) {
-      player.addListener(new PlayerListener() {
+      player.addListener(new Player.DefaultEventListener() {
         @Override
         public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
           player.removeListener(this);
@@ -406,54 +402,4 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
 
   }
 
-  /** Listener implementation used for overriding. Does nothing. */
-  private static class PlayerListener implements Player.EventListener {
-
-    @Override
-    public void onTimelineChanged(Timeline timeline, Object manifest) {
-
-    }
-
-    @Override
-    public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-
-    }
-
-    @Override
-    public void onLoadingChanged(boolean isLoading) {
-
-    }
-
-    @Override
-    public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-
-    }
-
-    @Override
-    public void onRepeatModeChanged(@ExoPlayer.RepeatMode int repeatMode) {
-
-    }
-
-    @Override
-    public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-
-    }
-
-    @Override
-    public void onPlayerError(ExoPlaybackException error) {
-
-    }
-
-    @Override
-    public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-
-    }
-
-    @Override
-    public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-
-    }
-
-  }
-
 }
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 d3186e475db..142c5060b51 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
@@ -25,23 +25,19 @@
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Format;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
 import com.google.android.exoplayer2.audio.AudioTrack;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
 import com.google.android.exoplayer2.source.MediaSource;
-import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.testutil.HostActivity.HostedTest;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.google.android.exoplayer2.upstream.BandwidthMeter;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
@@ -53,7 +49,7 @@
 /**
  * A {@link HostedTest} for {@link ExoPlayer} playback tests.
  */
-public abstract class ExoHostedTest implements HostedTest, Player.EventListener,
+public abstract class ExoHostedTest extends Player.DefaultEventListener implements HostedTest,
     AudioRendererEventListener, VideoRendererEventListener {
 
   static {
@@ -203,16 +199,6 @@ public final void onFinished() {
 
   // Player.EventListener
 
-  @Override
-  public void onLoadingChanged(boolean isLoading) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray trackSelections) {
-    // Do nothing.
-  }
-
   @Override
   public final void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     Log.d(tag, "state [" + playWhenReady + ", " + playbackState + "]");
@@ -230,16 +216,6 @@ public final void onPlayerStateChanged(boolean playWhenReady, int playbackState)
     this.playing = playing;
   }
 
-  @Override
-  public void onRepeatModeChanged(int repeatMode) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-    // Do nothing.
-  }
-
   @Override
   public final void onPlayerError(ExoPlaybackException error) {
     playerWasPrepared = true;
@@ -247,21 +223,6 @@ public final void onPlayerError(ExoPlaybackException error) {
     onPlayerErrorInternal(error);
   }
 
-  @Override
-  public final void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
-    // Do nothing.
-  }
-
-  @Override
-  public final void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-    // Do nothing.
-  }
-
-  @Override
-  public final void onTimelineChanged(Timeline timeline, Object manifest) {
-    // Do nothing.
-  }
-
   // AudioRendererEventListener
 
   @Override
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 b8c0846f8ed..a87066415d4 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
@@ -22,7 +22,6 @@
 import com.google.android.exoplayer2.ExoPlayerFactory;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.LoadControl;
-import com.google.android.exoplayer2.PlaybackParameters;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.RenderersFactory;
@@ -49,7 +48,7 @@
 /**
  * Helper class to run an ExoPlayer test.
  */
-public final class ExoPlayerTestRunner implements Player.EventListener {
+public final class ExoPlayerTestRunner extends Player.DefaultEventListener {
 
   /**
    * Builder to set-up a {@link ExoPlayerTestRunner}. Default fake implementations will be used for
@@ -341,11 +340,6 @@ public void onTracksChanged(TrackGroupArray trackGroups, TrackSelectionArray tra
     this.trackGroups = trackGroups;
   }
 
-  @Override
-  public void onLoadingChanged(boolean isLoading) {
-    // Do nothing.
-  }
-
   @Override
   public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     if (periodIndices.isEmpty() && playbackState == Player.STATE_READY) {
@@ -358,16 +352,6 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     }
   }
 
-  @Override
-  public void onRepeatModeChanged(@Player.RepeatMode int repeatMode) {
-    // Do nothing.
-  }
-
-  @Override
-  public void onShuffleModeEnabledChanged(boolean shuffleModeEnabled) {
-    // Do nothing.
-  }
-
   @Override
   public void onPlayerError(ExoPlaybackException error) {
     handleException(exception);
@@ -379,9 +363,4 @@ public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
     periodIndices.add(player.getCurrentPeriodIndex());
   }
 
-  @Override
-  public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
-    // Do nothing.
-  }
-
 }

From b14b3d43de673398bc18581aaa646e73166b73d7 Mon Sep 17 00:00:00 2001
From: zhihuichen <zhihuichen@google.com>
Date: Wed, 27 Sep 2017 16:11:01 -0700
Subject: [PATCH 263/421] Expose OnKeyStatusChange events, this is required to
 learn the usabilities of the keys.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170268043
---
 .../android/exoplayer2/drm/ExoMediaDrm.java   | 32 +++++++++++++
 .../exoplayer2/drm/FrameworkMediaDrm.java     | 48 ++++++++++++++++++-
 2 files changed, 78 insertions(+), 2 deletions(-)

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 25b065c543a..1930e11f062 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,9 @@
 import android.media.MediaDrm;
 import android.media.MediaDrmException;
 import android.media.NotProvisionedException;
+import android.os.Handler;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -80,6 +82,31 @@ void onEvent(ExoMediaDrm<? extends T> mediaDrm, byte[] sessionId, int event, int
         byte[] data);
   }
 
+  /**
+   * @see android.media.MediaDrm.KeyStatus
+   */
+  interface ExoKeyStatus {
+    int getStatusCode();
+    byte[] getKeyId();
+  }
+
+  /**
+   * @see android.media.MediaDrm.OnKeyStatusChangeListener
+   */
+  interface OnKeyStatusChangeListener<T extends ExoMediaCrypto> {
+    /**
+     * Called when the keys in a session change status, such as when the license is renewed or
+     * expires.
+     *
+     * @param mediaDrm the {@link ExoMediaDrm} object on which the event occurred.
+     * @param sessionId the DRM session ID on which the event occurred.
+     * @param exoKeyInfo a list of {@link ExoKeyStatus} that contains key ID and status.
+     * @param hasNewUsableKey true if new key becomes usable.
+     */
+    void onKeyStatusChange(ExoMediaDrm<? extends T> mediaDrm, byte[] sessionId,
+        List<ExoKeyStatus> exoKeyInfo, boolean hasNewUsableKey);
+  }
+
   /**
    * @see android.media.MediaDrm.KeyRequest
    */
@@ -101,6 +128,11 @@ interface ProvisionRequest {
    */
   void setOnEventListener(OnEventListener<? super T> listener);
 
+  /**
+   * @see MediaDrm#setOnKeyStatusChangeListener(MediaDrm.OnKeyStatusChangeListener, Handler)
+   */
+  void setOnKeyStatusChangeListener(OnKeyStatusChangeListener<? super T> listener);
+
   /**
    * @see MediaDrm#openSession()
    */
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 2edd6ff254b..c3ab3462d9b 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
@@ -20,6 +20,7 @@
 import android.media.MediaCrypto;
 import android.media.MediaCryptoException;
 import android.media.MediaDrm;
+import android.media.MediaDrm.KeyStatus;
 import android.media.MediaDrmException;
 import android.media.NotProvisionedException;
 import android.media.UnsupportedSchemeException;
@@ -27,14 +28,16 @@
 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.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 /**
  * An {@link ExoMediaDrm} implementation that wraps the framework {@link MediaDrm}.
  */
-@TargetApi(18)
+@TargetApi(23)
 public final class FrameworkMediaDrm implements ExoMediaDrm<FrameworkMediaCrypto> {
 
   private final UUID uuid;
@@ -71,13 +74,36 @@ public void setOnEventListener(
       final ExoMediaDrm.OnEventListener<? super FrameworkMediaCrypto> listener) {
     mediaDrm.setOnEventListener(listener == null ? null : new MediaDrm.OnEventListener() {
       @Override
-      public void onEvent(@NonNull MediaDrm md, byte[] sessionId, int event, int extra,
+      public void onEvent(@NonNull MediaDrm md, @NonNull byte[] sessionId, int event, int extra,
           byte[] data) {
         listener.onEvent(FrameworkMediaDrm.this, sessionId, event, extra, data);
       }
     });
   }
 
+  @Override
+  public void setOnKeyStatusChangeListener(
+      final ExoMediaDrm.OnKeyStatusChangeListener<? super FrameworkMediaCrypto> listener) {
+    if (Util.SDK_INT < 23) {
+      throw new UnsupportedOperationException();
+    }
+    
+    mediaDrm.setOnKeyStatusChangeListener(listener == null ? null
+        : new MediaDrm.OnKeyStatusChangeListener() {
+          @Override
+          public void onKeyStatusChange(@NonNull MediaDrm md, @NonNull byte[] sessionId,
+              @NonNull List<KeyStatus> keyInfo, boolean hasNewUsableKey) {
+            List<ExoKeyStatus> exoKeyInfo = new ArrayList<>();
+            for (KeyStatus keyStatus : keyInfo) {
+              exoKeyInfo.add(new FrameworkKeyStatus(keyStatus));
+            }
+
+            listener.onKeyStatusChange(FrameworkMediaDrm.this, sessionId, exoKeyInfo,
+                hasNewUsableKey);
+          }
+        }, null);
+  }
+
   @Override
   public byte[] openSession() throws MediaDrmException {
     return mediaDrm.openSession();
@@ -178,4 +204,22 @@ public FrameworkMediaCrypto createMediaCrypto(byte[] initData) throws MediaCrypt
         forceAllowInsecureDecoderComponents);
   }
 
+  private static final class FrameworkKeyStatus implements ExoKeyStatus {
+    private final MediaDrm.KeyStatus keyStatus;
+
+    FrameworkKeyStatus(MediaDrm.KeyStatus keyStatus) {
+      this.keyStatus = keyStatus;
+    }
+
+    @Override
+    public int getStatusCode() {
+      return keyStatus.getStatusCode();
+    }
+
+    @Override
+    public byte[] getKeyId() {
+      return keyStatus.getKeyId();
+    }
+  }
+
 }

From 9c7950f342a9312ea2354df60cf3cdb84efd432c Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 28 Sep 2017 00:56:03 -0700
Subject: [PATCH 264/421] Add AudioSink interface and use it from audio
 renderers

This change allows applications to provide custom AudioSinks, which could be
based on android.media.AudioTrack like AudioTrackAudioSink, or could be
completely custom.

The refactoring is mostly mechanical and shouldn't result in any functionality
changes.

Some android.media.AudioTrack-specific details have to appear in the AudioSink
interface so this change modifies the javadoc on the AudioTrack (now AudioSink)
to note that some methods will have no effect.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170311083
---
 .../android/exoplayer2/demo/EventLogger.java  |   2 +-
 .../android/exoplayer2/SimpleExoPlayer.java   |   4 +-
 .../audio/AudioRendererEventListener.java     |  14 +-
 .../android/exoplayer2/audio/AudioSink.java   | 332 ++++++++++++++
 .../audio/ChannelMappingAudioProcessor.java   |   2 +-
 ...{AudioTrack.java => DefaultAudioSink.java} | 422 ++++--------------
 .../audio/MediaCodecAudioRenderer.java        |  89 ++--
 .../audio/SimpleDecoderAudioRenderer.java     |  94 ++--
 .../audio/TrimmingAudioProcessor.java         |   2 +-
 .../exoplayer2/testutil/ExoHostedTest.java    |  12 +-
 10 files changed, 560 insertions(+), 413 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
 rename library/core/src/main/java/com/google/android/exoplayer2/audio/{AudioTrack.java => DefaultAudioSink.java} (76%)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 83ba61fff1b..5c2b40e6305 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -248,7 +248,7 @@ public void onAudioDisabled(DecoderCounters counters) {
   }
 
   @Override
-  public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
+  public void onAudioSinkUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
     printInternalError("audioTrackUnderrun [" + bufferSize + ", " + bufferSizeMs + ", "
         + elapsedSinceLastFeedMs + "]", null);
   }
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 1c35adb9178..5a5a948d58b 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
@@ -976,10 +976,10 @@ public void onAudioInputFormatChanged(Format format) {
     }
 
     @Override
-    public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs,
+    public void onAudioSinkUnderrun(int bufferSize, long bufferSizeMs,
         long elapsedSinceLastFeedMs) {
       if (audioDebugListener != null) {
-        audioDebugListener.onAudioTrackUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
+        audioDebugListener.onAudioSinkUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
       }
     }
 
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 5f9f599f017..7a4958a61a4 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
@@ -63,15 +63,15 @@ void onAudioDecoderInitialized(String decoderName, long initializedTimestampMs,
   void onAudioInputFormatChanged(Format format);
 
   /**
-   * Called when an {@link AudioTrack} underrun occurs.
+   * Called when an {@link AudioSink} underrun occurs.
    *
-   * @param bufferSize The size of the {@link AudioTrack}'s buffer, in bytes.
-   * @param bufferSizeMs The size of the {@link AudioTrack}'s buffer, in milliseconds, if it is
+   * @param bufferSize The size of the {@link AudioSink}'s buffer, in bytes.
+   * @param bufferSizeMs The size of the {@link AudioSink}'s buffer, in milliseconds, if it is
    *     configured for PCM output. {@link C#TIME_UNSET} if it is configured for passthrough output,
    *     as the buffered media can have a variable bitrate so the duration may be unknown.
-   * @param elapsedSinceLastFeedMs The time since the {@link AudioTrack} was last fed data.
+   * @param elapsedSinceLastFeedMs The time since the {@link AudioSink} was last fed data.
    */
-  void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
+  void onAudioSinkUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
 
   /**
    * Called when the renderer is disabled.
@@ -144,7 +144,7 @@ public void run() {
     }
 
     /**
-     * Invokes {@link AudioRendererEventListener#onAudioTrackUnderrun(int, long, long)}.
+     * Invokes {@link AudioRendererEventListener#onAudioSinkUnderrun(int, long, long)}.
      */
     public void audioTrackUnderrun(final int bufferSize, final long bufferSizeMs,
         final long elapsedSinceLastFeedMs) {
@@ -152,7 +152,7 @@ public void audioTrackUnderrun(final int bufferSize, final long bufferSizeMs,
         handler.post(new Runnable()  {
           @Override
           public void run() {
-            listener.onAudioTrackUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
+            listener.onAudioSinkUnderrun(bufferSize, bufferSizeMs, elapsedSinceLastFeedMs);
           }
         });
       }
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
new file mode 100644
index 00000000000..879769b0e22
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioSink.java
@@ -0,0 +1,332 @@
+/*
+ * 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.audio;
+
+import android.media.AudioTrack;
+import android.support.annotation.Nullable;
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.PlaybackParameters;
+import java.nio.ByteBuffer;
+
+/**
+ * A sink that consumes audio data.
+ * <p>
+ * Before starting playback, specify the input audio format by calling
+ * {@link #configure(String, 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(String, 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.
+ */
+public interface AudioSink {
+
+  /**
+   * Listener for audio sink events.
+   */
+  interface Listener {
+
+    /**
+     * Called if the audio sink has started rendering audio to a new platform audio session.
+     *
+     * @param audioSessionId The newly generated audio session's identifier.
+     */
+    void onAudioSessionId(int audioSessionId);
+
+    /**
+     * Called when the audio sink handles a buffer whose timestamp is discontinuous with the last
+     * buffer handled since it was reset.
+     */
+    void onPositionDiscontinuity();
+
+    /**
+     * Called when the audio sink runs out of data.
+     * <p>
+     * An audio sink implementation may never call this method (for example, if audio data is
+     * consumed in batches rather than based on the sink's own clock).
+     *
+     * @param bufferSize The size of the sink's buffer, in bytes.
+     * @param bufferSizeMs The size of the sink's buffer, in milliseconds, if it is configured for
+     *     PCM output. {@link C#TIME_UNSET} if it is configured for passthrough output, as the
+     *     buffered media can have a variable bitrate so the duration may be unknown.
+     * @param elapsedSinceLastFeedMs The time since the sink was last fed data, in milliseconds.
+     */
+    void onUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
+
+  }
+
+  /**
+   * Thrown when a failure occurs configuring the sink.
+   */
+  final class ConfigurationException extends Exception {
+
+    /**
+     * Creates a new configuration exception with the specified {@code cause} and no message.
+     */
+    public ConfigurationException(Throwable cause) {
+      super(cause);
+    }
+
+    /**
+     * Creates a new configuration exception with the specified {@code message} and no cause.
+     */
+    public ConfigurationException(String message) {
+      super(message);
+    }
+
+  }
+
+  /**
+   * Thrown when a failure occurs initializing the sink.
+   */
+  final class InitializationException extends Exception {
+
+    /**
+     * The underlying {@link AudioTrack}'s state, if applicable.
+     */
+    public final int audioTrackState;
+
+    /**
+     * @param audioTrackState The underlying {@link AudioTrack}'s state, if applicable.
+     * @param sampleRate The requested sample rate in Hz.
+     * @param channelConfig The requested channel configuration.
+     * @param bufferSize The requested buffer size in bytes.
+     */
+    public InitializationException(int audioTrackState, int sampleRate, int channelConfig,
+        int bufferSize) {
+      super("AudioTrack init failed: " + audioTrackState + ", Config(" + sampleRate + ", "
+          + channelConfig + ", " + bufferSize + ")");
+      this.audioTrackState = audioTrackState;
+    }
+
+  }
+
+  /**
+   * Thrown when a failure occurs writing to the sink.
+   */
+  final class WriteException extends Exception {
+
+    /**
+     * The error value returned from the sink implementation. If the sink writes to a platform
+     * {@link AudioTrack}, this will be the error value returned from
+     * {@link AudioTrack#write(byte[], int, int)} or {@link AudioTrack#write(ByteBuffer, int, int)}.
+     * Otherwise, the meaning of the error code depends on the sink implementation.
+     */
+    public final int errorCode;
+
+    /**
+     * @param errorCode The error value returned from the sink implementation.
+     */
+    public WriteException(int errorCode) {
+      super("AudioTrack write failed: " + errorCode);
+      this.errorCode = errorCode;
+    }
+
+  }
+
+  /**
+   * Returned by {@link #getCurrentPositionUs(boolean)} when the position is not set.
+   */
+  long CURRENT_POSITION_NOT_SET = Long.MIN_VALUE;
+
+  /**
+   * Sets the listener for sink events, which should be the audio renderer.
+   *
+   * @param listener The listener for sink events, which should be the audio renderer.
+   */
+  void setListener(Listener listener);
+
+  /**
+   * Returns whether it's possible to play audio in the specified format using encoded audio
+   * passthrough.
+   *
+   * @param mimeType The format mime type.
+   * @return Whether it's possible to play audio in the format using encoded audio passthrough.
+   */
+  boolean isPassthroughSupported(String mimeType);
+
+  /**
+   * Returns the playback position in the stream starting at zero, in microseconds, or
+   * {@link #CURRENT_POSITION_NOT_SET} if it is not yet available.
+   *
+   * @param sourceEnded Specify {@code true} if no more input buffers will be provided.
+   * @return The playback position relative to the start of playback, in microseconds.
+   */
+  long getCurrentPositionUs(boolean sourceEnded);
+
+  /**
+   * Configures (or reconfigures) the sink.
+   *
+   * @param mimeType The MIME type of audio data provided in the input buffers.
+   * @param channelCount The number of channels.
+   * @param sampleRate The sample rate in Hz.
+   * @param pcmEncoding For PCM formats, the encoding used. One of {@link C#ENCODING_PCM_16BIT},
+   *     {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT} and
+   *     {@link C#ENCODING_PCM_32BIT}.
+   * @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to infer a
+   *     suitable buffer size.
+   * @param outputChannels A mapping from input to output channels that is applied to this sink's
+   *     input as a preprocessing step, if handling PCM input. Specify {@code null} to leave the
+   *     input unchanged. Otherwise, the element at index {@code i} specifies index of the input
+   *     channel to map to output channel {@code i} when preprocessing input buffers. After the
+   *     map is applied the audio data will have {@code outputChannels.length} channels.
+   * @param trimStartSamples The number of audio samples to trim from the start of data written to
+   *     the sink after this call.
+   * @param trimEndSamples The number of audio samples to trim from data written to the sink
+   *     immediately preceding the next call to {@link #reset()} or
+   *     {@link #configure(String, int, int, int, int, int[], int, int)}.
+   * @throws ConfigurationException If an error occurs configuring the sink.
+   */
+  void configure(String mimeType, int channelCount, int sampleRate, @C.PcmEncoding int pcmEncoding,
+      int specifiedBufferSize, @Nullable int[] outputChannels, int trimStartSamples,
+      int trimEndSamples) throws ConfigurationException;
+
+  /**
+   * Starts or resumes consuming audio if initialized.
+   */
+  void play();
+
+  /**
+   * Signals to the sink that the next buffer is discontinuous with the previous buffer.
+   */
+  void handleDiscontinuity();
+
+  /**
+   * Attempts to process data from a {@link ByteBuffer}, starting from its current position and
+   * 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(String, int, int, int, int, int[], int, int)} that causes the sink to be
+   * reset).
+   *
+   * @param buffer The buffer containing audio data.
+   * @param presentationTimeUs The presentation timestamp of the buffer in microseconds.
+   * @return Whether the buffer was handled fully.
+   * @throws InitializationException If an error occurs initializing the sink.
+   * @throws WriteException If an error occurs writing the audio data.
+   */
+  boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
+      throws InitializationException, WriteException;
+
+  /**
+   * Processes any remaining data. {@link #isEnded()} will return {@code true} when no data remains.
+   *
+   * @throws WriteException If an error occurs draining data to the sink.
+   */
+  void playToEndOfStream() throws WriteException;
+
+  /**
+   * Returns whether {@link #playToEndOfStream} has been called and all buffers have been processed.
+   */
+  boolean isEnded();
+
+  /**
+   * Returns whether the sink has data pending that has not been consumed yet.
+   */
+  boolean hasPendingData();
+
+  /**
+   * Attempts to set the playback parameters and returns the active playback parameters, which may
+   * differ from those passed in.
+   *
+   * @param playbackParameters The new playback parameters to attempt to set.
+   * @return The active playback parameters.
+   */
+  PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters);
+
+  /**
+   * Gets the active {@link PlaybackParameters}.
+   */
+  PlaybackParameters getPlaybackParameters();
+
+  /**
+   * Sets attributes for audio playback. If the attributes have changed and if the sink is not
+   * configured for use with tunneling, then it is reset and the audio session id is cleared.
+   * <p>
+   * If the sink is configured for use with tunneling then the audio attributes are ignored. The
+   * sink is not reset and the audio session id is not cleared. The passed attributes will be used
+   * if the sink is later re-configured into non-tunneled mode.
+   *
+   * @param audioAttributes The attributes for audio playback.
+   */
+  void setAudioAttributes(AudioAttributes audioAttributes);
+
+  /**
+   * Sets the audio session id.
+   */
+  void setAudioSessionId(int audioSessionId);
+
+  /**
+   * Enables tunneling, if possible. The sink is reset if tunneling was previously disabled or if
+   * the audio session id has changed. Enabling tunneling is only possible if the sink is based on a
+   * platform {@link AudioTrack}, and requires platform API version 21 onwards.
+   *
+   * @param tunnelingAudioSessionId The audio session id to use.
+   * @throws IllegalStateException Thrown if enabling tunneling on platform API version &lt; 21.
+   */
+  void enableTunnelingV21(int tunnelingAudioSessionId);
+
+  /**
+   * Disables tunneling. If tunneling was previously enabled then the sink is reset and any audio
+   * session id is cleared.
+   */
+  void disableTunneling();
+
+  /**
+   * Sets the playback volume.
+   *
+   * @param volume A volume in the range [0.0, 1.0].
+   */
+  void setVolume(float volume);
+
+  /**
+   * Pauses playback.
+   */
+  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.
+   */
+  void reset();
+
+  /**
+   * Releases any resources associated with this instance.
+   */
+  void release();
+
+}
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 ef85985f1fb..03bbd5817be 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
@@ -52,7 +52,7 @@ public ChannelMappingAudioProcessor() {
    * Resets the channel mapping. After calling this method, call {@link #configure(int, int, int)}
    * to start using the new channel map.
    *
-   * @see AudioTrack#configure(String, int, int, int, int, int[], int, int)
+   * @see AudioSink#configure(String, int, int, int, int, int[], int, int)
    */
   public void setChannelMap(int[] outputChannels) {
     pendingOutputChannels = outputChannels;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
similarity index 76%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
rename to library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
index 25813aefc08..34ea173debc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioTrack.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/DefaultAudioSink.java
@@ -20,6 +20,7 @@
 import android.media.AudioFormat;
 import android.media.AudioManager;
 import android.media.AudioTimestamp;
+import android.media.AudioTrack;
 import android.os.ConditionVariable;
 import android.os.SystemClock;
 import android.support.annotation.IntDef;
@@ -39,131 +40,19 @@
 import java.util.LinkedList;
 
 /**
- * Plays audio data. The implementation delegates to an {@link android.media.AudioTrack} and handles
- * playback position smoothing, non-blocking writes and reconfiguration.
+ * Plays audio data. The implementation delegates to an {@link AudioTrack} and handles playback
+ * position smoothing, non-blocking writes and reconfiguration.
  * <p>
- * Before starting playback, specify the input format by calling
- * {@link #configure(String, int, int, int, int, int[], int, int)}. Optionally call
- * {@link #setAudioSessionId(int)}, {@link #setAudioAttributes(AudioAttributes)},
- * {@link #enableTunnelingV21(int)} and {@link #disableTunneling()} to configure audio playback.
- * These methods may be called after writing data to the track, in which case it will be
- * reinitialized as required.
- * <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(String, int, int, int, int, int[], int, int)} whenever the input format
- * changes. The track will be reinitialized on the next call to
- * {@link #handleBuffer(ByteBuffer, long)}.
- * <p>
- * Calling {@link #reset()} releases the underlying {@link android.media.AudioTrack} (and so does
- * calling {@link #configure(String, int, int, int, int, int[], int, int)} unless the format is
- * unchanged). It is safe to call {@link #handleBuffer(ByteBuffer, long)} after {@link #reset()}
- * without calling {@link #configure(String, int, int, int, int, int[], int, int)}.
- * <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.
+ * If tunneling mode is enabled, care must be taken that audio processors do not output buffers with
+ * a different duration than their input, and buffer processors must produce output corresponding to
+ * their last input immediately after that input is queued. This means that, for example, speed
+ * adjustment is not possible while using tunneling.
  */
-public final class AudioTrack {
-
-  /**
-   * Listener for audio track events.
-   */
-  public interface Listener {
-
-    /**
-     * Called when the audio track has been initialized with a newly generated audio session id.
-     *
-     * @param audioSessionId The newly generated audio session id.
-     */
-    void onAudioSessionId(int audioSessionId);
-
-    /**
-     * Called when the audio track handles a buffer whose timestamp is discontinuous with the last
-     * buffer handled since it was reset.
-     */
-    void onPositionDiscontinuity();
-
-    /**
-     * Called when the audio track underruns.
-     *
-     * @param bufferSize The size of the track's buffer, in bytes.
-     * @param bufferSizeMs The size of the track's buffer, in milliseconds, if it is configured for
-     *     PCM output. {@link C#TIME_UNSET} if it is configured for passthrough output, as the
-     *     buffered media can have a variable bitrate so the duration may be unknown.
-     * @param elapsedSinceLastFeedMs The time since the track was last fed data, in milliseconds.
-     */
-    void onUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs);
-
-  }
-
-  /**
-   * Thrown when a failure occurs configuring the track.
-   */
-  public static final class ConfigurationException extends Exception {
-
-    public ConfigurationException(Throwable cause) {
-      super(cause);
-    }
-
-    public ConfigurationException(String message) {
-      super(message);
-    }
-
-  }
-
-  /**
-   * Thrown when a failure occurs initializing an {@link android.media.AudioTrack}.
-   */
-  public static final class InitializationException extends Exception {
-
-    /**
-     * The state as reported by {@link android.media.AudioTrack#getState()}.
-     */
-    public final int audioTrackState;
-
-    /**
-     * @param audioTrackState The state as reported by {@link android.media.AudioTrack#getState()}.
-     * @param sampleRate The requested sample rate in Hz.
-     * @param channelConfig The requested channel configuration.
-     * @param bufferSize The requested buffer size in bytes.
-     */
-    public InitializationException(int audioTrackState, int sampleRate, int channelConfig,
-        int bufferSize) {
-      super("AudioTrack init failed: " + audioTrackState + ", Config(" + sampleRate + ", "
-          + channelConfig + ", " + bufferSize + ")");
-      this.audioTrackState = audioTrackState;
-    }
-
-  }
-
-  /**
-   * Thrown when a failure occurs writing to an {@link android.media.AudioTrack}.
-   */
-  public static final class WriteException extends Exception {
-
-    /**
-     * The error value returned from {@link android.media.AudioTrack#write(byte[], int, int)} or
-     *     {@link android.media.AudioTrack#write(ByteBuffer, int, int)}.
-     */
-    public final int errorCode;
-
-    /**
-     * @param errorCode The error value returned from
-     *     {@link android.media.AudioTrack#write(byte[], int, int)} or
-     *     {@link android.media.AudioTrack#write(ByteBuffer, int, int)}.
-     */
-    public WriteException(int errorCode) {
-      super("AudioTrack write failed: " + errorCode);
-      this.errorCode = errorCode;
-    }
-
-  }
+public final class DefaultAudioSink implements AudioSink {
 
   /**
-   * Thrown when {@link android.media.AudioTrack#getTimestamp} returns a spurious timestamp, if
-   * {@code AudioTrack#failOnSpuriousAudioTimestamp} is set.
+   * Thrown when {@link AudioTrack#getTimestamp} returns a spurious timestamp, if
+   * {@link #failOnSpuriousAudioTimestamp} is set.
    */
   public static final class InvalidAudioTrackTimestampException extends RuntimeException {
 
@@ -177,61 +66,56 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
   }
 
   /**
-   * Returned by {@link #getCurrentPositionUs(boolean)} when the position is not set.
-   */
-  public static final long CURRENT_POSITION_NOT_SET = Long.MIN_VALUE;
-
-  /**
-   * A minimum length for the {@link android.media.AudioTrack} buffer, in microseconds.
+   * A minimum length for the {@link AudioTrack} buffer, in microseconds.
    */
   private static final long MIN_BUFFER_DURATION_US = 250000;
   /**
-   * A maximum length for the {@link android.media.AudioTrack} buffer, in microseconds.
+   * A maximum length for the {@link AudioTrack} buffer, in microseconds.
    */
   private static final long MAX_BUFFER_DURATION_US = 750000;
   /**
-   * The length for passthrough {@link android.media.AudioTrack} buffers, in microseconds.
+   * The length for passthrough {@link AudioTrack} buffers, in microseconds.
    */
   private static final long PASSTHROUGH_BUFFER_DURATION_US = 250000;
   /**
    * A multiplication factor to apply to the minimum buffer size requested by the underlying
-   * {@link android.media.AudioTrack}.
+   * {@link AudioTrack}.
    */
   private static final int BUFFER_MULTIPLICATION_FACTOR = 4;
 
   /**
-   * @see android.media.AudioTrack#PLAYSTATE_STOPPED
+   * @see AudioTrack#PLAYSTATE_STOPPED
    */
-  private static final int PLAYSTATE_STOPPED = android.media.AudioTrack.PLAYSTATE_STOPPED;
+  private static final int PLAYSTATE_STOPPED = AudioTrack.PLAYSTATE_STOPPED;
   /**
-   * @see android.media.AudioTrack#PLAYSTATE_PAUSED
+   * @see AudioTrack#PLAYSTATE_PAUSED
    */
-  private static final int PLAYSTATE_PAUSED = android.media.AudioTrack.PLAYSTATE_PAUSED;
+  private static final int PLAYSTATE_PAUSED = AudioTrack.PLAYSTATE_PAUSED;
   /**
-   * @see android.media.AudioTrack#PLAYSTATE_PLAYING
+   * @see AudioTrack#PLAYSTATE_PLAYING
    */
-  private static final int PLAYSTATE_PLAYING = android.media.AudioTrack.PLAYSTATE_PLAYING;
+  private static final int PLAYSTATE_PLAYING = AudioTrack.PLAYSTATE_PLAYING;
   /**
-   * @see android.media.AudioTrack#ERROR_BAD_VALUE
+   * @see AudioTrack#ERROR_BAD_VALUE
    */
-  private static final int ERROR_BAD_VALUE = android.media.AudioTrack.ERROR_BAD_VALUE;
+  private static final int ERROR_BAD_VALUE = AudioTrack.ERROR_BAD_VALUE;
   /**
-   * @see android.media.AudioTrack#MODE_STATIC
+   * @see AudioTrack#MODE_STATIC
    */
-  private static final int MODE_STATIC = android.media.AudioTrack.MODE_STATIC;
+  private static final int MODE_STATIC = AudioTrack.MODE_STATIC;
   /**
-   * @see android.media.AudioTrack#MODE_STREAM
+   * @see AudioTrack#MODE_STREAM
    */
-  private static final int MODE_STREAM = android.media.AudioTrack.MODE_STREAM;
+  private static final int MODE_STREAM = AudioTrack.MODE_STREAM;
   /**
-   * @see android.media.AudioTrack#STATE_INITIALIZED
+   * @see AudioTrack#STATE_INITIALIZED
    */
-  private static final int STATE_INITIALIZED = android.media.AudioTrack.STATE_INITIALIZED;
+  private static final int STATE_INITIALIZED = AudioTrack.STATE_INITIALIZED;
   /**
-   * @see android.media.AudioTrack#WRITE_NON_BLOCKING
+   * @see AudioTrack#WRITE_NON_BLOCKING
    */
   @SuppressLint("InlinedApi")
-  private static final int WRITE_NON_BLOCKING = android.media.AudioTrack.WRITE_NON_BLOCKING;
+  private static final int WRITE_NON_BLOCKING = AudioTrack.WRITE_NON_BLOCKING;
 
   private static final String TAG = "AudioTrack";
 
@@ -282,7 +166,7 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
 
   /**
    * Whether to throw an {@link InvalidAudioTrackTimestampException} when a spurious timestamp is
-   * reported from {@link android.media.AudioTrack#getTimestamp}.
+   * reported from {@link AudioTrack#getTimestamp}.
    * <p>
    * The flag must be set before creating a player. Should be set to {@code true} for testing and
    * debugging purposes only.
@@ -294,18 +178,17 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
   private final TrimmingAudioProcessor trimmingAudioProcessor;
   private final SonicAudioProcessor sonicAudioProcessor;
   private final AudioProcessor[] availableAudioProcessors;
-  private final Listener listener;
   private final ConditionVariable releasingConditionVariable;
   private final long[] playheadOffsets;
   private final AudioTrackUtil audioTrackUtil;
   private final LinkedList<PlaybackParametersCheckpoint> playbackParametersCheckpoints;
 
+  @Nullable private Listener listener;
   /**
    * Used to keep the audio session active on pre-V21 builds (see {@link #initialize()}).
    */
-  private android.media.AudioTrack keepSessionIdAudioTrack;
-
-  private android.media.AudioTrack audioTrack;
+  private AudioTrack keepSessionIdAudioTrack;
+  private AudioTrack audioTrack;
   private int sampleRate;
   private int channelConfig;
   private @C.Encoding int encoding;
@@ -364,17 +247,15 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
    *     default capabilities (no encoded audio passthrough support) should be assumed.
    * @param audioProcessors An array of {@link AudioProcessor}s that will process PCM audio before
    *     output. May be empty.
-   * @param listener Listener for audio track events.
    */
-  public AudioTrack(@Nullable AudioCapabilities audioCapabilities, AudioProcessor[] audioProcessors,
-      Listener listener) {
+  public DefaultAudioSink(@Nullable AudioCapabilities audioCapabilities,
+      AudioProcessor[] audioProcessors) {
     this.audioCapabilities = audioCapabilities;
-    this.listener = listener;
     releasingConditionVariable = new ConditionVariable(true);
     if (Util.SDK_INT >= 18) {
       try {
         getLatencyMethod =
-            android.media.AudioTrack.class.getMethod("getLatency", (Class<?>[]) null);
+            AudioTrack.class.getMethod("getLatency", (Class<?>[]) null);
       } catch (NoSuchMethodException e) {
         // There's no guarantee this method exists. Do nothing.
       }
@@ -405,29 +286,21 @@ public AudioTrack(@Nullable AudioCapabilities audioCapabilities, AudioProcessor[
     playbackParametersCheckpoints = new LinkedList<>();
   }
 
-  /**
-   * Returns whether it's possible to play audio in the specified format using encoded passthrough.
-   *
-   * @param mimeType The format mime type.
-   * @return Whether it's possible to play audio in the format using encoded passthrough.
-   */
+  @Override
+  public void setListener(Listener listener) {
+    this.listener = listener;
+  }
+
+  @Override
   public boolean isPassthroughSupported(String mimeType) {
     return audioCapabilities != null
         && audioCapabilities.supportsEncoding(getEncodingForMimeType(mimeType));
   }
 
-  /**
-   * Returns the playback position in the stream starting at zero, in microseconds, or
-   * {@link #CURRENT_POSITION_NOT_SET} if it is not yet available.
-   *
-   * <p>If the device supports it, the method uses the playback timestamp from
-   * {@link android.media.AudioTrack#getTimestamp}. Otherwise, it derives a smoothed position by
-   * sampling the {@link android.media.AudioTrack}'s frame position.
-   *
-   * @param sourceEnded Specify {@code true} if no more input buffers will be provided.
-   * @return The playback position relative to the start of playback, in microseconds.
-   */
+  @Override
   public long getCurrentPositionUs(boolean sourceEnded) {
+    // If the device supports it, use the playback timestamp from AudioTrack.getTimestamp.
+    // Otherwise, derive a smoothed position by sampling the track's frame position.
     if (!hasCurrentPositionUs()) {
       return CURRENT_POSITION_NOT_SET;
     }
@@ -462,29 +335,7 @@ public long getCurrentPositionUs(boolean sourceEnded) {
     return startMediaTimeUs + applySpeedup(positionUs);
   }
 
-  /**
-   * Configures (or reconfigures) the audio track.
-   *
-   * @param mimeType The mime type.
-   * @param channelCount The number of channels.
-   * @param sampleRate The sample rate in Hz.
-   * @param pcmEncoding For PCM formats, the encoding used. One of {@link C#ENCODING_PCM_16BIT},
-   *     {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT} and
-   *     {@link C#ENCODING_PCM_32BIT}.
-   * @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to infer a
-   *     suitable buffer size automatically.
-   * @param outputChannels A mapping from input to output channels that is applied to this track's
-   *     input as a preprocessing step, if handling PCM input. Specify {@code null} to leave the
-   *     input unchanged. Otherwise, the element at index {@code i} specifies index of the input
-   *     channel to map to output channel {@code i} when preprocessing input buffers. After the
-   *     map is applied the audio data will have {@code outputChannels.length} channels.
-   * @param trimStartSamples The number of audio samples to trim from the start of data written to
-   *     the track after this call.
-   * @param trimEndSamples The number of audio samples to trim from data written to the track
-   *     immediately preceding the next call to {@link #reset()} or
-   *     {@link #configure(String, int, int, int, int, int[], int, int)}.
-   * @throws ConfigurationException If an error occurs configuring the track.
-   */
+  @Override
   public void configure(String mimeType, int channelCount, int sampleRate,
       @C.PcmEncoding int pcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
       int trimStartSamples, int trimEndSamples) throws ConfigurationException {
@@ -590,8 +441,7 @@ public void configure(String mimeType, int channelCount, int sampleRate,
         bufferSize = (int) (PASSTHROUGH_BUFFER_DURATION_US * 192 * 1024 / C.MICROS_PER_SECOND);
       }
     } else {
-      int minBufferSize =
-          android.media.AudioTrack.getMinBufferSize(sampleRate, channelConfig, outputEncoding);
+      int minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, outputEncoding);
       Assertions.checkState(minBufferSize != ERROR_BAD_VALUE);
       int multipliedBufferSize = minBufferSize * BUFFER_MULTIPLICATION_FACTOR;
       int minAppBufferSize = (int) durationUsToFrames(MIN_BUFFER_DURATION_US) * outputPcmFrameSize;
@@ -651,7 +501,9 @@ private void initialize() throws InitializationException {
     }
     if (this.audioSessionId != audioSessionId) {
       this.audioSessionId = audioSessionId;
-      listener.onAudioSessionId(audioSessionId);
+      if (listener != null) {
+        listener.onAudioSessionId(audioSessionId);
+      }
     }
 
     audioTrackUtil.reconfigure(audioTrack, needsPassthroughWorkarounds());
@@ -659,9 +511,7 @@ private void initialize() throws InitializationException {
     hasData = false;
   }
 
-  /**
-   * Starts or resumes playing audio if the audio track has been initialized.
-   */
+  @Override
   public void play() {
     playing = true;
     if (isInitialized()) {
@@ -670,9 +520,7 @@ public void play() {
     }
   }
 
-  /**
-   * Signals to the audio track that the next buffer is discontinuous with the previous buffer.
-   */
+  @Override
   public void handleDiscontinuity() {
     // Force resynchronization after a skipped buffer.
     if (startMediaTimeState == START_IN_SYNC) {
@@ -680,24 +528,7 @@ public void handleDiscontinuity() {
     }
   }
 
-  /**
-   * Attempts to process data from a {@link ByteBuffer}, starting from its current position and
-   * 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 interleaving call to {@link #reset()} (or an interleaving call to
-   * {@link #configure(String, int, int, int, int, int[], int, int)} that caused the track to be
-   * reset).
-   *
-   * @param buffer The buffer containing audio data.
-   * @param presentationTimeUs The presentation timestamp of the buffer in microseconds.
-   * @return Whether the buffer was handled fully.
-   * @throws InitializationException If an error occurs initializing the track.
-   * @throws WriteException If an error occurs writing the audio data.
-   */
+  @Override
   @SuppressWarnings("ReferenceEquality")
   public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
       throws InitializationException, WriteException {
@@ -729,7 +560,7 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
 
     boolean hadData = hasData;
     hasData = hasPendingData();
-    if (hadData && !hasData && audioTrack.getPlayState() != PLAYSTATE_STOPPED) {
+    if (hadData && !hasData && audioTrack.getPlayState() != PLAYSTATE_STOPPED && listener != null) {
       long elapsedSinceLastFeedMs = SystemClock.elapsedRealtime() - lastFeedElapsedRealtimeMs;
       listener.onUnderrun(bufferSize, C.usToMs(bufferSizeUs), elapsedSinceLastFeedMs);
     }
@@ -779,7 +610,9 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
           // number of bytes submitted.
           startMediaTimeUs += (presentationTimeUs - expectedPresentationTimeUs);
           startMediaTimeState = START_IN_SYNC;
-          listener.onPositionDiscontinuity();
+          if (listener != null) {
+            listener.onPositionDiscontinuity();
+          }
         }
       }
 
@@ -899,11 +732,7 @@ private boolean writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs)
     return false;
   }
 
-  /**
-   * Plays out remaining audio. {@link #isEnded()} will return {@code true} when playback has ended.
-   *
-   * @throws WriteException If an error occurs draining data to the track.
-   */
+  @Override
   public void playToEndOfStream() throws WriteException {
     if (handledEndOfStream || !isInitialized()) {
       return;
@@ -947,30 +776,19 @@ private boolean drainAudioProcessorsToEndOfStream() throws WriteException {
     return true;
   }
 
-  /**
-   * Returns whether all buffers passed to {@link #handleBuffer(ByteBuffer, long)} have been
-   * completely processed and played.
-   */
+  @Override
   public boolean isEnded() {
     return !isInitialized() || (handledEndOfStream && !hasPendingData());
   }
 
-  /**
-   * Returns whether the audio track has more data pending that will be played back.
-   */
+  @Override
   public boolean hasPendingData() {
     return isInitialized()
         && (getWrittenFrames() > audioTrackUtil.getPlaybackHeadPosition()
         || overrideHasPendingData());
   }
 
-  /**
-   * Attempts to set the playback parameters and returns the active playback parameters, which may
-   * differ from those passed in.
-   *
-   * @param playbackParameters The new playback parameters to attempt to set.
-   * @return The active playback parameters.
-   */
+  @Override
   public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
     if (passthrough) {
       // The playback parameters are always the default in passthrough mode.
@@ -997,24 +815,12 @@ public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParam
     return this.playbackParameters;
   }
 
-  /**
-   * Gets the {@link PlaybackParameters}.
-   */
+  @Override
   public PlaybackParameters getPlaybackParameters() {
     return playbackParameters;
   }
 
-  /**
-   * Sets the attributes for audio playback. If the attributes have changed and if the audio track
-   * is not configured for use with tunneling, then the audio track is reset and the audio session
-   * id is cleared.
-   * <p>
-   * If the audio track is configured for use with tunneling then the audio attributes are ignored.
-   * The audio track is not reset and the audio session id is not cleared. The passed attributes
-   * will be used if the audio track is later re-configured into non-tunneled mode.
-   *
-   * @param audioAttributes The attributes for audio playback.
-   */
+  @Override
   public void setAudioAttributes(AudioAttributes audioAttributes) {
     if (this.audioAttributes.equals(audioAttributes)) {
       return;
@@ -1028,9 +834,7 @@ public void setAudioAttributes(AudioAttributes audioAttributes) {
     audioSessionId = C.AUDIO_SESSION_ID_UNSET;
   }
 
-  /**
-   * Sets the audio session id. The audio track is reset if the audio session id has changed.
-   */
+  @Override
   public void setAudioSessionId(int audioSessionId) {
     if (this.audioSessionId != audioSessionId) {
       this.audioSessionId = audioSessionId;
@@ -1038,18 +842,7 @@ public void setAudioSessionId(int audioSessionId) {
     }
   }
 
-  /**
-   * Enables tunneling. The audio track is reset if tunneling was previously disabled or if the
-   * audio session id has changed. Enabling tunneling requires platform API version 21 onwards.
-   * <p>
-   * If this instance has {@link AudioProcessor}s and tunneling is enabled, care must be taken that
-   * audio processors do not output buffers with a different duration than their input, and buffer
-   * processors must produce output corresponding to their last input immediately after that input
-   * is queued.
-   *
-   * @param tunnelingAudioSessionId The audio session id to use.
-   * @throws IllegalStateException Thrown if enabling tunneling on platform API version &lt; 21.
-   */
+  @Override
   public void enableTunnelingV21(int tunnelingAudioSessionId) {
     Assertions.checkState(Util.SDK_INT >= 21);
     if (!tunneling || audioSessionId != tunnelingAudioSessionId) {
@@ -1059,10 +852,7 @@ public void enableTunnelingV21(int tunnelingAudioSessionId) {
     }
   }
 
-  /**
-   * Disables tunneling. If tunneling was previously enabled then the audio track is reset and the
-   * audio session id is cleared.
-   */
+  @Override
   public void disableTunneling() {
     if (tunneling) {
       tunneling = false;
@@ -1071,11 +861,7 @@ public void disableTunneling() {
     }
   }
 
-  /**
-   * Sets the playback volume.
-   *
-   * @param volume A volume in the range [0.0, 1.0].
-   */
+  @Override
   public void setVolume(float volume) {
     if (this.volume != volume) {
       this.volume = volume;
@@ -1093,9 +879,7 @@ private void setVolumeInternal() {
     }
   }
 
-  /**
-   * Pauses playback.
-   */
+  @Override
   public void pause() {
     playing = false;
     if (isInitialized()) {
@@ -1104,13 +888,7 @@ public void pause() {
     }
   }
 
-  /**
-   * Releases the underlying audio track asynchronously.
-   * <p>
-   * Calling {@link #handleBuffer(ByteBuffer, long)} will block until the audio track has been
-   * released, so it is safe to use the audio track immediately after a reset. The audio session may
-   * remain active until {@link #release()} is called.
-   */
+  @Override
   public void reset() {
     if (isInitialized()) {
       submittedPcmBytes = 0;
@@ -1146,7 +924,7 @@ public void reset() {
         audioTrack.pause();
       }
       // AudioTrack.release can take some time, so we call it on a background thread.
-      final android.media.AudioTrack toRelease = audioTrack;
+      final AudioTrack toRelease = audioTrack;
       audioTrack = null;
       audioTrackUtil.reconfigure(null, false);
       releasingConditionVariable.close();
@@ -1164,9 +942,7 @@ public void run() {
     }
   }
 
-  /**
-   * Releases all resources associated with this instance.
-   */
+  @Override
   public void release() {
     reset();
     releaseKeepSessionIdAudioTrack();
@@ -1186,7 +962,7 @@ private void releaseKeepSessionIdAudioTrack() {
     }
 
     // AudioTrack.release can take some time, so we call it on a background thread.
-    final android.media.AudioTrack toRelease = keepSessionIdAudioTrack;
+    final AudioTrack toRelease = keepSessionIdAudioTrack;
     keepSessionIdAudioTrack = null;
     new Thread() {
       @Override
@@ -1367,19 +1143,19 @@ private boolean overrideHasPendingData() {
         && audioTrack.getPlaybackHeadPosition() == 0;
   }
 
-  private android.media.AudioTrack initializeAudioTrack() throws InitializationException {
-    android.media.AudioTrack audioTrack;
+  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 android.media.AudioTrack(streamType, sampleRate, channelConfig,
-            outputEncoding, bufferSize, MODE_STREAM);
+        audioTrack = new AudioTrack(streamType, sampleRate, channelConfig, outputEncoding,
+            bufferSize, MODE_STREAM);
       } else {
         // Re-attach to the same audio session.
-        audioTrack = new android.media.AudioTrack(streamType, sampleRate, channelConfig,
-            outputEncoding, bufferSize, MODE_STREAM, audioSessionId);
+        audioTrack = new AudioTrack(streamType, sampleRate, channelConfig, outputEncoding,
+            bufferSize, MODE_STREAM, audioSessionId);
       }
     }
 
@@ -1397,7 +1173,7 @@ private android.media.AudioTrack initializeAudioTrack() throws InitializationExc
   }
 
   @TargetApi(21)
-  private android.media.AudioTrack createAudioTrackV21() {
+  private AudioTrack createAudioTrackV21() {
     android.media.AudioAttributes attributes;
     if (tunneling) {
       attributes = new android.media.AudioAttributes.Builder()
@@ -1415,17 +1191,16 @@ private android.media.AudioTrack createAudioTrackV21() {
         .build();
     int audioSessionId = this.audioSessionId != C.AUDIO_SESSION_ID_UNSET ? this.audioSessionId
         : AudioManager.AUDIO_SESSION_ID_GENERATE;
-    return new android.media.AudioTrack(attributes, format, bufferSize, MODE_STREAM,
-        audioSessionId);
+    return new AudioTrack(attributes, format, bufferSize, MODE_STREAM, audioSessionId);
   }
 
-  private android.media.AudioTrack initializeKeepSessionIdAudioTrack(int audioSessionId) {
-    int sampleRate = 4000; // Equal to private android.media.AudioTrack.MIN_SAMPLE_RATE.
+  private 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;
     int bufferSize = 2; // Use a two byte buffer, as it is not actually used for playback.
-    return new android.media.AudioTrack(C.STREAM_TYPE_DEFAULT, sampleRate, channelConfig, encoding,
-        bufferSize, MODE_STATIC, audioSessionId);
+    return new AudioTrack(C.STREAM_TYPE_DEFAULT, sampleRate, channelConfig, encoding, bufferSize,
+        MODE_STATIC, audioSessionId);
   }
 
   @C.Encoding
@@ -1457,14 +1232,13 @@ private static int getFramesPerEncodedSample(@C.Encoding int encoding, ByteBuffe
   }
 
   @TargetApi(21)
-  private static int writeNonBlockingV21(android.media.AudioTrack audioTrack, ByteBuffer buffer,
-      int size) {
+  private static int writeNonBlockingV21(AudioTrack audioTrack, ByteBuffer buffer, int size) {
     return audioTrack.write(buffer, size, WRITE_NON_BLOCKING);
   }
 
   @TargetApi(21)
-  private int writeNonBlockingWithAvSyncV21(android.media.AudioTrack audioTrack,
-      ByteBuffer buffer, int size, long presentationTimeUs) {
+  private int writeNonBlockingWithAvSyncV21(AudioTrack audioTrack, ByteBuffer buffer, int size,
+      long presentationTimeUs) {
     // TODO: Uncomment this when [Internal ref: b/33627517] is clarified or fixed.
     // if (Util.SDK_INT >= 23) {
     //   // The underlying platform AudioTrack writes AV sync headers directly.
@@ -1502,21 +1276,21 @@ private int writeNonBlockingWithAvSyncV21(android.media.AudioTrack audioTrack,
   }
 
   @TargetApi(21)
-  private static void setVolumeInternalV21(android.media.AudioTrack audioTrack, float volume) {
+  private static void setVolumeInternalV21(AudioTrack audioTrack, float volume) {
     audioTrack.setVolume(volume);
   }
 
   @SuppressWarnings("deprecation")
-  private static void setVolumeInternalV3(android.media.AudioTrack audioTrack, float volume) {
+  private static void setVolumeInternalV3(AudioTrack audioTrack, float volume) {
     audioTrack.setStereoVolume(volume, volume);
   }
 
   /**
-   * Wraps an {@link android.media.AudioTrack} to expose useful utility methods.
+   * Wraps an {@link AudioTrack} to expose useful utility methods.
    */
   private static class AudioTrackUtil {
 
-    protected android.media.AudioTrack audioTrack;
+    protected AudioTrack audioTrack;
     private boolean needsPassthroughWorkaround;
     private int sampleRate;
     private long lastRawPlaybackHeadPosition;
@@ -1534,8 +1308,7 @@ private static class AudioTrackUtil {
      * @param needsPassthroughWorkaround Whether to workaround issues with pausing AC-3 passthrough
      *     audio tracks on platform API version 21/22.
      */
-    public void reconfigure(android.media.AudioTrack audioTrack,
-        boolean needsPassthroughWorkaround) {
+    public void reconfigure(AudioTrack audioTrack, boolean needsPassthroughWorkaround) {
       this.audioTrack = audioTrack;
       this.needsPassthroughWorkaround = needsPassthroughWorkaround;
       stopTimestampUs = C.TIME_UNSET;
@@ -1574,9 +1347,9 @@ public void pause() {
     }
 
     /**
-     * {@link android.media.AudioTrack#getPlaybackHeadPosition()} returns a value intended to be
-     * interpreted as an unsigned 32 bit integer, which also wraps around periodically. This method
-     * returns the playback head position as a long that will only wrap around if the value exceeds
+     * {@link AudioTrack#getPlaybackHeadPosition()} returns a value intended to be interpreted as an
+     * unsigned 32 bit integer, which also wraps around periodically. This method returns the
+     * playback head position as a long that will only wrap around if the value exceeds
      * {@link Long#MAX_VALUE} (which in practice will never happen).
      *
      * @return The playback head position, in frames.
@@ -1676,8 +1449,7 @@ public AudioTrackUtilV19() {
     }
 
     @Override
-    public void reconfigure(android.media.AudioTrack audioTrack,
-        boolean needsPassthroughWorkaround) {
+    public void reconfigure(AudioTrack audioTrack, boolean needsPassthroughWorkaround) {
       super.reconfigure(audioTrack, needsPassthroughWorkaround);
       rawTimestampFramePositionWrapCount = 0;
       lastRawTimestampFramePosition = 0;
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 cbb3a4944dd..f8206e94cf8 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
@@ -40,13 +40,13 @@
 import java.nio.ByteBuffer;
 
 /**
- * Decodes and renders audio using {@link MediaCodec} and {@link AudioTrack}.
+ * Decodes and renders audio using {@link MediaCodec} and an {@link AudioSink}.
  */
 @TargetApi(16)
 public class MediaCodecAudioRenderer extends MediaCodecRenderer implements MediaClock {
 
   private final EventDispatcher eventDispatcher;
-  private final AudioTrack audioTrack;
+  private final AudioSink audioSink;
 
   private boolean passthroughEnabled;
   private boolean codecNeedsDiscardChannelsWorkaround;
@@ -110,7 +110,7 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
       boolean playClearSamplesWithoutKeys, @Nullable Handler eventHandler,
       @Nullable AudioRendererEventListener eventListener) {
     this(mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys, eventHandler,
-        eventListener, null);
+        eventListener, (AudioCapabilities) null);
   }
 
   /**
@@ -135,9 +135,32 @@ public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
       boolean playClearSamplesWithoutKeys, @Nullable Handler eventHandler,
       @Nullable AudioRendererEventListener eventListener,
       @Nullable AudioCapabilities audioCapabilities, AudioProcessor... audioProcessors) {
+    this(mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys,
+        eventHandler, eventListener, new DefaultAudioSink(audioCapabilities, audioProcessors));
+  }
+
+  /**
+   * @param mediaCodecSelector A decoder selector.
+   * @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 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 audioSink The sink to which audio will be output.
+   */
+  public MediaCodecAudioRenderer(MediaCodecSelector mediaCodecSelector,
+      @Nullable DrmSessionManager<FrameworkMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys, @Nullable Handler eventHandler,
+      @Nullable AudioRendererEventListener eventListener, AudioSink audioSink) {
     super(C.TRACK_TYPE_AUDIO, mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys);
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
-    audioTrack = new AudioTrack(audioCapabilities, audioProcessors, new AudioTrackListener());
+    this.audioSink = audioSink;
+    audioSink.setListener(new AudioSinkListener());
   }
 
   @Override
@@ -196,14 +219,14 @@ protected MediaCodecInfo getDecoderInfo(MediaCodecSelector mediaCodecSelector,
 
   /**
    * Returns whether encoded audio passthrough should be used for playing back the input format.
-   * This implementation returns true if the {@link AudioTrack}'s audio capabilities indicate that
-   * passthrough is supported.
+   * This implementation returns true if the {@link AudioSink} indicates that passthrough is
+   * supported.
    *
    * @param mimeType The type of input media.
-   * @return Whether passthrough playback should be used.
+   * @return Whether passthrough playback is supported.
    */
   protected boolean allowPassthrough(String mimeType) {
-    return audioTrack.isPassthroughSupported(mimeType);
+    return audioSink.isPassthroughSupported(mimeType);
   }
 
   @Override
@@ -266,9 +289,9 @@ protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat)
     }
 
     try {
-      audioTrack.configure(mimeType, channelCount, sampleRate, pcmEncoding, 0, channelMap,
+      audioSink.configure(mimeType, channelCount, sampleRate, pcmEncoding, 0, channelMap,
           encoderDelay, encoderPadding);
-    } catch (AudioTrack.ConfigurationException e) {
+    } catch (AudioSink.ConfigurationException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
   }
@@ -279,21 +302,21 @@ protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat)
    * order to spatialize the audio channels. For this use case, any {@link Virtualizer} instances
    * should be released in {@link #onDisabled()} (if not before).
    *
-   * @see AudioTrack.Listener#onAudioSessionId(int)
+   * @see AudioSink.Listener#onAudioSessionId(int)
    */
   protected void onAudioSessionId(int audioSessionId) {
     // Do nothing.
   }
 
   /**
-   * @see AudioTrack.Listener#onPositionDiscontinuity()
+   * @see AudioSink.Listener#onPositionDiscontinuity()
    */
   protected void onAudioTrackPositionDiscontinuity() {
     // Do nothing.
   }
 
   /**
-   * @see AudioTrack.Listener#onUnderrun(int, long, long)
+   * @see AudioSink.Listener#onUnderrun(int, long, long)
    */
   protected void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs,
       long elapsedSinceLastFeedMs) {
@@ -306,16 +329,16 @@ protected void onEnabled(boolean joining) throws ExoPlaybackException {
     eventDispatcher.enabled(decoderCounters);
     int tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     if (tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET) {
-      audioTrack.enableTunnelingV21(tunnelingAudioSessionId);
+      audioSink.enableTunnelingV21(tunnelingAudioSessionId);
     } else {
-      audioTrack.disableTunneling();
+      audioSink.disableTunneling();
     }
   }
 
   @Override
   protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
     super.onPositionReset(positionUs, joining);
-    audioTrack.reset();
+    audioSink.reset();
     currentPositionUs = positionUs;
     allowPositionDiscontinuity = true;
   }
@@ -323,19 +346,19 @@ protected void onPositionReset(long positionUs, boolean joining) throws ExoPlayb
   @Override
   protected void onStarted() {
     super.onStarted();
-    audioTrack.play();
+    audioSink.play();
   }
 
   @Override
   protected void onStopped() {
-    audioTrack.pause();
+    audioSink.pause();
     super.onStopped();
   }
 
   @Override
   protected void onDisabled() {
     try {
-      audioTrack.release();
+      audioSink.release();
     } finally {
       try {
         super.onDisabled();
@@ -348,18 +371,18 @@ protected void onDisabled() {
 
   @Override
   public boolean isEnded() {
-    return super.isEnded() && audioTrack.isEnded();
+    return super.isEnded() && audioSink.isEnded();
   }
 
   @Override
   public boolean isReady() {
-    return audioTrack.hasPendingData() || super.isReady();
+    return audioSink.hasPendingData() || super.isReady();
   }
 
   @Override
   public long getPositionUs() {
-    long newCurrentPositionUs = audioTrack.getCurrentPositionUs(isEnded());
-    if (newCurrentPositionUs != AudioTrack.CURRENT_POSITION_NOT_SET) {
+    long newCurrentPositionUs = audioSink.getCurrentPositionUs(isEnded());
+    if (newCurrentPositionUs != AudioSink.CURRENT_POSITION_NOT_SET) {
       currentPositionUs = allowPositionDiscontinuity ? newCurrentPositionUs
           : Math.max(currentPositionUs, newCurrentPositionUs);
       allowPositionDiscontinuity = false;
@@ -369,12 +392,12 @@ public long getPositionUs() {
 
   @Override
   public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
-    return audioTrack.setPlaybackParameters(playbackParameters);
+    return audioSink.setPlaybackParameters(playbackParameters);
   }
 
   @Override
   public PlaybackParameters getPlaybackParameters() {
-    return audioTrack.getPlaybackParameters();
+    return audioSink.getPlaybackParameters();
   }
 
   @Override
@@ -390,17 +413,17 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, M
     if (shouldSkip) {
       codec.releaseOutputBuffer(bufferIndex, false);
       decoderCounters.skippedOutputBufferCount++;
-      audioTrack.handleDiscontinuity();
+      audioSink.handleDiscontinuity();
       return true;
     }
 
     try {
-      if (audioTrack.handleBuffer(buffer, bufferPresentationTimeUs)) {
+      if (audioSink.handleBuffer(buffer, bufferPresentationTimeUs)) {
         codec.releaseOutputBuffer(bufferIndex, false);
         decoderCounters.renderedOutputBufferCount++;
         return true;
       }
-    } catch (AudioTrack.InitializationException | AudioTrack.WriteException e) {
+    } catch (AudioSink.InitializationException | AudioSink.WriteException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
     return false;
@@ -409,8 +432,8 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, M
   @Override
   protected void renderToEndOfStream() throws ExoPlaybackException {
     try {
-      audioTrack.playToEndOfStream();
-    } catch (AudioTrack.WriteException e) {
+      audioSink.playToEndOfStream();
+    } catch (AudioSink.WriteException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
   }
@@ -419,11 +442,11 @@ protected void renderToEndOfStream() throws ExoPlaybackException {
   public void handleMessage(int messageType, Object message) throws ExoPlaybackException {
     switch (messageType) {
       case C.MSG_SET_VOLUME:
-        audioTrack.setVolume((Float) message);
+        audioSink.setVolume((Float) message);
         break;
       case C.MSG_SET_AUDIO_ATTRIBUTES:
         AudioAttributes audioAttributes = (AudioAttributes) message;
-        audioTrack.setAudioAttributes(audioAttributes);
+        audioSink.setAudioAttributes(audioAttributes);
         break;
       default:
         super.handleMessage(messageType, message);
@@ -445,7 +468,7 @@ private static boolean codecNeedsDiscardChannelsWorkaround(String codecName) {
         || Util.DEVICE.startsWith("heroqlte"));
   }
 
-  private final class AudioTrackListener implements AudioTrack.Listener {
+  private final class AudioSinkListener implements AudioSink.Listener {
 
     @Override
     public void onAudioSessionId(int audioSessionId) {
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 557421e4b3c..98a84fdff8d 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
@@ -72,7 +72,7 @@ public abstract class SimpleDecoderAudioRenderer extends BaseRenderer implements
   private final DrmSessionManager<ExoMediaCrypto> drmSessionManager;
   private final boolean playClearSamplesWithoutKeys;
   private final EventDispatcher eventDispatcher;
-  private final AudioTrack audioTrack;
+  private final AudioSink audioSink;
   private final FormatHolder formatHolder;
   private final DecoderInputBuffer flagsOnlyBuffer;
 
@@ -107,8 +107,8 @@ public 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 SimpleDecoderAudioRenderer(Handler eventHandler,
-      AudioRendererEventListener eventListener, AudioProcessor... audioProcessors) {
+  public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
+      AudioProcessor... audioProcessors) {
     this(eventHandler, eventListener, null, null, false, audioProcessors);
   }
 
@@ -119,8 +119,8 @@ public SimpleDecoderAudioRenderer(Handler eventHandler,
    * @param audioCapabilities The audio capabilities for playback on this device. May be null if the
    *     default capabilities (no encoded audio passthrough support) should be assumed.
    */
-  public SimpleDecoderAudioRenderer(Handler eventHandler,
-      AudioRendererEventListener eventListener, AudioCapabilities audioCapabilities) {
+  public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
+      AudioCapabilities audioCapabilities) {
     this(eventHandler, eventListener, audioCapabilities, null, false);
   }
 
@@ -139,15 +139,35 @@ public SimpleDecoderAudioRenderer(Handler eventHandler,
    *     has obtained the keys necessary to decrypt encrypted regions of the media.
    * @param audioProcessors Optional {@link AudioProcessor}s that will process audio before output.
    */
-  public SimpleDecoderAudioRenderer(Handler eventHandler,
-      AudioRendererEventListener eventListener, AudioCapabilities audioCapabilities,
+  public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
+      AudioCapabilities audioCapabilities, DrmSessionManager<ExoMediaCrypto> drmSessionManager,
+      boolean playClearSamplesWithoutKeys, AudioProcessor... audioProcessors) {
+    this(eventHandler, eventListener, drmSessionManager,
+        playClearSamplesWithoutKeys, new DefaultAudioSink(audioCapabilities, audioProcessors));
+  }
+
+  /**
+   * @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 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 audioSink The sink to which audio will be output.
+   */
+  public SimpleDecoderAudioRenderer(Handler eventHandler, AudioRendererEventListener eventListener,
       DrmSessionManager<ExoMediaCrypto> drmSessionManager, boolean playClearSamplesWithoutKeys,
-      AudioProcessor... audioProcessors) {
+      AudioSink audioSink) {
     super(C.TRACK_TYPE_AUDIO);
     this.drmSessionManager = drmSessionManager;
     this.playClearSamplesWithoutKeys = playClearSamplesWithoutKeys;
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
-    audioTrack = new AudioTrack(audioCapabilities, audioProcessors, new AudioTrackListener());
+    this.audioSink = audioSink;
+    audioSink.setListener(new AudioSinkListener());
     formatHolder = new FormatHolder();
     flagsOnlyBuffer = DecoderInputBuffer.newFlagsOnlyInstance();
     decoderReinitializationState = REINITIALIZATION_STATE_NONE;
@@ -184,8 +204,8 @@ protected abstract int supportsFormatInternal(DrmSessionManager<ExoMediaCrypto>
   public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackException {
     if (outputStreamEnded) {
       try {
-        audioTrack.playToEndOfStream();
-      } catch (AudioTrack.WriteException e) {
+        audioSink.playToEndOfStream();
+      } catch (AudioSink.WriteException e) {
         throw ExoPlaybackException.createForRenderer(e, getIndex());
       }
       return;
@@ -220,8 +240,8 @@ public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackEx
         while (drainOutputBuffer()) {}
         while (feedInputBuffer()) {}
         TraceUtil.endSection();
-      } catch (AudioDecoderException | AudioTrack.ConfigurationException
-          | AudioTrack.InitializationException | AudioTrack.WriteException e) {
+      } catch (AudioDecoderException | AudioSink.ConfigurationException
+          | AudioSink.InitializationException | AudioSink.WriteException e) {
         throw ExoPlaybackException.createForRenderer(e, getIndex());
       }
       decoderCounters.ensureUpdated();
@@ -234,21 +254,21 @@ public void render(long positionUs, long elapsedRealtimeUs) throws ExoPlaybackEx
    * order to spatialize the audio channels. For this use case, any {@link Virtualizer} instances
    * should be released in {@link #onDisabled()} (if not before).
    *
-   * @see AudioTrack.Listener#onAudioSessionId(int)
+   * @see AudioSink.Listener#onAudioSessionId(int)
    */
   protected void onAudioSessionId(int audioSessionId) {
     // Do nothing.
   }
 
   /**
-   * @see AudioTrack.Listener#onPositionDiscontinuity()
+   * @see AudioSink.Listener#onPositionDiscontinuity()
    */
   protected void onAudioTrackPositionDiscontinuity() {
     // Do nothing.
   }
 
   /**
-   * @see AudioTrack.Listener#onUnderrun(int, long, long)
+   * @see AudioSink.Listener#onUnderrun(int, long, long)
    */
   protected void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs,
       long elapsedSinceLastFeedMs) {
@@ -282,8 +302,8 @@ protected Format getOutputFormat() {
   }
 
   private boolean drainOutputBuffer() throws ExoPlaybackException, AudioDecoderException,
-      AudioTrack.ConfigurationException, AudioTrack.InitializationException,
-      AudioTrack.WriteException {
+      AudioSink.ConfigurationException, AudioSink.InitializationException,
+      AudioSink.WriteException {
     if (outputBuffer == null) {
       outputBuffer = decoder.dequeueOutputBuffer();
       if (outputBuffer == null) {
@@ -309,12 +329,12 @@ private boolean drainOutputBuffer() throws ExoPlaybackException, AudioDecoderExc
 
     if (audioTrackNeedsConfigure) {
       Format outputFormat = getOutputFormat();
-      audioTrack.configure(outputFormat.sampleMimeType, outputFormat.channelCount,
+      audioSink.configure(outputFormat.sampleMimeType, outputFormat.channelCount,
           outputFormat.sampleRate, outputFormat.pcmEncoding, 0, null, encoderDelay, encoderPadding);
       audioTrackNeedsConfigure = false;
     }
 
-    if (audioTrack.handleBuffer(outputBuffer.data, outputBuffer.timeUs)) {
+    if (audioSink.handleBuffer(outputBuffer.data, outputBuffer.timeUs)) {
       decoderCounters.renderedOutputBufferCount++;
       outputBuffer.release();
       outputBuffer = null;
@@ -394,8 +414,8 @@ private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackExc
   private void processEndOfStream() throws ExoPlaybackException {
     outputStreamEnded = true;
     try {
-      audioTrack.playToEndOfStream();
-    } catch (AudioTrack.WriteException e) {
+      audioSink.playToEndOfStream();
+    } catch (AudioSink.WriteException e) {
       throw ExoPlaybackException.createForRenderer(drmSession.getError(), getIndex());
     }
   }
@@ -418,19 +438,19 @@ private void flushDecoder() throws ExoPlaybackException {
 
   @Override
   public boolean isEnded() {
-    return outputStreamEnded && audioTrack.isEnded();
+    return outputStreamEnded && audioSink.isEnded();
   }
 
   @Override
   public boolean isReady() {
-    return audioTrack.hasPendingData()
+    return audioSink.hasPendingData()
         || (inputFormat != null && !waitingForKeys && (isSourceReady() || outputBuffer != null));
   }
 
   @Override
   public long getPositionUs() {
-    long newCurrentPositionUs = audioTrack.getCurrentPositionUs(isEnded());
-    if (newCurrentPositionUs != AudioTrack.CURRENT_POSITION_NOT_SET) {
+    long newCurrentPositionUs = audioSink.getCurrentPositionUs(isEnded());
+    if (newCurrentPositionUs != AudioSink.CURRENT_POSITION_NOT_SET) {
       currentPositionUs = allowPositionDiscontinuity ? newCurrentPositionUs
           : Math.max(currentPositionUs, newCurrentPositionUs);
       allowPositionDiscontinuity = false;
@@ -440,12 +460,12 @@ public long getPositionUs() {
 
   @Override
   public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
-    return audioTrack.setPlaybackParameters(playbackParameters);
+    return audioSink.setPlaybackParameters(playbackParameters);
   }
 
   @Override
   public PlaybackParameters getPlaybackParameters() {
-    return audioTrack.getPlaybackParameters();
+    return audioSink.getPlaybackParameters();
   }
 
   @Override
@@ -454,15 +474,15 @@ protected void onEnabled(boolean joining) throws ExoPlaybackException {
     eventDispatcher.enabled(decoderCounters);
     int tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     if (tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET) {
-      audioTrack.enableTunnelingV21(tunnelingAudioSessionId);
+      audioSink.enableTunnelingV21(tunnelingAudioSessionId);
     } else {
-      audioTrack.disableTunneling();
+      audioSink.disableTunneling();
     }
   }
 
   @Override
   protected void onPositionReset(long positionUs, boolean joining) throws ExoPlaybackException {
-    audioTrack.reset();
+    audioSink.reset();
     currentPositionUs = positionUs;
     allowPositionDiscontinuity = true;
     inputStreamEnded = false;
@@ -474,12 +494,12 @@ protected void onPositionReset(long positionUs, boolean joining) throws ExoPlayb
 
   @Override
   protected void onStarted() {
-    audioTrack.play();
+    audioSink.play();
   }
 
   @Override
   protected void onStopped() {
-    audioTrack.pause();
+    audioSink.pause();
   }
 
   @Override
@@ -489,7 +509,7 @@ protected void onDisabled() {
     waitingForKeys = false;
     try {
       releaseDecoder();
-      audioTrack.release();
+      audioSink.release();
     } finally {
       try {
         if (drmSession != null) {
@@ -599,11 +619,11 @@ private void onInputFormatChanged(Format newFormat) throws ExoPlaybackException
   public void handleMessage(int messageType, Object message) throws ExoPlaybackException {
     switch (messageType) {
       case C.MSG_SET_VOLUME:
-        audioTrack.setVolume((Float) message);
+        audioSink.setVolume((Float) message);
         break;
       case C.MSG_SET_AUDIO_ATTRIBUTES:
         AudioAttributes audioAttributes = (AudioAttributes) message;
-        audioTrack.setAudioAttributes(audioAttributes);
+        audioSink.setAudioAttributes(audioAttributes);
         break;
       default:
         super.handleMessage(messageType, message);
@@ -611,7 +631,7 @@ public void handleMessage(int messageType, Object message) throws ExoPlaybackExc
     }
   }
 
-  private final class AudioTrackListener implements AudioTrack.Listener {
+  private final class AudioSinkListener implements AudioSink.Listener {
 
     @Override
     public void onAudioSessionId(int audioSessionId) {
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 c66cbf48827..9338c24b76d 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
@@ -55,7 +55,7 @@ public TrimmingAudioProcessor() {
    *
    * @param trimStartSamples The number of audio samples to trim from the start of audio.
    * @param trimEndSamples The number of audio samples to trim from the end of audio.
-   * @see AudioTrack#configure(String, int, int, int, int, int[], int, int)
+   * @see AudioSink#configure(String, int, int, int, int, int[], int, int)
    */
   public void setTrimSampleCount(int trimStartSamples, int trimEndSamples) {
     this.trimStartSamples = trimStartSamples;
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 142c5060b51..ee4018ba0e8 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
@@ -29,7 +29,7 @@
 import com.google.android.exoplayer2.RenderersFactory;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.audio.AudioRendererEventListener;
-import com.google.android.exoplayer2.audio.AudioTrack;
+import com.google.android.exoplayer2.audio.DefaultAudioSink;
 import com.google.android.exoplayer2.decoder.DecoderCounters;
 import com.google.android.exoplayer2.drm.DrmSessionManager;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -53,10 +53,10 @@ public abstract class ExoHostedTest extends Player.DefaultEventListener implemen
     AudioRendererEventListener, VideoRendererEventListener {
 
   static {
-    // ExoPlayer's AudioTrack class is able to work around spurious timestamps reported by the
-    // platform (by ignoring them). Disable this workaround, since we're interested in testing
-    // that the underlying platform is behaving correctly.
-    AudioTrack.failOnSpuriousAudioTimestamp = true;
+    // DefaultAudioSink is able to work around spurious timestamps reported by the platform (by
+    // ignoring them). Disable this workaround, since we're interested in testing that the
+    // underlying platform is behaving correctly.
+    DefaultAudioSink.failOnSpuriousAudioTimestamp = true;
   }
 
   public static final long MAX_PLAYING_TIME_DISCREPANCY_MS = 2000;
@@ -253,7 +253,7 @@ public void onAudioDisabled(DecoderCounters counters) {
   }
 
   @Override
-  public void onAudioTrackUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
+  public void onAudioSinkUnderrun(int bufferSize, long bufferSizeMs, long elapsedSinceLastFeedMs) {
     Log.e(tag, "audioTrackUnderrun [" + bufferSize + ", " + bufferSizeMs + ", "
         + elapsedSinceLastFeedMs + "]", null);
   }

From 60de1574105e2669734237f79e7880b063e45834 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 28 Sep 2017 02:32:27 -0700
Subject: [PATCH 265/421] Add a few initial tests for
 SimpleDecoderAudioRenderer

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170318174
---
 .../audio/SimpleDecoderAudioRendererTest.java | 138 ++++++++++++++++++
 1 file changed, 138 insertions(+)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java

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
new file mode 100644
index 00000000000..346b94e5f46
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SimpleDecoderAudioRendererTest.java
@@ -0,0 +1,138 @@
+/*
+ * 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.audio;
+
+import static com.google.android.exoplayer2.RendererCapabilities.ADAPTIVE_NOT_SEAMLESS;
+import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_HANDLED;
+import static com.google.android.exoplayer2.RendererCapabilities.TUNNELING_NOT_SUPPORTED;
+import static com.google.android.exoplayer2.RendererCapabilities.TUNNELING_SUPPORTED;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.RendererConfiguration;
+import com.google.android.exoplayer2.decoder.DecoderInputBuffer;
+import com.google.android.exoplayer2.decoder.SimpleDecoder;
+import com.google.android.exoplayer2.decoder.SimpleOutputBuffer;
+import com.google.android.exoplayer2.drm.DrmSessionManager;
+import com.google.android.exoplayer2.drm.ExoMediaCrypto;
+import com.google.android.exoplayer2.testutil.FakeSampleStream;
+import com.google.android.exoplayer2.util.MimeTypes;
+import org.junit.Before;
+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)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class SimpleDecoderAudioRendererTest {
+
+  private static final Format FORMAT = Format.createSampleFormat(null, MimeTypes.AUDIO_RAW, 0);
+
+  @Mock private AudioSink mockAudioSink;
+  private SimpleDecoderAudioRenderer audioRenderer;
+
+  @Before
+  public void setUp() throws Exception {
+    MockitoAnnotations.initMocks(this);
+    audioRenderer = new SimpleDecoderAudioRenderer(null, null, null, false, mockAudioSink) {
+      @Override
+      protected int supportsFormatInternal(DrmSessionManager<ExoMediaCrypto> drmSessionManager,
+          Format format) {
+        return FORMAT_HANDLED;
+      }
+
+      @Override
+      protected SimpleDecoder<DecoderInputBuffer, ? extends SimpleOutputBuffer,
+          ? extends AudioDecoderException> createDecoder(Format format, ExoMediaCrypto mediaCrypto)
+          throws AudioDecoderException {
+        return new FakeDecoder();
+      }
+    };
+  }
+
+  @Config(sdk = 19)
+  @Test
+  public void testSupportsFormatAtApi19() {
+    assertThat(audioRenderer.supportsFormat(FORMAT))
+        .isEqualTo(ADAPTIVE_NOT_SEAMLESS | TUNNELING_NOT_SUPPORTED | FORMAT_HANDLED);
+  }
+
+  @Config(sdk = 21)
+  @Test
+  public void testSupportsFormatAtApi21() {
+    // From API 21, tunneling is supported.
+    assertThat(audioRenderer.supportsFormat(FORMAT))
+        .isEqualTo(ADAPTIVE_NOT_SEAMLESS | TUNNELING_SUPPORTED | FORMAT_HANDLED);
+  }
+
+  @Test
+  public void testImmediatelyReadEndOfStreamPlaysAudioSinkToEndOfStream() throws Exception {
+    audioRenderer.enable(RendererConfiguration.DEFAULT, new Format[] {FORMAT},
+        new FakeSampleStream(FORMAT), 0, false, 0);
+    audioRenderer.setCurrentStreamFinal();
+    when(mockAudioSink.isEnded()).thenReturn(true);
+    while (!audioRenderer.isEnded()) {
+      audioRenderer.render(0, 0);
+    }
+    verify(mockAudioSink, times(1)).playToEndOfStream();
+    audioRenderer.disable();
+    verify(mockAudioSink, times(1)).release();
+  }
+
+  private static final class FakeDecoder
+      extends SimpleDecoder<DecoderInputBuffer, SimpleOutputBuffer, AudioDecoderException> {
+
+    public FakeDecoder() {
+      super(new DecoderInputBuffer[1], new SimpleOutputBuffer[1]);
+    }
+
+    @Override
+    public String getName() {
+      return "FakeDecoder";
+    }
+
+    @Override
+    protected DecoderInputBuffer createInputBuffer() {
+      return new DecoderInputBuffer(DecoderInputBuffer.BUFFER_REPLACEMENT_MODE_DISABLED);
+    }
+
+    @Override
+    protected SimpleOutputBuffer createOutputBuffer() {
+      return new SimpleOutputBuffer(this);
+    }
+
+    @Override
+    protected AudioDecoderException decode(DecoderInputBuffer inputBuffer,
+        SimpleOutputBuffer outputBuffer, boolean reset) {
+      if (inputBuffer.isEndOfStream()) {
+        outputBuffer.setFlags(C.BUFFER_FLAG_END_OF_STREAM);
+      }
+      return null;
+    }
+
+  }
+
+}

From 7665571ff92a55fd7059ff3e03a3b96c11fb308e Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Tue, 25 Jul 2017 02:37:22 +0100
Subject: [PATCH 266/421] Do not copy data to output frame in libvpx unless
 necessary.

In out libvpx extension, currently we always call vpxGetFrame and copy the data
from the native decoder to output frame. However, if the inputBuffer has
isDecoderOnly set, we can avoid populating the output buffer, but only setting
BUFFER_FLAG_DECODE_ONLY.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170318527
---
 .../android/exoplayer2/ext/vp9/VpxDecoder.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 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 4bec5bdf4ca..ef999d5d2b3 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
@@ -120,14 +120,16 @@ protected VpxDecoderException decode(VpxInputBuffer inputBuffer, VpxOutputBuffer
       }
     }
 
-    outputBuffer.init(inputBuffer.timeUs, outputMode);
-    int getFrameResult = vpxGetFrame(vpxDecContext, outputBuffer);
-    if (getFrameResult == 1) {
-      outputBuffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY);
-    } else if (getFrameResult == -1) {
-      return new VpxDecoderException("Buffer initialization failed.");
+    if (!inputBuffer.isDecodeOnly()) {
+      outputBuffer.init(inputBuffer.timeUs, outputMode);
+      int getFrameResult = vpxGetFrame(vpxDecContext, outputBuffer);
+      if (getFrameResult == 1) {
+        outputBuffer.addFlag(C.BUFFER_FLAG_DECODE_ONLY);
+      } else if (getFrameResult == -1) {
+        return new VpxDecoderException("Buffer initialization failed.");
+      }
+      outputBuffer.colorInfo = inputBuffer.colorInfo;
     }
-    outputBuffer.colorInfo = inputBuffer.colorInfo;
     return null;
   }
 

From a3a9c0f3b0eb5d38702aaecfe4308333ebd273ae Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 28 Sep 2017 08:04:01 -0700
Subject: [PATCH 267/421] Sanity check current position <= written frame
 position

This avoids spurious position reports following an underrun.

Github: #1874

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

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 34ea173debc..1cafdc5efe9 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
@@ -332,6 +332,7 @@ public long getCurrentPositionUs(boolean sourceEnded) {
       }
     }
 
+    positionUs = Math.min(positionUs, framesToDurationUs(getWrittenFrames()));
     return startMediaTimeUs + applySpeedup(positionUs);
   }
 

From 28173991d18f5d4fef0ed70af61b538956a35c3e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 28 Sep 2017 10:17:19 -0700
Subject: [PATCH 268/421] Return requested position when selecting tracks in
 FakeMediaPeriod.

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

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 3863cf79876..38a5e37fa53 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
@@ -81,7 +81,7 @@ public long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamF
         streamResetFlags[i] = true;
       }
     }
-    return 0;
+    return positionUs;
   }
 
   @Override

From 096d7651d2b2f1636ee128bda05685009212f0fd Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 29 Sep 2017 01:51:00 -0700
Subject: [PATCH 269/421] Execute actions in action schedule immediately.

Run next action immediately without using the handler when the requested
delay is zero. This ensures that no other code can run between these two
actions to improve deterministic test behaviour.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170456852
---
 .../google/android/exoplayer2/testutil/ActionSchedule.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 ba76c58d11d..60c13d1947d 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,6 +16,7 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.os.Handler;
+import android.os.Looper;
 import android.view.Surface;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
@@ -342,7 +343,11 @@ public void schedule(SimpleExoPlayer player, MappingTrackSelector trackSelector,
       this.trackSelector = trackSelector;
       this.surface = surface;
       this.mainHandler = mainHandler;
-      clock.postDelayed(mainHandler, this, delayMs);
+      if (delayMs == 0 && Looper.myLooper() == mainHandler.getLooper()) {
+        run();
+      } else {
+        clock.postDelayed(mainHandler, this, delayMs);
+      }
     }
 
     @Override

From fd576d218960d0ee862c9478ea5586a41646a332 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 29 Sep 2017 18:35:39 -0700
Subject: [PATCH 270/421] Smoother PlaybackControlView updates when speed != 1

* If speed <= 0.1, update every second.
* If 0.1 < speed < 1, update approximately once per
  second in real time, aligned so that each second boundary
  in media time has a corresponding updatae.
* If speed == 1, keep existing behavior.
* If 1 < speed <= 5, update every second in media time
* If speed > 5, update every 200ms.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170559037
---
 .../exoplayer2/ui/PlaybackControlView.java       | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 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 f47ac8695c1..e2ae1f732b0 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
@@ -825,9 +825,19 @@ private void updateProgress() {
     if (playbackState != Player.STATE_IDLE && playbackState != Player.STATE_ENDED) {
       long delayMs;
       if (player.getPlayWhenReady() && playbackState == Player.STATE_READY) {
-        delayMs = 1000 - (position % 1000);
-        if (delayMs < 200) {
-          delayMs += 1000;
+        float playbackSpeed = player.getPlaybackParameters().speed;
+        if (playbackSpeed <= 0.1f) {
+          delayMs = 1000;
+        } else if (playbackSpeed <= 5f) {
+          long mediaTimeUpdatePeriodMs = 1000 / Math.max(1, Math.round(1 / playbackSpeed));
+          long mediaTimeDelayMs = mediaTimeUpdatePeriodMs - (position % mediaTimeUpdatePeriodMs);
+          if (mediaTimeDelayMs < (mediaTimeUpdatePeriodMs / 5)) {
+            mediaTimeDelayMs += mediaTimeUpdatePeriodMs;
+          }
+          delayMs = playbackSpeed == 1 ? mediaTimeDelayMs
+              : (long) (mediaTimeDelayMs / playbackSpeed);
+        } else {
+          delayMs = 200;
         }
       } else {
         delayMs = 1000;

From 7e7fea4068d9b178b463ab74c818d78831c894ca Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 2 Oct 2017 04:37:38 -0700
Subject: [PATCH 271/421] Add WaitForPlaybackStateChanged action to action
 schedule.

This works similar to the existing WaitForXXXX actions.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170687058
---
 .../android/exoplayer2/testutil/Action.java   | 43 +++++++++++++++++++
 .../exoplayer2/testutil/ActionSchedule.java   | 11 +++++
 2 files changed, 54 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 76e39525b49..cc18b630168 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
@@ -379,6 +379,49 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
 
   }
 
+  /**
+   * Waits for a specified playback state, returning either immediately or after a call to
+   * {@link Player.EventListener#onPlayerStateChanged(boolean, int)}.
+   */
+  public static final class WaitForPlaybackState extends Action {
+
+    private final int targetPlaybackState;
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public WaitForPlaybackState(String tag, int targetPlaybackState) {
+      super(tag, "WaitForPlaybackState");
+      this.targetPlaybackState = targetPlaybackState;
+    }
+
+    @Override
+    protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
+        final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
+        final ActionNode nextAction) {
+      if (targetPlaybackState == player.getPlaybackState()) {
+        nextAction.schedule(player, trackSelector, surface, handler);
+      } else {
+        player.addListener(new Player.DefaultEventListener() {
+          @Override
+          public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+            if (targetPlaybackState == playbackState) {
+              player.removeListener(this);
+              nextAction.schedule(player, trackSelector, surface, handler);
+            }
+          }
+        });
+      }
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      // Not triggered.
+    }
+
+  }
+
   /**
    * Calls {@link Runnable#run()}.
    */
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 60c13d1947d..8a6f3360f31 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
@@ -33,6 +33,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.WaitForPlaybackState;
 import com.google.android.exoplayer2.testutil.Action.WaitForPositionDiscontinuity;
 import com.google.android.exoplayer2.testutil.Action.WaitForTimelineChanged;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
@@ -257,6 +258,16 @@ public Builder waitForPositionDiscontinuity() {
       return apply(new WaitForPositionDiscontinuity(tag));
     }
 
+    /**
+     * Schedules a delay until the playback state changed to the specified state.
+     *
+     * @param targetPlaybackState The target playback state.
+     * @return The builder, for convenience.
+     */
+    public Builder waitForPlaybackState(int targetPlaybackState) {
+      return apply(new WaitForPlaybackState(tag, targetPlaybackState));
+    }
+
     /**
      * Schedules a {@link Runnable} to be executed.
      *

From 1495b9a47370b95043eaf31aaef56a1e1e0da0ba Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 2 Oct 2017 10:16:59 -0700
Subject: [PATCH 272/421] Fix stuck playback when media has uneven track end
 times

* Always assume a renderer is ready if it's read to the end of
  its current stream and there's a subsequent period already
  prepared. This prevents getting stuck when a non-clock renderer
  has a short stream.
* Switch to the standalone clock if the renderer providing the
  media clock has read to the end of its current stream, is no
  longer ready, and there's a subsequent period already prepared.
  This prevents getting stuck when a clock renderer has a short
  stream.
* Remove unnecessary clock synchronization logic (since it would
  need to be made more complicated as a result of this change).
* Don't update the playing period holder when playWhenReady is
  false. This avoids the position jumping to the start of the
  next period when seeking to the very end of the current period
  whilst paused (we still end up showing the first frame of video
  from the next period, but fixing that will have to wait).

Github: #1874

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170717481
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 128 ++++++++++--------
 .../exoplayer2/util/StandaloneMediaClock.java |  10 --
 2 files changed, 70 insertions(+), 68 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 61c5b01cf7f..838a44b4ee9 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
@@ -556,11 +556,17 @@ private void updatePlaybackPositions() throws ExoPlaybackException {
     if (periodPositionUs != C.TIME_UNSET) {
       resetRendererPosition(periodPositionUs);
     } else {
-      if (rendererMediaClockSource != null && !rendererMediaClockSource.isEnded()) {
+      // Use the standalone clock if there's no renderer clock, or if the providing renderer has
+      // ended or needs the next sample stream to reenter the ready state. The latter case uses the
+      // standalone clock to avoid getting stuck if tracks in the current period have uneven
+      // durations. See: https://github.com/google/ExoPlayer/issues/1874.
+      if (rendererMediaClockSource == null || rendererMediaClockSource.isEnded()
+          || (!rendererMediaClockSource.isReady()
+              && rendererWaitingForNextStream(rendererMediaClockSource))) {
+        rendererPositionUs = standaloneMediaClock.getPositionUs();
+      } else {
         rendererPositionUs = rendererMediaClock.getPositionUs();
         standaloneMediaClock.setPositionUs(rendererPositionUs);
-      } else {
-        rendererPositionUs = standaloneMediaClock.getPositionUs();
       }
       periodPositionUs = playingPeriodHolder.toPeriodTime(rendererPositionUs);
     }
@@ -597,9 +603,12 @@ private void doSomeWork() throws ExoPlaybackException, IOException {
       // invocation of this method.
       renderer.render(rendererPositionUs, elapsedRealtimeUs);
       allRenderersEnded = allRenderersEnded && renderer.isEnded();
-      // Determine whether the renderer is ready (or ended). If it's not, throw an error that's
-      // preventing the renderer from making progress, if such an error exists.
-      boolean rendererReadyOrEnded = renderer.isReady() || renderer.isEnded();
+      // Determine whether the renderer is ready (or ended). We override to assume the renderer is
+      // ready if it needs the next sample stream. This is necessary to avoid getting stuck if
+      // tracks in the current period have uneven durations. See:
+      // https://github.com/google/ExoPlayer/issues/1874
+      boolean rendererReadyOrEnded = renderer.isReady() || renderer.isEnded()
+          || rendererWaitingForNextStream(renderer);
       if (!rendererReadyOrEnded) {
         renderer.maybeThrowStreamError();
       }
@@ -617,7 +626,7 @@ private void doSomeWork() throws ExoPlaybackException, IOException {
         // TODO: Make LoadControl, period transition position projection, adaptive track selection
         // and potentially any time-related code in renderers take into account the playback speed.
         this.playbackParameters = playbackParameters;
-        standaloneMediaClock.synchronize(rendererMediaClock);
+        standaloneMediaClock.setPlaybackParameters(playbackParameters);
         eventHandler.obtainMessage(MSG_PLAYBACK_PARAMETERS_CHANGED, playbackParameters)
             .sendToTarget();
       }
@@ -813,9 +822,10 @@ private void resetRendererPosition(long periodPositionUs) throws ExoPlaybackExce
   }
 
   private void setPlaybackParametersInternal(PlaybackParameters playbackParameters) {
-    playbackParameters = rendererMediaClock != null
-        ? rendererMediaClock.setPlaybackParameters(playbackParameters)
-        : standaloneMediaClock.setPlaybackParameters(playbackParameters);
+    if (rendererMediaClock != null) {
+      playbackParameters = rendererMediaClock.setPlaybackParameters(playbackParameters);
+    }
+    standaloneMediaClock.setPlaybackParameters(playbackParameters);
     this.playbackParameters = playbackParameters;
     eventHandler.obtainMessage(MSG_PLAYBACK_PARAMETERS_CHANGED, playbackParameters).sendToTarget();
   }
@@ -945,12 +955,6 @@ private void reselectTracksInternal() throws ExoPlaybackException {
           if (sampleStream != renderer.getStream()) {
             // We need to disable the renderer.
             if (renderer == rendererMediaClockSource) {
-              // The renderer is providing the media clock.
-              if (sampleStream == null) {
-                // The renderer won't be re-enabled. Sync standaloneMediaClock so that it can take
-                // over timing responsibilities.
-                standaloneMediaClock.synchronize(rendererMediaClock);
-              }
               rendererMediaClock = null;
               rendererMediaClockSource = null;
             }
@@ -1300,8 +1304,8 @@ private void updatePeriods() throws ExoPlaybackException, IOException {
       return;
     }
 
-    // Update the playing and reading periods.
-    while (playingPeriodHolder != readingPeriodHolder
+    // Advance the playing period if necessary.
+    while (playWhenReady && playingPeriodHolder != readingPeriodHolder
         && rendererPositionUs >= playingPeriodHolder.next.rendererPositionOffsetUs) {
       // 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.
@@ -1327,55 +1331,60 @@ private void updatePeriods() throws ExoPlaybackException, IOException {
       return;
     }
 
+    // Advance the reading period if necessary.
+    if (readingPeriodHolder.next == null || !readingPeriodHolder.next.prepared) {
+      // We don't have a successor to advance the reading period to.
+      return;
+    }
+
     for (int i = 0; i < renderers.length; i++) {
       Renderer renderer = renderers[i];
       SampleStream sampleStream = readingPeriodHolder.sampleStreams[i];
       if (renderer.getStream() != sampleStream
           || (sampleStream != null && !renderer.hasReadStreamToEnd())) {
+        // The current reading period is still being read by at least one renderer.
         return;
       }
     }
 
-    if (readingPeriodHolder.next != null && readingPeriodHolder.next.prepared) {
-      TrackSelectorResult oldTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
-      readingPeriodHolder = readingPeriodHolder.next;
-      TrackSelectorResult newTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
+    TrackSelectorResult oldTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
+    readingPeriodHolder = readingPeriodHolder.next;
+    TrackSelectorResult newTrackSelectorResult = readingPeriodHolder.trackSelectorResult;
 
-      boolean initialDiscontinuity =
-          readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET;
-      for (int i = 0; i < renderers.length; i++) {
-        Renderer renderer = renderers[i];
-        boolean rendererWasEnabled = oldTrackSelectorResult.renderersEnabled[i];
-        if (!rendererWasEnabled) {
-          // The renderer was disabled and will be enabled when we play the next period.
-        } else if (initialDiscontinuity) {
-          // The new period starts with a discontinuity, so the renderer will play out all data then
-          // be disabled and re-enabled when it starts playing the next period.
+    boolean initialDiscontinuity =
+        readingPeriodHolder.mediaPeriod.readDiscontinuity() != C.TIME_UNSET;
+    for (int i = 0; i < renderers.length; i++) {
+      Renderer renderer = renderers[i];
+      boolean rendererWasEnabled = oldTrackSelectorResult.renderersEnabled[i];
+      if (!rendererWasEnabled) {
+        // The renderer was disabled and will be enabled when we play the next period.
+      } else if (initialDiscontinuity) {
+        // The new period starts with a discontinuity, so the renderer will play out all data then
+        // be disabled and re-enabled when it starts playing the next period.
+        renderer.setCurrentStreamFinal();
+      } else if (!renderer.isCurrentStreamFinal()) {
+        TrackSelection newSelection = newTrackSelectorResult.selections.get(i);
+        boolean newRendererEnabled = newTrackSelectorResult.renderersEnabled[i];
+        boolean isNoSampleRenderer = rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE;
+        RendererConfiguration oldConfig = oldTrackSelectorResult.rendererConfigurations[i];
+        RendererConfiguration newConfig = newTrackSelectorResult.rendererConfigurations[i];
+        if (newRendererEnabled && newConfig.equals(oldConfig) && !isNoSampleRenderer) {
+          // Replace the renderer's SampleStream so the transition to playing the next period can
+          // be seamless.
+          // This should be avoided for no-sample renderer, because skipping ahead for such
+          // renderer doesn't have any benefit (the renderer does not consume the sample stream),
+          // and it will change the provided rendererOffsetUs while the renderer is still
+          // rendering from the playing media period.
+          Format[] formats = getFormats(newSelection);
+          renderer.replaceStream(formats, readingPeriodHolder.sampleStreams[i],
+              readingPeriodHolder.getRendererOffset());
+        } else {
+          // The renderer will be disabled when transitioning to playing the next period, because
+          // there's no new selection, or because a configuration change is required, or because
+          // it's a no-sample renderer for which rendererOffsetUs should be updated only when
+          // starting to play the next period. Mark the SampleStream as final to play out any
+          // remaining data.
           renderer.setCurrentStreamFinal();
-        } else if (!renderer.isCurrentStreamFinal()) {
-          TrackSelection newSelection = newTrackSelectorResult.selections.get(i);
-          boolean newRendererEnabled = newTrackSelectorResult.renderersEnabled[i];
-          boolean isNoSampleRenderer = rendererCapabilities[i].getTrackType() == C.TRACK_TYPE_NONE;
-          RendererConfiguration oldConfig = oldTrackSelectorResult.rendererConfigurations[i];
-          RendererConfiguration newConfig = newTrackSelectorResult.rendererConfigurations[i];
-          if (newRendererEnabled && newConfig.equals(oldConfig) && !isNoSampleRenderer) {
-            // Replace the renderer's SampleStream so the transition to playing the next period can
-            // be seamless.
-            // This should be avoided for no-sample renderer, because skipping ahead for such
-            // renderer doesn't have any benefit (the renderer does not consume the sample stream),
-            // and it will change the provided rendererOffsetUs while the renderer is still
-            // rendering from the playing media period.
-            Format[] formats = getFormats(newSelection);
-            renderer.replaceStream(formats, readingPeriodHolder.sampleStreams[i],
-                readingPeriodHolder.getRendererOffset());
-          } else {
-            // The renderer will be disabled when transitioning to playing the next period, because
-            // there's no new selection, or because a configuration change is required, or because
-            // it's a no-sample renderer for which rendererOffsetUs should be updated only when
-            // starting to play the next period. Mark the SampleStream as final to play out any
-            // remaining data.
-            renderer.setCurrentStreamFinal();
-          }
         }
       }
     }
@@ -1478,8 +1487,6 @@ private void setPlayingPeriodHolder(MediaPeriodHolder periodHolder) throws ExoPl
         // needed to play the next period, or because we need to re-enable it as its current stream
         // is final and it's not reading ahead.
         if (renderer == rendererMediaClockSource) {
-          // Sync standaloneMediaClock so that it can take over timing responsibilities.
-          standaloneMediaClock.synchronize(rendererMediaClock);
           rendererMediaClock = null;
           rendererMediaClockSource = null;
         }
@@ -1539,6 +1546,11 @@ private void enableRenderer(int rendererIndex, boolean wasRendererEnabled,
     }
   }
 
+  private boolean rendererWaitingForNextStream(Renderer renderer) {
+    return readingPeriodHolder.next != null && readingPeriodHolder.next.prepared
+        && renderer.hasReadStreamToEnd();
+  }
+
   @NonNull
   private static Format[] getFormats(TrackSelection newSelection) {
     // Build an array of formats contained by the selection.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java b/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java
index 5b8d117dd08..96203bb99a9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/StandaloneMediaClock.java
@@ -69,16 +69,6 @@ public void setPositionUs(long positionUs) {
     }
   }
 
-  /**
-   * Synchronizes this clock with the current state of {@code clock}.
-   *
-   * @param clock The clock with which to synchronize.
-   */
-  public void synchronize(MediaClock clock) {
-    setPositionUs(clock.getPositionUs());
-    playbackParameters = clock.getPlaybackParameters();
-  }
-
   @Override
   public long getPositionUs() {
     long positionUs = baseUs;

From 2f622b8bd8f4d647256613ba012276161a12f1b9 Mon Sep 17 00:00:00 2001
From: Nate Roy <nroy@twitter.com>
Date: Mon, 2 Oct 2017 15:43:19 -0400
Subject: [PATCH 273/421] Allow passing of HlsPlaylistParser to HlsMediaSource.

Also create helper method in HlsMasterPlaylist to allow the copying of
the playlist to another, but with the variants reordered based on a
passed comparator. Also added an implementation of HlsPlaylistParser
which will reorder the variants returned.
---
 .../playlist/HlsMasterPlaylistParserTest.java |  44 ++++++-
 .../ReorderingHlsPlaylistParserTest.java      | 107 ++++++++++++++++++
 .../exoplayer2/source/hls/HlsMediaSource.java |  14 ++-
 .../hls/playlist/HlsMasterPlaylist.java       |  20 ++++
 .../hls/playlist/HlsPlaylistTracker.java      |   6 +-
 .../playlist/ReorderingHlsPlaylistParser.java |  39 +++++++
 6 files changed, 225 insertions(+), 5 deletions(-)
 create mode 100644 library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java
 create mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java

diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 35cd7f03d8f..4dedc9526f1 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -16,16 +16,20 @@
 package com.google.android.exoplayer2.source.hls.playlist;
 
 import android.net.Uri;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.util.MimeTypes;
+
+import junit.framework.TestCase;
+
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
-import junit.framework.TestCase;
 
 /**
  * Test for {@link HlsMasterPlaylistParserTest}
@@ -147,6 +151,44 @@ public void testPlaylistWithoutClosedCaptions() throws IOException {
     assertEquals(Collections.emptyList(), playlist.muxedCaptionFormats);
   }
 
+  public void testReorderedVariantCopy() throws IOException {
+    HlsMasterPlaylist playlist = parseMasterPlaylist(PLAYLIST_URI, MASTER_PLAYLIST);
+    HlsMasterPlaylist nonReorderedPlaylist =
+            playlist.copyWithReorderedVariants(new Comparator<HlsMasterPlaylist.HlsUrl>() {
+      @Override
+      public int compare(HlsMasterPlaylist.HlsUrl url1, HlsMasterPlaylist.HlsUrl url2) {
+        return 0;
+      }
+    });
+    assertEquals(playlist.variants, nonReorderedPlaylist.variants);
+    HlsMasterPlaylist.HlsUrl preferred = null;
+    for (HlsMasterPlaylist.HlsUrl url : playlist.variants) {
+      if (preferred == null || url.format.bitrate > preferred.format.bitrate) {
+        preferred = url;
+      }
+    }
+
+    assertNotNull(preferred);
+
+    final Comparator comparator = Collections.reverseOrder(new Comparator<HlsMasterPlaylist.HlsUrl>() {
+      @Override
+      public int compare(HlsMasterPlaylist.HlsUrl url1, HlsMasterPlaylist.HlsUrl url2) {
+        if (url1.format.bitrate > url2.format.bitrate) {
+          return 1;
+        }
+
+        if (url2.format.bitrate > url1.format.bitrate) {
+          return -1;
+        }
+
+        return 0;
+      }
+    });
+    HlsMasterPlaylist reorderedPlaylist = playlist.copyWithReorderedVariants(comparator);
+
+    assertEquals(reorderedPlaylist.variants.get(0), preferred);
+  }
+
   private static HlsMasterPlaylist parseMasterPlaylist(String uri, String playlistString)
       throws IOException {
     Uri playlistUri = Uri.parse(uri);
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java
new file mode 100644
index 00000000000..2816832704b
--- /dev/null
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java
@@ -0,0 +1,107 @@
+package com.google.android.exoplayer2.source.hls.playlist;
+
+import android.net.Uri;
+
+import com.google.android.exoplayer2.C;
+
+import junit.framework.TestCase;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.charset.Charset;
+import java.util.Collections;
+import java.util.Comparator;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+public class ReorderingHlsPlaylistParserTest extends TestCase {
+    private static final String MASTER_PLAYLIST = " #EXTM3U \n"
+            + "\n"
+            + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,CODECS=\"mp4a.40.2,avc1.66.30\",RESOLUTION=304x128\n"
+            + "http://example.com/low.m3u8\n"
+            + "\n"
+            + "#EXT-X-STREAM-INF:BANDWIDTH=2560000,FRAME-RATE=25,RESOLUTION=384x160\n"
+            + "http://example.com/mid.m3u8\n"
+            + "\n"
+            + "#EXT-X-STREAM-INF:BANDWIDTH=7680000,FRAME-RATE=29.997\n"
+            + "http://example.com/hi.m3u8\n"
+            + "\n"
+            + "#EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS=\"mp4a.40.5\"\n"
+            + "http://example.com/audio-only.m3u8";
+
+    public void testReorderingWithNonMasterPlaylist() throws IOException {
+        Uri playlistUri = Uri.parse("https://example.com/test.m3u8");
+        String playlistString = "#EXTM3U\n"
+                + "#EXT-X-VERSION:3\n"
+                + "#EXT-X-PLAYLIST-TYPE:VOD\n"
+                + "#EXT-X-START:TIME-OFFSET=-25"
+                + "#EXT-X-TARGETDURATION:8\n"
+                + "#EXT-X-MEDIA-SEQUENCE:2679\n"
+                + "#EXT-X-DISCONTINUITY-SEQUENCE:4\n"
+                + "#EXT-X-ALLOW-CACHE:YES\n"
+                + "\n"
+                + "#EXTINF:7.975,\n"
+                + "#EXT-X-BYTERANGE:51370@0\n"
+                + "https://priv.example.com/fileSequence2679.ts\n"
+                + "\n"
+                + "#EXT-X-KEY:METHOD=AES-128,URI=\"https://priv.example.com/key.php?r=2680\",IV=0x1566B\n"
+                + "#EXTINF:7.975,\n"
+                + "#EXT-X-BYTERANGE:51501@2147483648\n"
+                + "https://priv.example.com/fileSequence2680.ts\n"
+                + "\n"
+                + "#EXT-X-KEY:METHOD=NONE\n"
+                + "#EXTINF:7.941,\n"
+                + "#EXT-X-BYTERANGE:51501\n" // @2147535149
+                + "https://priv.example.com/fileSequence2681.ts\n"
+                + "\n"
+                + "#EXT-X-DISCONTINUITY\n"
+                + "#EXT-X-KEY:METHOD=AES-128,URI=\"https://priv.example.com/key.php?r=2682\"\n"
+                + "#EXTINF:7.975,\n"
+                + "#EXT-X-BYTERANGE:51740\n" // @2147586650
+                + "https://priv.example.com/fileSequence2682.ts\n"
+                + "\n"
+                + "#EXTINF:7.975,\n"
+                + "https://priv.example.com/fileSequence2683.ts\n"
+                + "#EXT-X-ENDLIST";
+        InputStream inputStream = new ByteArrayInputStream(playlistString.getBytes(Charset.forName(C.UTF8_NAME)));
+        Comparator<HlsMasterPlaylist.HlsUrl> comparator = mock(Comparator.class);
+        ReorderingHlsPlaylistParser playlistParser = new ReorderingHlsPlaylistParser(new HlsPlaylistParser(),
+                comparator);
+        final HlsMediaPlaylist playlist = (HlsMediaPlaylist) playlistParser.parse(playlistUri, inputStream);
+        assertNotNull(playlist);
+        // We should never compare the variants for a media level playlist.
+        verify(comparator, never()).compare(any(HlsMasterPlaylist.HlsUrl.class), any(HlsMasterPlaylist.HlsUrl.class));
+    }
+
+    public void testReorderingForMasterPlaylist() throws IOException {
+        Uri playlistUri = Uri.parse("https://example.com/test.m3u8");
+        ByteArrayInputStream inputStream = new ByteArrayInputStream(
+                MASTER_PLAYLIST.getBytes(Charset.forName(C.UTF8_NAME)));
+        final Comparator comparator = Collections.reverseOrder(new Comparator<HlsMasterPlaylist.HlsUrl>() {
+            @Override
+            public int compare(HlsMasterPlaylist.HlsUrl url1, HlsMasterPlaylist.HlsUrl url2) {
+                if (url1.format.bitrate > url2.format.bitrate) {
+                    return 1;
+                }
+
+                if (url2.format.bitrate > url1.format.bitrate) {
+                    return -1;
+                }
+
+                return 0;
+            }
+        });
+        ReorderingHlsPlaylistParser playlistParser = new ReorderingHlsPlaylistParser(new HlsPlaylistParser(),
+                comparator);
+        final HlsMasterPlaylist reorderedPlaylist = (HlsMasterPlaylist) playlistParser.parse(playlistUri, inputStream);
+        assertNotNull(reorderedPlaylist);
+
+        inputStream.reset();
+        final HlsMasterPlaylist playlist = (HlsMasterPlaylist) new HlsPlaylistParser().parse(playlistUri, inputStream);
+        assertEquals(reorderedPlaylist.variants.get(0).format, playlist.variants.get(2).format);
+    }
+}
\ No newline at end of file
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 fd3d5333378..b7f7124e442 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
@@ -26,9 +26,12 @@
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.SinglePeriodTimeline;
 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.HlsPlaylistTracker;
 import com.google.android.exoplayer2.upstream.Allocator;
 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.List;
@@ -52,6 +55,7 @@ public final class HlsMediaSource implements MediaSource,
   private final HlsDataSourceFactory dataSourceFactory;
   private final int minLoadableRetryCount;
   private final EventDispatcher eventDispatcher;
+  private final ParsingLoadable.Parser<HlsPlaylist> playlistParser;
 
   private HlsPlaylistTracker playlistTracker;
   private Listener sourceListener;
@@ -72,9 +76,17 @@ public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory,
   public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
       int minLoadableRetryCount, Handler eventHandler,
       AdaptiveMediaSourceEventListener eventListener) {
+   this(manifestUri, dataSourceFactory, minLoadableRetryCount, eventHandler, eventListener, new HlsPlaylistParser());
+  }
+
+  public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
+                        int minLoadableRetryCount, Handler eventHandler,
+                        AdaptiveMediaSourceEventListener eventListener,
+                        ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
     this.manifestUri = manifestUri;
     this.dataSourceFactory = dataSourceFactory;
     this.minLoadableRetryCount = minLoadableRetryCount;
+    this.playlistParser = playlistParser;
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
   }
 
@@ -82,7 +94,7 @@ public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
   public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
     Assertions.checkState(playlistTracker == null);
     playlistTracker = new HlsPlaylistTracker(manifestUri, dataSourceFactory, eventDispatcher,
-        minLoadableRetryCount, this);
+        minLoadableRetryCount, this, playlistParser);
     sourceListener = listener;
     playlistTracker.start();
   }
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 04192def9d7..5ded975f88e 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
@@ -19,6 +19,7 @@
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -123,6 +124,25 @@ public HlsMasterPlaylist copy(List<String> renditionUrls) {
         muxedAudioFormat, muxedCaptionFormats);
   }
 
+  /**
+   * Returns a copy of this playlist which includes the variants sorted using the passed comparator. NOTE: the variants
+   * will be sorted in ascending order by default. If you wish to use descending order, you can wrap your comparator in
+   * {@link Collections#reverseOrder(Comparator)}.
+   *
+   * @param variantComparator the comparator to use to sort the variant list.
+   * @return a copy of this playlist which includes the variants sorted using the passed comparator.
+   */
+  public HlsMasterPlaylist copyWithReorderedVariants(Comparator<HlsUrl> variantComparator) {
+    return new HlsMasterPlaylist(baseUri, tags, filterVariants(variants, variantComparator), audios,
+            subtitles, muxedAudioFormat, muxedCaptionFormats);
+  }
+
+  private List<HlsUrl> filterVariants(List<HlsUrl> variants, Comparator<HlsUrl> variantComparator) {
+    List<HlsUrl> reorderedList = new ArrayList<>(variants);
+    Collections.sort(reorderedList, variantComparator);
+    return reorderedList;
+  }
+
   /**
    * Creates a playlist with a single variant.
    *
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 d3682217d8e..52d5a4b5bce 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
@@ -115,7 +115,7 @@ public interface PlaylistEventListener {
 
   private final Uri initialPlaylistUri;
   private final HlsDataSourceFactory dataSourceFactory;
-  private final HlsPlaylistParser playlistParser;
+  private final ParsingLoadable.Parser<HlsPlaylist> playlistParser;
   private final int minRetryCount;
   private final IdentityHashMap<HlsUrl, MediaPlaylistBundle> playlistBundles;
   private final Handler playlistRefreshHandler;
@@ -140,7 +140,7 @@ public interface PlaylistEventListener {
    */
   public HlsPlaylistTracker(Uri initialPlaylistUri, HlsDataSourceFactory dataSourceFactory,
       EventDispatcher eventDispatcher, int minRetryCount,
-      PrimaryPlaylistListener primaryPlaylistListener) {
+      PrimaryPlaylistListener primaryPlaylistListener, ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
     this.initialPlaylistUri = initialPlaylistUri;
     this.dataSourceFactory = dataSourceFactory;
     this.eventDispatcher = eventDispatcher;
@@ -148,7 +148,7 @@ public HlsPlaylistTracker(Uri initialPlaylistUri, HlsDataSourceFactory dataSourc
     this.primaryPlaylistListener = primaryPlaylistListener;
     listeners = new ArrayList<>();
     initialPlaylistLoader = new Loader("HlsPlaylistTracker:MasterPlaylist");
-    playlistParser = new HlsPlaylistParser();
+    this.playlistParser = playlistParser;
     playlistBundles = new IdentityHashMap<>();
     playlistRefreshHandler = new Handler();
   }
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java
new file mode 100644
index 00000000000..bdd47e8c285
--- /dev/null
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java
@@ -0,0 +1,39 @@
+package com.google.android.exoplayer2.source.hls.playlist;
+
+import android.net.Uri;
+
+import com.google.android.exoplayer2.upstream.ParsingLoadable;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Comparator;
+
+/**
+ * Parser for {@link HlsPlaylist}s that reorders the variants based on the comparator passed.
+ */
+public class ReorderingHlsPlaylistParser implements ParsingLoadable.Parser<HlsPlaylist> {
+    private final ParsingLoadable.Parser<HlsPlaylist> playlistParser;
+    private final Comparator<HlsMasterPlaylist.HlsUrl> variantComparator;
+
+    /**
+     * @param playlistParser the {@link ParsingLoadable.Parser} to wrap.
+     * @param variantComparator the {@link Comparator} to use to reorder the variants.
+     *                          See {@link HlsMasterPlaylist#copyWithReorderedVariants(Comparator)} for more details.
+     */
+    public ReorderingHlsPlaylistParser(ParsingLoadable.Parser<HlsPlaylist> playlistParser,
+                                       Comparator<HlsMasterPlaylist.HlsUrl> variantComparator) {
+        this.playlistParser = playlistParser;
+        this.variantComparator = variantComparator;
+    }
+
+    @Override
+    public HlsPlaylist parse(Uri uri, InputStream inputStream) throws IOException {
+        final HlsPlaylist playlist = playlistParser.parse(uri, inputStream);
+
+        if (playlist instanceof HlsMasterPlaylist) {
+            return ((HlsMasterPlaylist) playlist).copyWithReorderedVariants(variantComparator);
+        }
+
+        return playlist;
+    }
+}

From 9783fc0924334beab16d1350548e5cce73b9b070 Mon Sep 17 00:00:00 2001
From: Nate Roy <nroy@twitter.com>
Date: Fri, 6 Oct 2017 14:35:18 -0400
Subject: [PATCH 274/421] remove reordering playlist parser

---
 .../ReorderingHlsPlaylistParserTest.java      | 107 ------------------
 .../playlist/ReorderingHlsPlaylistParser.java |  39 -------
 2 files changed, 146 deletions(-)
 delete mode 100644 library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java
 delete mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java

diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java
deleted file mode 100644
index 2816832704b..00000000000
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParserTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package com.google.android.exoplayer2.source.hls.playlist;
-
-import android.net.Uri;
-
-import com.google.android.exoplayer2.C;
-
-import junit.framework.TestCase;
-
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.Charset;
-import java.util.Collections;
-import java.util.Comparator;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.never;
-import static org.mockito.Mockito.verify;
-
-public class ReorderingHlsPlaylistParserTest extends TestCase {
-    private static final String MASTER_PLAYLIST = " #EXTM3U \n"
-            + "\n"
-            + "#EXT-X-STREAM-INF:BANDWIDTH=1280000,CODECS=\"mp4a.40.2,avc1.66.30\",RESOLUTION=304x128\n"
-            + "http://example.com/low.m3u8\n"
-            + "\n"
-            + "#EXT-X-STREAM-INF:BANDWIDTH=2560000,FRAME-RATE=25,RESOLUTION=384x160\n"
-            + "http://example.com/mid.m3u8\n"
-            + "\n"
-            + "#EXT-X-STREAM-INF:BANDWIDTH=7680000,FRAME-RATE=29.997\n"
-            + "http://example.com/hi.m3u8\n"
-            + "\n"
-            + "#EXT-X-STREAM-INF:BANDWIDTH=65000,CODECS=\"mp4a.40.5\"\n"
-            + "http://example.com/audio-only.m3u8";
-
-    public void testReorderingWithNonMasterPlaylist() throws IOException {
-        Uri playlistUri = Uri.parse("https://example.com/test.m3u8");
-        String playlistString = "#EXTM3U\n"
-                + "#EXT-X-VERSION:3\n"
-                + "#EXT-X-PLAYLIST-TYPE:VOD\n"
-                + "#EXT-X-START:TIME-OFFSET=-25"
-                + "#EXT-X-TARGETDURATION:8\n"
-                + "#EXT-X-MEDIA-SEQUENCE:2679\n"
-                + "#EXT-X-DISCONTINUITY-SEQUENCE:4\n"
-                + "#EXT-X-ALLOW-CACHE:YES\n"
-                + "\n"
-                + "#EXTINF:7.975,\n"
-                + "#EXT-X-BYTERANGE:51370@0\n"
-                + "https://priv.example.com/fileSequence2679.ts\n"
-                + "\n"
-                + "#EXT-X-KEY:METHOD=AES-128,URI=\"https://priv.example.com/key.php?r=2680\",IV=0x1566B\n"
-                + "#EXTINF:7.975,\n"
-                + "#EXT-X-BYTERANGE:51501@2147483648\n"
-                + "https://priv.example.com/fileSequence2680.ts\n"
-                + "\n"
-                + "#EXT-X-KEY:METHOD=NONE\n"
-                + "#EXTINF:7.941,\n"
-                + "#EXT-X-BYTERANGE:51501\n" // @2147535149
-                + "https://priv.example.com/fileSequence2681.ts\n"
-                + "\n"
-                + "#EXT-X-DISCONTINUITY\n"
-                + "#EXT-X-KEY:METHOD=AES-128,URI=\"https://priv.example.com/key.php?r=2682\"\n"
-                + "#EXTINF:7.975,\n"
-                + "#EXT-X-BYTERANGE:51740\n" // @2147586650
-                + "https://priv.example.com/fileSequence2682.ts\n"
-                + "\n"
-                + "#EXTINF:7.975,\n"
-                + "https://priv.example.com/fileSequence2683.ts\n"
-                + "#EXT-X-ENDLIST";
-        InputStream inputStream = new ByteArrayInputStream(playlistString.getBytes(Charset.forName(C.UTF8_NAME)));
-        Comparator<HlsMasterPlaylist.HlsUrl> comparator = mock(Comparator.class);
-        ReorderingHlsPlaylistParser playlistParser = new ReorderingHlsPlaylistParser(new HlsPlaylistParser(),
-                comparator);
-        final HlsMediaPlaylist playlist = (HlsMediaPlaylist) playlistParser.parse(playlistUri, inputStream);
-        assertNotNull(playlist);
-        // We should never compare the variants for a media level playlist.
-        verify(comparator, never()).compare(any(HlsMasterPlaylist.HlsUrl.class), any(HlsMasterPlaylist.HlsUrl.class));
-    }
-
-    public void testReorderingForMasterPlaylist() throws IOException {
-        Uri playlistUri = Uri.parse("https://example.com/test.m3u8");
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(
-                MASTER_PLAYLIST.getBytes(Charset.forName(C.UTF8_NAME)));
-        final Comparator comparator = Collections.reverseOrder(new Comparator<HlsMasterPlaylist.HlsUrl>() {
-            @Override
-            public int compare(HlsMasterPlaylist.HlsUrl url1, HlsMasterPlaylist.HlsUrl url2) {
-                if (url1.format.bitrate > url2.format.bitrate) {
-                    return 1;
-                }
-
-                if (url2.format.bitrate > url1.format.bitrate) {
-                    return -1;
-                }
-
-                return 0;
-            }
-        });
-        ReorderingHlsPlaylistParser playlistParser = new ReorderingHlsPlaylistParser(new HlsPlaylistParser(),
-                comparator);
-        final HlsMasterPlaylist reorderedPlaylist = (HlsMasterPlaylist) playlistParser.parse(playlistUri, inputStream);
-        assertNotNull(reorderedPlaylist);
-
-        inputStream.reset();
-        final HlsMasterPlaylist playlist = (HlsMasterPlaylist) new HlsPlaylistParser().parse(playlistUri, inputStream);
-        assertEquals(reorderedPlaylist.variants.get(0).format, playlist.variants.get(2).format);
-    }
-}
\ No newline at end of file
diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java
deleted file mode 100644
index bdd47e8c285..00000000000
--- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/ReorderingHlsPlaylistParser.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.google.android.exoplayer2.source.hls.playlist;
-
-import android.net.Uri;
-
-import com.google.android.exoplayer2.upstream.ParsingLoadable;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Comparator;
-
-/**
- * Parser for {@link HlsPlaylist}s that reorders the variants based on the comparator passed.
- */
-public class ReorderingHlsPlaylistParser implements ParsingLoadable.Parser<HlsPlaylist> {
-    private final ParsingLoadable.Parser<HlsPlaylist> playlistParser;
-    private final Comparator<HlsMasterPlaylist.HlsUrl> variantComparator;
-
-    /**
-     * @param playlistParser the {@link ParsingLoadable.Parser} to wrap.
-     * @param variantComparator the {@link Comparator} to use to reorder the variants.
-     *                          See {@link HlsMasterPlaylist#copyWithReorderedVariants(Comparator)} for more details.
-     */
-    public ReorderingHlsPlaylistParser(ParsingLoadable.Parser<HlsPlaylist> playlistParser,
-                                       Comparator<HlsMasterPlaylist.HlsUrl> variantComparator) {
-        this.playlistParser = playlistParser;
-        this.variantComparator = variantComparator;
-    }
-
-    @Override
-    public HlsPlaylist parse(Uri uri, InputStream inputStream) throws IOException {
-        final HlsPlaylist playlist = playlistParser.parse(uri, inputStream);
-
-        if (playlist instanceof HlsMasterPlaylist) {
-            return ((HlsMasterPlaylist) playlist).copyWithReorderedVariants(variantComparator);
-        }
-
-        return playlist;
-    }
-}

From b8e719b101e529922485ff8afc3ad00c1401f7c9 Mon Sep 17 00:00:00 2001
From: Justin Yorke <justiny@valvesoftware.com>
Date: Fri, 6 Oct 2017 14:52:29 -0700
Subject: [PATCH 275/421] Allow multiple PSSH boxes for same system.

Updates DefaultDrmSessionManager to use the prefered Widevine version (v1
on >= 23 and v0 for < 23).
For other DRM schemes, uses the first scheme found.
---
 .../drm/DefaultDrmSessionManager.java         | 35 +++++++++++---
 .../android/exoplayer2/drm/DrmInitData.java   | 13 +++--
 .../extractor/mp4/PsshAtomUtil.java           | 46 ++++++++++++++----
 .../exoplayer2/drm/DrmInitDataTest.java       | 47 +++++++++++--------
 4 files changed, 99 insertions(+), 42 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 a0d5a932f27..9125efa4585 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
@@ -323,7 +323,7 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
       // If there is no scheme information, assume patternless AES-CTR.
       return true;
     } else if (C.CENC_TYPE_cbc1.equals(schemeType) || C.CENC_TYPE_cbcs.equals(schemeType)
-        || C.CENC_TYPE_cens.equals(schemeType)) {
+            || C.CENC_TYPE_cens.equals(schemeType)) {
       // AES-CBC and pattern encryption are supported on API 24 onwards.
       return Util.SDK_INT >= 24;
     }
@@ -331,6 +331,7 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
     return true;
   }
 
+
   @Override
   public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitData) {
     Assertions.checkState(this.playbackLooper == null || this.playbackLooper == playbackLooper);
@@ -435,12 +436,34 @@ public void onProvisionError(Exception error) {
    * @return The extracted {@link SchemeData}, or null if no suitable data is present.
    */
   private static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid) {
-    SchemeData schemeData = drmInitData.get(uuid);
-    if (schemeData == null && C.CLEARKEY_UUID.equals(uuid)) {
-      // If present, the Common PSSH box should be used for ClearKey.
-      schemeData = drmInitData.get(C.COMMON_PSSH_UUID);
+    List<SchemeData> schemeDatas = new ArrayList<>();
+    // Look for matching PSSH boxes, or the common box in the case of ClearKey
+    for (int i = 0; i < drmInitData.schemeDataCount; ++i) {
+      SchemeData schemeData = drmInitData.get(i);
+      if (schemeData.matches(uuid)
+              || (C.CLEARKEY_UUID.equals(uuid) && schemeData.matches(C.COMMON_PSSH_UUID))) {
+        schemeDatas.add(schemeData);
+      }
     }
-    return schemeData;
+
+    if (schemeDatas.isEmpty()) {
+      return null;
+    }
+
+    // For Widevine, we prefer v1 init data on M and higher, v0 for lower
+    if (C.WIDEVINE_UUID.equals(uuid)) {
+      for (SchemeData schemeData : schemeDatas ) {
+        int version = PsshAtomUtil.parseVersion(schemeData.data);
+        if (Util.SDK_INT < 23 && version == 0) {
+          return schemeData;
+        } else if (Util.SDK_INT >= 23 && version == 1) {
+          return schemeData;
+        }
+      }
+    }
+
+    // If we don't have any special handling for this system, we take the first scheme data found
+    return schemeDatas.get(0);
   }
 
   private static byte[] getSchemeInitData(SchemeData data, UUID uuid) {
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 e346ab800f2..e9aeb78f2d6 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
@@ -22,6 +22,8 @@
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
+
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -78,12 +80,7 @@ private DrmInitData(@Nullable String schemeType, boolean cloneSchemeDatas,
     // 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);
-    // Check for no duplicates.
-    for (int i = 1; i < schemeDatas.length; i++) {
-      if (schemeDatas[i - 1].uuid.equals(schemeDatas[i].uuid)) {
-        throw new IllegalArgumentException("Duplicate data for uuid: " + schemeDatas[i].uuid);
-      }
-    }
+
     this.schemeDatas = schemeDatas;
     schemeDataCount = schemeDatas.length;
   }
@@ -97,9 +94,11 @@ private DrmInitData(@Nullable String schemeType, boolean cloneSchemeDatas,
   /**
    * Retrieves data for a given DRM scheme, specified by its UUID.
    *
+   * @deprecated This will only get the first data found for the scheme.
    * @param uuid The DRM scheme's UUID.
    * @return The initialization data for the scheme, or null if the scheme is not supported.
    */
+  @Deprecated
   public SchemeData get(UUID uuid) {
     for (SchemeData schemeData : schemeDatas) {
       if (schemeData.matches(uuid)) {
@@ -112,7 +111,7 @@ public SchemeData get(UUID uuid) {
   /**
    * Retrieves the {@link SchemeData} at a given index.
    *
-   * @param index index of the scheme to return.
+   * @param index index of the scheme to return. Must not exceed {@link #schemeDataCount}.
    * @return The {@link SchemeData} at the index.
    */
   public SchemeData get(int index) {
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 cfca0153484..9854c574146 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
@@ -86,11 +86,28 @@ public static byte[] buildPsshAtom(UUID systemId, UUID[] keyIds, byte[] data) {
    *     an unsupported version.
    */
   public static UUID parseUuid(byte[] atom) {
-    Pair<UUID, byte[]> parsedAtom = parsePsshAtom(atom);
+    PsshAtom parsedAtom = parsePsshAtom(atom);
     if (parsedAtom == null) {
       return null;
     }
-    return parsedAtom.first;
+    return parsedAtom.uuid;
+  }
+
+  /**
+   * Parses the version from a PSSH atom. Version 0 and 1 PSSH atoms are supported.
+   * <p>
+   * The UUID is only parsed if the data is a valid PSSH atom.
+   *
+   * @param atom The atom to parse.
+   * @return The parsed UUID. -1 if the input is not a valid PSSH atom, or if the PSSH atom has
+   *     an unsupported version.
+   */
+  public static int parseVersion(byte[] atom) {
+    PsshAtom parsedAtom = parsePsshAtom(atom);
+    if (parsedAtom == null) {
+      return -1;
+    }
+    return parsedAtom.version;
   }
 
   /**
@@ -105,15 +122,15 @@ public static UUID parseUuid(byte[] atom) {
    *     PSSH atom has an unsupported version, or if the PSSH atom does not match the passed UUID.
    */
   public static byte[] parseSchemeSpecificData(byte[] atom, UUID uuid) {
-    Pair<UUID, byte[]> parsedAtom = parsePsshAtom(atom);
+    PsshAtom parsedAtom = parsePsshAtom(atom);
     if (parsedAtom == null) {
       return null;
     }
-    if (uuid != null && !uuid.equals(parsedAtom.first)) {
-      Log.w(TAG, "UUID mismatch. Expected: " + uuid + ", got: " + parsedAtom.first + ".");
+    if (uuid != null && !uuid.equals(parsedAtom.uuid)) {
+      Log.w(TAG, "UUID mismatch. Expected: " + uuid + ", got: " + parsedAtom.uuid + ".");
       return null;
     }
-    return parsedAtom.second;
+    return parsedAtom.data;
   }
 
   /**
@@ -125,7 +142,7 @@ public static byte[] parseSchemeSpecificData(byte[] atom, UUID uuid) {
    *     not a valid PSSH atom, or if the PSSH atom has an unsupported version.
    */
   // TODO: Support parsing of the key ids for version 1 PSSH atoms.
-  private static Pair<UUID, byte[]> parsePsshAtom(byte[] atom) {
+  private static PsshAtom parsePsshAtom(byte[] atom) {
     ParsableByteArray atomData = new ParsableByteArray(atom);
     if (atomData.limit() < Atom.FULL_HEADER_SIZE + 16 /* UUID */ + 4 /* DataSize */) {
       // Data too short.
@@ -159,7 +176,18 @@ private static Pair<UUID, byte[]> parsePsshAtom(byte[] atom) {
     }
     byte[] data = new byte[dataSize];
     atomData.readBytes(data, 0, dataSize);
-    return Pair.create(uuid, data);
+    return new PsshAtom(uuid, atomVersion, data);
   }
 
-}
+  private static class PsshAtom {
+    final UUID uuid;
+    final int version;
+    final byte[] data;
+
+    PsshAtom(final UUID uuid, final int version, final byte[] data) {
+      this.uuid = uuid;
+      this.version = version;
+      this.data = data;
+    }
+  }
+}
\ No newline at end of file
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 b6c068c2180..610dd5368e7 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
@@ -31,6 +31,9 @@
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Unit test for {@link DrmInitData}.
  */
@@ -97,6 +100,7 @@ public void testEquals() {
   }
 
   @Test
+  @Deprecated
   public void testGet() {
     // Basic matching.
     DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
@@ -124,27 +128,22 @@ public void testGet() {
   }
 
   @Test
-  public void testDuplicateSchemeDataRejected() {
-    try {
-      new DrmInitData(DATA_1, DATA_1);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
-
-    try {
-      new DrmInitData(DATA_1, DATA_1B);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
+  public void testGetByIndex() {
+    DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
+    assertThat(getAllSchemeData(testInitData)).containsAllOf(DATA_1, DATA_2);
+  }
 
-    try {
-      new DrmInitData(DATA_1, DATA_2, DATA_1B);
-      fail();
-    } catch (IllegalArgumentException e) {
-      // Expected.
-    }
+  @Test
+  public void testDuplicateSchemeData() {
+    DrmInitData testInitData = new DrmInitData(DATA_1, DATA_1);
+    assertThat(testInitData.schemeDataCount).isEqualTo(2);
+
+    testInitData = new DrmInitData(DATA_1, DATA_2, DATA_1B);
+    assertThat(testInitData.schemeDataCount).isEqualTo(3);
+    assertThat(getAllSchemeData(testInitData)).containsAllOf(DATA_1, DATA_1B, DATA_2);
+    // Deprecated get method should return first entry
+    assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
+    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
   }
 
   @Test
@@ -162,4 +161,12 @@ public void testSchemeDataMatches() {
     assertThat(DATA_UNIVERSAL.matches(UUID_NIL)).isTrue();
   }
 
+  private List<SchemeData> getAllSchemeData(DrmInitData drmInitData) {
+    ArrayList<SchemeData> schemeDatas = new ArrayList<>();
+    for (int i = 0; i < drmInitData.schemeDataCount; i++) {
+      schemeDatas.add(drmInitData.get(i));
+    }
+    return schemeDatas;
+  }
+
 }

From 5baddfb56a9db55bd87e2dbc296fd9e28d1c9558 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 3 Oct 2017 02:46:04 -0700
Subject: [PATCH 276/421] Add onSeekProcessed callback to Player interface.

This is useful to determine when a seek request was processed by the player
and all playback state changes (mostly to BUFFERING) have been performed.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170826793
---
 .../android/exoplayer2/demo/EventLogger.java  |  5 +++
 .../exoplayer2/ext/cast/CastPlayer.java       | 23 +++++++-----
 .../android/exoplayer2/ExoPlayerTest.java     | 36 +++++++++++++++++++
 .../android/exoplayer2/ExoPlayerImpl.java     | 12 +++++--
 .../exoplayer2/ExoPlayerImplInternal.java     | 17 ++++-----
 .../com/google/android/exoplayer2/Player.java | 12 +++++++
 6 files changed, 85 insertions(+), 20 deletions(-)

diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 5c2b40e6305..68f7ddfd213 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -209,6 +209,11 @@ public void onTracksChanged(TrackGroupArray ignored, TrackSelectionArray trackSe
     Log.d(TAG, "]");
   }
 
+  @Override
+  public void onSeekProcessed() {
+    Log.d(TAG, "seekProcessed");
+  }
+
   // MetadataOutput
 
   @Override
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 9d3636f8acf..ffb06ed2326 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
@@ -41,7 +41,6 @@
 import com.google.android.gms.cast.framework.SessionManagerListener;
 import com.google.android.gms.cast.framework.media.RemoteMediaClient;
 import com.google.android.gms.cast.framework.media.RemoteMediaClient.MediaChannelResult;
-import com.google.android.gms.common.api.CommonStatusCodes;
 import com.google.android.gms.common.api.PendingResult;
 import com.google.android.gms.common.api.ResultCallback;
 import java.util.List;
@@ -115,6 +114,7 @@ public interface SessionAvailabilityListener {
   private int currentWindowIndex;
   private boolean playWhenReady;
   private long lastReportedPositionMs;
+  private int pendingSeekCount;
   private int pendingSeekWindowIndex;
   private long pendingSeekPositionMs;
 
@@ -333,11 +333,16 @@ public void seekTo(int windowIndex, long positionMs) {
       } else {
         remoteMediaClient.seek(positionMs).setResultCallback(seekResultCallback);
       }
+      pendingSeekCount++;
       pendingSeekWindowIndex = windowIndex;
       pendingSeekPositionMs = positionMs;
       for (EventListener listener : listeners) {
         listener.onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
       }
+    } else if (pendingSeekCount == 0) {
+      for (EventListener listener : listeners) {
+        listener.onSeekProcessed();
+      }
     }
   }
 
@@ -536,7 +541,7 @@ public void updateInternalState() {
       }
     }
     int currentWindowIndex = fetchCurrentWindowIndex(getMediaStatus());
-    if (this.currentWindowIndex != currentWindowIndex) {
+    if (this.currentWindowIndex != currentWindowIndex && pendingSeekCount == 0) {
       this.currentWindowIndex = currentWindowIndex;
       for (EventListener listener : listeners) {
         listener.onPositionDiscontinuity(DISCONTINUITY_REASON_PERIOD_TRANSITION);
@@ -831,18 +836,18 @@ private final class SeekResultCallback implements ResultCallback<MediaChannelRes
     @Override
     public void onResult(@NonNull MediaChannelResult result) {
       int statusCode = result.getStatus().getStatusCode();
-      if (statusCode == CastStatusCodes.REPLACED) {
-        // A seek was executed before this one completed. Do nothing.
-      } else {
+      if (statusCode != CastStatusCodes.SUCCESS && statusCode != CastStatusCodes.REPLACED) {
+        Log.e(TAG, "Seek failed. Error code " + statusCode + ": "
+            + CastUtils.getLogString(statusCode));
+      }
+      if (--pendingSeekCount == 0) {
         pendingSeekWindowIndex = C.INDEX_UNSET;
         pendingSeekPositionMs = C.TIME_UNSET;
-        if (statusCode != CommonStatusCodes.SUCCESS) {
-          Log.e(TAG, "Seek failed. Error code " + statusCode + ": "
-              + CastUtils.getLogString(statusCode));
+        for (EventListener listener : listeners) {
+          listener.onSeekProcessed();
         }
       }
     }
-
   }
 
 }
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 9f172dc8022..2971aaf779d 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -28,6 +28,8 @@
 import com.google.android.exoplayer2.testutil.FakeShuffleOrder;
 import com.google.android.exoplayer2.testutil.FakeTimeline;
 import com.google.android.exoplayer2.testutil.FakeTimeline.TimelineWindowDefinition;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import junit.framework.TestCase;
 
@@ -259,4 +261,38 @@ public void testShuffleModeEnabledChanges() throws Exception {
     assertTrue(renderer.isEnded);
   }
 
+  public void testSeekProcessedCallback() throws Exception {
+    Timeline timeline = new FakeTimeline(
+        new TimelineWindowDefinition(true, false, 100000),
+        new TimelineWindowDefinition(true, false, 100000));
+    ActionSchedule actionSchedule = new ActionSchedule.Builder("testSeekProcessedCallback")
+        // Initial seek before timeline preparation finished.
+        .pause().seek(10).waitForPlaybackState(Player.STATE_READY)
+        // Re-seek to same position, start playback and wait until playback reaches second window.
+        .seek(10).play().waitForPositionDiscontinuity()
+        // Seek twice in concession, expecting the first seek to be replaced.
+        .seek(5).seek(60).build();
+    final List<Integer> playbackStatesWhenSeekProcessed = new ArrayList<>();
+    Player.EventListener eventListener = new Player.DefaultEventListener() {
+      private int currentPlaybackState = Player.STATE_IDLE;
+
+      @Override
+      public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
+        currentPlaybackState = playbackState;
+      }
+
+      @Override
+      public void onSeekProcessed() {
+        playbackStatesWhenSeekProcessed.add(currentPlaybackState);
+      }
+    };
+    new ExoPlayerTestRunner.Builder()
+        .setTimeline(timeline).setEventListener(eventListener).setActionSchedule(actionSchedule)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    assertEquals(3, playbackStatesWhenSeekProcessed.size());
+    assertEquals(Player.STATE_BUFFERING, (int) playbackStatesWhenSeekProcessed.get(0));
+    assertEquals(Player.STATE_READY, (int) playbackStatesWhenSeekProcessed.get(1));
+    assertEquals(Player.STATE_BUFFERING, (int) playbackStatesWhenSeekProcessed.get(2));
+  }
+
 }
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 75e08aadc60..22226604691 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
@@ -482,10 +482,11 @@ public Object getCurrentManifest() {
             maskingWindowIndex = 0;
             maskingWindowPositionMs = 0;
           }
-          if (msg.arg1 != 0) {
-            for (Player.EventListener listener : listeners) {
-              listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK);
+          for (Player.EventListener listener : listeners) {
+            if (msg.arg1 != 0) {
+              listener.onPositionDiscontinuity(DISCONTINUITY_REASON_INTERNAL);
             }
+            listener.onSeekProcessed();
           }
         }
         break;
@@ -516,6 +517,11 @@ public Object getCurrentManifest() {
             listener.onTimelineChanged(timeline, manifest);
           }
         }
+        if (pendingSeekAcks == 0 && sourceInfo.seekAcks > 0) {
+          for (Player.EventListener listener : listeners) {
+            listener.onSeekProcessed();
+          }
+        }
         break;
       }
       case ExoPlayerImplInternal.MSG_PLAYBACK_PARAMETERS_CHANGED: {
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 838a44b4ee9..765b2a7634d 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
@@ -701,12 +701,12 @@ private void seekToInternal(SeekPosition seekPosition) throws ExoPlaybackExcepti
           timeline.getFirstWindowIndex(shuffleModeEnabled), window).firstPeriodIndex;
       // 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.
-      playbackInfo = new PlaybackInfo(firstPeriodIndex, 0);
-      eventHandler.obtainMessage(MSG_SEEK_ACK, 1, 0, playbackInfo).sendToTarget();
       // Set the internal position to (firstPeriodIndex,TIME_UNSET) so that a subsequent seek to
       // (firstPeriodIndex,0) isn't ignored.
       playbackInfo = new PlaybackInfo(firstPeriodIndex, C.TIME_UNSET);
       setState(Player.STATE_ENDED);
+      eventHandler.obtainMessage(MSG_SEEK_ACK, 1, 0, new PlaybackInfo(firstPeriodIndex, 0))
+          .sendToTarget();
       // Reset, but retain the source so that it can still be used should a seek occur.
       resetInternal(false);
       return;
@@ -1031,7 +1031,7 @@ private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifes
           MediaPeriodId periodId =
               mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex, positionUs);
           playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : positionUs, positionUs);
-          notifySourceInfoRefresh(manifest, processedInitialSeekCount);
+          notifySourceInfoRefresh(manifest, playbackInfo, processedInitialSeekCount);
         }
       } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
         if (timeline.isEmpty()) {
@@ -1182,22 +1182,23 @@ private void handleSourceInfoRefreshEndedPlayback(Object manifest,
       int processedInitialSeekCount) {
     int firstPeriodIndex = timeline.isEmpty() ? 0 : timeline.getWindow(
         timeline.getFirstWindowIndex(shuffleModeEnabled), window).firstPeriodIndex;
-    // Set the playback position to (firstPeriodIndex,0) for notifying the eventHandler.
-    playbackInfo = new PlaybackInfo(firstPeriodIndex, 0);
-    notifySourceInfoRefresh(manifest, processedInitialSeekCount);
     // Set the internal position to (firstPeriodIndex,TIME_UNSET) so that a subsequent seek to
     // (firstPeriodIndex,0) isn't ignored.
     playbackInfo = new PlaybackInfo(firstPeriodIndex, C.TIME_UNSET);
     setState(Player.STATE_ENDED);
+    // Set the playback position to (firstPeriodIndex,0) for notifying the eventHandler.
+    notifySourceInfoRefresh(manifest, new PlaybackInfo(firstPeriodIndex, 0),
+        processedInitialSeekCount);
     // Reset, but retain the source so that it can still be used should a seek occur.
     resetInternal(false);
   }
 
   private void notifySourceInfoRefresh(Object manifest) {
-    notifySourceInfoRefresh(manifest, 0);
+    notifySourceInfoRefresh(manifest, playbackInfo, 0);
   }
 
-  private void notifySourceInfoRefresh(Object manifest, int processedInitialSeekCount) {
+  private void notifySourceInfoRefresh(Object manifest, PlaybackInfo playbackInfo,
+      int processedInitialSeekCount) {
     eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED,
         new SourceInfo(timeline, manifest, playbackInfo, processedInitialSeekCount)).sendToTarget();
   }
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 3dd702b85f9..983ef878f2e 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
@@ -134,6 +134,13 @@ interface EventListener {
      */
     void onPlaybackParametersChanged(PlaybackParameters playbackParameters);
 
+    /**
+     * Called when all pending seek requests have been processed by the player. This is guaranteed
+     * to happen after any necessary changes to the player state were reported to
+     * {@link #onPlayerStateChanged(boolean, int)}.
+     */
+    void onSeekProcessed();
+
   }
 
   /**
@@ -186,6 +193,11 @@ public void onPlaybackParametersChanged(PlaybackParameters playbackParameters) {
       // Do nothing.
     }
 
+    @Override
+    public void onSeekProcessed() {
+      // Do nothing.
+    }
+
   }
 
   /**

From ad500ca87110d4a43eb1ac56298743f6522278a4 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 3 Oct 2017 03:01:33 -0700
Subject: [PATCH 277/421] Replace IMA ad state booleans with an @IntDef

imaPausedInAd could only be true when imaPlayingAd was true, so there are only
three possible states.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170827974
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 110 ++++++++++--------
 1 file changed, 61 insertions(+), 49 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 a411da01331..6b20404a393 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
@@ -18,6 +18,7 @@
 import android.content.Context;
 import android.net.Uri;
 import android.os.SystemClock;
+import android.support.annotation.IntDef;
 import android.util.Log;
 import android.view.ViewGroup;
 import android.webkit.WebView;
@@ -49,6 +50,8 @@
 import com.google.android.exoplayer2.source.ads.AdsLoader;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -88,6 +91,25 @@ public final class ImaAdsLoader extends Player.DefaultEventListener implements A
   private static final String FOCUS_SKIP_BUTTON_WORKAROUND_JS = "javascript:"
       + "try{ document.getElementsByClassName(\"videoAdUiSkipButton\")[0].focus(); } catch (e) {}";
 
+  /**
+   * The state of ad playback based on IMA's calls to {@link #playAd()} and {@link #pauseAd()}.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef({IMA_AD_STATE_NONE, IMA_AD_STATE_PLAYING, IMA_AD_STATE_PAUSED})
+  private @interface ImaAdState {}
+  /**
+   * The ad playback state when IMA is not playing an ad.
+   */
+  private static final int IMA_AD_STATE_NONE = 0;
+  /**
+   * The ad playback state when IMA has called {@link #playAd()} and not {@link #pauseAd()}.
+   */
+  private static final int IMA_AD_STATE_PLAYING = 1;
+  /**
+   * The ad playback state when IMA has called {@link #pauseAd()} while playing an ad.
+   */
+  private static final int IMA_AD_STATE_PAUSED = 2;
+
   private final Uri adTagUri;
   private final Timeline.Period period;
   private final List<VideoAdPlayerCallback> adCallbacks;
@@ -117,15 +139,9 @@ public final class ImaAdsLoader extends Player.DefaultEventListener implements A
    */
   private boolean imaPausedContent;
   /**
-   * If {@link #playingAd} is set, stores whether IMA has called {@link #playAd()} and not
-   * {@link #stopAd()}.
-   */
-  private boolean imaPlayingAd;
-  /**
-   * If {@link #playingAd} is set, stores whether IMA has called {@link #pauseAd()} since a
-   * preceding call to {@link #playAd()} for the current ad.
+   * The current ad playback state based on IMA's calls to {@link #playAd()} and {@link #stopAd()}.
    */
-  private boolean imaPausedInAd;
+  private @ImaAdState int imaAdState;
   /**
    * Whether {@link com.google.ads.interactivemedia.v3.api.AdsLoader#contentComplete()} has been
    * called since starting ad playback.
@@ -439,21 +455,23 @@ public void playAd() {
       playWhenReadyOverriddenForAds = true;
       player.setPlayWhenReady(true);
     }
-    if (imaPlayingAd && !imaPausedInAd) {
-      // Work around an issue where IMA does not always call stopAd before resuming content.
-      // See [Internal: b/38354028, b/63320878].
-      Log.w(TAG, "Unexpected playAd without stopAd");
-    }
-    if (!imaPlayingAd) {
-      imaPlayingAd = true;
-      for (int i = 0; i < adCallbacks.size(); i++) {
-        adCallbacks.get(i).onPlay();
-      }
-    } else if (imaPausedInAd) {
-      imaPausedInAd = false;
-      for (int i = 0; i < adCallbacks.size(); i++) {
-        adCallbacks.get(i).onResume();
-      }
+    switch (imaAdState) {
+      case IMA_AD_STATE_PLAYING:
+        // IMA does not always call stopAd before resuming content.
+        // See [Internal: b/38354028, b/63320878].
+        Log.w(TAG, "Unexpected playAd without stopAd");
+        break;
+      case IMA_AD_STATE_NONE:
+        imaAdState = IMA_AD_STATE_PLAYING;
+        for (int i = 0; i < adCallbacks.size(); i++) {
+          adCallbacks.get(i).onPlay();
+        }
+        break;
+      case IMA_AD_STATE_PAUSED:
+        imaAdState = IMA_AD_STATE_PLAYING;
+        for (int i = 0; i < adCallbacks.size(); i++) {
+          adCallbacks.get(i).onResume();
+        }
     }
   }
 
@@ -466,7 +484,7 @@ public void stopAd() {
       // Sometimes messages from IMA arrive after detaching the player. See [Internal: b/63801642].
       Log.w(TAG, "Unexpected stopAd while detached");
     }
-    if (!imaPlayingAd) {
+    if (imaAdState == IMA_AD_STATE_NONE) {
       Log.w(TAG, "Unexpected stopAd");
       return;
     }
@@ -478,11 +496,11 @@ public void pauseAd() {
     if (DEBUG) {
       Log.d(TAG, "pauseAd");
     }
-    if (!imaPlayingAd) {
+    if (imaAdState == IMA_AD_STATE_NONE) {
       // This method is called after content is resumed.
       return;
     }
-    imaPausedInAd = true;
+    imaAdState = IMA_AD_STATE_PAUSED;
     for (int i = 0; i < adCallbacks.size(); i++) {
       adCallbacks.get(i).onPause();
     }
@@ -514,9 +532,10 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
       return;
     }
 
-    if (!imaPlayingAd && playbackState == Player.STATE_BUFFERING && playWhenReady) {
+    if (imaAdState == IMA_AD_STATE_NONE && playbackState == Player.STATE_BUFFERING
+        && playWhenReady) {
       checkForContentComplete();
-    } else if (imaPlayingAd && playbackState == Player.STATE_ENDED) {
+    } else if (imaAdState != IMA_AD_STATE_NONE && playbackState == Player.STATE_ENDED) {
       // IMA is waiting for the ad playback to finish so invoke the callback now.
       // Either CONTENT_RESUME_REQUESTED will be passed next, or playAd will be called again.
       for (int i = 0; i < adCallbacks.size(); i++) {
@@ -603,7 +622,8 @@ private void updateImaStateForPlayerState() {
   }
 
   private void resumeContentInternal() {
-    if (imaPlayingAd) {
+    if (imaAdState != IMA_AD_STATE_NONE) {
+      imaAdState = IMA_AD_STATE_NONE;
       if (DEBUG) {
         Log.d(TAG, "Unexpected CONTENT_RESUME_REQUESTED without stopAd");
       }
@@ -613,10 +633,10 @@ private void resumeContentInternal() {
       adGroupIndex = C.INDEX_UNSET;
       updateAdPlaybackState();
     }
-    clearFlags();
   }
 
   private void pauseContentInternal() {
+    imaAdState = IMA_AD_STATE_NONE;
     if (sentPendingContentPositionMs) {
       pendingContentPositionMs = C.TIME_UNSET;
       sentPendingContentPositionMs = false;
@@ -624,24 +644,16 @@ private void pauseContentInternal() {
     // IMA is requesting to pause content, so stop faking the content position.
     fakeContentProgressElapsedRealtimeMs = C.TIME_UNSET;
     fakeContentProgressOffsetMs = C.TIME_UNSET;
-    clearFlags();
   }
 
   private void stopAdInternal() {
-    Assertions.checkState(imaPlayingAd);
+    Assertions.checkState(imaAdState != IMA_AD_STATE_NONE);
+    imaAdState = IMA_AD_STATE_NONE;
     adPlaybackState.playedAd(adGroupIndex);
     updateAdPlaybackState();
     if (!playingAd) {
       adGroupIndex = C.INDEX_UNSET;
     }
-    clearFlags();
-  }
-
-  private void clearFlags() {
-    // If an ad is displayed, these flags will be updated in response to playAd/pauseAd/stopAd until
-    // the content is resumed.
-    imaPlayingAd = false;
-    imaPausedInAd = false;
   }
 
   private void checkForContentComplete() {
@@ -663,6 +675,15 @@ private void updateAdPlaybackState() {
     }
   }
 
+  private void focusSkipButton() {
+    if (playingAd && adUiViewGroup != null && adUiViewGroup.getChildCount() > 0
+        && adUiViewGroup.getChildAt(0) instanceof WebView) {
+      WebView webView = (WebView) (adUiViewGroup.getChildAt(0));
+      webView.requestFocus();
+      webView.loadUrl(FOCUS_SKIP_BUTTON_WORKAROUND_JS);
+    }
+  }
+
   private static long[] getAdGroupTimesUs(List<Float> cuePoints) {
     if (cuePoints.isEmpty()) {
       // If no cue points are specified, there is a preroll ad.
@@ -679,13 +700,4 @@ private static long[] getAdGroupTimesUs(List<Float> cuePoints) {
     return adGroupTimesUs;
   }
 
-  private void focusSkipButton() {
-    if (playingAd && adUiViewGroup != null && adUiViewGroup.getChildCount() > 0
-        && adUiViewGroup.getChildAt(0) instanceof WebView) {
-      WebView webView = (WebView) (adUiViewGroup.getChildAt(0));
-      webView.requestFocus();
-      webView.loadUrl(FOCUS_SKIP_BUTTON_WORKAROUND_JS);
-    }
-  }
-
 }

From 45c1f0838394a386d7e1af4b9ea10d2cbe5dbbee Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 3 Oct 2017 03:37:26 -0700
Subject: [PATCH 278/421] Annotate the content type local

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170831088
---
 .../com/google/android/exoplayer2/demo/PlayerActivity.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 c0838390edb..716af02c01b 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
@@ -34,6 +34,7 @@
 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;
@@ -357,7 +358,7 @@ private void initializePlayer() {
   }
 
   private MediaSource buildMediaSource(Uri uri, String overrideExtension) {
-    int type = TextUtils.isEmpty(overrideExtension) ? Util.inferContentType(uri)
+    @ContentType int type = TextUtils.isEmpty(overrideExtension) ? Util.inferContentType(uri)
         : Util.inferContentType("." + overrideExtension);
     switch (type) {
       case C.TYPE_SS:

From b3d462df398578836139f14cd708230fdf8a9b04 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 4 Oct 2017 00:59:14 -0700
Subject: [PATCH 279/421] Catch up video rendering by dropping to keyframes

If the current output buffer is very late and the playback position is in a
later group of pictures, drop all buffers to the keyframe preceding the
playback position.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170975259
---
 .../exoplayer2/decoder/DecoderCounters.java   |   9 ++
 .../video/MediaCodecVideoRenderer.java        | 107 ++++++++++++++++--
 .../exoplayer2/ui/DebugTextViewHelper.java    |   3 +-
 .../testutil/DebugRenderersFactory.java       |   2 +-
 4 files changed, 111 insertions(+), 10 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
index 7a532110d39..e1dff12e52c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
@@ -65,6 +65,14 @@ public final class DecoderCounters {
    * Skipped output buffers are ignored for the purposes of calculating this value.
    */
   public int maxConsecutiveDroppedOutputBufferCount;
+  /**
+   * The number of times all buffers to a keyframe were dropped.
+   * <p>
+   * Each time buffers to a keyframe are dropped, this counter is increased by one, and the dropped
+   * output buffer counters are increased by one (for the current output buffer) plus the number of
+   * buffers dropped from the source to advance to the keyframe.
+   */
+  public int droppedToKeyframeCount;
 
   /**
    * Should be called to ensure counter values are made visible across threads. The playback thread
@@ -91,6 +99,7 @@ public void merge(DecoderCounters other) {
     droppedOutputBufferCount += other.droppedOutputBufferCount;
     maxConsecutiveDroppedOutputBufferCount = Math.max(maxConsecutiveDroppedOutputBufferCount,
         other.maxConsecutiveDroppedOutputBufferCount);
+    droppedToKeyframeCount += other.droppedToKeyframeCount;
   }
 
 }
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 4c1f4c0eb20..84073f93382 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,6 +25,7 @@
 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 android.util.Log;
@@ -85,10 +86,12 @@ public class MediaCodecVideoRenderer extends MediaCodecRenderer {
   @C.VideoScalingMode
   private int scalingMode;
   private boolean renderedFirstFrame;
+  private boolean forceRenderFrame;
   private long joiningDeadlineMs;
   private long droppedFrameAccumulationStartTimeMs;
   private int droppedFrames;
   private int consecutiveDroppedFrameCount;
+  private int buffersInCodecCount;
 
   private int pendingRotationDegrees;
   private float pendingPixelWidthHeightRatio;
@@ -414,11 +417,14 @@ protected void configureCodec(MediaCodecInfo codecInfo, MediaCodec codec, Format
     }
   }
 
+  @CallSuper
   @Override
   protected void releaseCodec() {
     try {
       super.releaseCodec();
     } finally {
+      buffersInCodecCount = 0;
+      forceRenderFrame = false;
       if (dummySurface != null) {
         if (surface == dummySurface) {
           surface = null;
@@ -429,6 +435,14 @@ protected void releaseCodec() {
     }
   }
 
+  @CallSuper
+  @Override
+  protected void flushCodec() throws ExoPlaybackException {
+    super.flushCodec();
+    buffersInCodecCount = 0;
+    forceRenderFrame = false;
+  }
+
   @Override
   protected void onCodecInitialized(String name, long initializedTimestampMs,
       long initializationDurationMs) {
@@ -444,8 +458,15 @@ protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackExceptio
     pendingRotationDegrees = getRotationDegrees(newFormat);
   }
 
+  /**
+   * Called immediately before an input buffer is queued into the codec.
+   *
+   * @param buffer The buffer to be queued.
+   */
+  @CallSuper
   @Override
   protected void onQueueInputBuffer(DecoderInputBuffer buffer) {
+    buffersInCodecCount++;
     if (Util.SDK_INT < 23 && tunneling) {
       maybeNotifyRenderedFirstFrame();
     }
@@ -492,7 +513,7 @@ protected boolean canReconfigureCodec(MediaCodec codec, boolean codecIsAdaptive,
   @Override
   protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, MediaCodec codec,
       ByteBuffer buffer, int bufferIndex, int bufferFlags, long bufferPresentationTimeUs,
-      boolean shouldSkip) {
+      boolean shouldSkip) throws ExoPlaybackException {
     while (pendingOutputStreamOffsetCount != 0
         && bufferPresentationTimeUs >= pendingOutputStreamOffsetsUs[0]) {
       outputStreamOffsetUs = pendingOutputStreamOffsetsUs[0];
@@ -517,7 +538,8 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, M
       return false;
     }
 
-    if (!renderedFirstFrame) {
+    if (!renderedFirstFrame || forceRenderFrame) {
+      forceRenderFrame = false;
       if (Util.SDK_INT >= 21) {
         renderOutputBufferV21(codec, bufferIndex, presentationTimeUs, System.nanoTime());
       } else {
@@ -544,7 +566,11 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, M
         bufferPresentationTimeUs, unadjustedFrameReleaseTimeNs);
     earlyUs = (adjustedReleaseTimeNs - systemTimeNs) / 1000;
 
-    if (shouldDropOutputBuffer(earlyUs, elapsedRealtimeUs)) {
+    if (shouldDropBuffersToKeyframe(earlyUs, elapsedRealtimeUs)
+        && maybeDropBuffersToKeyframe(codec, bufferIndex, presentationTimeUs, positionUs)) {
+      forceRenderFrame = true;
+      return true;
+    } else if (shouldDropOutputBuffer(earlyUs, elapsedRealtimeUs)) {
       dropOutputBuffer(codec, bufferIndex, presentationTimeUs);
       return true;
     }
@@ -577,6 +603,17 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, M
     return false;
   }
 
+  /**
+   * Called when an output buffer is successfully processed.
+   *
+   * @param presentationTimeUs The timestamp associated with the output buffer.
+   */
+  @CallSuper
+  @Override
+  protected void onProcessedOutputBuffer(long presentationTimeUs) {
+    buffersInCodecCount--;
+  }
+
   /**
    * Returns whether the buffer being processed should be dropped.
    *
@@ -589,6 +626,19 @@ protected boolean shouldDropOutputBuffer(long earlyUs, long elapsedRealtimeUs) {
     return isBufferLate(earlyUs);
   }
 
+  /**
+   * Returns whether to drop all buffers from the buffer being processed to the keyframe at or after
+   * the current playback position, if possible.
+   *
+   * @param earlyUs The time until the current buffer should be presented in microseconds. A
+   *     negative value indicates that the buffer is late.
+   * @param elapsedRealtimeUs {@link android.os.SystemClock#elapsedRealtime()} in microseconds,
+   *     measured at the start of the current iteration of the rendering loop.
+   */
+  protected boolean shouldDropBuffersToKeyframe(long earlyUs, long elapsedRealtimeUs) {
+    return isBufferVeryLate(earlyUs);
+  }
+
   /**
    * Skips the output buffer with the specified index.
    *
@@ -614,12 +664,48 @@ protected void dropOutputBuffer(MediaCodec codec, int index, long presentationTi
     TraceUtil.beginSection("dropVideoBuffer");
     codec.releaseOutputBuffer(index, false);
     TraceUtil.endSection();
-    decoderCounters.droppedOutputBufferCount++;
-    droppedFrames++;
-    consecutiveDroppedFrameCount++;
+    updateDroppedBufferCounters(1);
+  }
+
+  /**
+   * Drops frames from the current output buffer to the next keyframe at or before the playback
+   * position. If no such keyframe exists, as the playback position is inside the same group of
+   * pictures as the buffer being processed, returns {@code false}. Returns {@code true} otherwise.
+   *
+   * @param codec The codec that owns the output buffer.
+   * @param index The index of the output buffer to drop.
+   * @param presentationTimeUs The presentation time of the output buffer, in microseconds.
+   * @param positionUs The current playback position, in microseconds.
+   * @return Whether any buffers were dropped.
+   * @throws ExoPlaybackException If an error occurs flushing the codec.
+   */
+  protected boolean maybeDropBuffersToKeyframe(MediaCodec codec, int index, long presentationTimeUs,
+      long positionUs) throws ExoPlaybackException {
+    int droppedSourceBufferCount = skipSource(positionUs);
+    if (droppedSourceBufferCount == 0) {
+      return false;
+    }
+    decoderCounters.droppedToKeyframeCount++;
+    // 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();
+    return true;
+  }
+
+  /**
+   * Updates decoder counters to reflect that {@code droppedBufferCount} additional buffers were
+   * dropped.
+   *
+   * @param droppedBufferCount The number of additional dropped buffers.
+   */
+  protected void updateDroppedBufferCounters(int droppedBufferCount) {
+    decoderCounters.droppedOutputBufferCount += droppedBufferCount;
+    droppedFrames += droppedBufferCount;
+    consecutiveDroppedFrameCount += droppedBufferCount;
     decoderCounters.maxConsecutiveDroppedOutputBufferCount = Math.max(consecutiveDroppedFrameCount,
         decoderCounters.maxConsecutiveDroppedOutputBufferCount);
-    if (droppedFrames == maxDroppedFramesToNotify) {
+    if (droppedFrames >= maxDroppedFramesToNotify) {
       maybeNotifyDroppedFrames();
     }
   }
@@ -740,10 +826,15 @@ private void maybeNotifyDroppedFrames() {
   }
 
   private static boolean isBufferLate(long earlyUs) {
-    // Class a buffer as late if it should have been presented more than 30ms ago.
+    // Class a buffer as late if it should have been presented more than 30 ms ago.
     return earlyUs < -30000;
   }
 
+  private static boolean isBufferVeryLate(long earlyUs) {
+    // Class a buffer as very late if it should have been presented more than 500 ms ago.
+    return earlyUs < -500000;
+  }
+
   @TargetApi(23)
   private static void setOutputSurfaceV23(MediaCodec codec, Surface surface) {
     codec.setOutputSurface(surface);
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 f443c2a06fe..9d9272f10e1 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
@@ -155,7 +155,8 @@ private static String getDecoderCountersBufferCountString(DecoderCounters counte
         + " sb:" + counters.skippedOutputBufferCount
         + " rb:" + counters.renderedOutputBufferCount
         + " db:" + counters.droppedOutputBufferCount
-        + " mcdb:" + counters.maxConsecutiveDroppedOutputBufferCount;
+        + " mcdb:" + counters.maxConsecutiveDroppedOutputBufferCount
+        + " dk:" + counters.droppedToKeyframeCount;
   }
 
   private static String getPixelAspectRatioString(float pixelAspectRatio) {
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 b63afd3984a..392a4907d42 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
@@ -124,7 +124,7 @@ protected void onQueueInputBuffer(DecoderInputBuffer buffer) {
     @Override
     protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, MediaCodec codec,
         ByteBuffer buffer, int bufferIndex, int bufferFlags, long bufferPresentationTimeUs,
-        boolean shouldSkip) {
+        boolean shouldSkip) throws ExoPlaybackException {
       if (skipToPositionBeforeRenderingFirstFrame && bufferPresentationTimeUs < positionUs) {
         // After the codec has been initialized, don't render the first frame until we've caught up
         // to the playback position. Else test runs on devices that do not support dummy surface

From 498ff144395b511dbeb1865cc60027cfd456fb26 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 4 Oct 2017 02:04:03 -0700
Subject: [PATCH 280/421] Add @IntDef annotations to DefaultEventListener

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=170980737
---
 .../src/main/java/com/google/android/exoplayer2/Player.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 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 983ef878f2e..af653ec2bd1 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
@@ -169,7 +169,7 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
     }
 
     @Override
-    public void onRepeatModeChanged(int repeatMode) {
+    public void onRepeatModeChanged(@RepeatMode int repeatMode) {
       // Do nothing.
     }
 
@@ -184,7 +184,7 @@ public void onPlayerError(ExoPlaybackException error) {
     }
 
     @Override
-    public void onPositionDiscontinuity(int reason) {
+    public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
       // Do nothing.
     }
 

From d7b4f8a645e0751be6c4500ddd185762683be2a1 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 4 Oct 2017 07:14:06 -0700
Subject: [PATCH 281/421] Amend seek action in ActionSchedule to optionally
 wait until playback resumes.

This allows more deterministic action schedules, especially for real media
which may take an arbitrary amount of time to rebuffer after seeking.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171005231
---
 .../gts/CommonEncryptionDrmTest.java          |  4 +--
 .../playbacktests/gts/DashStreamingTest.java  |  6 ++--
 .../android/exoplayer2/testutil/Action.java   | 33 +++++++++++++++++++
 .../exoplayer2/testutil/ActionSchedule.java   | 13 ++++++++
 4 files changed, 51 insertions(+), 5 deletions(-)

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 15acae96fd5..8c6285cef32 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
@@ -39,8 +39,8 @@ public final class CommonEncryptionDrmTest extends ActivityInstrumentationTestCa
 
   // Seeks help reproduce playback issues in certain devices.
   private static final ActionSchedule ACTION_SCHEDULE_WITH_SEEKS = new ActionSchedule.Builder(TAG)
-      .delay(30000).seek(300000).delay(10000).seek(270000).delay(10000).seek(200000).delay(10000)
-      .seek(732000).build();
+      .delay(30000).seekAndWait(300000).delay(10000).seekAndWait(270000).delay(10000)
+      .seekAndWait(200000).delay(10000).seekAndWait(732000).build();
 
   private DashTestRunner testRunner;
 
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 529f57582e3..251cf7b56b3 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
@@ -33,10 +33,10 @@ public final class DashStreamingTest extends ActivityInstrumentationTestCase2<Ho
   private static final String TAG = "DashStreamingTest";
 
   private static final ActionSchedule SEEKING_SCHEDULE = new ActionSchedule.Builder(TAG)
-      .delay(10000).seek(15000)
-      .delay(10000).seek(30000).seek(31000).seek(32000).seek(33000).seek(34000)
+      .delay(10000).seekAndWait(15000)
+      .delay(10000).seek(30000).seek(31000).seek(32000).seek(33000).seekAndWait(34000)
       .delay(1000).pause().delay(1000).play()
-      .delay(1000).pause().seek(120000).delay(1000).play()
+      .delay(1000).pause().seekAndWait(120000).delay(1000).play()
       .build();
   private static final ActionSchedule RENDERER_DISABLING_SCHEDULE = new ActionSchedule.Builder(TAG)
       // Wait 10 seconds, disable the video renderer, wait another 10 seconds and enable it again.
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 cc18b630168..66e034f21c1 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
@@ -422,6 +422,39 @@ protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSe
 
   }
 
+  /**
+   * Waits for {@link Player.EventListener#onSeekProcessed()}.
+   */
+  public static final class WaitForSeekProcessed extends Action {
+
+    /**
+     * @param tag A tag to use for logging.
+     */
+    public WaitForSeekProcessed(String tag) {
+      super(tag, "WaitForSeekProcessed");
+    }
+
+    @Override
+    protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
+        final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
+        final ActionNode nextAction) {
+      player.addListener(new Player.DefaultEventListener() {
+        @Override
+        public void onSeekProcessed() {
+          player.removeListener(this);
+          nextAction.schedule(player, trackSelector, surface, handler);
+        }
+      });
+    }
+
+    @Override
+    protected void doActionImpl(SimpleExoPlayer player, MappingTrackSelector trackSelector,
+        Surface surface) {
+      // Not triggered.
+    }
+
+  }
+
   /**
    * Calls {@link Runnable#run()}.
    */
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 8a6f3360f31..ddfa2345ee5 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
@@ -35,6 +35,7 @@
 import com.google.android.exoplayer2.testutil.Action.Stop;
 import com.google.android.exoplayer2.testutil.Action.WaitForPlaybackState;
 import com.google.android.exoplayer2.testutil.Action.WaitForPositionDiscontinuity;
+import com.google.android.exoplayer2.testutil.Action.WaitForSeekProcessed;
 import com.google.android.exoplayer2.testutil.Action.WaitForTimelineChanged;
 import com.google.android.exoplayer2.trackselection.MappingTrackSelector;
 import com.google.android.exoplayer2.util.Clock;
@@ -138,6 +139,18 @@ public Builder seek(long positionMs) {
       return apply(new Seek(tag, positionMs));
     }
 
+    /**
+     * Schedules a seek action to be executed and waits until playback resumes after the seek.
+     *
+     * @param positionMs The seek position.
+     * @return The builder, for convenience.
+     */
+    public Builder seekAndWait(long positionMs) {
+      return apply(new Seek(tag, positionMs))
+          .apply(new WaitForSeekProcessed(tag))
+          .apply(new WaitForPlaybackState(tag, Player.STATE_READY));
+    }
+
     /**
      * Schedules a stop action to be executed.
      *

From 331c179a883fe720c394cbb35ca70f5f88151846 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Wed, 4 Oct 2017 07:59:09 -0700
Subject: [PATCH 282/421] Wait until playback started in certain action
 schedules.

Some action schedules (especially those for real media with potentially
long initial buffering times) don't wait until the playback started
before executing the rest of the schedule.

Added waitForPlaybackStateChanged(STATE_READY) to all applicable action schedules.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171009434
---
 .../playbacktests/gts/CommonEncryptionDrmTest.java          | 6 ++++--
 .../exoplayer2/playbacktests/gts/DashStreamingTest.java     | 3 +++
 .../playbacktests/gts/DashWidevineOfflineTest.java          | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

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 8c6285cef32..a590e45f5f0 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
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.playbacktests.gts;
 
 import android.test.ActivityInstrumentationTestCase2;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.testutil.ActionSchedule;
 import com.google.android.exoplayer2.testutil.HostActivity;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -39,8 +40,9 @@ public final class CommonEncryptionDrmTest extends ActivityInstrumentationTestCa
 
   // Seeks help reproduce playback issues in certain devices.
   private static final ActionSchedule ACTION_SCHEDULE_WITH_SEEKS = new ActionSchedule.Builder(TAG)
-      .delay(30000).seekAndWait(300000).delay(10000).seekAndWait(270000).delay(10000)
-      .seekAndWait(200000).delay(10000).seekAndWait(732000).build();
+      .waitForPlaybackState(Player.STATE_READY).delay(30000).seekAndWait(300000).delay(10000)
+      .seekAndWait(270000).delay(10000).seekAndWait(200000).delay(10000).seekAndWait(732000)
+      .build();
 
   private DashTestRunner testRunner;
 
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 251cf7b56b3..39cdc7ee435 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
@@ -17,6 +17,7 @@
 
 import android.test.ActivityInstrumentationTestCase2;
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.mediacodec.MediaCodecInfo;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil;
 import com.google.android.exoplayer2.mediacodec.MediaCodecUtil.DecoderQueryException;
@@ -33,12 +34,14 @@ public final class DashStreamingTest extends ActivityInstrumentationTestCase2<Ho
   private static final String TAG = "DashStreamingTest";
 
   private static final ActionSchedule SEEKING_SCHEDULE = new ActionSchedule.Builder(TAG)
+      .waitForPlaybackState(Player.STATE_READY)
       .delay(10000).seekAndWait(15000)
       .delay(10000).seek(30000).seek(31000).seek(32000).seek(33000).seekAndWait(34000)
       .delay(1000).pause().delay(1000).play()
       .delay(1000).pause().seekAndWait(120000).delay(1000).play()
       .build();
   private static final ActionSchedule RENDERER_DISABLING_SCHEDULE = new ActionSchedule.Builder(TAG)
+      .waitForPlaybackState(Player.STATE_READY)
       // Wait 10 seconds, disable the video renderer, wait another 10 seconds and enable it again.
       .delay(10000).disableRenderer(DashTestRunner.VIDEO_RENDERER_INDEX)
       .delay(10000).enableRenderer(DashTestRunner.VIDEO_RENDERER_INDEX)
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 88215ae1eb6..1ddceb551c3 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
@@ -19,6 +19,7 @@
 import android.net.Uri;
 import android.test.ActivityInstrumentationTestCase2;
 import android.util.Pair;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
 import com.google.android.exoplayer2.drm.FrameworkMediaCrypto;
@@ -162,6 +163,7 @@ public void testWidevineOfflineLicenseExpiresOnPause() throws Exception {
     assertTrue("License duration should be less than 30 sec. "
         + "Server settings might have changed.", licenseDuration < 30);
     ActionSchedule schedule = new ActionSchedule.Builder(TAG)
+        .waitForPlaybackState(Player.STATE_READY)
         .delay(3000).pause().delay(licenseDuration * 1000 + 2000).play().build();
 
     // DefaultDrmSessionManager should renew the license and stream play fine

From 09165ab870132e5fe7a68a94e62b6cbff08899e2 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Sat, 15 Jul 2017 00:49:09 +0100
Subject: [PATCH 283/421] Rename droppedOutputBufferCount

Now this counter includes input buffers too, which are dropped as part of
skipping to keyframes for catch up.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171119930
---
 .../ext/vp9/LibvpxVideoRenderer.java          |  6 ++---
 .../exoplayer2/decoder/DecoderCounters.java   | 20 ++++++++--------
 .../video/MediaCodecVideoRenderer.java        |  6 ++---
 .../exoplayer2/ui/DebugTextViewHelper.java    |  4 ++--
 .../playbacktests/gts/DashTestRunner.java     | 14 +++++------
 .../testutil/DecoderCountersUtil.java         | 23 +++++++++----------
 6 files changed, 36 insertions(+), 37 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 100ca6f00f1..ec18db24706 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
@@ -342,11 +342,11 @@ private void renderBuffer() {
   }
 
   private void dropBuffer() {
-    decoderCounters.droppedOutputBufferCount++;
+    decoderCounters.droppedBufferCount++;
     droppedFrames++;
     consecutiveDroppedFrameCount++;
-    decoderCounters.maxConsecutiveDroppedOutputBufferCount = Math.max(
-        consecutiveDroppedFrameCount, decoderCounters.maxConsecutiveDroppedOutputBufferCount);
+    decoderCounters.maxConsecutiveDroppedBufferCount = Math.max(
+        consecutiveDroppedFrameCount, decoderCounters.maxConsecutiveDroppedBufferCount);
     if (droppedFrames == maxDroppedFramesToNotify) {
       maybeNotifyDroppedFrames();
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
index e1dff12e52c..8409bab558d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/decoder/DecoderCounters.java
@@ -53,24 +53,24 @@ public final class DecoderCounters {
    */
   public int skippedOutputBufferCount;
   /**
-   * The number of dropped output buffers.
+   * The number of dropped buffers.
    * <p>
-   * A dropped output buffer is an output buffer that was supposed to be rendered, but was instead
+   * A dropped buffer is an buffer that was supposed to be decoded/rendered, but was instead
    * dropped because it could not be rendered in time.
    */
-  public int droppedOutputBufferCount;
+  public int droppedBufferCount;
   /**
-   * The maximum number of dropped output buffers without an interleaving rendered output buffer.
+   * The maximum number of dropped buffers without an interleaving rendered output buffer.
    * <p>
    * Skipped output buffers are ignored for the purposes of calculating this value.
    */
-  public int maxConsecutiveDroppedOutputBufferCount;
+  public int maxConsecutiveDroppedBufferCount;
   /**
    * The number of times all buffers to a keyframe were dropped.
    * <p>
    * Each time buffers to a keyframe are dropped, this counter is increased by one, and the dropped
-   * output buffer counters are increased by one (for the current output buffer) plus the number of
-   * buffers dropped from the source to advance to the keyframe.
+   * buffer counters are increased by one (for the current output buffer) plus the number of buffers
+   * dropped from the source to advance to the keyframe.
    */
   public int droppedToKeyframeCount;
 
@@ -96,9 +96,9 @@ public void merge(DecoderCounters other) {
     skippedInputBufferCount += other.skippedInputBufferCount;
     renderedOutputBufferCount += other.renderedOutputBufferCount;
     skippedOutputBufferCount += other.skippedOutputBufferCount;
-    droppedOutputBufferCount += other.droppedOutputBufferCount;
-    maxConsecutiveDroppedOutputBufferCount = Math.max(maxConsecutiveDroppedOutputBufferCount,
-        other.maxConsecutiveDroppedOutputBufferCount);
+    droppedBufferCount += other.droppedBufferCount;
+    maxConsecutiveDroppedBufferCount = Math.max(maxConsecutiveDroppedBufferCount,
+        other.maxConsecutiveDroppedBufferCount);
     droppedToKeyframeCount += other.droppedToKeyframeCount;
   }
 
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 84073f93382..cb443e38eeb 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
@@ -700,11 +700,11 @@ protected boolean maybeDropBuffersToKeyframe(MediaCodec codec, int index, long p
    * @param droppedBufferCount The number of additional dropped buffers.
    */
   protected void updateDroppedBufferCounters(int droppedBufferCount) {
-    decoderCounters.droppedOutputBufferCount += droppedBufferCount;
+    decoderCounters.droppedBufferCount += droppedBufferCount;
     droppedFrames += droppedBufferCount;
     consecutiveDroppedFrameCount += droppedBufferCount;
-    decoderCounters.maxConsecutiveDroppedOutputBufferCount = Math.max(consecutiveDroppedFrameCount,
-        decoderCounters.maxConsecutiveDroppedOutputBufferCount);
+    decoderCounters.maxConsecutiveDroppedBufferCount = Math.max(consecutiveDroppedFrameCount,
+        decoderCounters.maxConsecutiveDroppedBufferCount);
     if (droppedFrames >= maxDroppedFramesToNotify) {
       maybeNotifyDroppedFrames();
     }
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 9d9272f10e1..fda74db28d7 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
@@ -154,8 +154,8 @@ private static String getDecoderCountersBufferCountString(DecoderCounters counte
     return " sib:" + counters.skippedInputBufferCount
         + " sb:" + counters.skippedOutputBufferCount
         + " rb:" + counters.renderedOutputBufferCount
-        + " db:" + counters.droppedOutputBufferCount
-        + " mcdb:" + counters.maxConsecutiveDroppedOutputBufferCount
+        + " db:" + counters.droppedBufferCount
+        + " mcdb:" + counters.maxConsecutiveDroppedBufferCount
         + " dk:" + counters.droppedToKeyframeCount;
   }
 
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 9b8d6483b97..06dab1164b8 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,9 +323,9 @@ protected void logMetrics(DecoderCounters audioCounters, DecoderCounters videoCo
       metricsLogger.logMetric(MetricsLogger.KEY_TEST_NAME, streamName);
       metricsLogger.logMetric(MetricsLogger.KEY_IS_CDD_LIMITED_RETRY, isCddLimitedRetry);
       metricsLogger.logMetric(MetricsLogger.KEY_FRAMES_DROPPED_COUNT,
-          videoCounters.droppedOutputBufferCount);
+          videoCounters.droppedBufferCount);
       metricsLogger.logMetric(MetricsLogger.KEY_MAX_CONSECUTIVE_FRAMES_DROPPED_COUNT,
-          videoCounters.maxConsecutiveDroppedOutputBufferCount);
+          videoCounters.maxConsecutiveDroppedBufferCount);
       metricsLogger.logMetric(MetricsLogger.KEY_FRAMES_SKIPPED_COUNT,
           videoCounters.skippedOutputBufferCount);
       metricsLogger.logMetric(MetricsLogger.KEY_FRAMES_RENDERED_COUNT,
@@ -343,20 +343,20 @@ protected void assertPassed(DecoderCounters audioCounters, DecoderCounters video
             .assertSkippedOutputBufferCount(tag + VIDEO_TAG_SUFFIX, videoCounters, 0);
         // We allow one fewer output buffer due to the way that MediaCodecRenderer and the
         // underlying decoders handle the end of stream. This should be tightened up in the future.
-        DecoderCountersUtil.assertTotalOutputBufferCount(tag + AUDIO_TAG_SUFFIX, audioCounters,
+        DecoderCountersUtil.assertTotalBufferCount(tag + AUDIO_TAG_SUFFIX, audioCounters,
             audioCounters.inputBufferCount - 1, audioCounters.inputBufferCount);
-        DecoderCountersUtil.assertTotalOutputBufferCount(tag + VIDEO_TAG_SUFFIX, videoCounters,
+        DecoderCountersUtil.assertTotalBufferCount(tag + VIDEO_TAG_SUFFIX, videoCounters,
             videoCounters.inputBufferCount - 1, videoCounters.inputBufferCount);
       }
       try {
         int droppedFrameLimit = (int) Math.ceil(MAX_DROPPED_VIDEO_FRAME_FRACTION
-            * DecoderCountersUtil.getTotalOutputBuffers(videoCounters));
+            * DecoderCountersUtil.getTotalBufferCount(videoCounters));
         // Assert that performance is acceptable.
         // Assert that total dropped frames were within limit.
-        DecoderCountersUtil.assertDroppedOutputBufferLimit(tag + VIDEO_TAG_SUFFIX, videoCounters,
+        DecoderCountersUtil.assertDroppedBufferLimit(tag + VIDEO_TAG_SUFFIX, videoCounters,
             droppedFrameLimit);
         // Assert that consecutive dropped frames were within limit.
-        DecoderCountersUtil.assertConsecutiveDroppedOutputBufferLimit(tag + VIDEO_TAG_SUFFIX,
+        DecoderCountersUtil.assertConsecutiveDroppedBufferLimit(tag + VIDEO_TAG_SUFFIX,
             videoCounters, MAX_CONSECUTIVE_DROPPED_VIDEO_FRAMES);
       } catch (AssertionFailedError e) {
         if (trackSelector.includedAdditionalVideoFormats) {
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java
index 448ec79c2da..16af394cdf1 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/DecoderCountersUtil.java
@@ -31,8 +31,9 @@ private DecoderCountersUtil() {}
    * @param counters The counters for which the total should be calculated.
    * @return The sum of the skipped, dropped and rendered buffers.
    */
-  public static int getTotalOutputBuffers(DecoderCounters counters) {
-    return counters.skippedOutputBufferCount + counters.droppedOutputBufferCount
+  public static int getTotalBufferCount(DecoderCounters counters) {
+    counters.ensureUpdated();
+    return counters.skippedOutputBufferCount + counters.droppedBufferCount
         + counters.renderedOutputBufferCount;
   }
 
@@ -44,26 +45,24 @@ public static void assertSkippedOutputBufferCount(String name, DecoderCounters c
         + expected + ".", expected, actual);
   }
 
-  public static void assertTotalOutputBufferCount(String name, DecoderCounters counters,
-      int minCount, int maxCount) {
-    counters.ensureUpdated();
-    int actual = getTotalOutputBuffers(counters);
+  public static void assertTotalBufferCount(String name, DecoderCounters counters, int minCount,
+      int maxCount) {
+    int actual = getTotalBufferCount(counters);
     TestCase.assertTrue("Codec(" + name + ") output " + actual + " buffers. Expected in range ["
         + minCount + ", " + maxCount + "].", minCount <= actual && actual <= maxCount);
   }
 
-  public static void assertDroppedOutputBufferLimit(String name, DecoderCounters counters,
-      int limit) {
+  public static void assertDroppedBufferLimit(String name, DecoderCounters counters, int limit) {
     counters.ensureUpdated();
-    int actual = counters.droppedOutputBufferCount;
+    int actual = counters.droppedBufferCount;
     TestCase.assertTrue("Codec(" + name + ") was late decoding: " + actual + " buffers. "
         + "Limit: " + limit + ".", actual <= limit);
   }
 
-  public static void assertConsecutiveDroppedOutputBufferLimit(String name,
-      DecoderCounters counters, int limit) {
+  public static void assertConsecutiveDroppedBufferLimit(String name, DecoderCounters counters,
+      int limit) {
     counters.ensureUpdated();
-    int actual = counters.maxConsecutiveDroppedOutputBufferCount;
+    int actual = counters.maxConsecutiveDroppedBufferCount;
     TestCase.assertTrue("Codec(" + name + ") was late decoding: " + actual
         + " buffers consecutively. " + "Limit: " + limit + ".", actual <= limit);
   }

From 20e43ac4f8539229f407700da011d008c253fabd Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 5 Oct 2017 01:36:23 -0700
Subject: [PATCH 284/421] Allow ads to be paused/resumed

Controls are still hidden while playing ads, but if the app pauses the player,
controls will be shown. During ads, the player is not seekable.

When the player enters the background then returns to the foreground, the
content period may not be prepared, so also cache the content window duration.
This means that if the app reenters the foreground while an ad is paused the
time bar can be populated.

Issue: #3303

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171123428
---
 .../exoplayer2/ext/ima/ImaAdsLoader.java      | 42 +++++++++++--------
 .../source/ads/AdPlaybackState.java           | 11 ++++-
 .../exoplayer2/source/ads/AdsMediaSource.java |  3 +-
 .../source/ads/SinglePeriodAdTimeline.java    | 18 +++++++-
 .../exoplayer2/ui/PlaybackControlView.java    |  6 +--
 .../exoplayer2/ui/SimpleExoPlayerView.java    | 22 +++++++++-
 .../res/layout/exo_simple_player_view.xml     |  4 +-
 7 files changed, 76 insertions(+), 30 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 6b20404a393..cbed5d166ee 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
@@ -150,10 +150,6 @@ public final class ImaAdsLoader extends Player.DefaultEventListener implements A
 
   // Fields tracking the player/loader state.
 
-  /**
-   * Whether the player's play when ready flag has temporarily been set to true for playing ads.
-   */
-  private boolean playWhenReadyOverriddenForAds;
   /**
    * Whether the player is playing an ad.
    */
@@ -243,7 +239,7 @@ public void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGrou
     player.addListener(this);
     if (adPlaybackState != null) {
       eventListener.onAdPlaybackState(adPlaybackState.copy());
-      if (imaPausedContent) {
+      if (imaPausedContent && player.getPlayWhenReady()) {
         adsManager.resume();
       }
     } else {
@@ -448,13 +444,6 @@ public void playAd() {
     if (DEBUG) {
       Log.d(TAG, "playAd");
     }
-    if (player == null) {
-      // Sometimes messages from IMA arrive after detaching the player. See [Internal: b/63801642].
-      Log.w(TAG, "Unexpected playAd while detached");
-    } else if (!player.getPlayWhenReady()) {
-      playWhenReadyOverriddenForAds = true;
-      player.setPlayWhenReady(true);
-    }
     switch (imaAdState) {
       case IMA_AD_STATE_PLAYING:
         // IMA does not always call stopAd before resuming content.
@@ -472,6 +461,15 @@ public void playAd() {
         for (int i = 0; i < adCallbacks.size(); i++) {
           adCallbacks.get(i).onResume();
         }
+        break;
+      default:
+        throw new IllegalStateException();
+    }
+    if (player == null) {
+      // Sometimes messages from IMA arrive after detaching the player. See [Internal: b/63801642].
+      Log.w(TAG, "Unexpected playAd while detached");
+    } else if (!player.getPlayWhenReady()) {
+      adsManager.pause();
     }
   }
 
@@ -522,7 +520,11 @@ public void onTimelineChanged(Timeline timeline, Object manifest) {
     }
     Assertions.checkArgument(timeline.getPeriodCount() == 1);
     this.timeline = timeline;
-    contentDurationMs = C.usToMs(timeline.getPeriod(0, period).durationUs);
+    long contentDurationUs = timeline.getPeriod(0, period).durationUs;
+    contentDurationMs = C.usToMs(contentDurationUs);
+    if (contentDurationUs != C.TIME_UNSET) {
+      adPlaybackState.contentDurationUs = contentDurationUs;
+    }
     updateImaStateForPlayerState();
   }
 
@@ -532,6 +534,16 @@ public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
       return;
     }
 
+    if (imaAdState == IMA_AD_STATE_PLAYING && !playWhenReady) {
+      adsManager.pause();
+      return;
+    }
+
+    if (imaAdState == IMA_AD_STATE_PAUSED && playWhenReady) {
+      adsManager.resume();
+      return;
+    }
+
     if (imaAdState == IMA_AD_STATE_NONE && playbackState == Player.STATE_BUFFERING
         && playWhenReady) {
       checkForContentComplete();
@@ -593,10 +605,6 @@ private void requestAds() {
   private void updateImaStateForPlayerState() {
     boolean wasPlayingAd = playingAd;
     playingAd = player.isPlayingAd();
-    if (!playingAd && playWhenReadyOverriddenForAds) {
-      playWhenReadyOverriddenForAds = false;
-      player.setPlayWhenReady(false);
-    }
     if (!sentContentComplete) {
       boolean adFinished = (wasPlayingAd && !playingAd)
           || playingAdIndexInAdGroup != player.getCurrentAdIndexInAdGroup();
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 97c97dec8f5..58fa149b59c 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
@@ -51,6 +51,10 @@ public final class AdPlaybackState {
    */
   public final Uri[][] adUris;
 
+  /**
+   * The content duration in microseconds, if known. {@link C#TIME_UNSET} otherwise.
+   */
+  public long contentDurationUs;
   /**
    * The position offset in the first unplayed ad at which to begin playback, in microseconds.
    */
@@ -71,15 +75,17 @@ public AdPlaybackState(long[] adGroupTimesUs) {
     adUris = new Uri[adGroupCount][];
     Arrays.fill(adUris, new Uri[0]);
     adsLoadedCounts = new int[adGroupTimesUs.length];
+    contentDurationUs = C.TIME_UNSET;
   }
 
   private AdPlaybackState(long[] adGroupTimesUs, int[] adCounts, int[] adsLoadedCounts,
-      int[] adsPlayedCounts, Uri[][] adUris, long adResumePositionUs) {
+      int[] adsPlayedCounts, Uri[][] adUris, long contentDurationUs, long adResumePositionUs) {
     this.adGroupTimesUs = adGroupTimesUs;
     this.adCounts = adCounts;
     this.adsLoadedCounts = adsLoadedCounts;
     this.adsPlayedCounts = adsPlayedCounts;
     this.adUris = adUris;
+    this.contentDurationUs = contentDurationUs;
     this.adResumePositionUs = adResumePositionUs;
     adGroupCount = adGroupTimesUs.length;
   }
@@ -94,7 +100,8 @@ public AdPlaybackState copy() {
     }
     return new AdPlaybackState(Arrays.copyOf(adGroupTimesUs, adGroupCount),
         Arrays.copyOf(adCounts, adGroupCount), Arrays.copyOf(adsLoadedCounts, adGroupCount),
-        Arrays.copyOf(adsPlayedCounts, adGroupCount), adUris, adResumePositionUs);
+        Arrays.copyOf(adsPlayedCounts, adGroupCount), adUris, contentDurationUs,
+        adResumePositionUs);
   }
 
   /**
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 41a856f83fc..9c75b5ee5e9 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
@@ -273,7 +273,8 @@ private void maybeUpdateSourceInfo() {
       Timeline timeline = adPlaybackState.adGroupCount == 0 ? contentTimeline
           : new SinglePeriodAdTimeline(contentTimeline, adPlaybackState.adGroupTimesUs,
               adPlaybackState.adCounts, adPlaybackState.adsLoadedCounts,
-              adPlaybackState.adsPlayedCounts, adDurationsUs, adPlaybackState.adResumePositionUs);
+              adPlaybackState.adsPlayedCounts, adDurationsUs, adPlaybackState.adResumePositionUs,
+              adPlaybackState.contentDurationUs);
       listener.onSourceInfoRefreshed(timeline, contentManifest);
     }
   }
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 c2974681dbb..0a04c9ab4b7 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
@@ -31,6 +31,7 @@
   private final int[] adsPlayedCounts;
   private final long[][] adDurationsUs;
   private final long adResumePositionUs;
+  private final long contentDurationUs;
 
   /**
    * Creates a new timeline with a single period containing the specified ads.
@@ -48,10 +49,12 @@
    *     may be {@link C#TIME_UNSET} if the duration is not yet known.
    * @param adResumePositionUs The position offset in the earliest unplayed ad at which to begin
    *     playback, in microseconds.
+   * @param contentDurationUs The content duration in microseconds, if known. {@link C#TIME_UNSET}
+   *     otherwise.
    */
   public SinglePeriodAdTimeline(Timeline contentTimeline, long[] adGroupTimesUs, int[] adCounts,
-      int[] adsLoadedCounts, int[] adsPlayedCounts, long[][] adDurationsUs,
-      long adResumePositionUs) {
+      int[] adsLoadedCounts, int[] adsPlayedCounts, long[][] adDurationsUs, long adResumePositionUs,
+      long contentDurationUs) {
     super(contentTimeline);
     Assertions.checkState(contentTimeline.getPeriodCount() == 1);
     Assertions.checkState(contentTimeline.getWindowCount() == 1);
@@ -61,6 +64,7 @@ public SinglePeriodAdTimeline(Timeline contentTimeline, long[] adGroupTimesUs, i
     this.adsPlayedCounts = adsPlayedCounts;
     this.adDurationsUs = adDurationsUs;
     this.adResumePositionUs = adResumePositionUs;
+    this.contentDurationUs = contentDurationUs;
   }
 
   @Override
@@ -72,4 +76,14 @@ public Period getPeriod(int periodIndex, Period period, boolean setIds) {
     return period;
   }
 
+  @Override
+  public Window getWindow(int windowIndex, Window window, boolean setIds,
+      long defaultPositionProjectionUs) {
+    window = super.getWindow(windowIndex, window, setIds, defaultPositionProjectionUs);
+    if (window.durationUs == C.TIME_UNSET) {
+      window.durationUs = contentDurationUs;
+    }
+    return window;
+  }
+
 }
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 e2ae1f732b0..964eda7de06 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
@@ -656,17 +656,13 @@ private void updateNavigation() {
     boolean isSeekable = false;
     boolean enablePrevious = false;
     boolean enableNext = false;
-    if (haveNonEmptyTimeline) {
+    if (haveNonEmptyTimeline && !player.isPlayingAd()) {
       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;
-      if (player.isPlayingAd()) {
-        // Always hide player controls during ads.
-        hide();
-      }
     }
     setButtonEnabled(enablePrevious, previousButton);
     setButtonEnabled(enableNext, nextButton);
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 053bc26a6e0..f34ede3e6dc 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
@@ -37,6 +37,7 @@
 import com.google.android.exoplayer2.ControlDispatcher;
 import com.google.android.exoplayer2.DefaultControlDispatcher;
 import com.google.android.exoplayer2.Player;
+import com.google.android.exoplayer2.Player.DiscontinuityReason;
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.ApicFrame;
@@ -751,6 +752,10 @@ public boolean onTrackballEvent(MotionEvent ev) {
    * Shows the playback controls, but only if forced or shown indefinitely.
    */
   private void maybeShowController(boolean isForced) {
+    if (isPlayingAd()) {
+      // Never show the controller if an ad is currently playing.
+      return;
+    }
     if (useController) {
       boolean wasShowingIndefinitely = controller.isVisible() && controller.getShowTimeoutMs() <= 0;
       boolean shouldShowIndefinitely = shouldShowControllerIndefinitely();
@@ -777,6 +782,10 @@ private void showController(boolean showIndefinitely) {
     controller.show();
   }
 
+  private boolean isPlayingAd() {
+    return player != null && player.isPlayingAd() && player.getPlayWhenReady();
+  }
+
   private void updateForCurrentTrackSelections() {
     if (player == null) {
       return;
@@ -907,7 +916,18 @@ public void onTracksChanged(TrackGroupArray tracks, TrackSelectionArray selectio
 
     @Override
     public void onPlayerStateChanged(boolean playWhenReady, int playbackState) {
-      maybeShowController(false);
+      if (isPlayingAd()) {
+        hideController();
+      } else {
+        maybeShowController(false);
+      }
+    }
+
+    @Override
+    public void onPositionDiscontinuity(@DiscontinuityReason int reason) {
+      if (isPlayingAd()) {
+        hideController();
+      }
     }
 
   }
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 1f59b7796d5..340113da6c6 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
@@ -38,11 +38,11 @@
 
   </com.google.android.exoplayer2.ui.AspectRatioFrameLayout>
 
-  <View android:id="@id/exo_controller_placeholder"
+  <FrameLayout android:id="@id/exo_overlay"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
 
-  <FrameLayout android:id="@id/exo_overlay"
+  <View android:id="@id/exo_controller_placeholder"
       android:layout_width="match_parent"
       android:layout_height="match_parent"/>
 

From f73a5bf692a227a4729f4b94f1109e258aaa4399 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 5 Oct 2017 03:02:10 -0700
Subject: [PATCH 285/421] Update gradle version to 3.0.0-beta5.

Android Studio refuses to build with the current beta4 version.

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

diff --git a/build.gradle b/build.gradle
index e95dd83d906..47538ddb529 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta4'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta5'
         classpath 'com.novoda:bintray-release:0.5.0'
     }
     // Workaround for the following test coverage issue. Remove when fixed:

From d5101d8d461f3d6ff2a87ee638400abf953948d9 Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Fri, 6 Oct 2017 02:56:52 -0700
Subject: [PATCH 286/421] Allow DefaultDRMSession to retry provisioning/key
 request

For initial DRM provisioning and key request, we allow the requests to be
retried (with increasing delay for each successive retry) before failing.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171271384
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 60 ++++++++++++++-----
 .../drm/DefaultDrmSessionManager.java         | 32 +++++++++-
 2 files changed, 75 insertions(+), 17 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 e82c7e46b27..4e60e466a80 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
@@ -82,6 +82,7 @@ public interface ProvisioningManager<T extends ExoMediaCrypto> {
   private final HashMap<String, String> optionalKeyRequestParameters;
   private final Handler eventHandler;
   private final DefaultDrmSessionManager.EventListener eventListener;
+  private final int initialDrmRequestRetryCount;
 
   /* package */ final MediaDrmCallback callback;
   /* package */ final UUID uuid;
@@ -89,7 +90,7 @@ public interface ProvisioningManager<T extends ExoMediaCrypto> {
   private @DrmSession.State int state;
   private int openCount;
   private HandlerThread requestHandlerThread;
-  private Handler postRequestHandler;
+  private PostRequestHandler postRequestHandler;
   private T mediaCrypto;
   private DrmSessionException lastException;
   private byte[] sessionId;
@@ -111,13 +112,16 @@ public interface ProvisioningManager<T extends ExoMediaCrypto> {
    * @param playbackLooper The playback looper.
    * @param eventHandler The handler to post listener events.
    * @param eventListener The DRM session manager event listener.
+   * @param initialDrmRequestRetryCount The number of times to retry for initial provisioning and
+   *     key request before reporting error.
    */
   public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm,
       ProvisioningManager<T> provisioningManager, byte[] initData, String mimeType,
       @DefaultDrmSessionManager.Mode int mode, byte[] offlineLicenseKeySetId,
       HashMap<String, String> optionalKeyRequestParameters, MediaDrmCallback callback,
       Looper playbackLooper, Handler eventHandler,
-      DefaultDrmSessionManager.EventListener eventListener) {
+      DefaultDrmSessionManager.EventListener eventListener,
+      int initialDrmRequestRetryCount) {
     this.uuid = uuid;
     this.provisioningManager = provisioningManager;
     this.mediaDrm = mediaDrm;
@@ -125,6 +129,7 @@ public DefaultDrmSession(UUID uuid, ExoMediaDrm<T> mediaDrm,
     this.offlineLicenseKeySetId = offlineLicenseKeySetId;
     this.optionalKeyRequestParameters = optionalKeyRequestParameters;
     this.callback = callback;
+    this.initialDrmRequestRetryCount = initialDrmRequestRetryCount;
 
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
@@ -152,7 +157,7 @@ public void acquire() {
         return;
       }
       if (openInternal(true)) {
-        doLicense();
+        doLicense(true);
       }
     }
   }
@@ -191,12 +196,12 @@ public boolean hasSessionId(byte[] sessionId) {
 
   public void provision() {
     ProvisionRequest request = mediaDrm.getProvisionRequest();
-    postRequestHandler.obtainMessage(MSG_PROVISION, request).sendToTarget();
+    postRequestHandler.obtainMessage(MSG_PROVISION, request, true).sendToTarget();
   }
 
   public void onProvisionCompleted() {
     if (openInternal(false)) {
-      doLicense();
+      doLicense(true);
     }
   }
 
@@ -285,12 +290,12 @@ private void onProvisionResponse(Object response) {
     provisioningManager.onProvisionCompleted();
   }
 
-  private void doLicense() {
+  private void doLicense(boolean allowRetry) {
     switch (mode) {
       case DefaultDrmSessionManager.MODE_PLAYBACK:
       case DefaultDrmSessionManager.MODE_QUERY:
         if (offlineLicenseKeySetId == null) {
-          postKeyRequest(ExoMediaDrm.KEY_TYPE_STREAMING);
+          postKeyRequest(ExoMediaDrm.KEY_TYPE_STREAMING, allowRetry);
         } else {
           if (restoreKeys()) {
             long licenseDurationRemainingSec = getLicenseDurationRemainingSec();
@@ -298,7 +303,7 @@ private void doLicense() {
                 && 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);
+              postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
             } else if (licenseDurationRemainingSec <= 0) {
               onError(new KeysExpiredException());
             } else {
@@ -317,11 +322,11 @@ public void run() {
         break;
       case DefaultDrmSessionManager.MODE_DOWNLOAD:
         if (offlineLicenseKeySetId == null) {
-          postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE);
+          postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
         } else {
           // Renew
           if (restoreKeys()) {
-            postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE);
+            postKeyRequest(ExoMediaDrm.KEY_TYPE_OFFLINE, allowRetry);
           }
         }
         break;
@@ -329,7 +334,7 @@ public void run() {
         // 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);
+          postKeyRequest(ExoMediaDrm.KEY_TYPE_RELEASE, allowRetry);
         }
         break;
       default:
@@ -356,12 +361,12 @@ private long getLicenseDurationRemainingSec() {
     return Math.min(pair.first, pair.second);
   }
 
-  private void postKeyRequest(int type) {
+  private void postKeyRequest(int type, boolean allowRetry) {
     byte[] scope = type == ExoMediaDrm.KEY_TYPE_RELEASE ? offlineLicenseKeySetId : sessionId;
     try {
       KeyRequest request = mediaDrm.getKeyRequest(scope, initData, mimeType, type,
           optionalKeyRequestParameters);
-      postRequestHandler.obtainMessage(MSG_KEYS, request).sendToTarget();
+      postRequestHandler.obtainMessage(MSG_KEYS, request, allowRetry).sendToTarget();
     } catch (Exception e) {
       onKeysError(e);
     }
@@ -452,7 +457,7 @@ public void onMediaDrmEvent(int what) {
     }
     switch (what) {
       case ExoMediaDrm.EVENT_KEY_REQUIRED:
-        doLicense();
+        doLicense(false);
         break;
       case ExoMediaDrm.EVENT_KEY_EXPIRED:
         // When an already expired key is loaded MediaDrm sends this event immediately. Ignore
@@ -501,6 +506,11 @@ public PostRequestHandler(Looper backgroundLooper) {
       super(backgroundLooper);
     }
 
+    Message obtainMessage(int what, Object object, boolean allowRetry) {
+      return obtainMessage(what, allowRetry ? 1 : 0 /* allow retry*/, 0 /* error count */,
+          object);
+    }
+
     @Override
     public void handleMessage(Message msg) {
       Object response;
@@ -516,11 +526,33 @@ public void handleMessage(Message msg) {
             throw new RuntimeException();
         }
       } catch (Exception e) {
+        if (maybeRetryRequest(msg)) {
+          return;
+        }
         response = e;
       }
       postResponseHandler.obtainMessage(msg.what, response).sendToTarget();
     }
 
+    private boolean maybeRetryRequest(Message originalMsg) {
+      boolean allowRetry = originalMsg.arg1 == 1;
+      if (!allowRetry) {
+        return false;
+      }
+      int errorCount = originalMsg.arg2 + 1;
+      if (errorCount > initialDrmRequestRetryCount) {
+        return false;
+      }
+      Message retryMsg = Message.obtain(originalMsg);
+      retryMsg.arg2 = errorCount;
+      sendMessageDelayed(retryMsg, getRetryDelayMillis(errorCount));
+      return true;
+    }
+
+    private long getRetryDelayMillis(int errorCount) {
+      return Math.min((errorCount - 1) * 1000, 5000);
+    }
+
   }
 
 }
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 a0d5a932f27..10cfe318a96 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
@@ -97,6 +97,8 @@ public interface EventListener {
   public static final int MODE_DOWNLOAD = 2;
   /** Releases an existing offline license. */
   public static final int MODE_RELEASE = 3;
+  /** Number of times to retry for initial provisioning and key request for reporting error. */
+  public static final int INITIAL_DRM_REQUEST_RETRY_COUNT = 3;
 
   private final UUID uuid;
   private final ExoMediaDrm<T> mediaDrm;
@@ -105,6 +107,7 @@ public interface EventListener {
   private final Handler eventHandler;
   private final EventListener eventListener;
   private final boolean multiSession;
+  private final int initialDrmRequestRetryCount;
 
   private final List<DefaultDrmSession<T>> sessions;
   private final List<DefaultDrmSession<T>> provisioningSessions;
@@ -176,7 +179,8 @@ public static DefaultDrmSessionManager<FrameworkMediaCrypto> newFrameworkInstanc
       UUID uuid, MediaDrmCallback callback, HashMap<String, String> optionalKeyRequestParameters,
       Handler eventHandler, EventListener eventListener) throws UnsupportedDrmException {
     return new DefaultDrmSessionManager<>(uuid, FrameworkMediaDrm.newInstance(uuid), callback,
-        optionalKeyRequestParameters, eventHandler, eventListener, false);
+        optionalKeyRequestParameters, eventHandler, eventListener, false,
+        INITIAL_DRM_REQUEST_RETRY_COUNT);
   }
 
   /**
@@ -193,7 +197,7 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
       HashMap<String, String> optionalKeyRequestParameters, Handler eventHandler,
       EventListener eventListener) {
     this(uuid, mediaDrm, callback, optionalKeyRequestParameters, eventHandler, eventListener,
-        false);
+        false, INITIAL_DRM_REQUEST_RETRY_COUNT);
   }
 
   /**
@@ -211,6 +215,27 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
   public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCallback callback,
       HashMap<String, String> optionalKeyRequestParameters, Handler eventHandler,
       EventListener eventListener, boolean multiSession) {
+    this(uuid, mediaDrm, callback, optionalKeyRequestParameters, eventHandler, eventListener,
+        multiSession, INITIAL_DRM_REQUEST_RETRY_COUNT);
+  }
+
+  /**
+   * @param uuid The UUID of the drm scheme.
+   * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
+   * @param callback Performs key and provisioning requests.
+   * @param optionalKeyRequestParameters An optional map of parameters to pass as the last argument
+   *     to {@link ExoMediaDrm#getKeyRequest(byte[], byte[], String, int, HashMap)}. May be null.
+   * @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 multiSession A boolean that specify whether multiple key session support is enabled.
+   *     Default is false.
+   * @param initialDrmRequestRetryCount The number of times to retry for initial provisioning and
+   *     key request before reporting error.
+   */
+  public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCallback callback,
+      HashMap<String, String> optionalKeyRequestParameters, Handler eventHandler,
+      EventListener eventListener, boolean multiSession, int initialDrmRequestRetryCount) {
     Assertions.checkNotNull(uuid);
     Assertions.checkNotNull(mediaDrm);
     Assertions.checkArgument(!C.COMMON_PSSH_UUID.equals(uuid), "Use C.CLEARKEY_UUID instead");
@@ -221,6 +246,7 @@ public DefaultDrmSessionManager(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCall
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
     this.multiSession = multiSession;
+    this.initialDrmRequestRetryCount = initialDrmRequestRetryCount;
     mode = MODE_PLAYBACK;
     sessions = new ArrayList<>();
     provisioningSessions = new ArrayList<>();
@@ -377,7 +403,7 @@ public void run() {
       // Create a new session.
       session = new DefaultDrmSession<>(uuid, mediaDrm, this, initData, mimeType, mode,
           offlineLicenseKeySetId, optionalKeyRequestParameters, callback, playbackLooper,
-          eventHandler, eventListener);
+          eventHandler, eventListener, initialDrmRequestRetryCount);
       sessions.add(session);
     }
     session.acquire();

From 10f8192c48dcacfd8aea90c39bb0a3712307a991 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 6 Oct 2017 03:25:20 -0700
Subject: [PATCH 287/421] Add ActionFile which stores and loads DownloadActions
 to/from a file.

This change also replaces individual DownloadAction versions with a
single master version.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171273880
---
 .../exoplayer2/offline/ActionFile.java        |  95 +++++++
 .../google/android/exoplayer2/util/Util.java  |   7 +-
 .../exoplayer2/offline/ActionFileTest.java    | 253 ++++++++++++++++++
 .../ProgressiveDownloadActionTest.java        |   2 +-
 4 files changed, 355 insertions(+), 2 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java

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
new file mode 100644
index 00000000000..38f599cc6ef
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
@@ -0,0 +1,95 @@
+/*
+ * 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 com.google.android.exoplayer2.offline.DownloadAction.Deserializer;
+import com.google.android.exoplayer2.util.AtomicFile;
+import com.google.android.exoplayer2.util.ClosedSource;
+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;
+import java.io.OutputStream;
+
+/**
+ * Stores and loads {@link DownloadAction}s to/from a file.
+ */
+@ClosedSource(reason = "Not ready yet")
+public final class ActionFile {
+
+  private final AtomicFile atomicFile;
+
+  /**
+   * @param actionFile File to be used to store and load {@link DownloadAction}s.
+   */
+  public ActionFile(File actionFile) {
+    atomicFile = new AtomicFile(actionFile);
+  }
+
+  /**
+   * Loads {@link DownloadAction}s from file.
+   *
+   * @param deserializers {@link Deserializer}s to deserialize DownloadActions.
+   * @return Loaded DownloadActions.
+   * @throws IOException If there is an error during loading.
+   */
+  public DownloadAction[] load(Deserializer... deserializers) throws IOException {
+    InputStream inputStream = null;
+    try {
+      inputStream = atomicFile.openRead();
+      DataInputStream dataInputStream = new DataInputStream(inputStream);
+      int version = dataInputStream.readInt();
+      if (version > DownloadAction.MASTER_VERSION) {
+        throw new IOException("Not supported action file version: " + version);
+      }
+      int actionCount = dataInputStream.readInt();
+      DownloadAction[] actions = new DownloadAction[actionCount];
+      for (int i = 0; i < actionCount; i++) {
+        actions[i] = DownloadAction.deserializeFromStream(deserializers, dataInputStream, version);
+      }
+      return actions;
+    } finally {
+      Util.closeQuietly(inputStream);
+    }
+  }
+
+  /**
+   * 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 {
+    OutputStream outputStream = null;
+    try {
+      outputStream = atomicFile.startWrite();
+      DataOutputStream dataOutputStream = new DataOutputStream(outputStream);
+      dataOutputStream.writeInt(DownloadAction.MASTER_VERSION);
+      dataOutputStream.writeInt(downloadActions.length);
+      for (DownloadAction action : downloadActions) {
+        DownloadAction.serializeToStream(action, dataOutputStream);
+      }
+      atomicFile.endWrite(outputStream);
+      // Avoid calling close twice.
+      outputStream = null;
+    } finally {
+      Util.closeQuietly(outputStream);
+    }
+  }
+
+}
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 5d93f413d51..24132e400c0 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
@@ -1076,12 +1076,17 @@ public static void recursiveDelete(File fileOrDirectory) {
 
   /** Creates an empty directory in the directory returned by {@link Context#getCacheDir()}. */
   public static File createTempDirectory(Context context, String prefix) throws IOException {
-    File tempFile = File.createTempFile(prefix, null, context.getCacheDir());
+    File tempFile = createTempFile(context, prefix);
     tempFile.delete(); // Delete the temp file.
     tempFile.mkdir(); // Create a directory with the same name.
     return tempFile;
   }
 
+  /** Creates a new empty file in the directory returned by {@link Context#getCacheDir()}. */
+  public static File createTempFile(Context context, String prefix) throws IOException {
+    return File.createTempFile(prefix, null, context.getCacheDir());
+  }
+
   /**
    * Returns the result of updating a CRC with the specified bytes in a "most significant bit first"
    * order.
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
new file mode 100644
index 00000000000..cc6a3e84adb
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
@@ -0,0 +1,253 @@
+/*
+ * 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 com.google.android.exoplayer2.offline.DownloadAction.Deserializer;
+import com.google.android.exoplayer2.util.ClosedSource;
+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 org.junit.After;
+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;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit tests for {@link ProgressiveDownloadAction}.
+ */
+@ClosedSource(reason = "Not ready yet")
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public class ActionFileTest {
+
+  private File tempFile;
+
+  @Before
+  public void setUp() throws Exception {
+    tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    tempFile.delete();
+  }
+
+  @Test
+  public void testLoadNoDataThrowsIOException() throws Exception {
+    try {
+      loadActions(new Object[] {});
+      Assert.fail();
+    } catch (IOException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void testLoadIncompleteHeaderThrowsIOException() throws Exception {
+    try {
+      loadActions(new Object[] {DownloadAction.MASTER_VERSION});
+      Assert.fail();
+    } catch (IOException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void testLoadCompleteHeaderZeroAction() throws Exception {
+    DownloadAction[] actions =
+        loadActions(new Object[] {DownloadAction.MASTER_VERSION, /*action count*/0});
+    assertThat(actions).isNotNull();
+    assertThat(actions).hasLength(0);
+  }
+
+  @Test
+  public void testLoadAction() throws Exception {
+    DownloadAction[] actions = loadActions(
+        new Object[] {DownloadAction.MASTER_VERSION, /*action count*/1, /*action 1*/"type2", 321},
+        new FakeDeserializer("type2"));
+    assertThat(actions).isNotNull();
+    assertThat(actions).hasLength(1);
+    assertAction(actions[0], "type2", DownloadAction.MASTER_VERSION, 321);
+  }
+
+  @Test
+  public void testLoadActions() throws Exception {
+    DownloadAction[] actions = loadActions(
+        new Object[] {DownloadAction.MASTER_VERSION, /*action count*/2, /*action 1*/"type1", 123,
+            /*action 2*/"type2", 321}, // Action 2
+        new FakeDeserializer("type1"), new FakeDeserializer("type2"));
+    assertThat(actions).isNotNull();
+    assertThat(actions).hasLength(2);
+    assertAction(actions[0], "type1", DownloadAction.MASTER_VERSION, 123);
+    assertAction(actions[1], "type2", DownloadAction.MASTER_VERSION, 321);
+  }
+
+  @Test
+  public void testLoadNotSupportedVersion() throws Exception {
+    try {
+      loadActions(new Object[] {DownloadAction.MASTER_VERSION + 1, /*action count*/1,
+              /*action 1*/"type2", 321}, new FakeDeserializer("type2"));
+      Assert.fail();
+    } catch (IOException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void testLoadNotSupportedType() throws Exception {
+    try {
+      loadActions(new Object[] {DownloadAction.MASTER_VERSION, /*action count*/1,
+              /*action 1*/"type2", 321}, new FakeDeserializer("type1"));
+      Assert.fail();
+    } catch (DownloadException e) {
+      // Expected exception.
+    }
+  }
+
+  @Test
+  public void testStoreAndLoadNoActions() throws Exception {
+    doTestSerializationRoundTrip(new DownloadAction[0]);
+  }
+
+  @Test
+  public void testStoreAndLoadActions() throws Exception {
+    doTestSerializationRoundTrip(new DownloadAction[] {
+        new FakeDownloadAction("type1", DownloadAction.MASTER_VERSION, 123),
+        new FakeDownloadAction("type2", DownloadAction.MASTER_VERSION, 321),
+    }, new FakeDeserializer("type1"), new FakeDeserializer("type2"));
+  }
+
+  private void doTestSerializationRoundTrip(DownloadAction[] actions,
+      Deserializer... deserializers) throws IOException {
+    ActionFile actionFile = new ActionFile(tempFile);
+    actionFile.store(actions);
+    assertThat(actionFile.load(deserializers)).isEqualTo(actions);
+  }
+
+  private DownloadAction[] loadActions(Object[] values, Deserializer... deserializers)
+      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); // Action count
+        } else if (value instanceof String) {
+          dataOutputStream.writeUTF((String) value); // Action count
+        } else {
+          throw new IllegalArgumentException();
+        }
+      }
+    } finally {
+      dataOutputStream.close();
+    }
+    return new ActionFile(tempFile).load(deserializers);
+  }
+
+  private static void assertAction(DownloadAction action, String type, int version, int data) {
+    assertThat(action).isInstanceOf(FakeDownloadAction.class);
+    assertThat(action.getType()).isEqualTo(type);
+    assertThat(((FakeDownloadAction) action).version).isEqualTo(version);
+    assertThat(((FakeDownloadAction) action).data).isEqualTo(data);
+  }
+
+  private static class FakeDeserializer implements Deserializer {
+    final String type;
+
+    FakeDeserializer(String type) {
+      this.type = type;
+    }
+
+    @Override
+    public String getType() {
+      return type;
+    }
+
+    @Override
+    public DownloadAction readFromStream(int version, DataInputStream input) throws IOException {
+      return new FakeDownloadAction(type, version, input.readInt());
+    }
+  }
+
+  private static class FakeDownloadAction extends DownloadAction {
+    final String type;
+    final int version;
+    final int data;
+
+    private FakeDownloadAction(String type, int version, int data) {
+      this.type = type;
+      this.version = version;
+      this.data = data;
+    }
+
+    @Override
+    protected String getType() {
+      return type;
+    }
+
+    @Override
+    protected void writeToStream(DataOutputStream output) throws IOException {
+      output.writeInt(data);
+    }
+
+    @Override
+    protected boolean isRemoveAction() {
+      return false;
+    }
+
+    @Override
+    protected boolean isSameMedia(DownloadAction other) {
+      return false;
+    }
+
+    @Override
+    protected Downloader createDownloader(DownloaderConstructorHelper downloaderConstructorHelper) {
+      return null;
+    }
+
+    // auto generated code
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+      FakeDownloadAction that = (FakeDownloadAction) o;
+      return version == that.version && data == that.data && type.equals(that.type);
+    }
+
+    @Override
+    public int hashCode() {
+      int result = type.hashCode();
+      result = 31 * result + version;
+      result = 31 * result + data;
+      return result;
+    }
+  }
+
+}
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 44fe6c069b1..85a2b02799a 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
@@ -136,7 +136,7 @@ private static void doTestSerializationRoundTrip(ProgressiveDownloadAction actio
     ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
     DataInputStream input = new DataInputStream(in);
     DownloadAction action2 =
-        ProgressiveDownloadAction.DESERIALIZER.readFromStream(action1.getVersion(), input);
+        ProgressiveDownloadAction.DESERIALIZER.readFromStream(DownloadAction.MASTER_VERSION, input);
 
     assertThat(action2).isEqualTo(action1);
   }

From e88716595539ea5034b8bea460ac5aa1ba87a0d1 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 9 Oct 2017 01:49:56 -0700
Subject: [PATCH 288/421] Provide a getter for IMA's AdsLoader

Issue: #3322

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171508635
---
 .../android/exoplayer2/ext/ima/ImaAdsLoader.java     | 12 +++++++++++-
 1 file changed, 11 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 cbed5d166ee..0b11a97f844 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
@@ -228,6 +228,16 @@ public ImaAdsLoader(Context context, Uri adTagUri, ImaSdkSettings imaSdkSettings
     contentDurationMs = C.TIME_UNSET;
   }
 
+  /**
+   * Returns the underlying {@code com.google.ads.interactivemedia.v3.api.AdsLoader} wrapped by
+   * this instance.
+   */
+  public com.google.ads.interactivemedia.v3.api.AdsLoader getAdsLoader() {
+    return adsLoader;
+  }
+
+  // AdsLoader implementation.
+
   @Override
   public void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGroup adUiViewGroup) {
     this.player = player;
@@ -270,7 +280,7 @@ public void release() {
     }
   }
 
-  // AdsLoader.AdsLoadedListener implementation.
+  // com.google.ads.interactivemedia.v3.api.AdsLoader.AdsLoadedListener implementation.
 
   @Override
   public void onAdsManagerLoaded(AdsManagerLoadedEvent adsManagerLoadedEvent) {

From 54d3df4b63a6291d8b98bcee67748e78012d0269 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 9 Oct 2017 03:35:45 -0700
Subject: [PATCH 289/421] Drop to keyframe in LibvpxVideoRenderer

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171517156
---
 .../ext/vp9/LibvpxVideoRenderer.java          | 88 +++++++++++++++----
 .../video/MediaCodecVideoRenderer.java        |  3 +-
 2 files changed, 74 insertions(+), 17 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 ec18db24706..dd303af0d82 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
@@ -109,12 +109,12 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
   private DrmSession<ExoMediaCrypto> drmSession;
   private DrmSession<ExoMediaCrypto> pendingDrmSession;
 
-  @ReinitializationState
-  private int decoderReinitializationState;
+  private @ReinitializationState int decoderReinitializationState;
   private boolean decoderReceivedBuffers;
 
   private Bitmap bitmap;
   private boolean renderedFirstFrame;
+  private boolean forceRenderFrame;
   private long joiningDeadlineMs;
   private Surface surface;
   private VpxOutputBufferRenderer outputBufferRenderer;
@@ -129,6 +129,7 @@ public final class LibvpxVideoRenderer extends BaseRenderer {
   private long droppedFrameAccumulationStartTimeMs;
   private int droppedFrames;
   private int consecutiveDroppedFrameCount;
+  private int buffersInCodecCount;
 
   /**
    * @param scaleToFit Whether video frames should be scaled to fit when rendering.
@@ -257,6 +258,7 @@ private boolean drainOutputBuffer(long positionUs) throws ExoPlaybackException,
         return false;
       }
       decoderCounters.skippedOutputBufferCount += outputBuffer.skippedOutputBufferCount;
+      buffersInCodecCount -= outputBuffer.skippedOutputBufferCount;
     }
 
     if (nextOutputBuffer == null) {
@@ -279,26 +281,42 @@ private boolean drainOutputBuffer(long positionUs) throws ExoPlaybackException,
     if (outputMode == VpxDecoder.OUTPUT_MODE_NONE) {
       // Skip frames in sync with playback, so we'll be at the right frame if the mode changes.
       if (isBufferLate(outputBuffer.timeUs - positionUs)) {
+        forceRenderFrame = false;
         skipBuffer();
+        buffersInCodecCount--;
         return true;
       }
       return false;
     }
 
+    if (forceRenderFrame) {
+      forceRenderFrame = false;
+      renderBuffer();
+      buffersInCodecCount--;
+      return true;
+    }
+
     final long nextOutputBufferTimeUs =
         nextOutputBuffer != null && !nextOutputBuffer.isEndOfStream()
             ? nextOutputBuffer.timeUs : C.TIME_UNSET;
-    if (shouldDropOutputBuffer(
+
+    long earlyUs = outputBuffer.timeUs - positionUs;
+    if (shouldDropBuffersToKeyframe(earlyUs) && maybeDropBuffersToKeyframe(positionUs)) {
+      forceRenderFrame = true;
+      return false;
+    } else if (shouldDropOutputBuffer(
         outputBuffer.timeUs, nextOutputBufferTimeUs, positionUs, joiningDeadlineMs)) {
       dropBuffer();
+      buffersInCodecCount--;
       return true;
     }
 
     // If we have yet to render a frame to the current output (either initially or immediately
     // following a seek), render one irrespective of the state or current position.
     if (!renderedFirstFrame
-        || (getState() == STATE_STARTED && outputBuffer.timeUs <= positionUs + 30000)) {
+        || (getState() == STATE_STARTED && earlyUs <= 30000)) {
       renderBuffer();
+      buffersInCodecCount--;
     }
     return false;
   }
@@ -307,18 +325,29 @@ private boolean drainOutputBuffer(long positionUs) throws ExoPlaybackException,
    * Returns whether the current frame should be dropped.
    *
    * @param outputBufferTimeUs The timestamp of the current output buffer.
-   * @param nextOutputBufferTimeUs The timestamp of the next output buffer or
-   *     {@link C#TIME_UNSET} if the next output buffer is unavailable.
+   * @param nextOutputBufferTimeUs The timestamp of the next output buffer or {@link C#TIME_UNSET}
+   *     if the next output buffer is unavailable.
    * @param positionUs The current playback position.
    * @param joiningDeadlineMs The joining deadline.
    * @return Returns whether to drop the current output buffer.
    */
-  protected boolean shouldDropOutputBuffer(long outputBufferTimeUs, long nextOutputBufferTimeUs,
+  private boolean shouldDropOutputBuffer(long outputBufferTimeUs, long nextOutputBufferTimeUs,
       long positionUs, long joiningDeadlineMs) {
     return isBufferLate(outputBufferTimeUs - positionUs)
         && (joiningDeadlineMs != C.TIME_UNSET || nextOutputBufferTimeUs != C.TIME_UNSET);
   }
 
+  /**
+   * Returns whether to drop all buffers from the buffer being processed to the keyframe at or after
+   * the current playback position, if possible.
+   *
+   * @param earlyUs The time until the current buffer should be presented in microseconds. A
+   *     negative value indicates that the buffer is late.
+   */
+  private boolean shouldDropBuffersToKeyframe(long earlyUs) {
+    return isBufferVeryLate(earlyUs);
+  }
+
   private void renderBuffer() {
     int bufferMode = outputBuffer.mode;
     boolean renderRgb = bufferMode == VpxDecoder.OUTPUT_MODE_RGB && surface != null;
@@ -342,18 +371,35 @@ private void renderBuffer() {
   }
 
   private void dropBuffer() {
-    decoderCounters.droppedBufferCount++;
-    droppedFrames++;
-    consecutiveDroppedFrameCount++;
-    decoderCounters.maxConsecutiveDroppedBufferCount = Math.max(
-        consecutiveDroppedFrameCount, decoderCounters.maxConsecutiveDroppedBufferCount);
-    if (droppedFrames == maxDroppedFramesToNotify) {
-      maybeNotifyDroppedFrames();
-    }
+    updateDroppedBufferCounters(1);
     outputBuffer.release();
     outputBuffer = null;
   }
 
+  private boolean maybeDropBuffersToKeyframe(long positionUs) throws ExoPlaybackException {
+    int droppedSourceBufferCount = skipSource(positionUs);
+    if (droppedSourceBufferCount == 0) {
+      return false;
+    }
+    decoderCounters.droppedToKeyframeCount++;
+    // 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);
+    flushDecoder();
+    return true;
+  }
+
+  private void updateDroppedBufferCounters(int droppedBufferCount) {
+    decoderCounters.droppedBufferCount += droppedBufferCount;
+    droppedFrames += droppedBufferCount;
+    consecutiveDroppedFrameCount += droppedBufferCount;
+    decoderCounters.maxConsecutiveDroppedBufferCount = Math.max(consecutiveDroppedFrameCount,
+        decoderCounters.maxConsecutiveDroppedBufferCount);
+    if (droppedFrames >= maxDroppedFramesToNotify) {
+      maybeNotifyDroppedFrames();
+    }
+  }
+
   private void skipBuffer() {
     decoderCounters.skippedOutputBufferCount++;
     outputBuffer.release();
@@ -426,6 +472,7 @@ private boolean feedInputBuffer() throws VpxDecoderException, ExoPlaybackExcepti
     inputBuffer.flip();
     inputBuffer.colorInfo = formatHolder.format.colorInfo;
     decoder.queueInputBuffer(inputBuffer);
+    buffersInCodecCount++;
     decoderReceivedBuffers = true;
     decoderCounters.inputBufferCount++;
     inputBuffer = null;
@@ -445,6 +492,8 @@ private boolean shouldWaitForKeys(boolean bufferEncrypted) throws ExoPlaybackExc
 
   private void flushDecoder() throws ExoPlaybackException {
     waitingForKeys = false;
+    forceRenderFrame = false;
+    buffersInCodecCount = 0;
     if (decoderReinitializationState != REINITIALIZATION_STATE_NONE) {
       releaseDecoder();
       maybeInitDecoder();
@@ -601,6 +650,8 @@ private void releaseDecoder() {
     decoderCounters.decoderReleaseCount++;
     decoderReinitializationState = REINITIALIZATION_STATE_NONE;
     decoderReceivedBuffers = false;
+    forceRenderFrame = false;
+    buffersInCodecCount = 0;
   }
 
   private void onInputFormatChanged(Format newFormat) throws ExoPlaybackException {
@@ -735,8 +786,13 @@ private void maybeNotifyDroppedFrames() {
   }
 
   private static boolean isBufferLate(long earlyUs) {
-    // Class a buffer as late if it should have been presented more than 30ms ago.
+    // Class a buffer as late if it should have been presented more than 30 ms ago.
     return earlyUs < -30000;
   }
 
+  private static boolean isBufferVeryLate(long earlyUs) {
+    // Class a buffer as very late if it should have been presented more than 500 ms ago.
+    return earlyUs < -500000;
+  }
+
 }
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 cb443e38eeb..40f2a7b0811 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
@@ -532,6 +532,7 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, M
     if (surface == dummySurface) {
       // Skip frames in sync with playback, so we'll be at the right frame if the mode changes.
       if (isBufferLate(earlyUs)) {
+        forceRenderFrame = false;
         skipOutputBuffer(codec, bufferIndex, presentationTimeUs);
         return true;
       }
@@ -569,7 +570,7 @@ protected boolean processOutputBuffer(long positionUs, long elapsedRealtimeUs, M
     if (shouldDropBuffersToKeyframe(earlyUs, elapsedRealtimeUs)
         && maybeDropBuffersToKeyframe(codec, bufferIndex, presentationTimeUs, positionUs)) {
       forceRenderFrame = true;
-      return true;
+      return false;
     } else if (shouldDropOutputBuffer(earlyUs, elapsedRealtimeUs)) {
       dropOutputBuffer(codec, bufferIndex, presentationTimeUs);
       return true;

From 030f52b41bb5ae2da5d8e1659af50c58435da57b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Mon, 9 Oct 2017 05:51:37 -0700
Subject: [PATCH 290/421] Wait for HandlerThread to terminate after calling
 quit.

Calling HandlerThread.quit() or .quitSafely() doesn't immediately terminate
the thread. It just instructs the Looper not to accept any new messages and
to terminate at the next opportunity. Added a HandlerThread.join() everywhere
where the intention is to close and release all resources and to stop all
threads.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171525241
---
 .../google/android/exoplayer2/ExoPlayerImplInternal.java  | 2 +-
 .../android/exoplayer2/testutil/FakeSimpleExoPlayer.java  | 8 ++++++++
 2 files changed, 9 insertions(+), 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 765b2a7634d..a0ca448de7f 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
@@ -304,7 +304,6 @@ public synchronized void release() {
       // Restore the interrupted status.
       Thread.currentThread().interrupt();
     }
-    internalPlaybackThread.quit();
   }
 
   public Looper getPlaybackLooper() {
@@ -840,6 +839,7 @@ private void releaseInternal() {
     resetInternal(true);
     loadControl.onReleased();
     setState(Player.STATE_IDLE);
+    internalPlaybackThread.quit();
     synchronized (this) {
       released = true;
       notifyAll();
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
index b56c299e78b..70c0f84051c 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -212,9 +212,17 @@ public void run () {
     }
 
     @Override
+    @SuppressWarnings("ThreadJoinLoop")
     public void release() {
       stop();
       playbackThread.quitSafely();
+      while (playbackThread.isAlive()) {
+        try {
+          playbackThread.join();
+        } catch (InterruptedException e) {
+          // Ignore interrupt.
+        }
+      }
     }
 
     @Override

From fc985fe4dabe287d54653aaa3f743607965ac1f8 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 9 Oct 2017 07:39:40 -0700
Subject: [PATCH 291/421] Update IMA documentation for AdsLoader

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

diff --git a/extensions/ima/README.md b/extensions/ima/README.md
index 4f63214f046..a796ca8694f 100644
--- a/extensions/ima/README.md
+++ b/extensions/ima/README.md
@@ -1,11 +1,11 @@
 # ExoPlayer IMA extension #
 
-The IMA extension is a [MediaSource][] implementation wrapping the
+The IMA extension is an [AdsLoader][] implementation wrapping the
 [Interactive Media Ads SDK for Android][IMA]. You can use it to insert ads
 alongside content.
 
 [IMA]: https://developers.google.com/interactive-media-ads/docs/sdks/android/
-[MediaSource]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/source/MediaSource.html
+[AdsLoader]: https://google.github.io/ExoPlayer/doc/reference/index.html?com/google/android/exoplayer2/source/ads/AdsLoader.html
 
 ## Getting the extension ##
 
@@ -27,7 +27,7 @@ locally. Instructions for doing this can be found in ExoPlayer's
 ## Using the extension ##
 
 To play ads alongside a single-window content `MediaSource`, prepare the player
-with an `ImaAdsMediaSource` constructed using an `ImaAdsLoader`, the content
+with an `AdsMediaSource` constructed using an `ImaAdsLoader`, the content
 `MediaSource` and an overlay `ViewGroup` on top of the player. Pass an ad tag
 URI from your ad campaign when creating the `ImaAdsLoader`. The IMA
 documentation includes some [sample ad tags][] for testing.
@@ -38,7 +38,7 @@ background, and are recreated when the player returns to the foreground. When
 playing ads it is necessary to persist ad playback state while in the background
 by keeping a reference to the `ImaAdsLoader`. Reuse it when resuming playback of
 the same content/ads by passing it in when constructing the new
-`ImaAdsMediaSource`. It is also important to persist the player position when
+`AdsMediaSource`. It is also important to persist the player position when
 entering the background by storing the value of `player.getContentPosition()`.
 On returning to the foreground, seek to that position before preparing the new
 player instance. Finally, it is important to call `ImaAdsLoader.release()` when

From 9a6d717a7a0389a57fd0c9c62dc3ae2c072fd2f2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 10 Oct 2017 12:39:34 -0700
Subject: [PATCH 292/421] Allow overriding of
 DefaultDashChunkSource.getNextChunk

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171718775
---
 .../source/dash/DefaultDashChunkSource.java    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 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 732934515bb..bb798b0af90 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
@@ -175,7 +175,7 @@ public int getPreferredQueueSize(long playbackPositionUs, List<? extends MediaCh
   }
 
   @Override
-  public final void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHolder out) {
+  public void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHolder out) {
     if (fatalError != null) {
       return;
     }
@@ -304,7 +304,7 @@ public boolean onChunkLoadError(Chunk chunk, boolean cancelable, Exception e) {
         trackSelection.indexOf(chunk.trackFormat), e);
   }
 
-  // Private methods.
+  // Internal methods.
 
   private ArrayList<Representation> getRepresentations() {
     List<AdaptationSet> manifestAdapationSets = manifest.getPeriod(periodIndex).adaptationSets;
@@ -329,7 +329,12 @@ private long getNowUnixTimeUs() {
     }
   }
 
-  private static Chunk newInitializationChunk(RepresentationHolder representationHolder,
+  private long resolveTimeToLiveEdgeUs(long playbackPositionUs) {
+    boolean resolveTimeToLiveEdgePossible = manifest.dynamic && liveEdgeTimeUs != C.TIME_UNSET;
+    return resolveTimeToLiveEdgePossible ? liveEdgeTimeUs - playbackPositionUs : C.TIME_UNSET;
+  }
+
+  protected static Chunk newInitializationChunk(RepresentationHolder representationHolder,
       DataSource dataSource, Format trackFormat, int trackSelectionReason,
       Object trackSelectionData, RangedUri initializationUri, RangedUri indexUri) {
     RangedUri requestUri;
@@ -350,7 +355,7 @@ private static Chunk newInitializationChunk(RepresentationHolder representationH
         trackSelectionReason, trackSelectionData, representationHolder.extractorWrapper);
   }
 
-  private static Chunk newMediaChunk(RepresentationHolder representationHolder,
+  protected static Chunk newMediaChunk(RepresentationHolder representationHolder,
       DataSource dataSource, int trackType, Format trackFormat, int trackSelectionReason,
       Object trackSelectionData, int firstSegmentNum, int maxSegmentCount) {
     Representation representation = representationHolder.representation;
@@ -385,11 +390,6 @@ private static Chunk newMediaChunk(RepresentationHolder representationHolder,
     }
   }
 
-  private long resolveTimeToLiveEdgeUs(long playbackPositionUs) {
-    boolean resolveTimeToLiveEdgePossible = manifest.dynamic && liveEdgeTimeUs != C.TIME_UNSET;
-    return resolveTimeToLiveEdgePossible ? liveEdgeTimeUs - playbackPositionUs : C.TIME_UNSET;
-  }
-
   // Protected classes.
 
   /**

From 5d4fa335f98d11c41b5d1e46a4945225545836ce Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 10 Oct 2017 12:40:02 -0700
Subject: [PATCH 293/421] Expose public constructors for FrameworkMediaCrypto

MediaCodecRenderer implementations require DrmSessionManager<FrameworkMediaCrypto>,
but it's currently not possible for an app to provide a custom implementation due
to FrameworkMediaCrypto having a package private constructor. This change exposes
public FrameworkMediaCrypto constructors, hence removing this restriction.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171718853
---
 .../exoplayer2/drm/FrameworkMediaCrypto.java  | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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 5bee85f4493..4e58ed6a313 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
@@ -28,12 +28,29 @@ public final class FrameworkMediaCrypto implements ExoMediaCrypto {
   private final MediaCrypto mediaCrypto;
   private final boolean forceAllowInsecureDecoderComponents;
 
-  /* package */ FrameworkMediaCrypto(MediaCrypto mediaCrypto,
+  /**
+   * @param mediaCrypto The {@link MediaCrypto} to wrap.
+   */
+  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);
     this.forceAllowInsecureDecoderComponents = forceAllowInsecureDecoderComponents;
   }
 
+  /**
+   * Returns the wrapped {@link MediaCrypto}.
+   */
   public MediaCrypto getWrappedMediaCrypto() {
     return mediaCrypto;
   }

From 763f663d019823ea00ae659cda839889648d921e Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Wed, 11 Oct 2017 03:54:15 -0700
Subject: [PATCH 294/421] Update DefaultTrackSelector to use more conditions
 when selecting audio track

Update the audio track selection logic in DefaultTrackSelector:

- When forcing lowest bitrate, use bitrate as tie-breaker when track scores are
the same, prefer the lower bitrate.
- Otherwise, use one of the following values as tie-breaker in order:
  - ChannelCount
  - SampleRate
  - BitRate
If the format being checked is within renderer's capabilities, select it if it
has higher tie-break value, else, select it if it has lower tie-break value.

If all tie-break values are the same, prefer the already selected track.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171803092
---
 .../trackselection/DefaultTrackSelector.java  | 132 +++-
 .../DefaultTrackSelectorTest.java             | 660 ++++++++++++++++++
 2 files changed, 762 insertions(+), 30 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.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 0ab4f62866f..42eeebde11b 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
@@ -762,10 +762,9 @@ private static int compareFormatValues(int first, int second) {
   protected TrackSelection selectAudioTrack(TrackGroupArray groups, int[][] formatSupport,
       Parameters params, TrackSelection.Factory adaptiveTrackSelectionFactory)
       throws ExoPlaybackException {
-    int selectedGroupIndex = C.INDEX_UNSET;
     int selectedTrackIndex = C.INDEX_UNSET;
-    int selectedTrackScore = 0;
-    int selectedBitrate = Format.NO_VALUE;
+    int selectedGroupIndex = C.INDEX_UNSET;
+    AudioTrackScore selectedTrackScore = null;
     for (int groupIndex = 0; groupIndex < groups.length; groupIndex++) {
       TrackGroup trackGroup = groups.get(groupIndex);
       int[] trackFormatSupport = formatSupport[groupIndex];
@@ -773,15 +772,12 @@ protected TrackSelection selectAudioTrack(TrackGroupArray groups, int[][] format
         if (isSupported(trackFormatSupport[trackIndex],
             params.exceedRendererCapabilitiesIfNecessary)) {
           Format format = trackGroup.getFormat(trackIndex);
-          int trackScore = getAudioTrackScore(trackFormatSupport[trackIndex],
-              params.preferredAudioLanguage, format);
-          if (trackScore > selectedTrackScore
-              || (trackScore == selectedTrackScore && params.forceLowestBitrate
-                  && compareFormatValues(format.bitrate, selectedBitrate) < 0)) {
+          AudioTrackScore trackScore =
+              new AudioTrackScore(format, params, trackFormatSupport[trackIndex]);
+          if (selectedTrackScore == null || trackScore.compareTo(selectedTrackScore) > 0) {
             selectedGroupIndex = groupIndex;
             selectedTrackIndex = trackIndex;
             selectedTrackScore = trackScore;
-            selectedBitrate = format.bitrate;
           }
         }
       }
@@ -804,27 +800,6 @@ && compareFormatValues(format.bitrate, selectedBitrate) < 0)) {
     return new FixedTrackSelection(selectedGroup, selectedTrackIndex);
   }
 
-  private static int getAudioTrackScore(int formatSupport, String preferredLanguage,
-      Format format) {
-    boolean isDefault = (format.selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0;
-    int trackScore;
-    if (formatHasLanguage(format, preferredLanguage)) {
-      if (isDefault) {
-        trackScore = 4;
-      } else {
-        trackScore = 3;
-      }
-    } else if (isDefault) {
-      trackScore = 2;
-    } else {
-      trackScore = 1;
-    }
-    if (isSupported(formatSupport, false)) {
-      trackScore += WITHIN_RENDERER_CAPABILITIES_BONUS;
-    }
-    return trackScore;
-  }
-
   private static int[] getAdaptiveAudioTracks(TrackGroup group, int[] formatSupport,
       boolean allowMixedMimeTypes) {
     int selectedConfigurationTrackCount = 0;
@@ -1090,6 +1065,103 @@ private static Point getMaxVideoSizeInViewport(boolean orientationMayChange, int
     }
   }
 
+  /**
+   * A representation of how well a track fits with our track selection {@link Parameters}.
+   *
+   * <p>This is used to rank different audio tracks relatively with each other.
+   */
+  private static final class AudioTrackScore implements Comparable<AudioTrackScore> {
+    private final Parameters parameters;
+    private final int withinRendererCapabilitiesScore;
+    private final int matchLanguageScore;
+    private final int defaultSelectionFlagScore;
+    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 = formatHasLanguage(format, parameters.preferredAudioLanguage) ? 1 : 0;
+      defaultSelectionFlagScore = (format.selectionFlags & C.SELECTION_FLAG_DEFAULT) != 0 ? 1 : 0;
+      channelCount = format.channelCount;
+      sampleRate = format.sampleRate;
+      bitrate = format.bitrate;
+    }
+
+    /**
+     * Compares the score of the current track format with another {@link AudioTrackScore}.
+     *
+     * @param other The other score to compare to.
+     * @return A positive integer if this score is better than the other. Zero if they are
+     * equal. A negative integer if this score is worse than the other.
+     */
+    @Override
+    public int compareTo(AudioTrackScore other) {
+      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);
+      }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+      if (this == o) {
+        return true;
+      }
+      if (o == null || getClass() != o.getClass()) {
+        return false;
+      }
+
+      AudioTrackScore that = (AudioTrackScore) o;
+
+      return withinRendererCapabilitiesScore == that.withinRendererCapabilitiesScore
+          && matchLanguageScore == that.matchLanguageScore
+          && defaultSelectionFlagScore == that.defaultSelectionFlagScore
+          && channelCount == that.channelCount && sampleRate == that.sampleRate
+          && bitrate == that.bitrate;
+    }
+
+    @Override
+    public int hashCode() {
+      int result = withinRendererCapabilitiesScore;
+      result = 31 * result + matchLanguageScore;
+      result = 31 * result + defaultSelectionFlagScore;
+      result = 31 * result + channelCount;
+      result = 31 * result + sampleRate;
+      result = 31 * result + bitrate;
+      return result;
+    }
+  }
+
+  /**
+   * Compares two integers in a safe way and avoiding potential overflow.
+   *
+   * @param first The first value.
+   * @param second The second value.
+   * @return A negative integer if the first value is less than the second. Zero if they are equal.
+   *     A positive integer if the first value is greater than the second.
+   */
+  private static int compareInts(int first, int second) {
+    return first > second ? 1 : (second > first ? -1 : 0);
+  }
+
   private static final class AudioConfigurationTuple {
 
     public final int 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
new file mode 100644
index 00000000000..a0e499139c9
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/trackselection/DefaultTrackSelectorTest.java
@@ -0,0 +1,660 @@
+package com.google.android.exoplayer2.trackselection;
+
+import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_EXCEEDS_CAPABILITIES;
+import static com.google.android.exoplayer2.RendererCapabilities.FORMAT_HANDLED;
+import static com.google.common.truth.Truth.assertThat;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.MockitoAnnotations.initMocks;
+
+import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.ExoPlaybackException;
+import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.RendererCapabilities;
+import com.google.android.exoplayer2.source.TrackGroup;
+import com.google.android.exoplayer2.source.TrackGroupArray;
+import com.google.android.exoplayer2.trackselection.DefaultTrackSelector.Parameters;
+import com.google.android.exoplayer2.trackselection.TrackSelector.InvalidationListener;
+import com.google.android.exoplayer2.util.MimeTypes;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit tests for {@link DefaultTrackSelector}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class DefaultTrackSelectorTest {
+
+  private static final Parameters DEFAULT_PARAMETERS = new Parameters();
+  private static final RendererCapabilities ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES =
+      new FakeRendererCapabilities(C.TRACK_TYPE_AUDIO);
+  private static final RendererCapabilities ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES =
+      new FakeRendererCapabilities(C.TRACK_TYPE_AUDIO, FORMAT_EXCEEDS_CAPABILITIES);
+
+  @Mock
+  private InvalidationListener invalidationListener;
+
+  private DefaultTrackSelector trackSelector;
+
+  @Before
+  public void setUp() {
+    initMocks(this);
+    trackSelector = new DefaultTrackSelector();
+  }
+
+  /**
+   * Tests that track selector will not call
+   * {@link InvalidationListener#onTrackSelectionsInvalidated()} when it's set with default
+   * values of {@link Parameters}.
+   */
+  @Test
+  public void testSetParameterWithDefaultParametersDoesNotNotifyInvalidationListener()
+      throws Exception {
+    trackSelector.init(invalidationListener);
+    trackSelector.setParameters(DEFAULT_PARAMETERS);
+
+    verify(invalidationListener, never()).onTrackSelectionsInvalidated();
+  }
+
+  /**
+   * Tests that track selector will call {@link InvalidationListener#onTrackSelectionsInvalidated()}
+   * when it's set with non-default values of {@link Parameters}.
+   */
+  @Test
+  public void testSetParameterWithNonDefaultParameterNotifyInvalidationListener()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withPreferredAudioLanguage("en");
+    trackSelector.init(invalidationListener);
+    trackSelector.setParameters(parameters);
+
+    verify(invalidationListener).onTrackSelectionsInvalidated();
+  }
+
+  /**
+   * Tests that track selector will not call
+   * {@link InvalidationListener#onTrackSelectionsInvalidated()} again when it's set with
+   * the same values of {@link Parameters}.
+   */
+  @Test
+  public void testSetParameterWithSameParametersDoesNotNotifyInvalidationListenerAgain()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withPreferredAudioLanguage("en");
+    trackSelector.init(invalidationListener);
+    trackSelector.setParameters(parameters);
+    trackSelector.setParameters(parameters);
+
+    verify(invalidationListener, times(1)).onTrackSelectionsInvalidated();
+  }
+
+  /**
+   * Tests that track selector will select audio track with {@link C#SELECTION_FLAG_DEFAULT}
+   * given default values of {@link Parameters}.
+   */
+  @Test
+  public void testSelectTracksSelectTrackWithSelectionFlag() throws Exception {
+    Format audioFormat =
+        Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    Format formatWithSelectionFlag =
+        Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 44100, null, null, C.SELECTION_FLAG_DEFAULT, null);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+        singleTrackGroup(formatWithSelectionFlag, audioFormat));
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(formatWithSelectionFlag);
+  }
+
+  /**
+   * Tests that track selector will select audio track with language that match preferred language
+   * given by {@link Parameters}.
+   */
+  @Test
+  public void testSelectTracksSelectPreferredAudioLanguage()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withPreferredAudioLanguage("en");
+    trackSelector.setParameters(parameters);
+
+    Format frAudioFormat =
+        Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 44100, null, null, 0, "fr");
+    Format enAudioFormat =
+        Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 44100, null, null, 0, "en");
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+        singleTrackGroup(frAudioFormat, enAudioFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer selecting audio track with language that match preferred
+   * language given by {@link Parameters} over track with {@link C#SELECTION_FLAG_DEFAULT}.
+   */
+  @Test
+  public void testSelectTracksSelectPreferredAudioLanguageOverSelectionFlag()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withPreferredAudioLanguage("en");
+    trackSelector.setParameters(parameters);
+
+    Format frAudioFormat =
+        Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 44100, null, null, C.SELECTION_FLAG_DEFAULT, "fr");
+    Format enAudioFormat =
+        Format.createAudioSampleFormat("audio", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 44100, null, null, 0, "en");
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+        singleTrackGroup(frAudioFormat, enAudioFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(enAudioFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer tracks that are within renderer's capabilities over
+   * track that exceed renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksPreferTrackWithinCapabilities()
+      throws Exception {
+    Format supportedFormat =
+        Format.createAudioSampleFormat("supportedFormat", MimeTypes.AUDIO_AAC, null,
+            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    Format exceededFormat =
+        Format.createAudioSampleFormat("exceededFormat", MimeTypes.AUDIO_AAC, null,
+            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, null);
+
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(supportedFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(exceededFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    RendererCapabilities mappedAudioRendererCapabilities =
+        new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {mappedAudioRendererCapabilities},
+        singleTrackGroup(exceededFormat, supportedFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
+  }
+
+  /**
+   * Tests that track selector will select a track that exceeds the renderer's capabilities when
+   * there are no other choice, given the default {@link Parameters}.
+   */
+  @Test
+  public void testSelectTracksWithNoTrackWithinCapabilitiesSelectExceededCapabilityTrack()
+      throws Exception {
+
+    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));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(audioFormat);
+  }
+
+  /**
+   * Tests that track selector will return a null track selection for a renderer when
+   * all tracks exceed that renderer's capabilities when {@link Parameters} does not allow
+   * exceeding-capabilities tracks.
+   */
+  @Test
+  public void testSelectTracksWithNoTrackWithinCapabilitiesAndSetByParamsReturnNoSelection()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withExceedRendererCapabilitiesIfNecessary(false);
+    trackSelector.setParameters(parameters);
+
+    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));
+
+    assertThat(result.selections.get(0)).isNull();
+  }
+
+  /**
+   * Tests that track selector will prefer tracks that are within renderer's capabilities over
+   * tracks that have {@link C#SELECTION_FLAG_DEFAULT} but exceed renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksPreferTrackWithinCapabilitiesOverSelectionFlag()
+      throws Exception {
+    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);
+
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(supportedFormat.id, FORMAT_HANDLED);
+    mappedCapabilities.put(exceededWithSelectionFlagFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    RendererCapabilities mappedAudioRendererCapabilities =
+        new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {mappedAudioRendererCapabilities},
+        singleTrackGroup(exceededWithSelectionFlagFormat, supportedFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer tracks that are within renderer's capabilities over
+   * track that have language matching preferred audio given by {@link Parameters} but exceed
+   * renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksPreferTrackWithinCapabilitiesOverPreferredLanguage()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withPreferredAudioLanguage("en");
+    trackSelector.setParameters(parameters);
+
+    Format supportedFrFormat =
+        Format.createAudioSampleFormat("supportedFormat", MimeTypes.AUDIO_AAC, null,
+            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, "fr");
+    Format exceededEnFormat =
+        Format.createAudioSampleFormat("exceededFormat", MimeTypes.AUDIO_AAC, null,
+            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, "en");
+
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(exceededEnFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    mappedCapabilities.put(supportedFrFormat.id, FORMAT_HANDLED);
+    RendererCapabilities mappedAudioRendererCapabilities =
+        new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {mappedAudioRendererCapabilities},
+        singleTrackGroup(exceededEnFormat, supportedFrFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer tracks that are within renderer's capabilities over
+   * track that have both language matching preferred audio given by {@link Parameters} and
+   * {@link C#SELECTION_FLAG_DEFAULT}, but exceed renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksPreferTrackWithinCapabilitiesOverSelectionFlagAndPreferredLanguage()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withPreferredAudioLanguage("en");
+    trackSelector.setParameters(parameters);
+
+    Format supportedFrFormat =
+        Format.createAudioSampleFormat("supportedFormat", MimeTypes.AUDIO_AAC, null,
+            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, 0, "fr");
+    Format exceededDefaultSelectionEnFormat =
+        Format.createAudioSampleFormat("exceededFormat", MimeTypes.AUDIO_AAC, null,
+            Format.NO_VALUE, Format.NO_VALUE, 2, 44100, null, null, C.SELECTION_FLAG_DEFAULT, "en");
+
+    Map<String, Integer> mappedCapabilities = new HashMap<>();
+    mappedCapabilities.put(exceededDefaultSelectionEnFormat.id, FORMAT_EXCEEDS_CAPABILITIES);
+    mappedCapabilities.put(supportedFrFormat.id, FORMAT_HANDLED);
+    RendererCapabilities mappedAudioRendererCapabilities =
+        new FakeMappedRendererCapabilities(C.TRACK_TYPE_AUDIO, mappedCapabilities);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {mappedAudioRendererCapabilities},
+        singleTrackGroup(exceededDefaultSelectionEnFormat, supportedFrFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(supportedFrFormat);
+  }
+
+  /**
+   * Tests that track selector will select audio tracks with higher num channel when other factors
+   * are the same, and tracks are within renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksWithinCapabilitiesSelectHigherNumChannel()
+      throws Exception {
+    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);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+        singleTrackGroup(higherChannelFormat, lowerChannelFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherChannelFormat);
+  }
+
+  /**
+   * Tests that track selector will select audio tracks with higher sample rate when other factors
+   * are the same, and tracks are within renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksWithinCapabilitiesSelectHigherSampleRate()
+      throws Exception {
+    Format higherSampleRateFormat =
+        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    Format lowerSampleRateFormat =
+        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));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(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.
+   */
+  @Test
+  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 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));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(higherBitrateFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer audio tracks with higher channel count over tracks with
+   * higher sample rate when other factors are the same, and tracks are within renderer's
+   * capabilities.
+   */
+  @Test
+  public void testSelectTracksPreferHigherNumChannelBeforeSampleRate()
+      throws Exception {
+    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);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_SUPPORTED_RENDERER_CAPABILITIES},
+        singleTrackGroup(higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat())
+        .isEqualTo(higherChannelLowerSampleRateFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer audio tracks with higher sample rate over tracks with
+   * higher bitrate when other factors are the same, and tracks are within renderer's
+   * capabilities.
+   */
+  @Test
+  public void testSelectTracksPreferHigherSampleRateBeforeBitrate()
+      throws Exception {
+    Format higherSampleRateLowerBitrateFormat =
+        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
+            Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    Format lowerSampleRateHigherBitrateFormat =
+        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));
+
+    assertThat(result.selections.get(0).getSelectedFormat())
+        .isEqualTo(higherSampleRateLowerBitrateFormat);
+  }
+
+  /**
+   * Tests that track selector will select audio tracks with lower num channel when other factors
+   * are the same, and tracks exceed renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksExceedingCapabilitiesSelectLowerNumChannel()
+      throws Exception {
+    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);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+        singleTrackGroup(higherChannelFormat, lowerChannelFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerChannelFormat);
+  }
+
+  /**
+   * Tests that track selector will select audio tracks with lower sample rate when other factors
+   * are the same, and tracks exceed renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksExceedingCapabilitiesSelectLowerSampleRate()
+      throws Exception {
+    Format lowerSampleRateFormat =
+        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, Format.NO_VALUE,
+            Format.NO_VALUE, 2, 22050, null, null, 0, null);
+    Format higherSampleRateFormat =
+        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));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerSampleRateFormat);
+  }
+
+  /**
+   * Tests that track selector will select audio tracks with lower bit-rate when other factors
+   * are the same, and tracks exceed renderer's capabilities.
+   */
+  @Test
+  public void testSelectTracksExceedingCapabilitiesSelectLowerBitrate()
+      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);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+        singleTrackGroup(lowerBitrateFormat, higherBitrateFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer audio tracks with lower channel count over tracks with
+   * lower sample rate when other factors are the same, and tracks are within renderer's
+   * capabilities.
+   */
+  @Test
+  public void testSelectTracksExceedingCapabilitiesPreferLowerNumChannelBeforeSampleRate()
+      throws Exception {
+    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);
+
+    TrackSelectorResult result = trackSelector.selectTracks(
+        new RendererCapabilities[] {ALL_AUDIO_FORMAT_EXCEEDED_RENDERER_CAPABILITIES},
+        singleTrackGroup(higherChannelLowerSampleRateFormat, lowerChannelHigherSampleRateFormat));
+
+    assertThat(result.selections.get(0).getSelectedFormat())
+        .isEqualTo(lowerChannelHigherSampleRateFormat);
+  }
+
+  /**
+   * Tests that track selector will prefer audio tracks with lower sample rate over tracks with
+   * lower bitrate when other factors are the same, and tracks are within renderer's
+   * capabilities.
+   */
+  @Test
+  public void testSelectTracksExceedingCapabilitiesPreferLowerSampleRateBeforeBitrate()
+      throws Exception {
+    Format higherSampleRateLowerBitrateFormat =
+        Format.createAudioSampleFormat("audioFormat", MimeTypes.AUDIO_AAC, null, 15000,
+            Format.NO_VALUE, 2, 44100, null, null, 0, null);
+    Format lowerSampleRateHigherBitrateFormat =
+        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));
+
+    assertThat(result.selections.get(0).getSelectedFormat())
+        .isEqualTo(lowerSampleRateHigherBitrateFormat);
+  }
+
+  /**
+   * Tests that track selector will select audio tracks with lower bitrate when {@link Parameters}
+   * indicate lowest bitrate preference, even when tracks are within capabilities.
+   */
+  @Test
+  public void testSelectTracksWithinCapabilitiesAndForceLowestBitrateSelectLowerBitrate()
+      throws Exception {
+    Parameters parameters = DEFAULT_PARAMETERS.withForceLowestBitrate(true);
+    trackSelector.setParameters(parameters);
+
+    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));
+
+    assertThat(result.selections.get(0).getSelectedFormat()).isEqualTo(lowerBitrateFormat);
+  }
+
+  private static TrackGroupArray singleTrackGroup(Format... formats) {
+    return new TrackGroupArray(new TrackGroup(formats));
+  }
+
+  /**
+   * A {@link RendererCapabilities} that advertises support for all formats of a given type using
+   * a provided support value. For any format that does not have the given track type,
+   * {@link #supportsFormat(Format)} will return {@link #FORMAT_UNSUPPORTED_TYPE}.
+   */
+  private static final class FakeRendererCapabilities implements RendererCapabilities {
+
+    private final int trackType;
+    private final int supportValue;
+
+    /**
+     * Returns {@link FakeRendererCapabilities} that advertises adaptive support for all
+     * tracks of the given type.
+     *
+     * @param trackType the track type of all formats that this renderer capabilities advertises
+     * support for.
+     */
+    FakeRendererCapabilities(int trackType) {
+      this(trackType, FORMAT_HANDLED | ADAPTIVE_SEAMLESS);
+    }
+
+    /**
+     * Returns {@link FakeRendererCapabilities} that advertises support level using given value
+     * for all tracks of the given type.
+     *
+     * @param trackType the track type of all formats that this renderer capabilities advertises
+     * support for.
+     * @param supportValue the support level value that will be returned for formats with
+     * the given type.
+     */
+    FakeRendererCapabilities(int trackType, int supportValue) {
+      this.trackType = trackType;
+      this.supportValue = supportValue;
+    }
+
+    @Override
+    public int getTrackType() {
+      return trackType;
+    }
+
+    @Override
+    public int supportsFormat(Format format) throws ExoPlaybackException {
+      return MimeTypes.getTrackType(format.sampleMimeType) == trackType
+          ? (supportValue) : FORMAT_UNSUPPORTED_TYPE;
+    }
+
+    @Override
+    public int supportsMixedMimeTypeAdaptation() throws ExoPlaybackException {
+      return ADAPTIVE_SEAMLESS;
+    }
+
+  }
+
+  /**
+   * A {@link RendererCapabilities} that advertises support for different formats using a mapping
+   * between format ID and format-support value.
+   */
+  private static final class FakeMappedRendererCapabilities implements RendererCapabilities {
+
+    private final int trackType;
+    private final Map<String, Integer> formatToCapability;
+
+    /**
+     * Returns {@link FakeRendererCapabilities} that advertises support level using the given
+     * mapping between format ID and format-support value.
+     *
+     * @param trackType the track type to be returned for {@link #getTrackType()}
+     * @param formatToCapability a map of (format id, support level) that will be used to return
+     * support level for any given format. For any format that's not in the map,
+     * {@link #supportsFormat(Format)} will return {@link #FORMAT_UNSUPPORTED_TYPE}.
+     */
+    FakeMappedRendererCapabilities(int trackType, Map<String, Integer> formatToCapability) {
+      this.trackType = trackType;
+      this.formatToCapability = new HashMap<>(formatToCapability);
+    }
+
+    @Override
+    public int getTrackType() {
+      return trackType;
+    }
+
+    @Override
+    public int supportsFormat(Format format) throws ExoPlaybackException {
+      return format.id != null && formatToCapability.containsKey(format.id)
+          ? formatToCapability.get(format.id)
+          : FORMAT_UNSUPPORTED_TYPE;
+    }
+
+    @Override
+    public int supportsMixedMimeTypeAdaptation() throws ExoPlaybackException {
+      return ADAPTIVE_SEAMLESS;
+    }
+
+  }
+
+}

From ac3501dd84394bafe9dc14ec2e0a6c04fbfa04a6 Mon Sep 17 00:00:00 2001
From: Drew Hill <drewhill80@gmail.com>
Date: Thu, 12 Oct 2017 08:39:06 -0400
Subject: [PATCH 295/421] make videoframereleasetimehelper get refresh rate
 when it's enabled, so we can reuse video renderer for multiple clips with
 different frame rates

---
 .../video/MediaCodecVideoRenderer.java        |  2 +-
 .../video/VideoFrameReleaseTimeHelper.java    | 36 +++++++++++--------
 2 files changed, 22 insertions(+), 16 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 4c1f4c0eb20..f8c3eace248 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
@@ -236,7 +236,7 @@ protected void onEnabled(boolean joining) throws ExoPlaybackException {
     tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     tunneling = tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET;
     eventDispatcher.enabled(decoderCounters);
-    frameReleaseTimeHelper.enable();
+    frameReleaseTimeHelper.enable(context);
   }
 
   @Override
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 ad489c2312e..96693a1bd26 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
@@ -38,10 +38,10 @@ public final class VideoFrameReleaseTimeHelper {
   private static final long VSYNC_OFFSET_PERCENTAGE = 80;
   private static final int MIN_FRAMES_FOR_ADJUSTMENT = 6;
 
-  private final VSyncSampler vsyncSampler;
-  private final boolean useDefaultDisplayVsync;
-  private final long vsyncDurationNs;
-  private final long vsyncOffsetNs;
+  private VSyncSampler vsyncSampler;
+  private boolean useDefaultDisplayVsync;
+  private long vsyncDurationNs;
+  private long vsyncOffsetNs;
 
   private long lastFramePresentationTimeUs;
   private long adjustedLastFrameTimeNs;
@@ -71,24 +71,16 @@ public VideoFrameReleaseTimeHelper(Context context) {
   }
 
   private VideoFrameReleaseTimeHelper(double defaultDisplayRefreshRate) {
-    useDefaultDisplayVsync = defaultDisplayRefreshRate != DISPLAY_REFRESH_RATE_UNKNOWN;
-    if (useDefaultDisplayVsync) {
-      vsyncSampler = VSyncSampler.getInstance();
-      vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
-      vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
-    } else {
-      vsyncSampler = null;
-      vsyncDurationNs = -1; // Value unused.
-      vsyncOffsetNs = -1; // Value unused.
-    }
+    setSync(defaultDisplayRefreshRate);
   }
 
   /**
    * Enables the helper.
    */
-  public void enable() {
+  public void enable(Context context) {
     haveSync = false;
     if (useDefaultDisplayVsync) {
+      setSync(getDefaultDisplayRefreshRate(context));
       vsyncSampler.addObserver();
     }
   }
@@ -102,6 +94,20 @@ public void disable() {
     }
   }
 
+  private void setSync(double defaultDisplayRefreshRate) {
+
+    useDefaultDisplayVsync = defaultDisplayRefreshRate != DISPLAY_REFRESH_RATE_UNKNOWN;
+    if (useDefaultDisplayVsync) {
+      vsyncSampler = VSyncSampler.getInstance();
+      vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
+      vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
+    } else {
+      vsyncSampler = null;
+      vsyncDurationNs = -1; // Value unused.
+      vsyncOffsetNs = -1; // Value unused.
+    }
+  }
+
   /**
    * Adjusts a frame release timestamp.
    *

From 3a1a032fa81e184c5467ec105838d425a5a7a82e Mon Sep 17 00:00:00 2001
From: Drew Hill <drewhill80@gmail.com>
Date: Thu, 12 Oct 2017 14:52:14 -0400
Subject: [PATCH 296/421] change to use displaymanager listener for refresh
 rate updating

---
 .../video/MediaCodecVideoRenderer.java        |  2 +-
 .../video/VideoFrameReleaseTimeHelper.java    | 71 +++++++++++++++++--
 2 files changed, 68 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 f8c3eace248..4c1f4c0eb20 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
@@ -236,7 +236,7 @@ protected void onEnabled(boolean joining) throws ExoPlaybackException {
     tunnelingAudioSessionId = getConfiguration().tunnelingAudioSessionId;
     tunneling = tunnelingAudioSessionId != C.AUDIO_SESSION_ID_UNSET;
     eventDispatcher.enabled(decoderCounters);
-    frameReleaseTimeHelper.enable(context);
+    frameReleaseTimeHelper.enable();
   }
 
   @Override
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 96693a1bd26..af06432261b 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
@@ -17,6 +17,8 @@
 
 import android.annotation.TargetApi;
 import android.content.Context;
+import android.hardware.display.DisplayManager;
+import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
@@ -31,6 +33,7 @@
 @TargetApi(16)
 public final class VideoFrameReleaseTimeHelper {
 
+  private static final int DISPLAY_ID_UNKNOWN = -1;
   private static final double DISPLAY_REFRESH_RATE_UNKNOWN = -1;
   private static final long CHOREOGRAPHER_SAMPLE_DELAY_MILLIS = 500;
   private static final long MAX_ALLOWED_DRIFT_NS = 20000000;
@@ -38,6 +41,9 @@ public final class VideoFrameReleaseTimeHelper {
   private static final long VSYNC_OFFSET_PERCENTAGE = 80;
   private static final int MIN_FRAMES_FOR_ADJUSTMENT = 6;
 
+  private DisplayManager.DisplayListener displayListener = null;
+  private Context context = null;
+
   private VSyncSampler vsyncSampler;
   private boolean useDefaultDisplayVsync;
   private long vsyncDurationNs;
@@ -68,6 +74,8 @@ public VideoFrameReleaseTimeHelper() {
    */
   public VideoFrameReleaseTimeHelper(Context context) {
     this(getDefaultDisplayRefreshRate(context));
+    this.context = context;
+    registerDisplayListener();
   }
 
   private VideoFrameReleaseTimeHelper(double defaultDisplayRefreshRate) {
@@ -77,12 +85,12 @@ private VideoFrameReleaseTimeHelper(double defaultDisplayRefreshRate) {
   /**
    * Enables the helper.
    */
-  public void enable(Context context) {
+  public void enable() {
     haveSync = false;
     if (useDefaultDisplayVsync) {
-      setSync(getDefaultDisplayRefreshRate(context));
       vsyncSampler.addObserver();
     }
+    registerDisplayListener();
   }
 
   /**
@@ -92,6 +100,29 @@ public void disable() {
     if (useDefaultDisplayVsync) {
       vsyncSampler.removeObserver();
     }
+    unregisterDisplayListener();
+  }
+
+  private void registerDisplayListener() {
+    if (displayListener == null && context != null &&
+     Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      DisplayManager displayManager = context.getSystemService(DisplayManager.class);
+      if (displayManager != null) {
+        displayListener = new DefaultDisplayListener(context);
+        displayManager.registerDisplayListener(displayListener, null);
+      }
+    }
+  }
+
+  private void unregisterDisplayListener() {
+    if (context != null && displayListener != null &&
+     Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+      DisplayManager displayManager = context.getSystemService(DisplayManager.class);
+      if (displayManager != null) {
+        displayManager.unregisterDisplayListener(displayListener);
+        displayListener = null;
+      }
+    }
   }
 
   private void setSync(double defaultDisplayRefreshRate) {
@@ -206,10 +237,16 @@ private static long closestVsync(long releaseTime, long sampledVsyncTime, long v
     return snappedAfterDiff < snappedBeforeDiff ? snappedAfterNs : snappedBeforeNs;
   }
 
+  private static int getDefaultDisplayId(Context context) {
+    WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+    return manager != null && manager.getDefaultDisplay() != null ?
+     manager.getDefaultDisplay().getDisplayId() : DISPLAY_ID_UNKNOWN;
+  }
+
   private static double getDefaultDisplayRefreshRate(Context context) {
     WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-    return manager.getDefaultDisplay() != null ? manager.getDefaultDisplay().getRefreshRate()
-        : DISPLAY_REFRESH_RATE_UNKNOWN;
+    return manager != null && manager.getDefaultDisplay() != null ?
+     manager.getDefaultDisplay().getRefreshRate() : DISPLAY_REFRESH_RATE_UNKNOWN;
   }
 
   /**
@@ -307,4 +344,30 @@ private void removeObserverInternal() {
 
   }
 
+  @TargetApi(17)
+  private class DefaultDisplayListener implements DisplayManager.DisplayListener {
+
+    private final Context context;
+    DefaultDisplayListener(Context context) {
+      this.context = context;
+    }
+
+    @Override
+    public void onDisplayAdded(int displayId) {
+    }
+
+    @Override
+    public void onDisplayRemoved(int displayId) {
+    }
+
+    @Override
+    public void onDisplayChanged(int displayId) {
+      final int defaultDisplayId = getDefaultDisplayId(context);
+      if (displayId == defaultDisplayId || defaultDisplayId == DISPLAY_ID_UNKNOWN) {
+        setSync(getDefaultDisplayRefreshRate(context));
+      }
+    }
+
+  }
+
 }

From a11c704d27c09ffeb0b50ad51b3911acdd2225fd Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 11 Oct 2017 07:34:11 -0700
Subject: [PATCH 297/421] Upgrade dependency versions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171819854
---
 build.gradle     | 2 +-
 constants.gradle | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 47538ddb529..d260f491da2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta5'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
         classpath 'com.novoda:bintray-release:0.5.0'
     }
     // Workaround for the following test coverage issue. Remove when fixed:
diff --git a/constants.gradle b/constants.gradle
index 73d6aa5c560..4778a0c66f3 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -19,10 +19,10 @@ project.ext {
     minSdkVersion = 14
     compileSdkVersion = 26
     targetSdkVersion = 26
-    buildToolsVersion = '26'
+    buildToolsVersion = '26.0.2'
     testSupportLibraryVersion = '0.5'
-    supportLibraryVersion = '26.0.2'
-    playServicesLibraryVersion = '11.2.0'
+    supportLibraryVersion = '26.1.0'
+    playServicesLibraryVersion = '11.4.2'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'
     junitVersion = '4.12'

From 333e745e7bf9d03aa3a4b4fbf83f29dede662c58 Mon Sep 17 00:00:00 2001
From: bachinger <bachinger@google.com>
Date: Thu, 12 Oct 2017 09:10:00 -0700
Subject: [PATCH 298/421] show PlaybackControlView when on key event for DPAD
 center or any direction and consume event without moving the focus.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171967057
---
 .../android/exoplayer2/demo/PlayerActivity.java   |  4 ++--
 .../exoplayer2/ui/SimpleExoPlayerView.java        | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 4 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 716af02c01b..1f92473bc99 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
@@ -218,8 +218,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
 
   @Override
   public boolean dispatchKeyEvent(KeyEvent event) {
-    // If the event was not handled then see if the player view can handle it.
-    return super.dispatchKeyEvent(event) || simpleExoPlayerView.dispatchKeyEvent(event);
+    // See whether the player view wants to handle media or DPAD keys events.
+    return simpleExoPlayerView.dispatchKeyEvent(event) || super.dispatchKeyEvent(event);
   }
 
   // OnClickListener methods
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 f34ede3e6dc..fc410317560 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,6 +15,7 @@
  */
 package com.google.android.exoplayer2.ui;
 
+import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.content.res.Resources;
@@ -521,8 +522,10 @@ public boolean dispatchKeyEvent(KeyEvent event) {
       overlayFrameLayout.requestFocus();
       return super.dispatchKeyEvent(event);
     }
+    boolean isDpadWhenControlHidden = isDpadKey(event.getKeyCode()) && useController
+        && !controller.isVisible();
     maybeShowController(true);
-    return dispatchMediaKeyEvent(event) || super.dispatchKeyEvent(event);
+    return isDpadWhenControlHidden || dispatchMediaKeyEvent(event) || super.dispatchKeyEvent(event);
   }
 
   /**
@@ -871,12 +874,20 @@ private static void configureEditModeLogo(Resources resources, ImageView logo) {
     logo.setBackgroundColor(resources.getColor(R.color.exo_edit_mode_background_color));
   }
 
-
   @SuppressWarnings("ResourceType")
   private static void setResizeModeRaw(AspectRatioFrameLayout aspectRatioFrame, int resizeMode) {
     aspectRatioFrame.setResizeMode(resizeMode);
   }
 
+  @SuppressLint("InlinedApi")
+  private boolean isDpadKey(int keyCode) {
+    return keyCode == KeyEvent.KEYCODE_DPAD_UP || keyCode == KeyEvent.KEYCODE_DPAD_UP_RIGHT
+        || keyCode == KeyEvent.KEYCODE_DPAD_RIGHT || keyCode == KeyEvent.KEYCODE_DPAD_DOWN_RIGHT
+        || keyCode == KeyEvent.KEYCODE_DPAD_DOWN || keyCode == KeyEvent.KEYCODE_DPAD_DOWN_LEFT
+        || keyCode == KeyEvent.KEYCODE_DPAD_LEFT || keyCode == KeyEvent.KEYCODE_DPAD_UP_LEFT
+        || keyCode == KeyEvent.KEYCODE_DPAD_CENTER;
+  }
+
   private final class ComponentListener extends Player.DefaultEventListener implements TextOutput,
       SimpleExoPlayer.VideoListener {
 

From b71effb7b0b2da1f97e62ba8f4e5b659f13f7f85 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 12 Oct 2017 10:12:04 -0700
Subject: [PATCH 299/421] Fix MobileHarness playback tests.

This change fixes various issues:
 - MobileHarness sometimes allocated devices with SDK < 16. As we have no tests running
   on these SDKs, a new dimension filter for the mobile_test target ensures that only
   devices with SDK >= 16 are selected. A similar filter for SDK version is also added
   to the ABR playback tests to ensure no old devices are selected.
 - DRM specific tests are skipped for Api < 18, but were not able to run because the
   DashTestRunner class tried to link to the MediaDrm constructor. Moved the
   constructor to a seperate Builder class to allow execution on Api levels 16 and 17.
 - DashWidevineOfflineTest also tried to access code for Api >= 18 without checking
   the current level.
 - Action implementations which are waiting for events did not ensure that they have a
   nextAction to wait for. This caused NullPointerExceptions when this next action was
   scheduled.
 - DefaultDrmSession always restored the offline keys when a new license was requested,
   even if the keys were already restored. These repeated slow calls to restoreKeys
   resulted in high numbers of dropped buffers.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171974859
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 38 ++++++++---------
 .../playbacktests/gts/DashTestRunner.java     | 41 ++++++++++++++-----
 .../gts/DashWidevineOfflineTest.java          |  6 ++-
 .../android/exoplayer2/testutil/Action.java   | 12 ++++++
 4 files changed, 64 insertions(+), 33 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 4e60e466a80..4e5696ef1ff 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
@@ -296,26 +296,24 @@ private void doLicense(boolean allowRetry) {
       case DefaultDrmSessionManager.MODE_QUERY:
         if (offlineLicenseKeySetId == null) {
           postKeyRequest(ExoMediaDrm.KEY_TYPE_STREAMING, allowRetry);
-        } else {
-          if (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);
-            } else if (licenseDurationRemainingSec <= 0) {
-              onError(new KeysExpiredException());
-            } else {
-              state = STATE_OPENED_WITH_KEYS;
-              if (eventHandler != null && eventListener != null) {
-                eventHandler.post(new Runnable() {
-                  @Override
-                  public void run() {
-                    eventListener.onDrmKeysRestored();
-                  }
-                });
-              }
+        } 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);
+          } else if (licenseDurationRemainingSec <= 0) {
+            onError(new KeysExpiredException());
+          } else {
+            state = STATE_OPENED_WITH_KEYS;
+            if (eventHandler != null && eventListener != null) {
+              eventHandler.post(new Runnable() {
+                @Override
+                public void run() {
+                  eventListener.onDrmKeysRestored();
+                }
+              });
             }
           }
         }
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 06dab1164b8..85cefbc2f68 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
@@ -108,21 +108,23 @@ public final class DashTestRunner {
   private String widevineLicenseUrl;
   private DataSource.Factory dataSourceFactory;
 
-  @TargetApi(18)
   @SuppressWarnings("ResourceType")
   public static boolean isL1WidevineAvailable(String mimeType) {
-    try {
-      // Force L3 if secure decoder is not available.
-      if (MediaCodecUtil.getDecoderInfo(mimeType, true) == null) {
-        return false;
+    if (Util.SDK_INT >= 18) {
+      try {
+        // Force L3 if secure decoder is not available.
+        if (MediaCodecUtil.getDecoderInfo(mimeType, true) == null) {
+          return false;
+        }
+        MediaDrm mediaDrm = MediaDrmBuilder.build();
+        String securityProperty = mediaDrm.getPropertyString(SECURITY_LEVEL_PROPERTY);
+        mediaDrm.release();
+        return WIDEVINE_SECURITY_LEVEL_1.equals(securityProperty);
+      } catch (MediaCodecUtil.DecoderQueryException e) {
+        throw new IllegalStateException(e);
       }
-      MediaDrm mediaDrm = new MediaDrm(WIDEVINE_UUID);
-      String securityProperty = mediaDrm.getPropertyString(SECURITY_LEVEL_PROPERTY);
-      mediaDrm.release();
-      return WIDEVINE_SECURITY_LEVEL_1.equals(securityProperty);
-    } catch (MediaCodecUtil.DecoderQueryException | UnsupportedSchemeException e) {
-      throw new IllegalStateException(e);
     }
+    return false;
   }
 
   public DashTestRunner(String tag, HostActivity activity, Instrumentation instrumentation) {
@@ -457,4 +459,21 @@ private static boolean isFormatHandled(int formatSupport) {
 
   }
 
+  /**
+   * Creates a new {@code MediaDrm} object. The encapsulation ensures that the tests can be
+   * executed for API level < 18.
+   */
+  @TargetApi(18)
+  private static final class MediaDrmBuilder {
+
+    public static MediaDrm build () {
+      try {
+        return new MediaDrm(WIDEVINE_UUID);
+      } catch (UnsupportedSchemeException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+
+  }
+
 }
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 1ddceb551c3..0d79a803d3d 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
@@ -67,8 +67,10 @@ protected void setUp() throws Exception {
     boolean useL1Widevine = DashTestRunner.isL1WidevineAvailable(MimeTypes.VIDEO_H264);
     String widevineLicenseUrl = DashTestData.getWidevineLicenseUrl(true, useL1Widevine);
     httpDataSourceFactory = new DefaultHttpDataSourceFactory(USER_AGENT);
-    offlineLicenseHelper = OfflineLicenseHelper.newWidevineInstance(widevineLicenseUrl,
-        httpDataSourceFactory);
+    if (Util.SDK_INT >= 18) {
+      offlineLicenseHelper = OfflineLicenseHelper.newWidevineInstance(widevineLicenseUrl,
+          httpDataSourceFactory);
+    }
   }
 
   @Override
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 66e034f21c1..2abe521883d 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
@@ -322,6 +322,9 @@ public WaitForTimelineChanged(String tag, Timeline expectedTimeline) {
     protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
         final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
         final ActionNode nextAction) {
+      if (nextAction == null) {
+        return;
+      }
       Player.EventListener listener = new Player.DefaultEventListener() {
         @Override
         public void onTimelineChanged(Timeline timeline, Object manifest) {
@@ -362,6 +365,9 @@ public WaitForPositionDiscontinuity(String tag) {
     protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
         final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
         final ActionNode nextAction) {
+      if (nextAction == null) {
+        return;
+      }
       player.addListener(new Player.DefaultEventListener() {
         @Override
         public void onPositionDiscontinuity(@Player.DiscontinuityReason int reason) {
@@ -399,6 +405,9 @@ public WaitForPlaybackState(String tag, int targetPlaybackState) {
     protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
         final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
         final ActionNode nextAction) {
+      if (nextAction == null) {
+        return;
+      }
       if (targetPlaybackState == player.getPlaybackState()) {
         nextAction.schedule(player, trackSelector, surface, handler);
       } else {
@@ -438,6 +447,9 @@ public WaitForSeekProcessed(String tag) {
     protected void doActionAndScheduleNextImpl(final SimpleExoPlayer player,
         final MappingTrackSelector trackSelector, final Surface surface, final Handler handler,
         final ActionNode nextAction) {
+      if (nextAction == null) {
+        return;
+      }
       player.addListener(new Player.DefaultEventListener() {
         @Override
         public void onSeekProcessed() {

From 3ae4143be30318c90e1856d6387fccff44bcecbf Mon Sep 17 00:00:00 2001
From: byungh <byungh@google.com>
Date: Thu, 12 Oct 2017 13:03:05 -0700
Subject: [PATCH 300/421] Cookie-based validation in CronetDataSource

Using cookie validation from streamer, streamer can enforce that only clients who have the cookie are able to stream the video.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=171999924
---
 .../ext/cronet/CronetDataSourceTest.java      |  70 ++++++++++-
 .../ext/cronet/CronetDataSource.java          | 109 ++++++++++++++++--
 2 files changed, 168 insertions(+), 11 deletions(-)

diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index c7050dbd0cf..dadc75b5d2a 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
@@ -45,6 +46,7 @@
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Predicate;
 import java.io.IOException;
+import java.net.CookieManager;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
@@ -102,12 +104,14 @@ public final class CronetDataSourceTest {
   @Mock private CronetEngine mockCronetEngine;
 
   private CronetDataSource dataSourceUnderTest;
+  private boolean redirectCalled;
 
   @Before
   public void setUp() throws Exception {
     System.setProperty("dexmaker.dexcache",
         InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
     initMocks(this);
+    CookieManager cookieManager = new CookieManager();
     dataSourceUnderTest = spy(
         new CronetDataSource(
             mockCronetEngine,
@@ -118,7 +122,8 @@ public void setUp() throws Exception {
             TEST_READ_TIMEOUT_MS,
             true, // resetTimeoutOnRedirects
             mockClock,
-            null));
+            null,
+            cookieManager));
     when(mockContentTypePredicate.evaluate(anyString())).thenReturn(true);
     when(mockCronetEngine.newUrlRequestBuilder(
             anyString(), any(UrlRequest.Callback.class), any(Executor.class)))
@@ -138,10 +143,14 @@ public void setUp() throws Exception {
   }
 
   private UrlResponseInfo createUrlResponseInfo(int statusCode) {
+    return createUrlResponseInfoWithUrl(TEST_URL, statusCode);
+  }
+
+  private UrlResponseInfo createUrlResponseInfoWithUrl(String url, int statusCode) {
     ArrayList<Map.Entry<String, String>> responseHeaderList = new ArrayList<>();
     responseHeaderList.addAll(testResponseHeader.entrySet());
     return new UrlResponseInfoImpl(
-        Collections.singletonList(TEST_URL),
+        Collections.singletonList(url),
         statusCode,
         null, // httpStatusText
         responseHeaderList,
@@ -150,11 +159,11 @@ private UrlResponseInfo createUrlResponseInfo(int statusCode) {
         null); // proxyServer
   }
 
-  @Test(expected = IllegalStateException.class)
+  @Test
   public void testOpeningTwiceThrows() throws HttpDataSourceException {
     mockResponseStartSuccess();
     dataSourceUnderTest.open(testDataSpec);
-    dataSourceUnderTest.open(testDataSpec);
+    assertThrows(IllegalStateException.class, () -> dataSourceUnderTest.open(testDataSpec));
   }
 
   @Test
@@ -649,6 +658,27 @@ public void run() {
     assertEquals(1, openExceptions.get());
   }
 
+  @Test
+  public void testRedirectParseAndAttachCookie() throws HttpDataSourceException {
+    mockSingleRedirectSuccess();
+
+    testResponseHeader.put("Set-Cookie", "testcookie=testcookie; Path=/video");
+    dataSourceUnderTest.open(testDataSpec);
+    verify(mockUrlRequestBuilder).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequest, never()).followRedirect();
+    verify(mockUrlRequest, times(2)).start();
+  }
+
+  @Test
+  public void testRedirectNoSetCookieFollowsRedirect() throws HttpDataSourceException {
+    mockSingleRedirectSuccess();
+    mockFollowRedirectSuccess();
+
+    dataSourceUnderTest.open(testDataSpec);
+    verify(mockUrlRequestBuilder, never()).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequest).followRedirect();
+  }
+
   @Test
   public void testExceptionFromTransferListener() throws HttpDataSourceException {
     mockResponseStartSuccess();
@@ -731,6 +761,38 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     }).when(mockUrlRequest).start();
   }
 
+  private void mockSingleRedirectSuccess() {
+    doAnswer(new Answer<Object>() {
+      @Override
+      public Object answer(InvocationOnMock invocation) throws Throwable {
+        if (!redirectCalled) {
+          redirectCalled = true;
+          dataSourceUnderTest.onRedirectReceived(
+              mockUrlRequest,
+              createUrlResponseInfoWithUrl("http://example.com/video", 300),
+              "http://example.com/video/redirect");
+        } else {
+          dataSourceUnderTest.onResponseStarted(
+              mockUrlRequest,
+              testUrlResponseInfo);
+        }
+        return null;
+      }
+    }).when(mockUrlRequest).start();
+  }
+
+  private void mockFollowRedirectSuccess() {
+    doAnswer(new Answer<Object>() {
+      @Override
+      public Object answer(InvocationOnMock invocation) throws Throwable {
+          dataSourceUnderTest.onResponseStarted(
+              mockUrlRequest,
+              testUrlResponseInfo);
+        return null;
+      }
+    }).when(mockUrlRequest).followRedirect();
+  }
+
   private void mockResponseStartFailure() {
     doAnswer(new Answer<Object>() {
       @Override
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 cdc8eb7b35f..52d76d61f40 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
@@ -29,9 +29,13 @@
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Predicate;
 import java.io.IOException;
+import java.net.CookieManager;
 import java.net.SocketTimeoutException;
+import java.net.URI;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -93,6 +97,7 @@ public OpenException(String errorMessage, DataSpec dataSpec, int cronetConnectio
       Pattern.compile("^bytes (\\d+)-(\\d+)/(\\d+)$");
   // The size of read buffer passed to cronet UrlRequest.read().
   private static final int READ_BUFFER_SIZE_BYTES = 32 * 1024;
+  private static final String SET_COOKIE = "Set-Cookie";
 
   private final CronetEngine cronetEngine;
   private final Executor executor;
@@ -105,6 +110,7 @@ public OpenException(String errorMessage, DataSpec dataSpec, int cronetConnectio
   private final RequestProperties requestProperties;
   private final ConditionVariable operation;
   private final Clock clock;
+  private final CookieManager cookieManager;
 
   // Accessed by the calling thread only.
   private boolean opened;
@@ -144,7 +150,7 @@ public OpenException(String errorMessage, DataSpec dataSpec, int cronetConnectio
   public CronetDataSource(CronetEngine cronetEngine, Executor executor,
       Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener) {
     this(cronetEngine, executor, contentTypePredicate, listener, DEFAULT_CONNECT_TIMEOUT_MILLIS,
-        DEFAULT_READ_TIMEOUT_MILLIS, false, null);
+        DEFAULT_READ_TIMEOUT_MILLIS, false, null, /* cookieManager= */ null);
   }
 
   /**
@@ -168,13 +174,42 @@ public CronetDataSource(CronetEngine cronetEngine, Executor executor,
       int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
       RequestProperties defaultRequestProperties) {
     this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
-        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties);
+        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties,
+        /* cookieManager= */ null);
+  }
+
+
+  /**
+   * @param cronetEngine A CronetEngine.
+   * @param executor The {@link java.util.concurrent.Executor} that will handle responses.
+   *     This may be a direct executor (i.e. executes tasks on the calling thread) in order
+   *     to avoid a thread hop from Cronet's internal network thread to the response handling
+   *     thread. However, to avoid slowing down overall network performance, care must be taken
+   *     to make sure response handling is a fast operation when using a direct executor.
+   * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
+   *     predicate then an {@link InvalidContentTypeException} is thrown from
+   *     {@link #open(DataSpec)}.
+   * @param listener An optional listener.
+   * @param connectTimeoutMs The connection timeout, in milliseconds.
+   * @param readTimeoutMs The read timeout, in milliseconds.
+   * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
+   * @param defaultRequestProperties The default request properties to be used.
+   * @param cookieManager An optional {@link CookieManager} to be used to handle "Set-Cookie"
+   *     requests. If this is null, then "Set-Cookie" requests will be ignored.
+   */
+  public CronetDataSource(CronetEngine cronetEngine, Executor executor,
+      Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
+      int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
+      RequestProperties defaultRequestProperties, CookieManager cookieManager) {
+    this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
+        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties,
+        cookieManager);
   }
 
   /* package */ CronetDataSource(CronetEngine cronetEngine, Executor executor,
       Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
       int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects, Clock clock,
-      RequestProperties defaultRequestProperties) {
+      RequestProperties defaultRequestProperties, CookieManager cookieManager) {
     this.cronetEngine = Assertions.checkNotNull(cronetEngine);
     this.executor = Assertions.checkNotNull(executor);
     this.contentTypePredicate = contentTypePredicate;
@@ -184,6 +219,7 @@ public CronetDataSource(CronetEngine cronetEngine, Executor executor,
     this.resetTimeoutOnRedirects = resetTimeoutOnRedirects;
     this.clock = Assertions.checkNotNull(clock);
     this.defaultRequestProperties = defaultRequestProperties;
+    this.cookieManager = cookieManager;
     requestProperties = new RequestProperties();
     operation = new ConditionVariable();
   }
@@ -223,7 +259,12 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
     operation.close();
     resetConnectTimeout();
     currentDataSpec = dataSpec;
-    currentUrlRequest = buildRequest(dataSpec);
+
+    try {
+      currentUrlRequest = buildRequest(dataSpec);
+    } catch (IOException e) {
+      throw new OpenException(e, dataSpec, Status.IDLE);
+    }
     currentUrlRequest.start();
     boolean requestStarted = blockUntilConnectTimeout();
 
@@ -379,7 +420,24 @@ public synchronized void onRedirectReceived(UrlRequest request, UrlResponseInfo
     if (resetTimeoutOnRedirects) {
       resetConnectTimeout();
     }
-    request.followRedirect();
+
+    Map<String, List<String>> headers = info.getAllHeaders();
+    if (cookieManager == null || isEmpty(headers.get(SET_COOKIE))) {
+      request.followRedirect();
+    } else {
+      currentUrlRequest.cancel();
+      UrlRequest.Builder requestBuilder =
+          cronetEngine.newUrlRequestBuilder(newLocationUrl, this, executor).allowDirectExecutor();
+      try {
+        parseCookies(info);
+        attachCookies(newLocationUrl, requestBuilder);
+        currentUrlRequest = requestBuilder.build();
+        currentUrlRequest.start();
+      } catch (IOException e) {
+        exception = e;
+        operation.open();
+      }
+    }
   }
 
   @Override
@@ -387,7 +445,12 @@ public synchronized void onResponseStarted(UrlRequest request, UrlResponseInfo i
     if (request != currentUrlRequest) {
       return;
     }
-    responseInfo = info;
+    try {
+      parseCookies(info);
+      responseInfo = info;
+    } catch (IOException e) {
+      exception = e;
+    }
     operation.open();
   }
 
@@ -427,7 +490,7 @@ public synchronized void onFailed(UrlRequest request, UrlResponseInfo info,
 
   // Internal methods.
 
-  private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
+  private UrlRequest buildRequest(DataSpec dataSpec) throws IOException {
     UrlRequest.Builder requestBuilder = cronetEngine.newUrlRequestBuilder(
         dataSpec.uri.toString(), this, executor).allowDirectExecutor();
     // Set the headers.
@@ -474,6 +537,7 @@ private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
             executor);
       }
     }
+    attachCookies(dataSpec.uri.toString(), requestBuilder);
     return requestBuilder.build();
   }
 
@@ -491,6 +555,37 @@ private void resetConnectTimeout() {
     currentConnectTimeoutMs = clock.elapsedRealtime() + connectTimeoutMs;
   }
 
+  private void parseCookies(UrlResponseInfo info) throws IOException {
+    if (cookieManager == null) {
+      return;
+    }
+    try {
+      cookieManager.put(new URI(info.getUrl()), info.getAllHeaders());
+    } catch (URISyntaxException e) {
+      throw new IOException("Failed to parse cookies", e);
+    }
+  }
+
+  private void attachCookies(String url, UrlRequest.Builder requestBuilder) throws IOException {
+    if (cookieManager == null) {
+      return;
+    }
+    try {
+      for (Entry<String, List<String>> headers :
+          cookieManager.get(new URI(url), Collections.emptyMap()).entrySet()) {
+        StringBuilder cookies = new StringBuilder();
+        for (String cookie : headers.getValue()) {
+          cookies.append(cookie).append("; ");
+        }
+        if (cookies.length() > 0) {
+          requestBuilder.addHeader(headers.getKey(), cookies.substring(0, cookies.length() - 1));
+        }
+      }
+    } catch (URISyntaxException e) {
+      throw new IOException("Failed to attach cookies", e);
+    }
+  }
+
   private static boolean getIsCompressed(UrlResponseInfo info) {
     for (Map.Entry<String, String> entry : info.getAllHeadersAsList()) {
       if (entry.getKey().equalsIgnoreCase("Content-Encoding")) {

From 7038c8fb7052715aa8252f3a9e2cd6a6d63c1002 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 13 Oct 2017 01:15:20 -0700
Subject: [PATCH 301/421] Add chunk size variation to fake adaptive data set.

The chunk size of real video data varies around the given average bitrate.
To account for this fact in the fake adaptive data set, the chunk size varies
randomly with a given standard deviation. The standard deviation used for the
BandwidthProfileSimulator is based on the chunk size variation measured on the
1 hour playlist of real media.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172068110
---
 .../testutil/FakeAdaptiveDataSet.java         | 62 +++++++++++++++----
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
index add0c5d22f4..82c14a5b328 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeAdaptiveDataSet.java
@@ -18,6 +18,7 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.source.TrackGroup;
+import java.util.Random;
 
 /**
  * Fake data set emulating the data of an adaptive media source.
@@ -30,46 +31,81 @@ public final class FakeAdaptiveDataSet extends FakeDataSet {
    */
   public static final class Factory {
 
+    private static final Random random = new Random();
+
     private final long chunkDurationUs;
+    private final double bitratePercentStdDev;
 
-    public Factory(long chunkDurationUs) {
+    /**
+     * Set up factory for {@link FakeAdaptiveDataSet}s with a chunk duration and the standard
+     * deviation of the chunk size.
+     *
+     * @param chunkDurationUs The chunk duration to use in microseconds.
+     * @param bitratePercentStdDev The standard deviation used to generate the chunk sizes centered
+     *     around the average bitrate of the {@link Format}s. The standard deviation is given in
+     *     percent (of the average size).
+     */
+    public Factory(long chunkDurationUs, double bitratePercentStdDev) {
       this.chunkDurationUs = chunkDurationUs;
+      this.bitratePercentStdDev = bitratePercentStdDev;
     }
 
+    /**
+     * Returns a new {@link FakeAdaptiveDataSet} for the given {@link TrackGroup}.
+     *
+     * @param trackGroup The {@link TrackGroup} for which the data set is to be created.
+     * @param mediaDurationUs The total duration of the fake data set in microseconds.
+     */
     public FakeAdaptiveDataSet createDataSet(TrackGroup trackGroup, long mediaDurationUs) {
-      return new FakeAdaptiveDataSet(trackGroup, mediaDurationUs, chunkDurationUs);
+      return new FakeAdaptiveDataSet(trackGroup, mediaDurationUs, chunkDurationUs,
+          bitratePercentStdDev, random);
     }
 
   }
 
-  private final long chunkCount;
+  private final int chunkCount;
   private final long chunkDurationUs;
   private final long lastChunkDurationUs;
 
-  public FakeAdaptiveDataSet(TrackGroup trackGroup, long mediaDurationUs, long chunkDurationUs) {
+  /**
+   * Create {@link FakeAdaptiveDataSet} using a {@link TrackGroup} and meta data about the media.
+   *
+   * @param trackGroup The {@link TrackGroup} for which the data set is to be created.
+   * @param mediaDurationUs The total duration of the fake data set in microseconds.
+   * @param chunkDurationUs The chunk duration to use in microseconds.
+   * @param bitratePercentStdDev  The standard deviation used to generate the chunk sizes centered
+   *     around the average bitrate of the {@link Format}s in the {@link TrackGroup}. The standard
+   *     deviation is given in percent (of the average size).
+   * @param random A {@link Random} instance used to generate random chunk sizes.
+   */
+  /* package */ FakeAdaptiveDataSet(TrackGroup trackGroup, long mediaDurationUs,
+      long chunkDurationUs, double bitratePercentStdDev, Random random) {
     this.chunkDurationUs = chunkDurationUs;
-    int trackCount = trackGroup.length;
     long lastChunkDurationUs = mediaDurationUs % chunkDurationUs;
     int fullChunks = (int) (mediaDurationUs / chunkDurationUs);
-    for (int i = 0; i < trackCount; i++) {
+    this.lastChunkDurationUs = lastChunkDurationUs == 0 ? chunkDurationUs : lastChunkDurationUs;
+    this.chunkCount = lastChunkDurationUs == 0 ? fullChunks : fullChunks + 1;
+    double[] bitrateFactors = new double[chunkCount];
+    for (int i = 0; i < chunkCount; i++) {
+      bitrateFactors[i] = 1.0 + random.nextGaussian() * bitratePercentStdDev / 100.0;
+    }
+    for (int i = 0; i < trackGroup.length; i++) {
       String uri = getUri(i);
       Format format = trackGroup.getFormat(i);
-      int chunkLength = (int) (format.bitrate * chunkDurationUs / (8 * C.MICROS_PER_SECOND));
+      double avgChunkLength = format.bitrate * chunkDurationUs / (8 * C.MICROS_PER_SECOND);
       FakeData newData = this.newData(uri);
       for (int j = 0; j < fullChunks; j++) {
-        newData.appendReadData(chunkLength);
+        newData.appendReadData((int) (avgChunkLength * bitrateFactors[j]));
       }
       if (lastChunkDurationUs > 0) {
-        int lastChunkLength = (int) (format.bitrate * (mediaDurationUs % chunkDurationUs)
-            / (8 * C.MICROS_PER_SECOND));
+        int lastChunkLength = (int) (format.bitrate * bitrateFactors[bitrateFactors.length - 1]
+            * (mediaDurationUs % chunkDurationUs) / (8 * C.MICROS_PER_SECOND));
         newData.appendReadData(lastChunkLength);
       }
     }
-    this.lastChunkDurationUs = lastChunkDurationUs == 0 ? chunkDurationUs : lastChunkDurationUs;
-    this.chunkCount = lastChunkDurationUs == 0 ? fullChunks : fullChunks + 1;
   }
 
-  public long getChunkCount() {
+  public int getChunkCount() {
     return chunkCount;
   }
 

From c9ed9366ceebea9f566d406c873338ef596baaba Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 13 Oct 2017 03:30:29 -0700
Subject: [PATCH 302/421] Fix Cronet extension build and test.

Recently added Java 8 features in the cronet extension and the linked native libs
require to enable Java 8 desugaring in gradle. Moreover, junit.assertThrows is not
available in our version and its usage has been replaced by the manual check.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172077967
---
 extensions/cronet/build.gradle                            | 5 +++++
 .../exoplayer2/ext/cronet/CronetDataSourceTest.java       | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/extensions/cronet/build.gradle b/extensions/cronet/build.gradle
index 930a53c7c56..197dec80a53 100644
--- a/extensions/cronet/build.gradle
+++ b/extensions/cronet/build.gradle
@@ -27,6 +27,11 @@ android {
     sourceSets.main {
         jniLibs.srcDirs = ['jniLibs']
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index dadc75b5d2a..8107e87440a 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -18,7 +18,6 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.any;
@@ -163,7 +162,12 @@ private UrlResponseInfo createUrlResponseInfoWithUrl(String url, int statusCode)
   public void testOpeningTwiceThrows() throws HttpDataSourceException {
     mockResponseStartSuccess();
     dataSourceUnderTest.open(testDataSpec);
-    assertThrows(IllegalStateException.class, () -> dataSourceUnderTest.open(testDataSpec));
+    try {
+      dataSourceUnderTest.open(testDataSpec);
+      fail("Expected IllegalStateException.");
+    } catch (IllegalStateException e) {
+      // Expected.
+    }
   }
 
   @Test

From 2fee010938f9a81ab241b1c7200117d018e46357 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 13 Oct 2017 09:31:00 -0700
Subject: [PATCH 303/421] Workaround/Fix #3351

1. Ignore edit list where the sequence doesn't contain a sync
   sample, rather than failing.
2. Make Mp4Extractor.readAtomPayload so it doesn't try and read
   the same payload twice if a failure occurs parsing it.
3. Make processAtomEnded so that it doesn't pop the moov if
   parsing it fails.

Issue: #3351

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172106244
---
 .../android/exoplayer2/extractor/mp4/AtomParsers.java       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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 c754c4b566b..42504519f25 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
@@ -395,7 +395,11 @@ public static TrackSampleTable parseStbl(Track track, Atom.ContainerAtom stblAto
       hasSyncSample |= (editedFlags[i] & C.BUFFER_FLAG_KEY_FRAME) != 0;
     }
     if (!hasSyncSample) {
-      throw new ParserException("The edited sample sequence does not contain a sync sample.");
+      // We don't support edit lists where the edited sample sequence doesn't contain a sync sample.
+      // Such edit lists are often (although not always) broken, so we ignore it and continue.
+      Log.w(TAG, "Ignoring edit list: Edited sample sequence does not contain a sync sample.");
+      Util.scaleLargeTimestampsInPlace(timestamps, C.MICROS_PER_SECOND, track.timescale);
+      return new TrackSampleTable(offsets, sizes, maximumSize, timestamps, flags);
     }
 
     return new TrackSampleTable(editedOffsets, editedSizes, editedMaximumSize, editedTimestamps,

From cad88512f5c1aae39d90a8f75cf6e2bbb8faf983 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 13 Oct 2017 11:38:47 -0700
Subject: [PATCH 304/421] Only parse common-encryption sinf boxes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172124807
---
 .../exoplayer2/extractor/mp4/AtomParsers.java  | 13 +++++++------
 .../extractor/mp4/AtomParsersTest.java         | 18 ++++++++++++++----
 2 files changed, 21 insertions(+), 10 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 42504519f25..86bdc2b41ca 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
@@ -1064,8 +1064,8 @@ private static Pair<Integer, TrackEncryptionBox> parseSampleEntryEncryptionData(
       Assertions.checkArgument(childAtomSize > 0, "childAtomSize should be positive");
       int childAtomType = parent.readInt();
       if (childAtomType == Atom.TYPE_sinf) {
-        Pair<Integer, TrackEncryptionBox> result = parseSinfFromParent(parent, childPosition,
-            childAtomSize);
+        Pair<Integer, TrackEncryptionBox> result = parseCommonEncryptionSinfFromParent(parent,
+            childPosition, childAtomSize);
         if (result != null) {
           return result;
         }
@@ -1075,8 +1075,8 @@ private static Pair<Integer, TrackEncryptionBox> parseSampleEntryEncryptionData(
     return null;
   }
 
-  private static Pair<Integer, TrackEncryptionBox> parseSinfFromParent(ParsableByteArray parent,
-      int position, int size) {
+  /* package */ static Pair<Integer, TrackEncryptionBox> parseCommonEncryptionSinfFromParent(
+      ParsableByteArray parent, int position, int size) {
     int childPosition = position + Atom.HEADER_SIZE;
     int schemeInformationBoxPosition = C.POSITION_UNSET;
     int schemeInformationBoxSize = 0;
@@ -1090,7 +1090,7 @@ private static Pair<Integer, TrackEncryptionBox> parseSinfFromParent(ParsableByt
         dataFormat = parent.readInt();
       } else if (childAtomType == Atom.TYPE_schm) {
         parent.skipBytes(4);
-        // scheme_type field. Defined in ISO/IEC 23001-7:2016, section 4.1.
+        // Common encryption scheme_type values are defined in ISO/IEC 23001-7:2016, section 4.1.
         schemeType = parent.readString(4);
       } else if (childAtomType == Atom.TYPE_schi) {
         schemeInformationBoxPosition = childPosition;
@@ -1099,7 +1099,8 @@ private static Pair<Integer, TrackEncryptionBox> parseSinfFromParent(ParsableByt
       childPosition += childAtomSize;
     }
 
-    if (schemeType != null) {
+    if (C.CENC_TYPE_cenc.equals(schemeType) || C.CENC_TYPE_cbc1.equals(schemeType)
+        || C.CENC_TYPE_cens.equals(schemeType) || C.CENC_TYPE_cbcs.equals(schemeType)) {
       Assertions.checkArgument(dataFormat != null, "frma atom is mandatory");
       Assertions.checkArgument(schemeInformationBoxPosition != C.POSITION_UNSET,
           "schi atom is mandatory");
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 0c69e0b1769..b0c37ee4528 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
@@ -40,22 +40,32 @@ public final class AtomParsersTest {
   private static final byte[] SIXTEEN_BIT_STZ2 = Util.getBytesFromHexString(ATOM_HEADER + "00000010"
       + SAMPLE_COUNT + "0001000200030004");
 
+  @Test
+  public void testParseCommonEncryptionSinfFromParentIgnoresUnknownSchemeType() {
+    byte[] cencSinf = new byte[] {
+        0, 0, 0, 24, 115, 105, 110, 102, // size (4), 'sinf' (4)
+        0, 0, 0, 16, 115, 99, 104, 109, // size (4), 'schm' (4)
+        0, 0, 0, 0, 88, 88, 88, 88}; // version (1), flags (3), 'xxxx' (4)
+    assertThat(AtomParsers.parseCommonEncryptionSinfFromParent(
+        new ParsableByteArray(cencSinf), 0, cencSinf.length)).isNull();
+  }
+
   @Test
   public void testStz2Parsing4BitFieldSize() {
-    verifyParsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(FOUR_BIT_STZ2)));
+    verifyStz2Parsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(FOUR_BIT_STZ2)));
   }
 
   @Test
   public void testStz2Parsing8BitFieldSize() {
-    verifyParsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(EIGHT_BIT_STZ2)));
+    verifyStz2Parsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(EIGHT_BIT_STZ2)));
   }
 
   @Test
   public void testStz2Parsing16BitFieldSize() {
-    verifyParsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(SIXTEEN_BIT_STZ2)));
+    verifyStz2Parsing(new Atom.LeafAtom(Atom.TYPE_stsz, new ParsableByteArray(SIXTEEN_BIT_STZ2)));
   }
 
-  private void verifyParsing(Atom.LeafAtom stz2Atom) {
+  private static void verifyStz2Parsing(Atom.LeafAtom stz2Atom) {
     AtomParsers.Stz2SampleSizeBox box = new AtomParsers.Stz2SampleSizeBox(stz2Atom);
     assertThat(box.getSampleCount()).isEqualTo(4);
     assertThat(box.isFixedSampleSize()).isFalse();

From 12513e9898d99324e45c0a96b0e58df1ece47c7f Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 13 Oct 2017 20:40:08 +0100
Subject: [PATCH 305/421] Tweak recently merged pull requests

---
 .../drm/DefaultDrmSessionManager.java         | 30 ++++++------
 .../android/exoplayer2/drm/DrmInitData.java   |  9 ++--
 .../extractor/mp4/PsshAtomUtil.java           | 30 ++++++------
 .../exoplayer2/drm/DrmInitDataTest.java       | 22 ++++-----
 .../playlist/HlsMasterPlaylistParserTest.java | 46 +------------------
 .../playlist/HlsMediaPlaylistParserTest.java  |  2 +-
 .../exoplayer2/source/hls/HlsMediaSource.java |  9 ++--
 .../hls/playlist/HlsMasterPlaylist.java       | 20 --------
 .../hls/playlist/HlsPlaylistTracker.java      |  5 +-
 9 files changed, 54 insertions(+), 119 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 239882e399b..52bb0842818 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
@@ -349,7 +349,7 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
       // If there is no scheme information, assume patternless AES-CTR.
       return true;
     } else if (C.CENC_TYPE_cbc1.equals(schemeType) || C.CENC_TYPE_cbcs.equals(schemeType)
-            || C.CENC_TYPE_cens.equals(schemeType)) {
+        || C.CENC_TYPE_cens.equals(schemeType)) {
       // AES-CBC and pattern encryption are supported on API 24 onwards.
       return Util.SDK_INT >= 24;
     }
@@ -357,7 +357,6 @@ public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
     return true;
   }
 
-
   @Override
   public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitData) {
     Assertions.checkState(this.playbackLooper == null || this.playbackLooper == playbackLooper);
@@ -462,34 +461,35 @@ public void onProvisionError(Exception error) {
    * @return The extracted {@link SchemeData}, or null if no suitable data is present.
    */
   private static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid) {
-    List<SchemeData> schemeDatas = new ArrayList<>();
-    // Look for matching PSSH boxes, or the common box in the case of ClearKey
-    for (int i = 0; i < drmInitData.schemeDataCount; ++i) {
+    // Look for matching scheme data (matching the Common PSSH box for ClearKey).
+    List<SchemeData> matchingSchemeDatas = new ArrayList<>(drmInitData.schemeDataCount);
+    for (int i = 0; i < drmInitData.schemeDataCount; i++) {
       SchemeData schemeData = drmInitData.get(i);
       if (schemeData.matches(uuid)
-              || (C.CLEARKEY_UUID.equals(uuid) && schemeData.matches(C.COMMON_PSSH_UUID))) {
-        schemeDatas.add(schemeData);
+          || (C.CLEARKEY_UUID.equals(uuid) && schemeData.matches(C.COMMON_PSSH_UUID))) {
+        matchingSchemeDatas.add(schemeData);
       }
     }
 
-    if (schemeDatas.isEmpty()) {
+    if (matchingSchemeDatas.isEmpty()) {
       return null;
     }
 
-    // For Widevine, we prefer v1 init data on M and higher, v0 for lower
+    // For Widevine PSSH boxes, prefer V1 boxes from API 23 and V0 before.
     if (C.WIDEVINE_UUID.equals(uuid)) {
-      for (SchemeData schemeData : schemeDatas ) {
-        int version = PsshAtomUtil.parseVersion(schemeData.data);
+      for (int i = 0; i < matchingSchemeDatas.size(); i++) {
+        SchemeData matchingSchemeData = matchingSchemeDatas.get(i);
+        int version = PsshAtomUtil.parseVersion(matchingSchemeData.data);
         if (Util.SDK_INT < 23 && version == 0) {
-          return schemeData;
+          return matchingSchemeData;
         } else if (Util.SDK_INT >= 23 && version == 1) {
-          return schemeData;
+          return matchingSchemeData;
         }
       }
     }
 
-    // If we don't have any special handling for this system, we take the first scheme data found
-    return schemeDatas.get(0);
+    // If we don't have any special handling, prefer the first matching scheme data.
+    return matchingSchemeDatas.get(0);
   }
 
   private static byte[] getSchemeInitData(SchemeData data, UUID uuid) {
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 e9aeb78f2d6..703efcb452c 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
@@ -22,8 +22,6 @@
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
-
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.List;
@@ -80,7 +78,6 @@ private DrmInitData(@Nullable String schemeType, boolean cloneSchemeDatas,
     // 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;
   }
@@ -94,7 +91,7 @@ private DrmInitData(@Nullable String schemeType, boolean cloneSchemeDatas,
   /**
    * Retrieves data for a given DRM scheme, specified by its UUID.
    *
-   * @deprecated This will only get the first data found for the scheme.
+   * @deprecated Use {@link #get(int)} and {@link SchemeData#matches(UUID)} instead.
    * @param uuid The DRM scheme's UUID.
    * @return The initialization data for the scheme, or null if the scheme is not supported.
    */
@@ -111,8 +108,8 @@ public SchemeData get(UUID uuid) {
   /**
    * Retrieves the {@link SchemeData} at a given index.
    *
-   * @param index index of the scheme to return. Must not exceed {@link #schemeDataCount}.
-   * @return The {@link SchemeData} at the index.
+   * @param index The index of the scheme to return. Must not exceed {@link #schemeDataCount}.
+   * @return The {@link SchemeData} at the specified index.
    */
   public SchemeData get(int index) {
     return schemeDatas[index];
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 9854c574146..55ce41e4b14 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
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2.extractor.mp4;
 
 import android.util.Log;
-import android.util.Pair;
 import com.google.android.exoplayer2.util.ParsableByteArray;
 import java.nio.ByteBuffer;
 import java.util.UUID;
@@ -96,10 +95,10 @@ public static UUID parseUuid(byte[] atom) {
   /**
    * Parses the version from a PSSH atom. Version 0 and 1 PSSH atoms are supported.
    * <p>
-   * The UUID is only parsed if the data is a valid PSSH atom.
+   * The version is only parsed if the data is a valid PSSH atom.
    *
    * @param atom The atom to parse.
-   * @return The parsed UUID. -1 if the input is not a valid PSSH atom, or if the PSSH atom has
+   * @return The parsed version. -1 if the input is not a valid PSSH atom, or if the PSSH atom has
    *     an unsupported version.
    */
   public static int parseVersion(byte[] atom) {
@@ -130,16 +129,15 @@ public static byte[] parseSchemeSpecificData(byte[] atom, UUID uuid) {
       Log.w(TAG, "UUID mismatch. Expected: " + uuid + ", got: " + parsedAtom.uuid + ".");
       return null;
     }
-    return parsedAtom.data;
+    return parsedAtom.schemeData;
   }
 
   /**
-   * Parses the UUID and scheme specific data from a PSSH atom. Version 0 and 1 PSSH atoms are
-   * supported.
+   * Parses a PSSH atom. Version 0 and 1 PSSH atoms are supported.
    *
    * @param atom The atom to parse.
-   * @return A pair consisting of the parsed UUID and scheme specific data. Null if the input is
-   *     not a valid PSSH atom, or if the PSSH atom has an unsupported version.
+   * @return The parsed PSSH atom. Null if the input is not a valid PSSH atom, or if the PSSH atom
+   *     has an unsupported version.
    */
   // TODO: Support parsing of the key ids for version 1 PSSH atoms.
   private static PsshAtom parsePsshAtom(byte[] atom) {
@@ -179,15 +177,19 @@ private static PsshAtom parsePsshAtom(byte[] atom) {
     return new PsshAtom(uuid, atomVersion, data);
   }
 
+  // TODO: Consider exposing this and making parsePsshAtom public.
   private static class PsshAtom {
-    final UUID uuid;
-    final int version;
-    final byte[] data;
 
-    PsshAtom(final UUID uuid, final int version, final byte[] data) {
+    private final UUID uuid;
+    private final int version;
+    private final byte[] schemeData;
+
+    public PsshAtom(UUID uuid, int version, byte[] schemeData) {
       this.uuid = uuid;
       this.version = version;
-      this.data = data;
+      this.schemeData = schemeData;
     }
+
   }
-}
\ No newline at end of file
+
+}
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 610dd5368e7..9fc6e801d37 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
@@ -20,20 +20,18 @@
 import static com.google.android.exoplayer2.C.WIDEVINE_UUID;
 import static com.google.android.exoplayer2.util.MimeTypes.VIDEO_MP4;
 import static com.google.common.truth.Truth.assertThat;
-import static org.junit.Assert.fail;
 
 import android.os.Parcel;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.testutil.TestUtil;
+import java.util.ArrayList;
+import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Unit test for {@link DrmInitData}.
  */
@@ -101,7 +99,7 @@ public void testEquals() {
 
   @Test
   @Deprecated
-  public void testGet() {
+  public void testGetByUuid() {
     // Basic matching.
     DrmInitData testInitData = new DrmInitData(DATA_1, DATA_2);
     assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
@@ -134,16 +132,14 @@ public void testGetByIndex() {
   }
 
   @Test
-  public void testDuplicateSchemeData() {
-    DrmInitData testInitData = new DrmInitData(DATA_1, DATA_1);
+  public void testSchemeDatasWithSameUuid() {
+    DrmInitData testInitData = new DrmInitData(DATA_1, DATA_1B);
     assertThat(testInitData.schemeDataCount).isEqualTo(2);
-
-    testInitData = new DrmInitData(DATA_1, DATA_2, DATA_1B);
-    assertThat(testInitData.schemeDataCount).isEqualTo(3);
-    assertThat(getAllSchemeData(testInitData)).containsAllOf(DATA_1, DATA_1B, DATA_2);
-    // Deprecated get method should return first entry
+    // Deprecated get method should return first entry.
     assertThat(testInitData.get(WIDEVINE_UUID)).isEqualTo(DATA_1);
-    assertThat(testInitData.get(PLAYREADY_UUID)).isEqualTo(DATA_2);
+    // Test retrieval of first and second entry.
+    assertThat(testInitData.get(0)).isEqualTo(DATA_1);
+    assertThat(testInitData.get(1)).isEqualTo(DATA_1B);
   }
 
   @Test
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
index 4dedc9526f1..8b0d76d2e59 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylistParserTest.java
@@ -16,23 +16,19 @@
 package com.google.android.exoplayer2.source.hls.playlist;
 
 import android.net.Uri;
-
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.ParserException;
 import com.google.android.exoplayer2.util.MimeTypes;
-
-import junit.framework.TestCase;
-
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.nio.charset.Charset;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
+import junit.framework.TestCase;
 
 /**
- * Test for {@link HlsMasterPlaylistParserTest}
+ * Test for {@link HlsMasterPlaylistParserTest}.
  */
 public class HlsMasterPlaylistParserTest extends TestCase {
 
@@ -151,44 +147,6 @@ public void testPlaylistWithoutClosedCaptions() throws IOException {
     assertEquals(Collections.emptyList(), playlist.muxedCaptionFormats);
   }
 
-  public void testReorderedVariantCopy() throws IOException {
-    HlsMasterPlaylist playlist = parseMasterPlaylist(PLAYLIST_URI, MASTER_PLAYLIST);
-    HlsMasterPlaylist nonReorderedPlaylist =
-            playlist.copyWithReorderedVariants(new Comparator<HlsMasterPlaylist.HlsUrl>() {
-      @Override
-      public int compare(HlsMasterPlaylist.HlsUrl url1, HlsMasterPlaylist.HlsUrl url2) {
-        return 0;
-      }
-    });
-    assertEquals(playlist.variants, nonReorderedPlaylist.variants);
-    HlsMasterPlaylist.HlsUrl preferred = null;
-    for (HlsMasterPlaylist.HlsUrl url : playlist.variants) {
-      if (preferred == null || url.format.bitrate > preferred.format.bitrate) {
-        preferred = url;
-      }
-    }
-
-    assertNotNull(preferred);
-
-    final Comparator comparator = Collections.reverseOrder(new Comparator<HlsMasterPlaylist.HlsUrl>() {
-      @Override
-      public int compare(HlsMasterPlaylist.HlsUrl url1, HlsMasterPlaylist.HlsUrl url2) {
-        if (url1.format.bitrate > url2.format.bitrate) {
-          return 1;
-        }
-
-        if (url2.format.bitrate > url1.format.bitrate) {
-          return -1;
-        }
-
-        return 0;
-      }
-    });
-    HlsMasterPlaylist reorderedPlaylist = playlist.copyWithReorderedVariants(comparator);
-
-    assertEquals(reorderedPlaylist.variants.get(0), preferred);
-  }
-
   private static HlsMasterPlaylist parseMasterPlaylist(String uri, String playlistString)
       throws IOException {
     Uri playlistUri = Uri.parse(uri);
diff --git a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
index b036f13a0f7..e4edb079263 100644
--- a/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
+++ b/library/hls/src/androidTest/java/com/google/android/exoplayer2/source/hls/playlist/HlsMediaPlaylistParserTest.java
@@ -27,7 +27,7 @@
 import junit.framework.TestCase;
 
 /**
- * Test for {@link HlsMediaPlaylistParserTest}
+ * Test for {@link HlsMediaPlaylistParserTest}.
  */
 public class HlsMediaPlaylistParserTest extends TestCase {
 
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 b7f7124e442..10a05366127 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
@@ -76,13 +76,14 @@ public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory,
   public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
       int minLoadableRetryCount, Handler eventHandler,
       AdaptiveMediaSourceEventListener eventListener) {
-   this(manifestUri, dataSourceFactory, minLoadableRetryCount, eventHandler, eventListener, new HlsPlaylistParser());
+   this(manifestUri, dataSourceFactory, minLoadableRetryCount, eventHandler, eventListener,
+       new HlsPlaylistParser());
   }
 
   public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
-                        int minLoadableRetryCount, Handler eventHandler,
-                        AdaptiveMediaSourceEventListener eventListener,
-                        ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
+     int minLoadableRetryCount, Handler eventHandler,
+     AdaptiveMediaSourceEventListener eventListener,
+     ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
     this.manifestUri = manifestUri;
     this.dataSourceFactory = dataSourceFactory;
     this.minLoadableRetryCount = minLoadableRetryCount;
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 5ded975f88e..04192def9d7 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
@@ -19,7 +19,6 @@
 import com.google.android.exoplayer2.util.MimeTypes;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -124,25 +123,6 @@ public HlsMasterPlaylist copy(List<String> renditionUrls) {
         muxedAudioFormat, muxedCaptionFormats);
   }
 
-  /**
-   * Returns a copy of this playlist which includes the variants sorted using the passed comparator. NOTE: the variants
-   * will be sorted in ascending order by default. If you wish to use descending order, you can wrap your comparator in
-   * {@link Collections#reverseOrder(Comparator)}.
-   *
-   * @param variantComparator the comparator to use to sort the variant list.
-   * @return a copy of this playlist which includes the variants sorted using the passed comparator.
-   */
-  public HlsMasterPlaylist copyWithReorderedVariants(Comparator<HlsUrl> variantComparator) {
-    return new HlsMasterPlaylist(baseUri, tags, filterVariants(variants, variantComparator), audios,
-            subtitles, muxedAudioFormat, muxedCaptionFormats);
-  }
-
-  private List<HlsUrl> filterVariants(List<HlsUrl> variants, Comparator<HlsUrl> variantComparator) {
-    List<HlsUrl> reorderedList = new ArrayList<>(variants);
-    Collections.sort(reorderedList, variantComparator);
-    return reorderedList;
-  }
-
   /**
    * Creates a playlist with a single variant.
    *
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 52d5a4b5bce..da73aa39964 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
@@ -140,15 +140,16 @@ public interface PlaylistEventListener {
    */
   public HlsPlaylistTracker(Uri initialPlaylistUri, HlsDataSourceFactory dataSourceFactory,
       EventDispatcher eventDispatcher, int minRetryCount,
-      PrimaryPlaylistListener primaryPlaylistListener, ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
+      PrimaryPlaylistListener primaryPlaylistListener,
+      ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
     this.initialPlaylistUri = initialPlaylistUri;
     this.dataSourceFactory = dataSourceFactory;
     this.eventDispatcher = eventDispatcher;
     this.minRetryCount = minRetryCount;
     this.primaryPlaylistListener = primaryPlaylistListener;
+    this.playlistParser = playlistParser;
     listeners = new ArrayList<>();
     initialPlaylistLoader = new Loader("HlsPlaylistTracker:MasterPlaylist");
-    this.playlistParser = playlistParser;
     playlistBundles = new IdentityHashMap<>();
     playlistRefreshHandler = new Handler();
   }

From 29ba640351dc7d9dd0c31b3a9403c137c23ffc9a Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@olly-macbookpro1.roam.corp.google.com>
Date: Fri, 13 Oct 2017 23:14:49 +0100
Subject: [PATCH 306/421] Delete accidentally added files

---
 .../exoplayer2/offline/ActionFile.java        |  95 -------
 .../exoplayer2/offline/ActionFileTest.java    | 253 ------------------
 2 files changed, 348 deletions(-)
 delete mode 100644 library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java

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
deleted file mode 100644
index 38f599cc6ef..00000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/ActionFile.java
+++ /dev/null
@@ -1,95 +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 com.google.android.exoplayer2.offline.DownloadAction.Deserializer;
-import com.google.android.exoplayer2.util.AtomicFile;
-import com.google.android.exoplayer2.util.ClosedSource;
-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;
-import java.io.OutputStream;
-
-/**
- * Stores and loads {@link DownloadAction}s to/from a file.
- */
-@ClosedSource(reason = "Not ready yet")
-public final class ActionFile {
-
-  private final AtomicFile atomicFile;
-
-  /**
-   * @param actionFile File to be used to store and load {@link DownloadAction}s.
-   */
-  public ActionFile(File actionFile) {
-    atomicFile = new AtomicFile(actionFile);
-  }
-
-  /**
-   * Loads {@link DownloadAction}s from file.
-   *
-   * @param deserializers {@link Deserializer}s to deserialize DownloadActions.
-   * @return Loaded DownloadActions.
-   * @throws IOException If there is an error during loading.
-   */
-  public DownloadAction[] load(Deserializer... deserializers) throws IOException {
-    InputStream inputStream = null;
-    try {
-      inputStream = atomicFile.openRead();
-      DataInputStream dataInputStream = new DataInputStream(inputStream);
-      int version = dataInputStream.readInt();
-      if (version > DownloadAction.MASTER_VERSION) {
-        throw new IOException("Not supported action file version: " + version);
-      }
-      int actionCount = dataInputStream.readInt();
-      DownloadAction[] actions = new DownloadAction[actionCount];
-      for (int i = 0; i < actionCount; i++) {
-        actions[i] = DownloadAction.deserializeFromStream(deserializers, dataInputStream, version);
-      }
-      return actions;
-    } finally {
-      Util.closeQuietly(inputStream);
-    }
-  }
-
-  /**
-   * 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 {
-    OutputStream outputStream = null;
-    try {
-      outputStream = atomicFile.startWrite();
-      DataOutputStream dataOutputStream = new DataOutputStream(outputStream);
-      dataOutputStream.writeInt(DownloadAction.MASTER_VERSION);
-      dataOutputStream.writeInt(downloadActions.length);
-      for (DownloadAction action : downloadActions) {
-        DownloadAction.serializeToStream(action, dataOutputStream);
-      }
-      atomicFile.endWrite(outputStream);
-      // Avoid calling close twice.
-      outputStream = null;
-    } finally {
-      Util.closeQuietly(outputStream);
-    }
-  }
-
-}
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
deleted file mode 100644
index cc6a3e84adb..00000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ActionFileTest.java
+++ /dev/null
@@ -1,253 +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 com.google.android.exoplayer2.offline.DownloadAction.Deserializer;
-import com.google.android.exoplayer2.util.ClosedSource;
-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 org.junit.After;
-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;
-import org.robolectric.annotation.Config;
-
-/**
- * Unit tests for {@link ProgressiveDownloadAction}.
- */
-@ClosedSource(reason = "Not ready yet")
-@RunWith(RobolectricTestRunner.class)
-@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
-public class ActionFileTest {
-
-  private File tempFile;
-
-  @Before
-  public void setUp() throws Exception {
-    tempFile = Util.createTempFile(RuntimeEnvironment.application, "ExoPlayerTest");
-  }
-
-  @After
-  public void tearDown() throws Exception {
-    tempFile.delete();
-  }
-
-  @Test
-  public void testLoadNoDataThrowsIOException() throws Exception {
-    try {
-      loadActions(new Object[] {});
-      Assert.fail();
-    } catch (IOException e) {
-      // Expected exception.
-    }
-  }
-
-  @Test
-  public void testLoadIncompleteHeaderThrowsIOException() throws Exception {
-    try {
-      loadActions(new Object[] {DownloadAction.MASTER_VERSION});
-      Assert.fail();
-    } catch (IOException e) {
-      // Expected exception.
-    }
-  }
-
-  @Test
-  public void testLoadCompleteHeaderZeroAction() throws Exception {
-    DownloadAction[] actions =
-        loadActions(new Object[] {DownloadAction.MASTER_VERSION, /*action count*/0});
-    assertThat(actions).isNotNull();
-    assertThat(actions).hasLength(0);
-  }
-
-  @Test
-  public void testLoadAction() throws Exception {
-    DownloadAction[] actions = loadActions(
-        new Object[] {DownloadAction.MASTER_VERSION, /*action count*/1, /*action 1*/"type2", 321},
-        new FakeDeserializer("type2"));
-    assertThat(actions).isNotNull();
-    assertThat(actions).hasLength(1);
-    assertAction(actions[0], "type2", DownloadAction.MASTER_VERSION, 321);
-  }
-
-  @Test
-  public void testLoadActions() throws Exception {
-    DownloadAction[] actions = loadActions(
-        new Object[] {DownloadAction.MASTER_VERSION, /*action count*/2, /*action 1*/"type1", 123,
-            /*action 2*/"type2", 321}, // Action 2
-        new FakeDeserializer("type1"), new FakeDeserializer("type2"));
-    assertThat(actions).isNotNull();
-    assertThat(actions).hasLength(2);
-    assertAction(actions[0], "type1", DownloadAction.MASTER_VERSION, 123);
-    assertAction(actions[1], "type2", DownloadAction.MASTER_VERSION, 321);
-  }
-
-  @Test
-  public void testLoadNotSupportedVersion() throws Exception {
-    try {
-      loadActions(new Object[] {DownloadAction.MASTER_VERSION + 1, /*action count*/1,
-              /*action 1*/"type2", 321}, new FakeDeserializer("type2"));
-      Assert.fail();
-    } catch (IOException e) {
-      // Expected exception.
-    }
-  }
-
-  @Test
-  public void testLoadNotSupportedType() throws Exception {
-    try {
-      loadActions(new Object[] {DownloadAction.MASTER_VERSION, /*action count*/1,
-              /*action 1*/"type2", 321}, new FakeDeserializer("type1"));
-      Assert.fail();
-    } catch (DownloadException e) {
-      // Expected exception.
-    }
-  }
-
-  @Test
-  public void testStoreAndLoadNoActions() throws Exception {
-    doTestSerializationRoundTrip(new DownloadAction[0]);
-  }
-
-  @Test
-  public void testStoreAndLoadActions() throws Exception {
-    doTestSerializationRoundTrip(new DownloadAction[] {
-        new FakeDownloadAction("type1", DownloadAction.MASTER_VERSION, 123),
-        new FakeDownloadAction("type2", DownloadAction.MASTER_VERSION, 321),
-    }, new FakeDeserializer("type1"), new FakeDeserializer("type2"));
-  }
-
-  private void doTestSerializationRoundTrip(DownloadAction[] actions,
-      Deserializer... deserializers) throws IOException {
-    ActionFile actionFile = new ActionFile(tempFile);
-    actionFile.store(actions);
-    assertThat(actionFile.load(deserializers)).isEqualTo(actions);
-  }
-
-  private DownloadAction[] loadActions(Object[] values, Deserializer... deserializers)
-      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); // Action count
-        } else if (value instanceof String) {
-          dataOutputStream.writeUTF((String) value); // Action count
-        } else {
-          throw new IllegalArgumentException();
-        }
-      }
-    } finally {
-      dataOutputStream.close();
-    }
-    return new ActionFile(tempFile).load(deserializers);
-  }
-
-  private static void assertAction(DownloadAction action, String type, int version, int data) {
-    assertThat(action).isInstanceOf(FakeDownloadAction.class);
-    assertThat(action.getType()).isEqualTo(type);
-    assertThat(((FakeDownloadAction) action).version).isEqualTo(version);
-    assertThat(((FakeDownloadAction) action).data).isEqualTo(data);
-  }
-
-  private static class FakeDeserializer implements Deserializer {
-    final String type;
-
-    FakeDeserializer(String type) {
-      this.type = type;
-    }
-
-    @Override
-    public String getType() {
-      return type;
-    }
-
-    @Override
-    public DownloadAction readFromStream(int version, DataInputStream input) throws IOException {
-      return new FakeDownloadAction(type, version, input.readInt());
-    }
-  }
-
-  private static class FakeDownloadAction extends DownloadAction {
-    final String type;
-    final int version;
-    final int data;
-
-    private FakeDownloadAction(String type, int version, int data) {
-      this.type = type;
-      this.version = version;
-      this.data = data;
-    }
-
-    @Override
-    protected String getType() {
-      return type;
-    }
-
-    @Override
-    protected void writeToStream(DataOutputStream output) throws IOException {
-      output.writeInt(data);
-    }
-
-    @Override
-    protected boolean isRemoveAction() {
-      return false;
-    }
-
-    @Override
-    protected boolean isSameMedia(DownloadAction other) {
-      return false;
-    }
-
-    @Override
-    protected Downloader createDownloader(DownloaderConstructorHelper downloaderConstructorHelper) {
-      return null;
-    }
-
-    // auto generated code
-
-    @Override
-    public boolean equals(Object o) {
-      if (this == o) {
-        return true;
-      }
-      if (o == null || getClass() != o.getClass()) {
-        return false;
-      }
-      FakeDownloadAction that = (FakeDownloadAction) o;
-      return version == that.version && data == that.data && type.equals(that.type);
-    }
-
-    @Override
-    public int hashCode() {
-      int result = type.hashCode();
-      result = 31 * result + version;
-      result = 31 * result + data;
-      return result;
-    }
-  }
-
-}

From ebf19c40287ec638ca2140c6ed25b73fa002fe62 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 13 Oct 2017 12:51:32 -0700
Subject: [PATCH 307/421] Update moe equivalence

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172133622
---
 .../ProgressiveDownloadActionTest.java        | 144 ------------------
 1 file changed, 144 deletions(-)
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java

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 85a2b02799a..00000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/offline/ProgressiveDownloadActionTest.java
+++ /dev/null
@@ -1,144 +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 com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
-import com.google.android.exoplayer2.util.ClosedSource;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.annotation.Config;
-
-/**
- * Unit tests for {@link ProgressiveDownloadAction}.
- */
-@ClosedSource(reason = "Not ready yet")
-@RunWith(RobolectricTestRunner.class)
-@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
-public class ProgressiveDownloadActionTest {
-
-  @Test
-  public void testDownloadActionIsNotRemoveAction() throws Exception {
-    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
-    assertThat(action.isRemoveAction()).isFalse();
-  }
-
-  @Test
-  public void testRemoveActionIsRemoveAction() throws Exception {
-    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
-    assertThat(action2.isRemoveAction()).isTrue();
-  }
-
-  @Test
-  public void testCreateDownloader() throws Exception {
-    MockitoAnnotations.initMocks(this);
-    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
-    DownloaderConstructorHelper constructorHelper = new DownloaderConstructorHelper(
-        Mockito.mock(Cache.class), DummyDataSource.FACTORY);
-    assertThat(action.createDownloader(constructorHelper)).isNotNull();
-  }
-
-  @Test
-  public void testSameUriCacheKeyDifferentAction_IsSameMedia() throws Exception {
-    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, false);
-    assertThat(action1.isSameMedia(action2)).isTrue();
-  }
-
-  @Test
-  public void testNullCacheKeyDifferentUriAction_IsNotSameMedia() throws Exception {
-    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri2", null, true);
-    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, false);
-    assertThat(action3.isSameMedia(action4)).isFalse();
-  }
-
-  @Test
-  public void testSameCacheKeyDifferentUriAction_IsSameMedia() throws Exception {
-    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri2", "key", true);
-    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", "key", false);
-    assertThat(action5.isSameMedia(action6)).isTrue();
-  }
-
-  @Test
-  public void testSameUriDifferentCacheKeyAction_IsNotSameMedia() throws Exception {
-    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
-    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", false);
-    assertThat(action7.isSameMedia(action8)).isFalse();
-  }
-
-  @Test
-  public void testEquals() throws Exception {
-    ProgressiveDownloadAction action1 = new ProgressiveDownloadAction("uri", null, true);
-    assertThat(action1.equals(action1)).isTrue();
-
-    ProgressiveDownloadAction action2 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action3 = new ProgressiveDownloadAction("uri", null, true);
-    assertThat(action2.equals(action3)).isTrue();
-
-    ProgressiveDownloadAction action4 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action5 = new ProgressiveDownloadAction("uri", null, false);
-    assertThat(action4.equals(action5)).isFalse();
-
-    ProgressiveDownloadAction action6 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action7 = new ProgressiveDownloadAction("uri", "key", true);
-    assertThat(action6.equals(action7)).isFalse();
-
-    ProgressiveDownloadAction action8 = new ProgressiveDownloadAction("uri", "key2", true);
-    ProgressiveDownloadAction action9 = new ProgressiveDownloadAction("uri", "key", true);
-    assertThat(action8.equals(action9)).isFalse();
-
-    ProgressiveDownloadAction action10 = new ProgressiveDownloadAction("uri", null, true);
-    ProgressiveDownloadAction action11 = new ProgressiveDownloadAction("uri2", null, true);
-    assertThat(action10.equals(action11)).isFalse();
-  }
-
-  @Test
-  public void testSerializerGetType() throws Exception {
-    ProgressiveDownloadAction action = new ProgressiveDownloadAction("uri", null, false);
-    assertThat(action.getType()).isNotNull();
-  }
-
-  @Test
-  public void testSerializerWriteRead() throws Exception {
-    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri1", null, false));
-    doTestSerializationRoundTrip(new ProgressiveDownloadAction("uri2", "key", true));
-  }
-
-  private static void doTestSerializationRoundTrip(ProgressiveDownloadAction action1)
-      throws IOException {
-    ByteArrayOutputStream out = new ByteArrayOutputStream();
-    DataOutputStream output = new DataOutputStream(out);
-    action1.writeToStream(output);
-
-    ByteArrayInputStream in = new ByteArrayInputStream(out.toByteArray());
-    DataInputStream input = new DataInputStream(in);
-    DownloadAction action2 =
-        ProgressiveDownloadAction.DESERIALIZER.readFromStream(DownloadAction.MASTER_VERSION, input);
-
-    assertThat(action2).isEqualTo(action1);
-  }
-
-}

From d0758c93938c6b85fac3ef98c634cb6dec90eb48 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 16 Oct 2017 08:30:55 -0700
Subject: [PATCH 308/421] Fix typo

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172328148
---
 .../com/google/android/exoplayer2/text/cea/Cea608Decoder.java   | 2 +-
 1 file changed, 1 insertion(+), 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 fe9a5fbc5c8..e2c592be6b6 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
@@ -350,7 +350,7 @@ private boolean handleCtrl(byte cc1, byte cc2) {
         repeatableControlSet = false;
         return true;
       } else {
-        // This is a repeatable command, but we haven't see it yet, so set the repeabable control
+        // This is a repeatable command, but we haven't see 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;

From 93563631175d5c2b1856f932b457d94e2ce82c6e Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 16 Oct 2017 08:46:54 -0700
Subject: [PATCH 309/421] Document load() exceptions

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172329677
---
 .../java/com/google/android/exoplayer2/upstream/Loader.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 02e9a321164..bd701505736 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
@@ -61,8 +61,8 @@ public interface Loadable {
     /**
      * Performs the load, returning on completion or cancellation.
      *
-     * @throws IOException
-     * @throws InterruptedException
+     * @throws IOException If the input could not be loaded.
+     * @throws InterruptedException If the thread was interrupted.
      */
     void load() throws IOException, InterruptedException;
 

From e46a7600cf593280ca091423fbdfed4488f7ee12 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 16 Oct 2017 10:04:52 -0700
Subject: [PATCH 310/421] Document DefaultTimeBar attributes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172339124
---
 .../android/exoplayer2/ui/DefaultTimeBar.java | 135 +++++++++++++++---
 1 file changed, 119 insertions(+), 16 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 8fe8dbfa5da..d8617888ce5 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
@@ -42,13 +42,124 @@
 
 /**
  * A time bar that shows a current position, buffered position, duration and ad markers.
+ * <p>
+ * A DefaultTimeBar can be customized by setting attributes, as outlined below.
+ *
+ * <h3>Attributes</h3>
+ * The following attributes can be set on a DefaultTimeBar when used in a layout XML file:
+ * <p>
+ * <ul>
+ *   <li><b>{@code bar_height}</b> - Dimension for the height of the time bar.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_BAR_HEIGHT_DP}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code touch_target_height}</b> - Dimension for the height of the area in which touch
+ *       interactions with the time bar are handled. If no height is specified, this also determines
+ *       the height of the view.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_TOUCH_TARGET_HEIGHT_DP}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code ad_marker_width}</b> - Dimension for the width of any ad markers shown on the
+ *       bar. Ad markers are superimposed on the time bar to show the times at which ads will play.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_AD_MARKER_WIDTH_DP}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code scrubber_enabled_size}</b> - Dimension for the diameter of the circular scrubber
+ *       handle when scrubbing is enabled but not in progress. Set to zero if no scrubber handle
+ *       should be shown.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_SCRUBBER_ENABLED_SIZE_DP}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code scrubber_disabled_size}</b> - Dimension for the diameter of the circular scrubber
+ *       handle when scrubbing isn't enabled. Set to zero if no scrubber handle should be shown.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_SCRUBBER_DISABLED_SIZE_DP}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code scrubber_dragged_size}</b> - Dimension for the diameter of the circular scrubber
+ *       handle when scrubbing is in progress. Set to zero if no scrubber handle should be shown.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_SCRUBBER_DRAGGED_SIZE_DP}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code played_color}</b> - Color for the portion of the time bar representing media
+ *       before the current playback position.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_PLAYED_COLOR}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code scrubber_color}</b> - Color for the scrubber handle.
+ *       <ul>
+ *         <li>Default: see {@link #getDefaultScrubberColor(int)}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code buffered_color}</b> - Color for the portion of the time bar after the current
+ *       played position up to the current buffered position.
+ *       <ul>
+ *         <li>Default: see {@link #getDefaultBufferedColor(int)}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code unplayed_color}</b> - Color for the portion of the time bar after the current
+ *       buffered position.
+ *       <ul>
+ *         <li>Default: see {@link #getDefaultUnplayedColor(int)}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code ad_marker_color}</b> - Color for unplayed ad markers.
+ *       <ul>
+ *         <li>Default: {@link #DEFAULT_AD_MARKER_COLOR}</li>
+ *       </ul>
+ *   </li>
+ *   <li><b>{@code played_ad_marker_color}</b> - Color for played ad markers.
+ *       <ul>
+ *         <li>Default: see {@link #getDefaultPlayedAdMarkerColor(int)}</li>
+ *       </ul>
+ *   </li>
+ * </ul>
  */
 public class DefaultTimeBar extends View implements TimeBar {
 
+  /**
+   * Default height for the time bar, in dp.
+   */
+  public static final int DEFAULT_BAR_HEIGHT_DP = 4;
+  /**
+   * Default height for the touch target, in dp.
+   */
+  public static final int DEFAULT_TOUCH_TARGET_HEIGHT_DP = 26;
+  /**
+   * Default width for ad markers, in dp.
+   */
+  public static final int DEFAULT_AD_MARKER_WIDTH_DP = 4;
+  /**
+   * Default diameter for the scrubber when enabled, in dp.
+   */
+  public static final int DEFAULT_SCRUBBER_ENABLED_SIZE_DP = 12;
+  /**
+   * Default diameter for the scrubber when disabled, in dp.
+   */
+  public static final int DEFAULT_SCRUBBER_DISABLED_SIZE_DP = 0;
+  /**
+   * Default diameter for the scrubber when dragged, in dp.
+   */
+  public static final int DEFAULT_SCRUBBER_DRAGGED_SIZE_DP = 16;
+  /**
+   * Default color for the played portion of the time bar.
+   */
+  public static final int DEFAULT_PLAYED_COLOR = 0xFFFFFFFF;
+  /**
+   * Default color for ad markers.
+   */
+  public static final int DEFAULT_AD_MARKER_COLOR = 0xB2FFFF00;
+
   /**
    * The threshold in dps above the bar at which touch events trigger fine scrub mode.
    */
-  private static final int FINE_SCRUB_Y_THRESHOLD = -50;
+  private static final int FINE_SCRUB_Y_THRESHOLD_DP = -50;
   /**
    * The ratio by which times are reduced in fine scrub mode.
    */
@@ -59,14 +170,6 @@ public class DefaultTimeBar extends View implements TimeBar {
    */
   private static final long STOP_SCRUBBING_TIMEOUT_MS = 1000;
   private static final int DEFAULT_INCREMENT_COUNT = 20;
-  private static final int DEFAULT_BAR_HEIGHT = 4;
-  private static final int DEFAULT_TOUCH_TARGET_HEIGHT = 26;
-  private static final int DEFAULT_PLAYED_COLOR = 0xFFFFFFFF;
-  private static final int DEFAULT_AD_MARKER_COLOR = 0xB2FFFF00;
-  private static final int DEFAULT_AD_MARKER_WIDTH = 4;
-  private static final int DEFAULT_SCRUBBER_ENABLED_SIZE = 12;
-  private static final int DEFAULT_SCRUBBER_DISABLED_SIZE = 0;
-  private static final int DEFAULT_SCRUBBER_DRAGGED_SIZE = 16;
 
   private final Rect seekBounds;
   private final Rect progressBar;
@@ -126,13 +229,13 @@ public DefaultTimeBar(Context context, AttributeSet attrs) {
     // Calculate the dimensions and paints for drawn elements.
     Resources res = context.getResources();
     DisplayMetrics displayMetrics = res.getDisplayMetrics();
-    fineScrubYThreshold = dpToPx(displayMetrics, FINE_SCRUB_Y_THRESHOLD);
-    int defaultBarHeight = dpToPx(displayMetrics, DEFAULT_BAR_HEIGHT);
-    int defaultTouchTargetHeight = dpToPx(displayMetrics, DEFAULT_TOUCH_TARGET_HEIGHT);
-    int defaultAdMarkerWidth = dpToPx(displayMetrics, DEFAULT_AD_MARKER_WIDTH);
-    int defaultScrubberEnabledSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_ENABLED_SIZE);
-    int defaultScrubberDisabledSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_DISABLED_SIZE);
-    int defaultScrubberDraggedSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_DRAGGED_SIZE);
+    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);
+    int defaultAdMarkerWidth = dpToPx(displayMetrics, DEFAULT_AD_MARKER_WIDTH_DP);
+    int defaultScrubberEnabledSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_ENABLED_SIZE_DP);
+    int defaultScrubberDisabledSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_DISABLED_SIZE_DP);
+    int defaultScrubberDraggedSize = dpToPx(displayMetrics, DEFAULT_SCRUBBER_DRAGGED_SIZE_DP);
     if (attrs != null) {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DefaultTimeBar, 0,
           0);

From ac31dc7c7a83a0cac7314e50369865006ae91359 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 17 Oct 2017 01:00:13 -0700
Subject: [PATCH 311/421] Allow setting output sample rate in
 SonicAudioProcessor

This is not really useful with the DefaultAudioSink, but could be used in a
custom AudioSink when mixing audio from sources that have different sample
rates.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172434482
---
 .../exoplayer2/ext/gvr/GvrAudioProcessor.java |   5 +
 .../exoplayer2/audio/AudioProcessor.java      |  32 +++-
 .../android/exoplayer2/audio/AudioSink.java   |  18 +--
 .../audio/ChannelMappingAudioProcessor.java   |   5 +
 .../exoplayer2/audio/DefaultAudioSink.java    |  43 +++---
 .../audio/ResamplingAudioProcessor.java       |   5 +
 .../android/exoplayer2/audio/Sonic.java       |  64 +++-----
 .../exoplayer2/audio/SonicAudioProcessor.java |  65 +++++++--
 .../audio/TrimmingAudioProcessor.java         |   8 +
 .../audio/SonicAudioProcessorTest.java        | 137 ++++++++++++++++++
 10 files changed, 292 insertions(+), 90 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java

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 5750f5f04d5..8d71f551cd3 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
@@ -138,6 +138,11 @@ public int getOutputEncoding() {
     return C.ENCODING_PCM_16BIT;
   }
 
+  @Override
+  public int getOutputSampleRateHz() {
+    return sampleRateHz;
+  }
+
   @Override
   public void queueInput(ByteBuffer input) {
     int position = input.position();
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 eced0408125..8a3d624222a 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
@@ -20,7 +20,15 @@
 import java.nio.ByteOrder;
 
 /**
- * Interface for audio processors.
+ * Interface for audio processors, which take audio data as input and transform it, potentially
+ * 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.
  */
 public interface AudioProcessor {
 
@@ -46,8 +54,9 @@ public UnhandledFormatException(int sampleRateHz, int channelCount, @C.Encoding
    * method, {@link #isActive()} returns whether the processor needs to handle buffers; if not, the
    * processor will not accept any buffers until it is reconfigured. Returns {@code true} if the
    * processor must be flushed, or if the value returned by {@link #isActive()} has changed as a
-   * result of the call. If it's active, {@link #getOutputChannelCount()} and
-   * {@link #getOutputEncoding()} return the processor's output format.
+   * result of the call. If it's active, {@link #getOutputSampleRateHz()},
+   * {@link #getOutputChannelCount()} and {@link #getOutputEncoding()} return the processor's output
+   * format.
    *
    * @param sampleRateHz The sample rate of input audio in Hz.
    * @param channelCount The number of interleaved channels in input audio.
@@ -65,16 +74,27 @@ boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
   boolean isActive();
 
   /**
-   * Returns the number of audio channels in the data output by the processor.
+   * 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.
    */
   int getOutputChannelCount();
 
   /**
-   * Returns the audio encoding used in the data output by the processor.
+   * 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.
    */
   @C.Encoding
   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.
+   */
+  int getOutputSampleRateHz();
+
   /**
    * Queues audio data between the position and limit of the input {@code buffer} for processing.
    * {@code buffer} must be a direct byte buffer with native byte order. Its contents are treated as
@@ -116,7 +136,7 @@ boolean configure(int sampleRateHz, int channelCount, @C.Encoding int encoding)
   void flush();
 
   /**
-   * Resets the processor to its initial state.
+   * Resets the processor to its unconfigured state.
    */
   void reset();
 
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 879769b0e22..8b39a281821 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
@@ -186,12 +186,12 @@ public WriteException(int errorCode) {
   /**
    * Configures (or reconfigures) the sink.
    *
-   * @param mimeType The MIME type of audio data provided in the input buffers.
-   * @param channelCount The number of channels.
-   * @param sampleRate The sample rate in Hz.
-   * @param pcmEncoding For PCM formats, the encoding used. One of {@link C#ENCODING_PCM_16BIT},
-   *     {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT} and
-   *     {@link C#ENCODING_PCM_32BIT}.
+   * @param inputMimeType The MIME type of audio data provided in the input buffers.
+   * @param inputChannelCount The number of channels.
+   * @param inputSampleRate The sample rate in Hz.
+   * @param inputPcmEncoding For PCM formats, the encoding used. One of
+   *     {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT}
+   *     and {@link C#ENCODING_PCM_32BIT}.
    * @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to infer a
    *     suitable buffer size.
    * @param outputChannels A mapping from input to output channels that is applied to this sink's
@@ -206,9 +206,9 @@ public WriteException(int errorCode) {
    *     {@link #configure(String, int, int, int, int, int[], int, int)}.
    * @throws ConfigurationException If an error occurs configuring the sink.
    */
-  void configure(String mimeType, int channelCount, int sampleRate, @C.PcmEncoding int pcmEncoding,
-      int specifiedBufferSize, @Nullable int[] outputChannels, int trimStartSamples,
-      int trimEndSamples) throws ConfigurationException;
+  void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
+      @C.PcmEncoding int inputPcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
+      int trimStartSamples, int trimEndSamples) throws ConfigurationException;
 
   /**
    * Starts or resumes consuming audio if initialized.
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 03bbd5817be..c3f3e32526c 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
@@ -103,6 +103,11 @@ public int getOutputEncoding() {
     return C.ENCODING_PCM_16BIT;
   }
 
+  @Override
+  public int getOutputSampleRateHz() {
+    return sampleRateHz;
+  }
+
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
     int position = inputBuffer.position();
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 1cafdc5efe9..a5173db2842 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
@@ -148,13 +148,6 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
   private static final int MIN_PLAYHEAD_OFFSET_SAMPLE_INTERVAL_US = 30000;
   private static final int MIN_TIMESTAMP_SAMPLE_INTERVAL_US = 500000;
 
-  /**
-   * The minimum number of output bytes from {@link #sonicAudioProcessor} at which the speedup is
-   * calculated using the input/output byte counts from the processor, rather than using the
-   * current playback parameters speed.
-   */
-  private static final int SONIC_MIN_BYTES_FOR_SPEEDUP = 1024;
-
   /**
    * Whether to enable a workaround for an issue where an audio effect does not keep its session
    * active across releasing/initializing a new audio track, on platform builds where
@@ -189,6 +182,7 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
    */
   private AudioTrack keepSessionIdAudioTrack;
   private AudioTrack audioTrack;
+  private int inputSampleRate;
   private int sampleRate;
   private int channelConfig;
   private @C.Encoding int encoding;
@@ -337,14 +331,18 @@ public long getCurrentPositionUs(boolean sourceEnded) {
   }
 
   @Override
-  public void configure(String mimeType, int channelCount, int sampleRate,
-      @C.PcmEncoding int pcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
+  public void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
+      @C.PcmEncoding int inputPcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
       int trimStartSamples, int trimEndSamples) throws ConfigurationException {
-    boolean passthrough = !MimeTypes.AUDIO_RAW.equals(mimeType);
-    @C.Encoding int encoding = passthrough ? getEncodingForMimeType(mimeType) : pcmEncoding;
+    this.inputSampleRate = inputSampleRate;
+    int channelCount = inputChannelCount;
+    int sampleRate = inputSampleRate;
+    @C.Encoding int encoding;
+    boolean passthrough = !MimeTypes.AUDIO_RAW.equals(inputMimeType);
     boolean flush = false;
     if (!passthrough) {
-      pcmFrameSize = Util.getPcmFrameSize(pcmEncoding, channelCount);
+      encoding = inputPcmEncoding;
+      pcmFrameSize = Util.getPcmFrameSize(inputPcmEncoding, channelCount);
       trimmingAudioProcessor.setTrimSampleCount(trimStartSamples, trimEndSamples);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
       for (AudioProcessor audioProcessor : availableAudioProcessors) {
@@ -355,12 +353,15 @@ public void configure(String mimeType, int channelCount, int sampleRate,
         }
         if (audioProcessor.isActive()) {
           channelCount = audioProcessor.getOutputChannelCount();
+          sampleRate = audioProcessor.getOutputSampleRateHz();
           encoding = audioProcessor.getOutputEncoding();
         }
       }
       if (flush) {
         resetAudioProcessors();
       }
+    } else {
+      encoding = getEncodingForMimeType(inputMimeType);
     }
 
     int channelConfig;
@@ -598,8 +599,8 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
         startMediaTimeState = START_IN_SYNC;
       } else {
         // Sanity check that presentationTimeUs is consistent with the expected value.
-        long expectedPresentationTimeUs = startMediaTimeUs
-            + framesToDurationUs(getSubmittedFrames());
+        long expectedPresentationTimeUs =
+            startMediaTimeUs + inputFramesToDurationUs(getSubmittedFrames());
         if (startMediaTimeState == START_IN_SYNC
             && Math.abs(expectedPresentationTimeUs - presentationTimeUs) > 200000) {
           Log.e(TAG, "Discontinuity detected [expected " + expectedPresentationTimeUs + ", got "
@@ -997,15 +998,11 @@ private long applySpeedup(long positionUs) {
       return positionUs + playbackParametersOffsetUs - playbackParametersPositionUs;
     }
 
-    if (playbackParametersCheckpoints.isEmpty()
-        && sonicAudioProcessor.getOutputByteCount() >= SONIC_MIN_BYTES_FOR_SPEEDUP) {
+    if (playbackParametersCheckpoints.isEmpty()) {
       return playbackParametersOffsetUs
-          + Util.scaleLargeTimestamp(positionUs - playbackParametersPositionUs,
-          sonicAudioProcessor.getInputByteCount(), sonicAudioProcessor.getOutputByteCount());
+          + sonicAudioProcessor.scaleDurationForSpeedup(positionUs - playbackParametersPositionUs);
     }
-
-    // We are playing drained data at a previous playback speed, or don't have enough bytes to
-    // calculate an accurate speedup, so fall back to multiplying by the speed.
+    // We are playing data at a previous playback speed, so fall back to multiplying by the speed.
     return playbackParametersOffsetUs
         + (long) ((double) playbackParameters.speed * (positionUs - playbackParametersPositionUs));
   }
@@ -1098,6 +1095,10 @@ 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) / sampleRate;
   }
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 0dd062150dc..a78adbcee39 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
@@ -79,6 +79,11 @@ public int getOutputEncoding() {
     return C.ENCODING_PCM_16BIT;
   }
 
+  @Override
+  public int getOutputSampleRateHz() {
+    return sampleRateHz;
+  }
+
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
     // Prepare the output buffer.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
index 5c5ac06da3a..dfd122c397e 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
@@ -32,8 +32,11 @@
   private static final int MAXIMUM_PITCH = 400;
   private static final int AMDF_FREQUENCY = 4000;
 
-  private final int sampleRate;
+  private final int inputSampleRateHz;
   private final int numChannels;
+  private final float speed;
+  private final float pitch;
+  private final float rate;
   private final int minPeriod;
   private final int maxPeriod;
   private final int maxRequired;
@@ -47,8 +50,6 @@
   private short[] pitchBuffer;
   private int oldRatePosition;
   private int newRatePosition;
-  private float speed;
-  private float pitch;
   private int numInputSamples;
   private int numOutputSamples;
   private int numPitchSamples;
@@ -61,14 +62,18 @@
   /**
    * Creates a new Sonic audio stream processor.
    *
-   * @param sampleRate The sample rate of input audio.
+   * @param inputSampleRateHz The sample rate of input audio, in hertz.
    * @param numChannels The number of channels in the input audio.
+   * @param speed The speedup factor for output audio.
+   * @param pitch The pitch factor for output audio.
+   * @param outputSampleRateHz The sample rate for output audio, in hertz.
    */
-  public Sonic(int sampleRate, int numChannels) {
-    this.sampleRate = sampleRate;
+  public Sonic(int inputSampleRateHz, int numChannels, float speed, float pitch,
+      int outputSampleRateHz) {
+    this.inputSampleRateHz = inputSampleRateHz;
     this.numChannels = numChannels;
-    minPeriod = sampleRate / MAXIMUM_PITCH;
-    maxPeriod = sampleRate / MINIMUM_PITCH;
+    minPeriod = inputSampleRateHz / MAXIMUM_PITCH;
+    maxPeriod = inputSampleRateHz / MINIMUM_PITCH;
     maxRequired = 2 * maxPeriod;
     downSampleBuffer = new short[maxRequired];
     inputBufferSize = maxRequired;
@@ -80,36 +85,9 @@ public Sonic(int sampleRate, int numChannels) {
     oldRatePosition = 0;
     newRatePosition = 0;
     prevPeriod = 0;
-    speed = 1.0f;
-    pitch = 1.0f;
-  }
-
-  /**
-   * Sets the output speed.
-   */
-  public void setSpeed(float speed) {
     this.speed = speed;
-  }
-
-  /**
-   * Gets the output speed.
-   */
-  public float getSpeed() {
-    return speed;
-  }
-
-  /**
-   * Sets the output pitch.
-   */
-  public void setPitch(float pitch) {
     this.pitch = pitch;
-  }
-
-  /**
-   * Gets the output pitch.
-   */
-  public float getPitch() {
-    return pitch;
+    this.rate = (float) inputSampleRateHz / outputSampleRateHz;
   }
 
   /**
@@ -148,8 +126,9 @@ public void getOutput(ShortBuffer buffer) {
   public void queueEndOfStream() {
     int remainingSamples = numInputSamples;
     float s = speed / pitch;
+    float r = rate * pitch;
     int expectedOutputSamples =
-        numOutputSamples + (int) ((remainingSamples / s + numPitchSamples) / pitch + 0.5f);
+        numOutputSamples + (int) ((remainingSamples / s + numPitchSamples) / r + 0.5f);
 
     // Add enough silence to flush both input and pitch buffers.
     enlargeInputBufferIfNeeded(remainingSamples + 2 * maxRequired);
@@ -292,7 +271,7 @@ private int findPitchPeriod(short[] samples, int position, boolean preferNewPeri
     // sampling.
     int period;
     int retPeriod;
-    int skip = sampleRate > AMDF_FREQUENCY ? sampleRate / AMDF_FREQUENCY : 1;
+    int skip = inputSampleRateHz > AMDF_FREQUENCY ? inputSampleRateHz / AMDF_FREQUENCY : 1;
     if (numChannels == 1 && skip == 1) {
       period = findPitchPeriodInRange(samples, position, minPeriod, maxPeriod);
     } else {
@@ -388,8 +367,8 @@ private void adjustRate(float rate, int originalNumOutputSamples) {
     if (numOutputSamples == originalNumOutputSamples) {
       return;
     }
-    int newSampleRate = (int) (sampleRate / rate);
-    int oldSampleRate = sampleRate;
+    int newSampleRate = (int) (inputSampleRateHz / rate);
+    int oldSampleRate = inputSampleRateHz;
     // Set these values to help with the integer math.
     while (newSampleRate > (1 << 14) || oldSampleRate > (1 << 14)) {
       newSampleRate /= 2;
@@ -476,6 +455,7 @@ private void processStreamInput() {
     // Resample as many pitch periods as we have buffered on the input.
     int originalNumOutputSamples = numOutputSamples;
     float s = speed / pitch;
+    float r = rate * pitch;
     if (s > 1.00001 || s < 0.99999) {
       changeSpeed(s);
     } else {
@@ -486,8 +466,8 @@ private void processStreamInput() {
       if (pitch != 1.0f) {
         adjustPitch(originalNumOutputSamples);
       }
-    } else if (!USE_CHORD_PITCH && pitch != 1.0f) {
-      adjustRate(pitch, originalNumOutputSamples);
+    } else if (r != 1.0f) {
+      adjustRate(r, originalNumOutputSamples);
     }
   }
 
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 df201392559..370ddb28098 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
@@ -24,7 +24,7 @@
 import java.nio.ShortBuffer;
 
 /**
- * An {@link AudioProcessor} that uses the Sonic library to modify the speed/pitch of audio.
+ * An {@link AudioProcessor} that uses the Sonic library to modify audio speed/pitch/sample rate.
  */
 public final class SonicAudioProcessor implements AudioProcessor {
 
@@ -44,18 +44,30 @@ public final class SonicAudioProcessor implements AudioProcessor {
    * The minimum allowed pitch in {@link #setPitch(float)}.
    */
   public static final float MINIMUM_PITCH = 0.1f;
+  /**
+   * Indicates that the output sample rate should be the same as the input.
+   */
+  public static final int SAMPLE_RATE_NO_CHANGE = -1;
 
   /**
    * The threshold below which the difference between two pitch/speed factors is negligible.
    */
   private static final float CLOSE_THRESHOLD = 0.01f;
 
+  /**
+   * The minimum number of output bytes at which the speedup is calculated using the input/output
+   * byte counts, rather than using the current playback parameters speed.
+   */
+  private static final int MIN_BYTES_FOR_SPEEDUP_CALCULATION = 1024;
+
+  private int pendingOutputSampleRateHz;
   private int channelCount;
   private int sampleRateHz;
 
   private Sonic sonic;
   private float speed;
   private float pitch;
+  private int outputSampleRateHz;
 
   private ByteBuffer buffer;
   private ShortBuffer shortBuffer;
@@ -72,9 +84,11 @@ public SonicAudioProcessor() {
     pitch = 1f;
     channelCount = Format.NO_VALUE;
     sampleRateHz = Format.NO_VALUE;
+    outputSampleRateHz = Format.NO_VALUE;
     buffer = EMPTY_BUFFER;
     shortBuffer = buffer.asShortBuffer();
     outputBuffer = EMPTY_BUFFER;
+    pendingOutputSampleRateHz = SAMPLE_RATE_NO_CHANGE;
   }
 
   /**
@@ -100,17 +114,34 @@ public float setPitch(float pitch) {
   }
 
   /**
-   * Returns the number of bytes of input queued since the last call to {@link #flush()}.
+   * Sets the sample rate for output audio, in hertz. Pass {@link #SAMPLE_RATE_NO_CHANGE} to output
+   * audio at the same sample rate as the input. After calling this method, call
+   * {@link #configure(int, int, int)} to start using the new sample rate.
+   *
+   * @param sampleRateHz The sample rate for output audio, in hertz.
+   * @see #configure(int, int, int)
    */
-  public long getInputByteCount() {
-    return inputBytes;
+  public void setOutputSampleRateHz(int sampleRateHz) {
+    pendingOutputSampleRateHz = sampleRateHz;
   }
 
   /**
-   * Returns the number of bytes of output dequeued since the last call to {@link #flush()}.
+   * Returns the specified duration scaled to take into account the speedup factor of this instance,
+   * in the same units as {@code duration}.
+   *
+   * @param duration The duration to scale taking into account speedup.
+   * @return The specified duration scaled to take into account speedup, in the same units as
+   *     {@code duration}.
    */
-  public long getOutputByteCount() {
-    return outputBytes;
+  public long scaleDurationForSpeedup(long duration) {
+    if (outputBytes >= MIN_BYTES_FOR_SPEEDUP_CALCULATION) {
+      return outputSampleRateHz == sampleRateHz
+          ? Util.scaleLargeTimestamp(duration, inputBytes, outputBytes)
+          : Util.scaleLargeTimestamp(duration, inputBytes * outputSampleRateHz,
+              outputBytes * sampleRateHz);
+    } else {
+      return (long) ((double) speed * duration);
+    }
   }
 
   @Override
@@ -119,17 +150,22 @@ public boolean configure(int sampleRateHz, int channelCount, @Encoding int encod
     if (encoding != C.ENCODING_PCM_16BIT) {
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
-    if (this.sampleRateHz == sampleRateHz && this.channelCount == channelCount) {
+    int outputSampleRateHz = pendingOutputSampleRateHz == SAMPLE_RATE_NO_CHANGE
+        ? sampleRateHz : pendingOutputSampleRateHz;
+    if (this.sampleRateHz == sampleRateHz && this.channelCount == channelCount
+        && this.outputSampleRateHz == outputSampleRateHz) {
       return false;
     }
     this.sampleRateHz = sampleRateHz;
     this.channelCount = channelCount;
+    this.outputSampleRateHz = outputSampleRateHz;
     return true;
   }
 
   @Override
   public boolean isActive() {
-    return Math.abs(speed - 1f) >= CLOSE_THRESHOLD || Math.abs(pitch - 1f) >= CLOSE_THRESHOLD;
+    return Math.abs(speed - 1f) >= CLOSE_THRESHOLD || Math.abs(pitch - 1f) >= CLOSE_THRESHOLD
+        || outputSampleRateHz != sampleRateHz;
   }
 
   @Override
@@ -142,6 +178,11 @@ public int getOutputEncoding() {
     return C.ENCODING_PCM_16BIT;
   }
 
+  @Override
+  public int getOutputSampleRateHz() {
+    return outputSampleRateHz;
+  }
+
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
     if (inputBuffer.hasRemaining()) {
@@ -187,9 +228,7 @@ public boolean isEnded() {
 
   @Override
   public void flush() {
-    sonic = new Sonic(sampleRateHz, channelCount);
-    sonic.setSpeed(speed);
-    sonic.setPitch(pitch);
+    sonic = new Sonic(sampleRateHz, channelCount, speed, pitch, outputSampleRateHz);
     outputBuffer = EMPTY_BUFFER;
     inputBytes = 0;
     outputBytes = 0;
@@ -204,9 +243,11 @@ public void reset() {
     outputBuffer = EMPTY_BUFFER;
     channelCount = Format.NO_VALUE;
     sampleRateHz = Format.NO_VALUE;
+    outputSampleRateHz = Format.NO_VALUE;
     inputBytes = 0;
     outputBytes = 0;
     inputEnded = false;
+    pendingOutputSampleRateHz = SAMPLE_RATE_NO_CHANGE;
   }
 
 }
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 9338c24b76d..068a867f066 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
@@ -31,6 +31,7 @@
   private int trimStartSamples;
   private int trimEndSamples;
   private int channelCount;
+  private int sampleRateHz;
 
   private int pendingTrimStartBytes;
   private ByteBuffer buffer;
@@ -69,6 +70,7 @@ public boolean configure(int sampleRateHz, int channelCount, @Encoding int encod
       throw new UnhandledFormatException(sampleRateHz, channelCount, encoding);
     }
     this.channelCount = channelCount;
+    this.sampleRateHz = sampleRateHz;
     endBuffer = new byte[trimEndSamples * channelCount * 2];
     endBufferSize = 0;
     pendingTrimStartBytes = trimStartSamples * channelCount * 2;
@@ -92,6 +94,11 @@ public int getOutputEncoding() {
     return C.ENCODING_PCM_16BIT;
   }
 
+  @Override
+  public int getOutputSampleRateHz() {
+    return sampleRateHz;
+  }
+
   @Override
   public void queueInput(ByteBuffer inputBuffer) {
     int position = inputBuffer.position();
@@ -174,6 +181,7 @@ public void reset() {
     flush();
     buffer = EMPTY_BUFFER;
     channelCount = Format.NO_VALUE;
+    sampleRateHz = Format.NO_VALUE;
     endBuffer = null;
   }
 
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
new file mode 100644
index 00000000000..a4f02f82578
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/audio/SonicAudioProcessorTest.java
@@ -0,0 +1,137 @@
+/*
+ * 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.audio;
+
+import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.fail;
+
+import com.google.android.exoplayer2.C;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link SonicAudioProcessor}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class SonicAudioProcessorTest {
+
+  private SonicAudioProcessor sonicAudioProcessor;
+
+  @Before
+  public void setUp() {
+    sonicAudioProcessor = new SonicAudioProcessor();
+  }
+
+  @Test
+  public void testReconfigureWithSameSampleRate() throws Exception {
+    // When configured for resampling from 44.1 kHz to 48 kHz, the output sample rate is correct.
+    sonicAudioProcessor.setOutputSampleRateHz(48000);
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    assertThat(sonicAudioProcessor.getOutputSampleRateHz()).isEqualTo(48000);
+    assertThat(sonicAudioProcessor.isActive()).isTrue();
+    // When reconfigured with 48 kHz input, there is no resampling.
+    sonicAudioProcessor.configure(48000, 2, C.ENCODING_PCM_16BIT);
+    assertThat(sonicAudioProcessor.getOutputSampleRateHz()).isEqualTo(48000);
+    assertThat(sonicAudioProcessor.isActive()).isFalse();
+    // When reconfigure with 44.1 kHz input, resampling is enabled again.
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    assertThat(sonicAudioProcessor.getOutputSampleRateHz()).isEqualTo(48000);
+    assertThat(sonicAudioProcessor.isActive()).isTrue();
+  }
+
+  @Test
+  public void testNoSampleRateChange() throws Exception {
+    // Configure for resampling 44.1 kHz to 48 kHz.
+    sonicAudioProcessor.setOutputSampleRateHz(48000);
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    // Reconfigure to not modify the sample rate.
+    sonicAudioProcessor.setOutputSampleRateHz(SonicAudioProcessor.SAMPLE_RATE_NO_CHANGE);
+    sonicAudioProcessor.configure(22050, 2, C.ENCODING_PCM_16BIT);
+    // The sample rate is unmodified, and the audio processor is not active.
+    assertThat(sonicAudioProcessor.getOutputSampleRateHz()).isEqualTo(22050);
+    assertThat(sonicAudioProcessor.isActive()).isFalse();
+  }
+
+  @Test
+  public void testBecomesActiveAfterConfigure() throws Exception {
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    // Set a new sample rate.
+    sonicAudioProcessor.setOutputSampleRateHz(22050);
+    // The new sample rate is not active yet.
+    assertThat(sonicAudioProcessor.isActive()).isFalse();
+    assertThat(sonicAudioProcessor.getOutputSampleRateHz()).isEqualTo(44100);
+  }
+
+  @Test
+  public void testSampleRateChangeBecomesActiveAfterConfigure() throws Exception {
+    // Configure for resampling 44.1 kHz to 48 kHz.
+    sonicAudioProcessor.setOutputSampleRateHz(48000);
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    // Set a new sample rate, which isn't active yet.
+    sonicAudioProcessor.setOutputSampleRateHz(22050);
+    assertThat(sonicAudioProcessor.getOutputSampleRateHz()).isEqualTo(48000);
+    // The new sample rate takes effect on reconfiguration.
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    assertThat(sonicAudioProcessor.getOutputSampleRateHz()).isEqualTo(22050);
+  }
+
+  @Test
+  public void testIsActiveWithSpeedChange() throws Exception {
+    sonicAudioProcessor.setSpeed(1.5f);
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    assertThat(sonicAudioProcessor.isActive()).isTrue();
+  }
+
+  @Test
+  public void testIsActiveWithPitchChange() throws Exception {
+    sonicAudioProcessor.setPitch(1.5f);
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    assertThat(sonicAudioProcessor.isActive()).isTrue();
+  }
+
+  @Test
+  public void testIsNotActiveWithNoChange() throws Exception {
+    sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_16BIT);
+    assertThat(sonicAudioProcessor.isActive()).isFalse();
+  }
+
+  @Test
+  public void testDoesNotSupportNon16BitInput() throws Exception {
+    try {
+      sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_8BIT);
+      fail();
+    } catch (AudioProcessor.UnhandledFormatException e) {
+      // Expected.
+    }
+    try {
+      sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_24BIT);
+      fail();
+    } catch (AudioProcessor.UnhandledFormatException e) {
+      // Expected.
+    }
+    try {
+      sonicAudioProcessor.configure(44100, 2, C.ENCODING_PCM_32BIT);
+      fail();
+    } catch (AudioProcessor.UnhandledFormatException e) {
+      // Expected.
+    }
+  }
+
+}

From f6821c6d9597389e71a61b3722f2b3d6a1d43b3e Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 17 Oct 2017 03:48:15 -0700
Subject: [PATCH 312/421] Split playbacktests mobile_test into multiple
 version-dependent test targets.

MobileHarness allocates random devices for each test and repeats tests up to 5 times to
account for spurious test failures. Some of our tests automatically pass for SDK versions
below a certain threshold. Thus, even if such a version-guarded test would always fail,
the MobileHarness test is likely to succeed as it only needs one random allocation to a
device with a lower SDK version.

To prevent this behaviour and to make sure all tests are actually run, the mobile_test
target is split into multiple targets one for each minimum SDK version.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172447046
---
 .../gts/CommonEncryptionDrmTest.java          |   8 +-
 .../playbacktests/gts/DashStreamingTest.java  | 111 +++++++++++-------
 .../gts/DashWidevineOfflineTest.java          |   8 +-
 3 files changed, 75 insertions(+), 52 deletions(-)

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 a590e45f5f0..a4cd35911b0 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
@@ -67,7 +67,7 @@ protected void tearDown() throws Exception {
     super.tearDown();
   }
 
-  public void testCencSchemeType() {
+  public void testCencSchemeTypeV18() {
     if (Util.SDK_INT < 18) {
       // Pass.
       return;
@@ -75,7 +75,7 @@ public void testCencSchemeType() {
     testRunner.setStreamName("test_widevine_h264_scheme_cenc").setManifestUrl(URL_cenc).run();
   }
 
-  public void testCbc1SchemeType() {
+  public void testCbc1SchemeTypeV25() {
     if (Util.SDK_INT < 25) {
       // cbc1 support was added in API 24, but it is stable from API 25 onwards.
       // See [internal: b/65634809].
@@ -85,7 +85,7 @@ public void testCbc1SchemeType() {
     testRunner.setStreamName("test_widevine_h264_scheme_cbc1").setManifestUrl(URL_cbc1).run();
   }
 
-  public void testCbcsSchemeType() {
+  public void testCbcsSchemeTypeV25() {
     if (Util.SDK_INT < 25) {
       // cbcs support was added in API 24, but it is stable from API 25 onwards.
       // See [internal: b/65634809].
@@ -95,7 +95,7 @@ public void testCbcsSchemeType() {
     testRunner.setStreamName("test_widevine_h264_scheme_cbcs").setManifestUrl(URL_cbcs).run();
   }
 
-  public void testCensSchemeType() {
+  public void testCensSchemeTypeV25() {
     // TODO: Implement once content is available. Track [internal: b/31219813].
   }
 
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 39cdc7ee435..3748779b9d3 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
@@ -162,7 +162,7 @@ public void testH264AdaptiveWithRendererDisabling() throws DecoderQueryException
 
   // H265 CDD.
 
-  public void testH265Fixed() {
+  public void testH265FixedV23() {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -176,8 +176,8 @@ public void testH265Fixed() {
         .run();
   }
 
-  public void testH265Adaptive() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H265)) {
+  public void testH265AdaptiveV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -191,8 +191,8 @@ public void testH265Adaptive() throws DecoderQueryException {
         .run();
   }
 
-  public void testH265AdaptiveWithSeeking() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H265)) {
+  public void testH265AdaptiveWithSeekingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -207,8 +207,8 @@ public void testH265AdaptiveWithSeeking() throws DecoderQueryException {
         .run();
   }
 
-  public void testH265AdaptiveWithRendererDisabling() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H265)) {
+  public void testH265AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -225,7 +225,7 @@ public void testH265AdaptiveWithRendererDisabling() throws DecoderQueryException
 
   // VP9 (CDD).
 
-  public void testVp9Fixed360p() {
+  public void testVp9Fixed360pV23() {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -240,8 +240,8 @@ public void testVp9Fixed360p() {
         .run();
   }
 
-  public void testVp9Adaptive() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_VP9)) {
+  public void testVp9AdaptiveV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -255,8 +255,8 @@ public void testVp9Adaptive() throws DecoderQueryException {
         .run();
   }
 
-  public void testVp9AdaptiveWithSeeking() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_VP9)) {
+  public void testVp9AdaptiveWithSeekingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -271,8 +271,8 @@ public void testVp9AdaptiveWithSeeking() throws DecoderQueryException {
         .run();
   }
 
-  public void testVp9AdaptiveWithRendererDisabling() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_VP9)) {
+  public void testVp9AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -290,7 +290,7 @@ public void testVp9AdaptiveWithRendererDisabling() throws DecoderQueryException
   // H264: Other frame-rates for output buffer count assertions.
 
   // 23.976 fps.
-  public void test23FpsH264Fixed() {
+  public void test23FpsH264FixedV23() {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -306,7 +306,7 @@ public void test23FpsH264Fixed() {
   }
 
   // 24 fps.
-  public void test24FpsH264Fixed() {
+  public void test24FpsH264FixedV23() {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -322,7 +322,7 @@ public void test24FpsH264Fixed() {
   }
 
   // 29.97 fps.
-  public void test29FpsH264Fixed() {
+  public void test29FpsH264FixedV23() {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -340,7 +340,7 @@ public void test29FpsH264Fixed() {
   // Widevine encrypted media tests.
   // H264 CDD.
 
-  public void testWidevineH264Fixed() throws DecoderQueryException {
+  public void testWidevineH264FixedV18() throws DecoderQueryException {
     if (Util.SDK_INT < 18) {
       // Pass.
       return;
@@ -356,7 +356,7 @@ public void testWidevineH264Fixed() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineH264Adaptive() throws DecoderQueryException {
+  public void testWidevineH264AdaptiveV18() throws DecoderQueryException {
     if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -372,7 +372,7 @@ public void testWidevineH264Adaptive() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineH264AdaptiveWithSeeking() throws DecoderQueryException {
+  public void testWidevineH264AdaptiveWithSeekingV18() throws DecoderQueryException {
     if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -389,7 +389,7 @@ public void testWidevineH264AdaptiveWithSeeking() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineH264AdaptiveWithRendererDisabling() throws DecoderQueryException {
+  public void testWidevineH264AdaptiveWithRendererDisablingV18() throws DecoderQueryException {
     if (Util.SDK_INT < 18 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H264)) {
       // Pass.
       return;
@@ -408,7 +408,7 @@ public void testWidevineH264AdaptiveWithRendererDisabling() throws DecoderQueryE
 
   // H265 CDD.
 
-  public void testWidevineH265Fixed() throws DecoderQueryException {
+  public void testWidevineH265FixedV23() throws DecoderQueryException {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -424,8 +424,8 @@ public void testWidevineH265Fixed() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineH265Adaptive() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H265)) {
+  public void testWidevineH265AdaptiveV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -440,8 +440,8 @@ public void testWidevineH265Adaptive() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineH265AdaptiveWithSeeking() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H265)) {
+  public void testWidevineH265AdaptiveWithSeekingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -457,8 +457,8 @@ public void testWidevineH265AdaptiveWithSeeking() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineH265AdaptiveWithRendererDisabling() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_H265)) {
+  public void testWidevineH265AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -476,7 +476,7 @@ public void testWidevineH265AdaptiveWithRendererDisabling() throws DecoderQueryE
 
   // VP9 (CDD).
 
-  public void testWidevineVp9Fixed360p() throws DecoderQueryException {
+  public void testWidevineVp9Fixed360pV23() throws DecoderQueryException {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -492,8 +492,8 @@ public void testWidevineVp9Fixed360p() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineVp9Adaptive() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_VP9)) {
+  public void testWidevineVp9AdaptiveV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -508,8 +508,8 @@ public void testWidevineVp9Adaptive() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineVp9AdaptiveWithSeeking() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_VP9)) {
+  public void testWidevineVp9AdaptiveWithSeekingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -525,8 +525,8 @@ public void testWidevineVp9AdaptiveWithSeeking() throws DecoderQueryException {
         .run();
   }
 
-  public void testWidevineVp9AdaptiveWithRendererDisabling() throws DecoderQueryException {
-    if (Util.SDK_INT < 24 || shouldSkipAdaptiveTest(MimeTypes.VIDEO_VP9)) {
+  public void testWidevineVp9AdaptiveWithRendererDisablingV24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
       // Pass.
       return;
     }
@@ -545,7 +545,7 @@ public void testWidevineVp9AdaptiveWithRendererDisabling() throws DecoderQueryEx
   // H264: Other frame-rates for output buffer count assertions.
 
   // 23.976 fps.
-  public void testWidevine23FpsH264Fixed() throws DecoderQueryException {
+  public void testWidevine23FpsH264FixedV23() throws DecoderQueryException {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -562,7 +562,7 @@ public void testWidevine23FpsH264Fixed() throws DecoderQueryException {
   }
 
   // 24 fps.
-  public void testWidevine24FpsH264Fixed() throws DecoderQueryException {
+  public void testWidevine24FpsH264FixedV23() throws DecoderQueryException {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -579,7 +579,7 @@ public void testWidevine24FpsH264Fixed() throws DecoderQueryException {
   }
 
   // 29.97 fps.
-  public void testWidevine29FpsH264Fixed() throws DecoderQueryException {
+  public void testWidevine29FpsH264FixedV23() throws DecoderQueryException {
     if (Util.SDK_INT < 23) {
       // Pass.
       return;
@@ -595,16 +595,39 @@ public void testWidevine29FpsH264Fixed() throws DecoderQueryException {
         .run();
   }
 
+  // Decoder info.
+
+  public void testDecoderInfoH264() throws DecoderQueryException {
+    if (Util.SDK_INT < 16) {
+      // Pass.
+      return;
+    }
+    MediaCodecInfo decoderInfo = MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_H264, false);
+    assertNotNull(decoderInfo);
+    assertTrue(Util.SDK_INT < 21 || decoderInfo.adaptive);
+  }
+
+  public void testDecoderInfoH265V24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
+      // Pass.
+      return;
+    }
+    assertTrue(MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_H265, false).adaptive);
+  }
+
+  public void testDecoderInfoVP9V24() throws DecoderQueryException {
+    if (Util.SDK_INT < 24) {
+      // Pass.
+      return;
+    }
+    assertTrue(MediaCodecUtil.getDecoderInfo(MimeTypes.VIDEO_VP9, false).adaptive);
+  }
+
   // Internal.
 
   private static boolean shouldSkipAdaptiveTest(String mimeType) throws DecoderQueryException {
     MediaCodecInfo decoderInfo = MediaCodecUtil.getDecoderInfo(mimeType, false);
-    assertNotNull(decoderInfo);
-    if (decoderInfo.adaptive) {
-      return false;
-    }
-    assertTrue(Util.SDK_INT < 21);
-    return true;
+    return decoderInfo == null || !decoderInfo.adaptive;
   }
 
 }
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 0d79a803d3d..a50c230a39a 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
@@ -89,7 +89,7 @@ protected void tearDown() throws Exception {
 
   // Offline license tests
 
-  public void testWidevineOfflineLicense() throws Exception {
+  public void testWidevineOfflineLicenseV22() throws Exception {
     if (Util.SDK_INT < 22) {
       return; // Pass.
     }
@@ -101,7 +101,7 @@ public void testWidevineOfflineLicense() throws Exception {
     Assert.assertNotNull(offlineLicenseKeySetId);
   }
 
-  public void testWidevineOfflineReleasedLicense() throws Throwable {
+  public void testWidevineOfflineReleasedLicenseV22() throws Throwable {
     if (Util.SDK_INT < 22) {
       return; // Pass.
     }
@@ -127,7 +127,7 @@ public void testWidevineOfflineReleasedLicense() throws Throwable {
     }
   }
 
-  public void testWidevineOfflineExpiredLicense() throws Exception {
+  public void testWidevineOfflineExpiredLicenseV22() throws Exception {
     if (Util.SDK_INT < 22) {
       return; // Pass.
     }
@@ -152,7 +152,7 @@ public void testWidevineOfflineExpiredLicense() throws Exception {
     testRunner.run();
   }
 
-  public void testWidevineOfflineLicenseExpiresOnPause() throws Exception {
+  public void testWidevineOfflineLicenseExpiresOnPauseV22() throws Exception {
     if (Util.SDK_INT < 22) {
       return; // Pass.
     }

From 2c10e6f1c3fd1692d8db3d16355648aab92e66f7 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 17 Oct 2017 03:49:49 -0700
Subject: [PATCH 313/421] We're not playing an ad if the timeline is empty.

Issue: #3334

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172447125
---
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 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 22226604691..6bd6cd4795c 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
@@ -386,17 +386,17 @@ public boolean isCurrentWindowSeekable() {
 
   @Override
   public boolean isPlayingAd() {
-    return pendingSeekAcks == 0 && playbackInfo.periodId.isAd();
+    return !timeline.isEmpty() && pendingSeekAcks == 0 && playbackInfo.periodId.isAd();
   }
 
   @Override
   public int getCurrentAdGroupIndex() {
-    return pendingSeekAcks == 0 ? playbackInfo.periodId.adGroupIndex : C.INDEX_UNSET;
+    return isPlayingAd() ? playbackInfo.periodId.adGroupIndex : C.INDEX_UNSET;
   }
 
   @Override
   public int getCurrentAdIndexInAdGroup() {
-    return pendingSeekAcks == 0 ? playbackInfo.periodId.adIndexInAdGroup : C.INDEX_UNSET;
+    return isPlayingAd() ? playbackInfo.periodId.adIndexInAdGroup : C.INDEX_UNSET;
   }
 
   @Override

From f9249d23eac4d9143f99f2fe5066b93fc96ceb88 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Tue, 17 Oct 2017 07:33:19 -0700
Subject: [PATCH 314/421] Add an extractor flag for ignoring edit lists

Issue: #3358

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172464053
---
 .../extractor/DefaultExtractorsFactory.java   | 15 +++++++++-
 .../exoplayer2/extractor/mp4/AtomParsers.java | 16 +++++++---
 .../extractor/mp4/FragmentedMp4Extractor.java |  8 +++--
 .../extractor/mp4/Mp4Extractor.java           | 30 ++++++++++++++++++-
 .../exoplayer2/extractor/mp4/Track.java       |  6 ++--
 5 files changed, 64 insertions(+), 11 deletions(-)

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 ccc5c0eb3ef..87165e7a9b0 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
@@ -67,6 +67,7 @@ public final class DefaultExtractorsFactory implements ExtractorsFactory {
   }
 
   private @MatroskaExtractor.Flags int matroskaFlags;
+  private @Mp4Extractor.Flags int mp4Flags;
   private @FragmentedMp4Extractor.Flags int fragmentedMp4Flags;
   private @Mp3Extractor.Flags int mp3Flags;
   private @TsExtractor.Mode int tsMode;
@@ -89,6 +90,18 @@ public synchronized DefaultExtractorsFactory setMatroskaExtractorFlags(
     return this;
   }
 
+  /**
+   * Sets flags for {@link Mp4Extractor} instances created by the factory.
+   *
+   * @see Mp4Extractor#Mp4Extractor(int)
+   * @param flags The flags to use.
+   * @return The factory, for convenience.
+   */
+  public synchronized DefaultExtractorsFactory setMp4ExtractorFlags(@Mp4Extractor.Flags int flags) {
+    this.mp4Flags = flags;
+    return this;
+  }
+
   /**
    * Sets flags for {@link FragmentedMp4Extractor} instances created by the factory.
    *
@@ -145,7 +158,7 @@ public synchronized Extractor[] createExtractors() {
     Extractor[] extractors = new Extractor[FLAC_EXTRACTOR_CONSTRUCTOR == null ? 11 : 12];
     extractors[0] = new MatroskaExtractor(matroskaFlags);
     extractors[1] = new FragmentedMp4Extractor(fragmentedMp4Flags);
-    extractors[2] = new Mp4Extractor();
+    extractors[2] = new Mp4Extractor(mp4Flags);
     extractors[3] = new Mp3Extractor(mp3Flags);
     extractors[4] = new AdtsExtractor();
     extractors[5] = new Ac3Extractor();
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 86bdc2b41ca..1c4ca995f69 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
@@ -60,11 +60,13 @@
    * @param duration The duration in units of the timescale declared in the mvhd atom, or
    *     {@link C#TIME_UNSET} if the duration should be parsed from the tkhd atom.
    * @param drmInitData {@link DrmInitData} to be included in the format.
+   * @param ignoreEditLists Whether to ignore any edit lists in the trak box.
    * @param isQuickTime True for QuickTime media. False otherwise.
    * @return A {@link Track} instance, or {@code null} if the track's type isn't supported.
    */
   public static Track parseTrak(Atom.ContainerAtom trak, Atom.LeafAtom mvhd, long duration,
-      DrmInitData drmInitData, boolean isQuickTime) throws ParserException {
+      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);
     if (trackType == C.TRACK_TYPE_UNKNOWN) {
@@ -88,11 +90,17 @@ public static Track parseTrak(Atom.ContainerAtom trak, Atom.LeafAtom mvhd, long
     Pair<Long, String> mdhdData = parseMdhd(mdia.getLeafAtomOfType(Atom.TYPE_mdhd).data);
     StsdData stsdData = parseStsd(stbl.getLeafAtomOfType(Atom.TYPE_stsd).data, tkhdData.id,
         tkhdData.rotationDegrees, mdhdData.second, drmInitData, isQuickTime);
-    Pair<long[], long[]> edtsData = parseEdts(trak.getContainerAtomOfType(Atom.TYPE_edts));
+    long[] editListDurations = null;
+    long[] editListMediaTimes = null;
+    if (!ignoreEditLists) {
+      Pair<long[], long[]> edtsData = parseEdts(trak.getContainerAtomOfType(Atom.TYPE_edts));
+      editListDurations = edtsData.first;
+      editListMediaTimes = edtsData.second;
+    }
     return stsdData.format == null ? null
         : new Track(tkhdData.id, trackType, mdhdData.first, movieTimescale, durationUs,
             stsdData.format, stsdData.requiredSampleTransformation, stsdData.trackEncryptionBoxes,
-            stsdData.nalUnitLengthFieldLength, edtsData.first, edtsData.second);
+            stsdData.nalUnitLengthFieldLength, editListDurations, editListMediaTimes);
   }
 
   /**
@@ -783,7 +791,7 @@ private static void parseVideoSampleEntry(ParsableByteArray parent, int atomType
    *
    * @param edtsAtom edts (edit box) atom to decode.
    * @return Pair of edit list durations and edit list media times, or a pair of nulls if they are
-   * not present.
+   *     not present.
    */
   private static Pair<long[], long[]> parseEdts(Atom.ContainerAtom edtsAtom) {
     Atom.LeafAtom elst;
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 4807e052772..867e4501faf 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
@@ -74,7 +74,7 @@ public Extractor[] createExtractors() {
   @Retention(RetentionPolicy.SOURCE)
   @IntDef(flag = true, value = {FLAG_WORKAROUND_EVERY_VIDEO_FRAME_IS_SYNC_FRAME,
       FLAG_WORKAROUND_IGNORE_TFDT_BOX, FLAG_ENABLE_EMSG_TRACK, FLAG_ENABLE_CEA608_TRACK,
-      FLAG_SIDELOADED})
+      FLAG_SIDELOADED, FLAG_WORKAROUND_IGNORE_EDIT_LISTS})
   public @interface Flags {}
   /**
    * Flag to work around an issue in some video streams where every frame is marked as a sync frame.
@@ -103,6 +103,10 @@ public Extractor[] createExtractors() {
    * container.
    */
   private static final int FLAG_SIDELOADED = 16;
+  /**
+   * Flag to ignore any edit lists in the stream.
+   */
+  public static final int FLAG_WORKAROUND_IGNORE_EDIT_LISTS = 32;
 
   private static final String TAG = "FragmentedMp4Extractor";
   private static final int SAMPLE_GROUP_TYPE_seig = Util.getIntegerCodeForString("seig");
@@ -432,7 +436,7 @@ private void onMoovContainerAtomRead(ContainerAtom moov) throws ParserException
       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, false);
+            drmInitData, (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0, false);
         if (track != null) {
           tracks.put(track.id, track);
         }
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 d3fe9e0d058..473e17e3e0f 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
@@ -28,6 +28,7 @@
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.mp4.Atom.ContainerAtom;
+import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor.Flags;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.NalUnitUtil;
@@ -57,6 +58,17 @@ public Extractor[] createExtractors() {
 
   };
 
+  /**
+   * Flags controlling the behavior of the extractor.
+   */
+  @Retention(RetentionPolicy.SOURCE)
+  @IntDef(flag = true, value = {FLAG_WORKAROUND_IGNORE_EDIT_LISTS})
+  public @interface Flags {}
+  /**
+   * Flag to ignore any edit lists in the stream.
+   */
+  public static final int FLAG_WORKAROUND_IGNORE_EDIT_LISTS = 1;
+
   /**
    * Parser states.
    */
@@ -76,6 +88,8 @@ public Extractor[] createExtractors() {
    */
   private static final long RELOAD_MINIMUM_SEEK_DISTANCE = 256 * 1024;
 
+  private final @Flags int flags;
+
   // Temporary arrays.
   private final ParsableByteArray nalStartCode;
   private final ParsableByteArray nalLength;
@@ -98,7 +112,21 @@ public Extractor[] createExtractors() {
   private long durationUs;
   private boolean isQuickTime;
 
+  /**
+   * Creates a new extractor for unfragmented MP4 streams.
+   */
   public Mp4Extractor() {
+    this(0);
+  }
+
+  /**
+   * Creates a new extractor for unfragmented MP4 streams, using the specified flags to control the
+   * extractor's behavior.
+   *
+   * @param flags Flags that control the extractor's behavior.
+   */
+  public Mp4Extractor(@Flags int flags) {
+    this.flags = flags;
     atomHeader = new ParsableByteArray(Atom.LONG_HEADER_SIZE);
     containerAtoms = new Stack<>();
     nalStartCode = new ParsableByteArray(NalUnitUtil.NAL_START_CODE);
@@ -345,7 +373,7 @@ private void processMoovAtom(ContainerAtom moov) throws ParserException {
       }
 
       Track track = AtomParsers.parseTrak(atom, moov.getLeafAtomOfType(Atom.TYPE_mvhd),
-          C.TIME_UNSET, null, isQuickTime);
+          C.TIME_UNSET, null, (flags & FLAG_WORKAROUND_IGNORE_EDIT_LISTS) != 0, isQuickTime);
       if (track == null) {
         continue;
       }
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 7ac31587946..3adc5a8972d 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
@@ -81,12 +81,12 @@ public final class Track {
   /**
    * Durations of edit list segments in the movie timescale. Null if there is no edit list.
    */
-  public final long[] editListDurations;
+  @Nullable public final long[] editListDurations;
 
   /**
    * Media times for edit list segments in the track timescale. Null if there is no edit list.
    */
-  public final long[] editListMediaTimes;
+  @Nullable public final long[] editListMediaTimes;
 
   /**
    * For H264 video tracks, the length in bytes of the NALUnitLength field in each sample. 0 for
@@ -99,7 +99,7 @@ public final class Track {
   public Track(int id, int type, long timescale, long movieTimescale, long durationUs,
       Format format, @Transformation int sampleTransformation,
       @Nullable TrackEncryptionBox[] sampleDescriptionEncryptionBoxes, int nalUnitLengthFieldLength,
-      long[] editListDurations, long[] editListMediaTimes) {
+      @Nullable long[] editListDurations, @Nullable long[] editListMediaTimes) {
     this.id = id;
     this.type = type;
     this.timescale = timescale;

From 4f8f87221ead66dab7610c5c2aa2796f33b3b336 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=97=E5=8D=8E=E6=A0=8B=28Rabbit=29?=
 <andy.miao858@gmail.com>
Date: Wed, 18 Oct 2017 23:03:26 +0800
Subject: [PATCH 315/421] Fix FLV AVCVIDEOPACKET -> compositionTimeMs Type from
 UI 24 to SI 24

---
 .../exoplayer2/extractor/flv/VideoTagPayloadReader.java        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
index 8a4d314ee0b..6bf91e48246 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
@@ -80,6 +80,9 @@ protected boolean parseHeader(ParsableByteArray data) throws UnsupportedFormatEx
   protected void parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
     int packetType = data.readUnsignedByte();
     int compositionTimeMs = data.readUnsignedInt24();
+    // compositionTimeMs is signed int 24, change unsigned int 24 to signed int 24
+    compositionTimeMs = (compositionTimeMs & 0x800000) >> 23 == 1 ? (compositionTimeMs & 0xff000000) : compositionTimeMs;
+
     timeUs += compositionTimeMs * 1000L;
     // Parse avc sequence header in case this was not done before.
     if (packetType == AVC_PACKET_TYPE_SEQUENCE_HEADER && !hasOutputFormat) {

From 5895884c53a33c8417f231696b27dd9ef30495f7 Mon Sep 17 00:00:00 2001
From: miaohuadong <andy.miao858@gmail.com>
Date: Thu, 19 Oct 2017 14:10:18 +0800
Subject: [PATCH 316/421] Fix bug

---
 .../android/exoplayer2/extractor/flv/VideoTagPayloadReader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
index 6bf91e48246..22a8b57ef74 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
@@ -81,7 +81,7 @@ protected void parsePayload(ParsableByteArray data, long timeUs) throws ParserEx
     int packetType = data.readUnsignedByte();
     int compositionTimeMs = data.readUnsignedInt24();
     // compositionTimeMs is signed int 24, change unsigned int 24 to signed int 24
-    compositionTimeMs = (compositionTimeMs & 0x800000) >> 23 == 1 ? (compositionTimeMs & 0xff000000) : compositionTimeMs;
+    compositionTimeMs = (compositionTimeMs & 0x800000L) >>> 23 == 1 ? (compositionTimeMs | 0xff000000) : compositionTimeMs;
 
     timeUs += compositionTimeMs * 1000L;
     // Parse avc sequence header in case this was not done before.

From 276087c532500a191b1559f424cd400e59667e22 Mon Sep 17 00:00:00 2001
From: Mike <silizium@ok.de>
Date: Thu, 19 Oct 2017 14:23:50 +0300
Subject: [PATCH 317/421] Removed useless parentheses

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

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 1f92473bc99..08c5bddb093 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
@@ -176,7 +176,7 @@ public void onStart() {
   @Override
   public void onResume() {
     super.onResume();
-    if ((Util.SDK_INT <= 23 || player == null)) {
+    if (Util.SDK_INT <= 23 || player == null) {
       initializePlayer();
     }
   }

From 69e50a43a8104723fdf2f37d477f27f1f1ee40a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=97=E5=8D=8E=E6=A0=8B=28Rabbit=29?=
 <andy.miao858@gmail.com>
Date: Thu, 19 Oct 2017 23:18:12 +0800
Subject: [PATCH 318/421] add readSignedInt24 in ParsableByteArray

---
 .../extractor/flv/VideoTagPayloadReader.java     |  4 +---
 .../exoplayer2/util/ParsableByteArray.java       |  8 ++++++++
 .../exoplayer2/util/ParsableByteArrayTest.java   | 16 ++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
index 22a8b57ef74..7fa45a2a946 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
@@ -79,9 +79,7 @@ protected boolean parseHeader(ParsableByteArray data) throws UnsupportedFormatEx
   @Override
   protected void parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
     int packetType = data.readUnsignedByte();
-    int compositionTimeMs = data.readUnsignedInt24();
-    // compositionTimeMs is signed int 24, change unsigned int 24 to signed int 24
-    compositionTimeMs = (compositionTimeMs & 0x800000L) >>> 23 == 1 ? (compositionTimeMs | 0xff000000) : compositionTimeMs;
+    int compositionTimeMs = data.readSignedInt24();
 
     timeUs += compositionTimeMs * 1000L;
     // Parse avc sequence header in case this was not done before.
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 70cb584085d..9de86cc3bcc 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
@@ -256,6 +256,14 @@ public int readUnsignedInt24() {
         | (data[position++] & 0xFF);
   }
 
+  /**
+   * Reads the next three bytes as an signed value.
+   */
+  public int readSignedInt24() {
+    int ui24 = readUnsignedInt24();
+    return (ui24 & 0x800000L) >>> 23 == 1 ? (ui24 | 0xff000000) : ui24;
+  }
+
   /**
    * Reads the next three bytes as a signed value in little endian order.
    */
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 504a58b4a85..56a47404648 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
@@ -334,6 +334,22 @@ public void testReadLittleEndianUnsignedInt24() {
     assertThat(byteArray.getPosition()).isEqualTo(3);
   }
 
+  @Test
+  public void testReadPositiveSignedInt24() {
+    byte[] data = { 0x01, 0x02, (byte) 0xFF };
+    ParsableByteArray byteArray = new ParsableByteArray(data);
+    assertThat(byteArray.readSignedInt24()).isEqualTo(0x0102FF);
+    assertThat(byteArray.getPosition()).isEqualTo(3);
+  }
+
+  @Test
+  public void testReadNegativeSignedInt24() {
+    byte[] data = { (byte)0xFF, 0x02, (byte) 0x01 };
+    ParsableByteArray byteArray = new ParsableByteArray(data);
+    assertThat(byteArray.readSignedInt24()).isEqualTo(0xFFFF0201);
+    assertThat(byteArray.getPosition()).isEqualTo(3);
+  }
+
   @Test
   public void testReadLittleEndianUnsignedShort() {
     ParsableByteArray byteArray = new ParsableByteArray(new byte[] {

From fc5e8ee5162757d4a52142f59ec5bf771791af34 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 18 Oct 2017 04:46:05 -0700
Subject: [PATCH 319/421] Add some additional device specific workarounds

Issue: #3355
Issue: #3257

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172587141
---
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java | 2 +-
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java | 8 +++++---
 2 files changed, 6 insertions(+), 4 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 1ad6c1eed7b..d965b662be4 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
@@ -1142,7 +1142,7 @@ private static boolean codecNeedsFlushWorkaround(String name) {
    */
   private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode(String name) {
     if (Util.SDK_INT <= 24 && "OMX.Exynos.avc.dec.secure".equals(name)
-        && Util.MODEL.startsWith("SM-T585")) {
+        && (Util.MODEL.startsWith("SM-T585") || Util.MODEL.startsWith("SM-A520"))) {
       return ADAPTATION_WORKAROUND_MODE_ALWAYS;
     } else if (Util.SDK_INT < 24
         && ("OMX.Nvidia.h264.decode".equals(name) || "OMX.Nvidia.h264.decode.secure".equals(name))
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 40f2a7b0811..25e507d9848 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
@@ -1071,9 +1071,11 @@ private static boolean deviceNeedsAutoFrcWorkaround() {
    * If true is returned then we fall back to releasing and re-instantiating the codec instead.
    */
   private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
-    // Work around https://github.com/google/ExoPlayer/issues/3236.
-    return ("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
-        && "OMX.qcom.video.decoder.avc".equals(name);
+    // Work around https://github.com/google/ExoPlayer/issues/3236 and
+    // https://github.com/google/ExoPlayer/issues/3355.
+    return (("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
+        && "OMX.qcom.video.decoder.avc".equals(name))
+        || ("tcl_eu".equals(Util.DEVICE) && "OMX.MTK.VIDEO.DECODER.AVC".equals(name));
   }
 
   /**

From 1e79d6eb849a7e404e7682f24bbdcbd720ab6eda Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 18 Oct 2017 05:59:14 -0700
Subject: [PATCH 320/421] Fix seeking with repeated periods

newPlayingPeriodHolder could be set then updated if seeking to a repeated period
that was loaded more than once. This led to MediaPeriodHolders leaking.

Only set newPlayingPeriodHolder once so that any later holders with the same
period identifier get released.

Also add a regression test. FakeMediaSource checks that all created
MediaPeriods were released when it is released.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172591937
---
 .../google/android/exoplayer2/ExoPlayerTest.java | 16 ++++++++++++++++
 .../exoplayer2/ExoPlayerImplInternal.java        |  3 ++-
 .../exoplayer2/testutil/FakeMediaSource.java     |  1 +
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
index 2971aaf779d..eb9dc6f9d8f 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -261,6 +261,22 @@ public void testShuffleModeEnabledChanges() throws Exception {
     assertTrue(renderer.isEnded);
   }
 
+  public void testPeriodHoldersReleasedAfterSeekWithRepeatModeAll() throws Exception {
+    Timeline fakeTimeline = new FakeTimeline(new TimelineWindowDefinition(true, false, 100000));
+    FakeRenderer renderer = new FakeRenderer(Builder.VIDEO_FORMAT);
+    ActionSchedule actionSchedule = new ActionSchedule.Builder("testPeriodHoldersReleased")
+        .setRepeatMode(Player.REPEAT_MODE_ALL)
+        .waitForPositionDiscontinuity()
+        .seek(0) // Seek with repeat mode set to REPEAT_MODE_ALL.
+        .waitForPositionDiscontinuity()
+        .setRepeatMode(Player.REPEAT_MODE_OFF) // Turn off repeat so that playback can finish.
+        .build();
+    new ExoPlayerTestRunner.Builder()
+        .setTimeline(fakeTimeline).setRenderers(renderer).setActionSchedule(actionSchedule)
+        .build().start().blockUntilEnded(TIMEOUT_MS);
+    assertTrue(renderer.isEnded);
+  }
+
   public void testSeekProcessedCallback() throws Exception {
     Timeline timeline = new FakeTimeline(
         new TimelineWindowDefinition(true, false, 100000),
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 a0ca448de7f..79c92aeb67c 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
@@ -753,7 +753,8 @@ private long seekToPeriodPosition(MediaPeriodId periodId, long periodPositionUs)
       // Clear the timeline, but keep the requested period if it is already prepared.
       MediaPeriodHolder periodHolder = playingPeriodHolder;
       while (periodHolder != null) {
-        if (shouldKeepPeriodHolder(periodId, periodPositionUs, periodHolder)) {
+        if (newPlayingPeriodHolder == null
+            && shouldKeepPeriodHolder(periodId, periodPositionUs, periodHolder)) {
           newPlayingPeriodHolder = periodHolder;
         } else {
           periodHolder.release();
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 9e7b498269b..a827fb80c64 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
@@ -116,4 +116,5 @@ private static TrackGroupArray buildTrackGroupArray(Format... formats) {
     }
     return new TrackGroupArray(trackGroups);
   }
+
 }

From b8ef1dcc78ed240c7f7535fea193e53d1b5a3867 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 18 Oct 2017 06:08:51 -0700
Subject: [PATCH 321/421] Fix MediaPeriod position param Javadoc.

prepare and selectTracks receive the position from which any
loading should start, where-as continueLoading receives the
actual playback position. These are different in the case that
a previous period is still being played out.

Also removed "relative to the start of the period" from prepare
documentation because it couldn't really be relative to anything
else.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172592769
---
 .../google/android/exoplayer2/source/MediaPeriod.java  | 10 ++++++----
 .../android/exoplayer2/source/SequenceableLoader.java  |  4 +++-
 2 files changed, 9 insertions(+), 5 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 514b96ae8d4..7d16f794cdd 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
@@ -58,8 +58,7 @@ interface Callback extends SequenceableLoader.Callback<MediaPeriod> {
    *
    * @param callback Callback to receive updates from this period, including being notified when
    *     preparation completes.
-   * @param positionUs The position in microseconds relative to the start of the period at which to
-   *     start loading data.
+   * @param positionUs The expected starting position, in microseconds.
    */
   void prepare(Callback callback, long positionUs);
 
@@ -103,7 +102,8 @@ interface Callback extends SequenceableLoader.Callback<MediaPeriod> {
    *     selections.
    * @param streamResetFlags Will be updated to indicate new sample streams, and sample streams that
    *     have been retained but with the requirement that the consuming renderer be reset.
-   * @param positionUs The current playback position in microseconds.
+   * @param positionUs The current playback position in microseconds. If playback of this period has
+    *    not yet started, the value will be the starting position.
    * @return The actual position at which the tracks were enabled, in microseconds.
    */
   long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
@@ -176,7 +176,9 @@ long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
    * called when the period is permitted to continue loading data. A period may do this both during
    * and after preparation.
    *
-   * @param positionUs The current playback position.
+   * @param positionUs The current playback position in microseconds. If playback of this period has
+   *     not yet started, the value will be the starting position minus the duration of any media in
+   *     previous periods still to be played.
    * @return True if progress was made, meaning that {@link #getNextLoadPositionUs()} will return
    *     a different value than prior to the call. False otherwise.
    */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
index 26cb9a2666d..e40ceab9762 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
@@ -52,7 +52,9 @@ interface Callback<T extends SequenceableLoader> {
   /**
    * Attempts to continue loading.
    *
-   * @param positionUs The current playback position.
+   * @param positionUs The current playback position in microseconds. If playback of the period to
+   *     which this loader belongs has not yet started, the value will be the period's starting
+   *     position minus the duration of any media in previous periods still to be played.
    * @return True if progress was made, meaning that {@link #getNextLoadPositionUs()} will return
    *     a different value than prior to the call. False otherwise.
    */

From eb08e1a5c3481057c2672446b50b9e0e565b7895 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 18 Oct 2017 07:46:54 -0700
Subject: [PATCH 322/421] Work around AudioTrack Bluetooth connection issue

If connecting a Bluetooth audio device fails, the AudioTrack may be left in a
bad state, where it is not actually playing and its position has jumped back to
zero. Detect and work around this case by resetting the track.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172600912
---
 .../exoplayer2/audio/DefaultAudioSink.java    | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 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 a5173db2842..73c0bc20be2 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
@@ -293,8 +293,6 @@ public boolean isPassthroughSupported(String mimeType) {
 
   @Override
   public long getCurrentPositionUs(boolean sourceEnded) {
-    // If the device supports it, use the playback timestamp from AudioTrack.getTimestamp.
-    // Otherwise, derive a smoothed position by sampling the track's frame position.
     if (!hasCurrentPositionUs()) {
       return CURRENT_POSITION_NOT_SET;
     }
@@ -303,6 +301,8 @@ public long getCurrentPositionUs(boolean sourceEnded) {
       maybeSampleSyncParams();
     }
 
+    // If the device supports it, use the playback timestamp from AudioTrack.getTimestamp.
+    // Otherwise, derive a smoothed position by sampling the track's frame position.
     long systemClockUs = System.nanoTime() / 1000;
     long positionUs;
     if (audioTimestampSet) {
@@ -638,6 +638,13 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
       inputBuffer = null;
       return true;
     }
+
+    if (audioTrackUtil.needsReset(getWrittenFrames())) {
+      Log.w(TAG, "Resetting stalled audio track");
+      reset();
+      return true;
+    }
+
     return false;
   }
 
@@ -1292,6 +1299,8 @@ private static void setVolumeInternalV3(AudioTrack audioTrack, float volume) {
    */
   private static class AudioTrackUtil {
 
+    private static final long FORCE_RESET_WORKAROUND_TIMEOUT_MS = 200;
+
     protected AudioTrack audioTrack;
     private boolean needsPassthroughWorkaround;
     private int sampleRate;
@@ -1300,6 +1309,7 @@ private static class AudioTrackUtil {
     private long passthroughWorkaroundPauseOffset;
 
     private long stopTimestampUs;
+    private long forceResetWorkaroundTimeMs;
     private long stopPlaybackHeadPosition;
     private long endPlaybackHeadPosition;
 
@@ -1314,6 +1324,7 @@ public void reconfigure(AudioTrack audioTrack, boolean needsPassthroughWorkaroun
       this.audioTrack = audioTrack;
       this.needsPassthroughWorkaround = needsPassthroughWorkaround;
       stopTimestampUs = C.TIME_UNSET;
+      forceResetWorkaroundTimeMs = C.TIME_UNSET;
       lastRawPlaybackHeadPosition = 0;
       rawPlaybackHeadWrapCount = 0;
       passthroughWorkaroundPauseOffset = 0;
@@ -1348,6 +1359,17 @@ public void pause() {
       audioTrack.pause();
     }
 
+    /**
+     * Returns whether the track is in an invalid state and must be reset.
+     *
+     * @see #getPlaybackHeadPosition()
+     */
+    public boolean needsReset(long writtenFrames) {
+      return forceResetWorkaroundTimeMs != C.TIME_UNSET && writtenFrames > 0
+          && SystemClock.elapsedRealtime() - forceResetWorkaroundTimeMs
+              >= FORCE_RESET_WORKAROUND_TIMEOUT_MS;
+    }
+
     /**
      * {@link AudioTrack#getPlaybackHeadPosition()} returns a value intended to be interpreted as an
      * unsigned 32 bit integer, which also wraps around periodically. This method returns the
@@ -1380,6 +1402,24 @@ public long getPlaybackHeadPosition() {
         }
         rawPlaybackHeadPosition += passthroughWorkaroundPauseOffset;
       }
+
+      if (Util.SDK_INT <= 26) {
+        if (rawPlaybackHeadPosition == 0 && lastRawPlaybackHeadPosition > 0
+            && state == PLAYSTATE_PLAYING) {
+          // If connecting a Bluetooth audio device fails, the AudioTrack may be left in a state
+          // where its Java API is in the playing state, but the native track is stopped. When this
+          // happens the playback head position gets stuck at zero. In this case, return the old
+          // playback head position and force the track to be reset after
+          // {@link #FORCE_RESET_WORKAROUND_TIMEOUT_MS} has elapsed.
+          if (forceResetWorkaroundTimeMs == C.TIME_UNSET) {
+            forceResetWorkaroundTimeMs = SystemClock.elapsedRealtime();
+          }
+          return lastRawPlaybackHeadPosition;
+        } else {
+          forceResetWorkaroundTimeMs = C.TIME_UNSET;
+        }
+      }
+
       if (lastRawPlaybackHeadPosition > rawPlaybackHeadPosition) {
         // The value must have wrapped around.
         rawPlaybackHeadWrapCount++;

From daf9c8d19a2b6e1d95425af910641896a944e606 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 19 Oct 2017 03:00:44 -0700
Subject: [PATCH 323/421] Update HLS sample streams

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172722536
---
 demos/main/src/main/assets/media.exolist.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/demos/main/src/main/assets/media.exolist.json b/demos/main/src/main/assets/media.exolist.json
index 59d8259d37b..38a0c577aea 100644
--- a/demos/main/src/main/assets/media.exolist.json
+++ b/demos/main/src/main/assets/media.exolist.json
@@ -344,11 +344,11 @@
     "samples": [
       {
         "name": "Apple 4x3 basic stream",
-        "uri": "https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8"
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3/bipbop_4x3_variant.m3u8"
       },
       {
         "name": "Apple 16x9 basic stream",
-        "uri": "https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8"
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_16x9/bipbop_16x9_variant.m3u8"
       },
       {
         "name": "Apple master playlist advanced (TS)",
@@ -360,11 +360,11 @@
       },
       {
         "name": "Apple TS media playlist",
-        "uri": "https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear1/prog_index.m3u8"
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3/gear1/prog_index.m3u8"
       },
       {
         "name": "Apple AAC media playlist",
-        "uri": "https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear0/prog_index.m3u8"
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3/gear0/prog_index.m3u8"
       },
       {
         "name": "Apple ID3 metadata",
@@ -381,11 +381,11 @@
       },
       {
         "name": "Apple AAC 10s",
-        "uri": "https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear0/fileSequence0.aac"
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3/gear0/fileSequence0.aac"
       },
       {
         "name": "Apple TS 10s",
-        "uri": "https://devimages.apple.com.edgekey.net/streaming/examples/bipbop_4x3/gear1/fileSequence0.ts"
+        "uri": "https://devstreaming-cdn.apple.com/videos/streaming/examples/bipbop_4x3/gear1/fileSequence0.ts"
       },
       {
         "name": "Android screens (Matroska)",

From 49aca6e9ce745f36443e1c5388f0572b4ee1fd58 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 19 Oct 2017 03:21:09 -0700
Subject: [PATCH 324/421] Fix typo in variable name

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172724250
---
 .../exoplayer2/source/dash/manifest/DashManifestParser.java | 6 +++---
 1 file changed, 3 insertions(+), 3 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 72faf21b579..410fd7e41e9 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
@@ -524,10 +524,10 @@ protected Representation buildRepresentation(RepresentationInfo representationIn
       }
       format = format.copyWithDrmInitData(drmInitData);
     }
-    ArrayList<Descriptor> inbandEventStremas = representationInfo.inbandEventStreams;
-    inbandEventStremas.addAll(extraInbandEventStreams);
+    ArrayList<Descriptor> inbandEventStreams = representationInfo.inbandEventStreams;
+    inbandEventStreams.addAll(extraInbandEventStreams);
     return Representation.newInstance(contentId, Representation.REVISION_ID_DEFAULT, format,
-        representationInfo.baseUrl, representationInfo.segmentBase, inbandEventStremas);
+        representationInfo.baseUrl, representationInfo.segmentBase, inbandEventStreams);
   }
 
   // SegmentBase, SegmentList and SegmentTemplate parsing.

From 2cfc478c3ebf3662727cbe38ad5fef7bcddc8a38 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 19 Oct 2017 03:57:51 -0700
Subject: [PATCH 325/421] Allow extractor injection for HLS

Issue:#2748

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172726367
---
 .../extractor/mp3/Mp3Extractor.java           |  11 +-
 .../exoplayer2/extractor/ts/Ac3Extractor.java |   5 +-
 .../extractor/ts/AdtsExtractor.java           |   5 +-
 .../ts/DefaultTsPayloadReaderFactory.java     |   2 +-
 .../hls/DefaultHlsExtractorFactory.java       | 106 ++++++++++++
 .../exoplayer2/source/hls/HlsChunkSource.java |  20 ++-
 .../source/hls/HlsExtractorFactory.java       |  53 ++++++
 .../exoplayer2/source/hls/HlsMediaChunk.java  | 162 +++++-------------
 .../exoplayer2/source/hls/HlsMediaPeriod.java |  11 +-
 .../exoplayer2/source/hls/HlsMediaSource.java |  53 ++++--
 .../source/hls/HlsSampleStreamWrapper.java    |  19 +-
 .../hls/playlist/HlsPlaylistTracker.java      |   5 +-
 12 files changed, 287 insertions(+), 165 deletions(-)
 create mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
 create mode 100644 library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java

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 8d33f95640e..a4349ada091 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
@@ -112,16 +112,11 @@ public Extractor[] createExtractors() {
   private long samplesRead;
   private int sampleBytesRemaining;
 
-  /**
-   * Constructs a new {@link Mp3Extractor}.
-   */
   public Mp3Extractor() {
     this(0);
   }
 
   /**
-   * Constructs a new {@link Mp3Extractor}.
-   *
    * @param flags Flags that control the extractor's behavior.
    */
   public Mp3Extractor(@Flags int flags) {
@@ -129,8 +124,6 @@ public Mp3Extractor(@Flags int flags) {
   }
 
   /**
-   * Constructs a new {@link Mp3Extractor}.
-   *
    * @param flags Flags that control the extractor's behavior.
    * @param forcedFirstSampleTimestampUs A timestamp to force for the first sample, or
    *     {@link C#TIME_UNSET} if forcing is not required.
@@ -144,6 +137,8 @@ public Mp3Extractor(@Flags int flags, long forcedFirstSampleTimestampUs) {
     basisTimeUs = C.TIME_UNSET;
   }
 
+  // Extractor implementation.
+
   @Override
   public boolean sniff(ExtractorInput input) throws IOException, InterruptedException {
     return synchronize(input, true);
@@ -195,6 +190,8 @@ public int read(ExtractorInput input, PositionHolder seekPosition)
     return readSample(input);
   }
 
+  // Internal methods.
+
   private int readSample(ExtractorInput extractorInput) throws IOException, InterruptedException {
     if (sampleBytesRemaining == 0) {
       extractorInput.resetPeekPosition();
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 8bab6b7ed1a..4d54600c6df 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
@@ -29,8 +29,7 @@
 import java.io.IOException;
 
 /**
- * Facilitates the extraction of AC-3 samples from elementary audio files formatted as AC-3
- * bitstreams.
+ * Extracts samples from (E-)AC-3 bitstreams.
  */
 public final class Ac3Extractor implements Extractor {
 
@@ -71,6 +70,8 @@ public Ac3Extractor(long firstSampleTimestampUs) {
     sampleData = new ParsableByteArray(MAX_SYNC_FRAME_SIZE);
   }
 
+  // Extractor implementation.
+
   @Override
   public boolean sniff(ExtractorInput input) throws IOException, InterruptedException {
     // Skip any ID3 headers.
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 a1851aa0eab..5ce15952a51 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
@@ -29,8 +29,7 @@
 import java.io.IOException;
 
 /**
- * Facilitates the extraction of AAC samples from elementary audio files formatted as AAC with ADTS
- * headers.
+ * Extracts samples from AAC bit streams with ADTS framing.
  */
 public final class AdtsExtractor implements Extractor {
 
@@ -70,6 +69,8 @@ public AdtsExtractor(long firstSampleTimestampUs) {
     packetBuffer = new ParsableByteArray(MAX_PACKET_SIZE);
   }
 
+  // Extractor implementation.
+
   @Override
   public boolean sniff(ExtractorInput input) throws IOException, InterruptedException {
     // Skip any ID3 headers.
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 bd013f96a31..2d16b468957 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
@@ -28,7 +28,7 @@
 import java.util.List;
 
 /**
- * Default implementation for {@link TsPayloadReader.Factory}.
+ * Default {@link TsPayloadReader.Factory} implementation.
  */
 public final class DefaultTsPayloadReaderFactory implements TsPayloadReader.Factory {
 
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
new file mode 100644
index 00000000000..9f0989e4440
--- /dev/null
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/DefaultHlsExtractorFactory.java
@@ -0,0 +1,106 @@
+/*
+ * 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;
+
+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;
+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.AdtsExtractor;
+import com.google.android.exoplayer2.extractor.ts.DefaultTsPayloadReaderFactory;
+import com.google.android.exoplayer2.extractor.ts.TsExtractor;
+import com.google.android.exoplayer2.util.MimeTypes;
+import com.google.android.exoplayer2.util.TimestampAdjuster;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * Default {@link HlsExtractorFactory} implementation.
+ *
+ * <p>This class can be extended to override {@link TsExtractor} instantiation.</p>
+ */
+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 EC3_FILE_EXTENSION = ".ec3";
+  public static final String MP3_FILE_EXTENSION = ".mp3";
+  public static final String MP4_FILE_EXTENSION = ".mp4";
+  public static final String M4_FILE_EXTENSION_PREFIX = ".m4";
+  public static final String VTT_FILE_EXTENSION = ".vtt";
+  public static final String WEBVTT_FILE_EXTENSION = ".webvtt";
+
+  @Override
+  public Pair<Extractor, Boolean> createExtractor(Extractor previousExtractor, Uri uri,
+      Format format, List<Format> muxedCaptionFormats, DrmInitData drmInitData,
+      TimestampAdjuster timestampAdjuster) {
+    String lastPathSegment = uri.getLastPathSegment();
+    boolean isPackedAudioExtractor = false;
+    Extractor extractor;
+    if (MimeTypes.TEXT_VTT.equals(format.sampleMimeType)
+        || lastPathSegment.endsWith(WEBVTT_FILE_EXTENSION)
+        || lastPathSegment.endsWith(VTT_FILE_EXTENSION)) {
+      extractor = new WebvttExtractor(format.language, timestampAdjuster);
+    } else if (lastPathSegment.endsWith(AAC_FILE_EXTENSION)) {
+      isPackedAudioExtractor = true;
+      extractor = new AdtsExtractor();
+    } else if (lastPathSegment.endsWith(AC3_FILE_EXTENSION)
+        || lastPathSegment.endsWith(EC3_FILE_EXTENSION)) {
+      isPackedAudioExtractor = true;
+      extractor = new Ac3Extractor();
+    } else if (lastPathSegment.endsWith(MP3_FILE_EXTENSION)) {
+      isPackedAudioExtractor = true;
+      extractor = new Mp3Extractor(0, 0);
+    } else if (previousExtractor != null) {
+      // Only reuse TS and fMP4 extractors.
+      extractor = previousExtractor;
+    } else if (lastPathSegment.endsWith(MP4_FILE_EXTENSION)
+        || lastPathSegment.startsWith(M4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 4)) {
+      extractor = new FragmentedMp4Extractor(0, timestampAdjuster, null, drmInitData);
+    } else {
+      // For any other file extension, we assume TS format.
+      @DefaultTsPayloadReaderFactory.Flags
+      int esReaderFactoryFlags = DefaultTsPayloadReaderFactory.FLAG_IGNORE_SPLICE_INFO_STREAM;
+      if (muxedCaptionFormats != null) {
+        // The playlist declares closed caption renditions, we should ignore descriptors.
+        esReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_OVERRIDE_CAPTION_DESCRIPTORS;
+      } else {
+        muxedCaptionFormats = Collections.emptyList();
+      }
+      String codecs = format.codecs;
+      if (!TextUtils.isEmpty(codecs)) {
+        // Sometimes AAC and H264 streams are declared in TS chunks even though they don't really
+        // 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;
+        }
+        if (!MimeTypes.VIDEO_H264.equals(MimeTypes.getVideoMediaMimeType(codecs))) {
+          esReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_IGNORE_H264_STREAM;
+        }
+      }
+      extractor = new TsExtractor(TsExtractor.MODE_HLS, timestampAdjuster,
+          new DefaultTsPayloadReaderFactory(esReaderFactoryFlags, muxedCaptionFormats));
+    }
+    return Pair.create(extractor, isPackedAudioExtractor);
+  }
+
+}
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 8aa4e057a23..b8a0c3ddb74 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
@@ -80,6 +80,7 @@ public void clear() {
 
   }
 
+  private final HlsExtractorFactory extractorFactory;
   private final DataSource mediaDataSource;
   private final DataSource encryptionDataSource;
   private final TimestampAdjusterProvider timestampAdjusterProvider;
@@ -106,6 +107,8 @@ public void clear() {
   private long liveEdgeTimeUs;
 
   /**
+   * @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 dataSourceFactory An {@link HlsDataSourceFactory} to create {@link DataSource}s for the
@@ -116,9 +119,10 @@ public void clear() {
    * @param muxedCaptionFormats List of muxed caption {@link Format}s. Null if no closed caption
    *     information is available in the master playlist.
    */
-  public HlsChunkSource(HlsPlaylistTracker playlistTracker, HlsUrl[] variants,
-      HlsDataSourceFactory dataSourceFactory, TimestampAdjusterProvider timestampAdjusterProvider,
-      List<Format> muxedCaptionFormats) {
+  public HlsChunkSource(HlsExtractorFactory extractorFactory, HlsPlaylistTracker playlistTracker,
+      HlsUrl[] variants, HlsDataSourceFactory dataSourceFactory,
+      TimestampAdjusterProvider timestampAdjusterProvider, List<Format> muxedCaptionFormats) {
+    this.extractorFactory = extractorFactory;
     this.playlistTracker = playlistTracker;
     this.variants = variants;
     this.timestampAdjusterProvider = timestampAdjusterProvider;
@@ -321,11 +325,11 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     Uri chunkUri = UriUtil.resolveToUri(mediaPlaylist.baseUri, segment.url);
     DataSpec dataSpec = new DataSpec(chunkUri, segment.byterangeOffset, segment.byterangeLength,
         null);
-    out.chunk = new HlsMediaChunk(mediaDataSource, dataSpec, initDataSpec, selectedUrl,
-        muxedCaptionFormats, trackSelection.getSelectionReason(), trackSelection.getSelectionData(),
-        startTimeUs, startTimeUs + segment.durationUs, chunkMediaSequence, discontinuitySequence,
-        isTimestampMaster, timestampAdjuster, previous, mediaPlaylist.drmInitData, encryptionKey,
-        encryptionIv);
+    out.chunk = new HlsMediaChunk(extractorFactory, mediaDataSource, dataSpec, initDataSpec,
+        selectedUrl, muxedCaptionFormats, trackSelection.getSelectionReason(),
+        trackSelection.getSelectionData(), startTimeUs, startTimeUs + segment.durationUs,
+        chunkMediaSequence, discontinuitySequence, isTimestampMaster, timestampAdjuster, previous,
+        mediaPlaylist.drmInitData, encryptionKey, encryptionIv);
   }
 
   /**
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
new file mode 100644
index 00000000000..3ed6a549db1
--- /dev/null
+++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsExtractorFactory.java
@@ -0,0 +1,53 @@
+/*
+ * 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;
+
+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;
+import com.google.android.exoplayer2.util.TimestampAdjuster;
+import java.util.List;
+
+/**
+ * Factory for HLS media chunk extractors.
+ */
+public interface HlsExtractorFactory {
+
+  HlsExtractorFactory DEFAULT = new DefaultHlsExtractorFactory();
+
+  /**
+   * Creates an {@link Extractor} for extracting HLS media chunks.
+   *
+   * @param previousExtractor A previously used {@link Extractor} which can be reused if the current
+   *     chunk is a continuation of the previously extracted chunk, or null otherwise. It is the
+   *     responsibility of implementers to only reuse extractors that are suited for reusage.
+   * @param uri The URI of the media chunk.
+   * @param format A {@link Format} associated with the chunk to extract.
+   * @param muxedCaptionFormats List of muxed caption {@link Format}s. Null if no closed caption
+   *     information is available in the master playlist.
+   * @param drmInitData {@link DrmInitData} associated with the chunk.
+   * @param timestampAdjuster Adjuster corresponding to the provided discontinuity sequence number.
+   * @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.
+   */
+  Pair<Extractor, Boolean> createExtractor(Extractor previousExtractor, Uri uri, Format format,
+      List<Format> muxedCaptionFormats, DrmInitData drmInitData,
+      TimestampAdjuster timestampAdjuster);
+
+}
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 91513b536e3..5ca8675dd91 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,19 +15,13 @@
  */
 package com.google.android.exoplayer2.source.hls;
 
-import android.text.TextUtils;
+import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.drm.DrmInitData;
 import com.google.android.exoplayer2.extractor.DefaultExtractorInput;
 import com.google.android.exoplayer2.extractor.Extractor;
 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.AdtsExtractor;
-import com.google.android.exoplayer2.extractor.ts.DefaultTsPayloadReaderFactory;
-import com.google.android.exoplayer2.extractor.ts.TsExtractor;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.metadata.id3.Id3Decoder;
 import com.google.android.exoplayer2.metadata.id3.PrivFrame;
@@ -35,12 +29,10 @@
 import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl;
 import com.google.android.exoplayer2.upstream.DataSource;
 import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.util.MimeTypes;
 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.util.Collections;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -49,19 +41,11 @@
  */
 /* package */ final class HlsMediaChunk extends MediaChunk {
 
-  private static final AtomicInteger UID_SOURCE = new AtomicInteger();
 
   private static final String PRIV_TIMESTAMP_FRAME_OWNER =
       "com.apple.streaming.transportStreamTimestamp";
 
-  private static final String AAC_FILE_EXTENSION = ".aac";
-  private static final String AC3_FILE_EXTENSION = ".ac3";
-  private static final String EC3_FILE_EXTENSION = ".ec3";
-  private static final String MP3_FILE_EXTENSION = ".mp3";
-  private static final String MP4_FILE_EXTENSION = ".mp4";
-  private static final String M4_FILE_EXTENSION_PREFIX = ".m4";
-  private static final String VTT_FILE_EXTENSION = ".vtt";
-  private static final String WEBVTT_FILE_EXTENSION = ".webvtt";
+  private static final AtomicInteger uidSource = new AtomicInteger();
 
   /**
    * A unique identifier for the chunk.
@@ -83,26 +67,24 @@
   private final boolean isEncrypted;
   private final boolean isMasterTimestampSource;
   private final TimestampAdjuster timestampAdjuster;
-  private final String lastPathSegment;
-  private final Extractor previousExtractor;
   private final boolean shouldSpliceIn;
-  private final boolean needNewExtractor;
-  private final List<Format> muxedCaptionFormats;
-  private final DrmInitData drmInitData;
-
-  private final boolean isPackedAudio;
+  private final Extractor extractor;
+  private final boolean isPackedAudioExtractor;
+  private final boolean reusingExtractor;
   private final Id3Decoder id3Decoder;
   private final ParsableByteArray id3Data;
 
-  private Extractor extractor;
+  private HlsSampleStreamWrapper output;
   private int initSegmentBytesLoaded;
   private int bytesLoaded;
+  private boolean id3TimestampPeeked;
   private boolean initLoadCompleted;
-  private HlsSampleStreamWrapper extractorOutput;
   private volatile boolean loadCanceled;
   private volatile 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.
@@ -124,10 +106,10 @@
    * @param encryptionIv The AES initialization vector, or null if the segment is not fully
    *     encrypted.
    */
-  public HlsMediaChunk(DataSource dataSource, DataSpec dataSpec, DataSpec initDataSpec,
-      HlsUrl hlsUrl, List<Format> muxedCaptionFormats, int trackSelectionReason,
-      Object trackSelectionData, long startTimeUs, long endTimeUs, int chunkIndex,
-      int discontinuitySequenceNumber, boolean isMasterTimestampSource,
+  public HlsMediaChunk(HlsExtractorFactory extractorFactory, DataSource dataSource,
+      DataSpec dataSpec, DataSpec initDataSpec, HlsUrl hlsUrl, List<Format> muxedCaptionFormats,
+      int trackSelectionReason, Object trackSelectionData, long startTimeUs, long endTimeUs,
+      int chunkIndex, int discontinuitySequenceNumber, boolean isMasterTimestampSource,
       TimestampAdjuster timestampAdjuster, HlsMediaChunk previousChunk, DrmInitData drmInitData,
       byte[] fullSegmentEncryptionKey, byte[] encryptionIv) {
     super(buildDataSource(dataSource, fullSegmentEncryptionKey, encryptionIv), dataSpec,
@@ -136,33 +118,34 @@ public HlsMediaChunk(DataSource dataSource, DataSpec dataSpec, DataSpec initData
     this.discontinuitySequenceNumber = discontinuitySequenceNumber;
     this.initDataSpec = initDataSpec;
     this.hlsUrl = hlsUrl;
-    this.muxedCaptionFormats = muxedCaptionFormats;
     this.isMasterTimestampSource = isMasterTimestampSource;
     this.timestampAdjuster = timestampAdjuster;
     // Note: this.dataSource and dataSource may be different.
     this.isEncrypted = this.dataSource instanceof Aes128DataSource;
-    this.drmInitData = drmInitData;
-    lastPathSegment = dataSpec.uri.getLastPathSegment();
-    isPackedAudio = lastPathSegment.endsWith(AAC_FILE_EXTENSION)
-        || lastPathSegment.endsWith(AC3_FILE_EXTENSION)
-        || lastPathSegment.endsWith(EC3_FILE_EXTENSION)
-        || lastPathSegment.endsWith(MP3_FILE_EXTENSION);
+    Extractor previousExtractor = null;
     if (previousChunk != null) {
-      id3Decoder = previousChunk.id3Decoder;
-      id3Data = previousChunk.id3Data;
-      previousExtractor = previousChunk.extractor;
       shouldSpliceIn = previousChunk.hlsUrl != hlsUrl;
-      needNewExtractor = previousChunk.discontinuitySequenceNumber != discontinuitySequenceNumber
-          || shouldSpliceIn;
+      previousExtractor = previousChunk.discontinuitySequenceNumber != discontinuitySequenceNumber
+          || shouldSpliceIn ? null : previousChunk.extractor;
     } else {
-      id3Decoder = isPackedAudio ? new Id3Decoder() : null;
-      id3Data = isPackedAudio ? new ParsableByteArray(Id3Decoder.ID3_HEADER_LENGTH) : null;
-      previousExtractor = null;
       shouldSpliceIn = false;
-      needNewExtractor = true;
+    }
+    Pair<Extractor, Boolean> extractorData = extractorFactory.createExtractor(previousExtractor,
+        dataSpec.uri, trackFormat, muxedCaptionFormats, drmInitData, timestampAdjuster);
+    extractor = extractorData.first;
+    isPackedAudioExtractor = extractorData.second;
+    reusingExtractor = extractor == previousExtractor;
+    initLoadCompleted = reusingExtractor && initDataSpec != null;
+    if (isPackedAudioExtractor) {
+      id3Decoder = previousChunk != null ? previousChunk.id3Decoder : new Id3Decoder();
+      id3Data =  previousChunk != null ? previousChunk.id3Data
+          : new ParsableByteArray(Id3Decoder.ID3_HEADER_LENGTH);
+    } else {
+      id3Decoder = null;
+      id3Data = null;
     }
     initDataSource = dataSource;
-    uid = UID_SOURCE.getAndIncrement();
+    uid = uidSource.getAndIncrement();
   }
 
   /**
@@ -172,8 +155,11 @@ public HlsMediaChunk(DataSource dataSource, DataSpec dataSpec, DataSpec initData
    * @param output The output that will receive the loaded samples.
    */
   public void init(HlsSampleStreamWrapper output) {
-    extractorOutput = output;
+    this.output = output;
     output.init(uid, shouldSpliceIn);
+    if (!reusingExtractor) {
+      extractor.init(output);
+    }
   }
 
   @Override
@@ -200,10 +186,6 @@ public boolean isLoadCanceled() {
 
   @Override
   public void load() throws IOException, InterruptedException {
-    if (extractor == null && !isPackedAudio) {
-      // See HLS spec, version 20, Section 3.4 for more information on packed audio extraction.
-      extractor = createExtractor();
-    }
     maybeLoadInitData();
     if (!loadCanceled) {
       loadMedia();
@@ -213,8 +195,8 @@ public void load() throws IOException, InterruptedException {
   // Internal loading methods.
 
   private void maybeLoadInitData() throws IOException, InterruptedException {
-    if (previousExtractor == extractor || initLoadCompleted || initDataSpec == null) {
-      // According to spec, for packed audio, initDataSpec is expected to be null.
+    if (initLoadCompleted || initDataSpec == null) {
+      // Note: The HLS spec forbids initialization segments for packed audio.
       return;
     }
     DataSpec initSegmentDataSpec = initDataSpec.subrange(initSegmentBytesLoaded);
@@ -258,10 +240,10 @@ private void loadMedia() throws IOException, InterruptedException {
     try {
       ExtractorInput input = new DefaultExtractorInput(dataSource,
           loadDataSpec.absoluteStreamPosition, dataSource.open(loadDataSpec));
-      if (extractor == null) {
-        // Media segment format is packed audio.
+      if (isPackedAudioExtractor && !id3TimestampPeeked) {
         long id3Timestamp = peekId3PrivTimestamp(input);
-        extractor = buildPackedAudioExtractor(id3Timestamp != C.TIME_UNSET
+        id3TimestampPeeked = true;
+        output.setSampleOffsetUs(id3Timestamp != C.TIME_UNSET
             ? timestampAdjuster.adjustTsTimestamp(id3Timestamp) : startTimeUs);
       }
       if (skipLoadedBytes) {
@@ -345,68 +327,4 @@ private static DataSource buildDataSource(DataSource dataSource, byte[] fullSegm
     return dataSource;
   }
 
-  private Extractor createExtractor() {
-    // Select the extractor that will read the chunk.
-    Extractor extractor;
-    boolean usingNewExtractor = true;
-    if (MimeTypes.TEXT_VTT.equals(hlsUrl.format.sampleMimeType)
-        || lastPathSegment.endsWith(WEBVTT_FILE_EXTENSION)
-        || lastPathSegment.endsWith(VTT_FILE_EXTENSION)) {
-      extractor = new WebvttExtractor(trackFormat.language, timestampAdjuster);
-    } else if (!needNewExtractor) {
-      // Only reuse TS and fMP4 extractors.
-      usingNewExtractor = false;
-      extractor = previousExtractor;
-    } else if (lastPathSegment.endsWith(MP4_FILE_EXTENSION)
-        || lastPathSegment.startsWith(M4_FILE_EXTENSION_PREFIX, lastPathSegment.length() - 4)) {
-      extractor = new FragmentedMp4Extractor(0, timestampAdjuster, null, drmInitData);
-    } else {
-      // MPEG-2 TS segments, but we need a new extractor.
-      // This flag ensures the change of pid between streams does not affect the sample queues.
-      @DefaultTsPayloadReaderFactory.Flags
-      int esReaderFactoryFlags = DefaultTsPayloadReaderFactory.FLAG_IGNORE_SPLICE_INFO_STREAM;
-      List<Format> closedCaptionFormats = muxedCaptionFormats;
-      if (closedCaptionFormats != null) {
-        // The playlist declares closed caption renditions, we should ignore descriptors.
-        esReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_OVERRIDE_CAPTION_DESCRIPTORS;
-      } else {
-        closedCaptionFormats = Collections.emptyList();
-      }
-      String codecs = trackFormat.codecs;
-      if (!TextUtils.isEmpty(codecs)) {
-        // Sometimes AAC and H264 streams are declared in TS chunks even though they don't really
-        // 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;
-        }
-        if (!MimeTypes.VIDEO_H264.equals(MimeTypes.getVideoMediaMimeType(codecs))) {
-          esReaderFactoryFlags |= DefaultTsPayloadReaderFactory.FLAG_IGNORE_H264_STREAM;
-        }
-      }
-      extractor = new TsExtractor(TsExtractor.MODE_HLS, timestampAdjuster,
-          new DefaultTsPayloadReaderFactory(esReaderFactoryFlags, closedCaptionFormats));
-    }
-    if (usingNewExtractor) {
-      extractor.init(extractorOutput);
-    }
-    return extractor;
-  }
-
-  private Extractor buildPackedAudioExtractor(long startTimeUs) {
-    Extractor extractor;
-    if (lastPathSegment.endsWith(AAC_FILE_EXTENSION)) {
-      extractor = new AdtsExtractor(startTimeUs);
-    } else if (lastPathSegment.endsWith(AC3_FILE_EXTENSION)
-        || lastPathSegment.endsWith(EC3_FILE_EXTENSION)) {
-      extractor = new Ac3Extractor(startTimeUs);
-    } else if (lastPathSegment.endsWith(MP3_FILE_EXTENSION)) {
-      extractor = new Mp3Extractor(0, startTimeUs);
-    } else {
-      throw new IllegalArgumentException("Unknown extension for audio file: " + lastPathSegment);
-    }
-    extractor.init(extractorOutput);
-    return extractor;
-  }
-
 }
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 003b38efef7..ea9e52e62ea 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
@@ -44,6 +44,7 @@
 public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper.Callback,
     HlsPlaylistTracker.PlaylistEventListener {
 
+  private final HlsExtractorFactory extractorFactory;
   private final HlsPlaylistTracker playlistTracker;
   private final HlsDataSourceFactory dataSourceFactory;
   private final int minLoadableRetryCount;
@@ -60,8 +61,10 @@ public final class HlsMediaPeriod implements MediaPeriod, HlsSampleStreamWrapper
   private HlsSampleStreamWrapper[] enabledSampleStreamWrappers;
   private CompositeSequenceableLoader sequenceableLoader;
 
-  public HlsMediaPeriod(HlsPlaylistTracker playlistTracker, HlsDataSourceFactory dataSourceFactory,
-      int minLoadableRetryCount, EventDispatcher eventDispatcher, Allocator allocator) {
+  public HlsMediaPeriod(HlsExtractorFactory extractorFactory, HlsPlaylistTracker playlistTracker,
+      HlsDataSourceFactory dataSourceFactory, int minLoadableRetryCount,
+      EventDispatcher eventDispatcher, Allocator allocator) {
+    this.extractorFactory = extractorFactory;
     this.playlistTracker = playlistTracker;
     this.dataSourceFactory = dataSourceFactory;
     this.minLoadableRetryCount = minLoadableRetryCount;
@@ -344,8 +347,8 @@ private void buildAndPrepareSampleStreamWrappers(long positionUs) {
 
   private HlsSampleStreamWrapper buildSampleStreamWrapper(int trackType, HlsUrl[] variants,
       Format muxedAudioFormat, List<Format> muxedCaptionFormats, long positionUs) {
-    HlsChunkSource defaultChunkSource = new HlsChunkSource(playlistTracker, variants,
-        dataSourceFactory, timestampAdjusterProvider, muxedCaptionFormats);
+    HlsChunkSource defaultChunkSource = new HlsChunkSource(extractorFactory, playlistTracker,
+        variants, dataSourceFactory, timestampAdjusterProvider, muxedCaptionFormats);
     return new HlsSampleStreamWrapper(trackType, this, defaultChunkSource, allocator, positionUs,
         muxedAudioFormat, minLoadableRetryCount, eventDispatcher);
   }
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 10a05366127..f7f26bb37ce 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
@@ -20,6 +20,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.source.AdaptiveMediaSourceEventListener;
 import com.google.android.exoplayer2.source.AdaptiveMediaSourceEventListener.EventDispatcher;
 import com.google.android.exoplayer2.source.MediaPeriod;
@@ -51,6 +52,7 @@ public final class HlsMediaSource implements MediaSource,
    */
   public static final int DEFAULT_MIN_LOADABLE_RETRY_COUNT = 3;
 
+  private final HlsExtractorFactory extractorFactory;
   private final Uri manifestUri;
   private final HlsDataSourceFactory dataSourceFactory;
   private final int minLoadableRetryCount;
@@ -60,32 +62,57 @@ public final class HlsMediaSource implements MediaSource,
   private HlsPlaylistTracker playlistTracker;
   private Listener sourceListener;
 
+  /**
+   * @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 An {@link AdaptiveMediaSourceEventListener}. May be null if delivery of
+   *     events is not required.
+   */
   public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory, Handler eventHandler,
       AdaptiveMediaSourceEventListener eventListener) {
     this(manifestUri, dataSourceFactory, 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 An {@link AdaptiveMediaSourceEventListener}. May be null if delivery of
+   *     events is not required.
+   */
   public HlsMediaSource(Uri manifestUri, DataSource.Factory dataSourceFactory,
       int minLoadableRetryCount, Handler eventHandler,
       AdaptiveMediaSourceEventListener eventListener) {
-    this(manifestUri, new DefaultHlsDataSourceFactory(dataSourceFactory), minLoadableRetryCount,
-        eventHandler, eventListener);
-  }
-
-  public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
-      int minLoadableRetryCount, Handler eventHandler,
-      AdaptiveMediaSourceEventListener eventListener) {
-   this(manifestUri, dataSourceFactory, minLoadableRetryCount, eventHandler, eventListener,
-       new HlsPlaylistParser());
+    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 An {@link AdaptiveMediaSourceEventListener}. May be null if delivery of
+   *     events is not required.
+   * @param playlistParser A {@link ParsingLoadable.Parser} for HLS playlists.
+   */
   public HlsMediaSource(Uri manifestUri, HlsDataSourceFactory dataSourceFactory,
-     int minLoadableRetryCount, Handler eventHandler,
+     HlsExtractorFactory extractorFactory, int minLoadableRetryCount, Handler eventHandler,
      AdaptiveMediaSourceEventListener eventListener,
-     ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
+      ParsingLoadable.Parser<HlsPlaylist> playlistParser) {
     this.manifestUri = manifestUri;
     this.dataSourceFactory = dataSourceFactory;
+    this.extractorFactory = extractorFactory;
     this.minLoadableRetryCount = minLoadableRetryCount;
     this.playlistParser = playlistParser;
     eventDispatcher = new EventDispatcher(eventHandler, eventListener);
@@ -108,8 +135,8 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
   @Override
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     Assertions.checkArgument(id.periodIndex == 0);
-    return new HlsMediaPeriod(playlistTracker, dataSourceFactory, minLoadableRetryCount,
-        eventDispatcher, allocator);
+    return new HlsMediaPeriod(extractorFactory, playlistTracker, dataSourceFactory,
+        minLoadableRetryCount, eventDispatcher, allocator);
   }
 
   @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 b844988588b..946ae24d172 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
@@ -103,6 +103,7 @@ public interface Callback extends SequenceableLoader.Callback<HlsSampleStreamWra
   private boolean[] trackGroupEnabledStates;
   private boolean[] trackGroupIsAudioVideoFlags;
 
+  private long sampleOffsetUs;
   private long lastSeekPositionUs;
   private long pendingResetPositionUs;
   private boolean pendingResetUpstreamFormats;
@@ -369,16 +370,16 @@ public void onPlaylistBlacklisted(HlsUrl url, long blacklistMs) {
 
   // SampleStream implementation.
 
-  /* package */ boolean isReady(int trackGroupIndex) {
+  public boolean isReady(int trackGroupIndex) {
     return loadingFinished || (!isPendingReset() && sampleQueues[trackGroupIndex].hasNextSample());
   }
 
-  /* package */ void maybeThrowError() throws IOException {
+  public void maybeThrowError() throws IOException {
     loader.maybeThrowError();
     chunkSource.maybeThrowError();
   }
 
-  /* package */ int readData(int trackGroupIndex, FormatHolder formatHolder,
+  public int readData(int trackGroupIndex, FormatHolder formatHolder,
       DecoderInputBuffer buffer, boolean requireFormat) {
     if (isPendingReset()) {
       return C.RESULT_NOTHING_READ;
@@ -402,7 +403,7 @@ public void onPlaylistBlacklisted(HlsUrl url, long blacklistMs) {
         lastSeekPositionUs);
   }
 
-  /* package */ int skipData(int trackGroupIndex, long positionUs) {
+  public int skipData(int trackGroupIndex, long positionUs) {
     SampleQueue sampleQueue = sampleQueues[trackGroupIndex];
     if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
       return sampleQueue.advanceToEnd();
@@ -573,6 +574,7 @@ public SampleQueue track(int id, int type) {
       }
     }
     SampleQueue trackOutput = new SampleQueue(allocator);
+    trackOutput.setSampleOffsetUs(sampleOffsetUs);
     trackOutput.setUpstreamFormatChangeListener(this);
     sampleQueueTrackIds = Arrays.copyOf(sampleQueueTrackIds, trackCount + 1);
     sampleQueueTrackIds[trackCount] = id;
@@ -599,6 +601,15 @@ public void onUpstreamFormatChanged(Format format) {
     handler.post(maybeFinishPrepareRunnable);
   }
 
+  // Called by the loading thread.
+
+  public void setSampleOffsetUs(long sampleOffsetUs) {
+    this.sampleOffsetUs = sampleOffsetUs;
+    for (SampleQueue sampleQueue : sampleQueues) {
+      sampleQueue.setSampleOffsetUs(sampleOffsetUs);
+    }
+  }
+
   // Internal methods.
 
   private void maybeFinishPrepare() {
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 da73aa39964..355a8575caf 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
@@ -134,8 +134,9 @@ public interface PlaylistEventListener {
    *     playlist or a master playlist.
    * @param dataSourceFactory A factory for {@link DataSource} instances.
    * @param eventDispatcher A dispatcher to notify of events.
-   * @param minRetryCount The minimum number of times the load must be retried before blacklisting a
-   *     playlist.
+   * @param minRetryCount The minimum number of times loads must be retried before
+   *     {@link #maybeThrowPlaylistRefreshError(HlsUrl)} and
+   *     {@link #maybeThrowPrimaryPlaylistRefreshError()} propagate any loading errors.
    * @param primaryPlaylistListener A callback for the primary playlist change events.
    */
   public HlsPlaylistTracker(Uri initialPlaylistUri, HlsDataSourceFactory dataSourceFactory,

From d09f872179d511fb2c620b085734dd06c1b7964e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 19 Oct 2017 06:30:50 -0700
Subject: [PATCH 326/421] Fix positions passed to TrackSelection

- When transitioning to a new period, the value of bufferedDurationUs
  passed to TrackSelection.updateSelectedTrack was incorrectly set to
  0. It should have been set to correctly reflect buffered media in
  previous periods still being played out.
- This change fixes the issue described above, and also propagates the
  playback position through to this method. The position of the next
  load within the period can be calculated by adding the position and
  bufferedDurationUs.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172736101
---
 .../exoplayer2/source/MediaPeriod.java        |  4 +--
 .../exoplayer2/source/SequenceableLoader.java |  4 +--
 .../source/chunk/ChunkSampleStream.java       | 13 ++++++--
 .../exoplayer2/source/chunk/ChunkSource.java  | 13 +++++---
 .../AdaptiveTrackSelection.java               |  3 +-
 .../trackselection/FixedTrackSelection.java   |  3 +-
 .../trackselection/RandomTrackSelection.java  |  3 +-
 .../trackselection/TrackSelection.java        | 30 +++++++++++++------
 .../source/dash/DefaultDashChunkSource.java   |  9 +++---
 .../exoplayer2/source/hls/HlsChunkSource.java | 24 +++++++++------
 .../source/hls/HlsSampleStreamWrapper.java    | 16 +++++++---
 .../smoothstreaming/DefaultSsChunkSource.java |  9 +++---
 .../exoplayer2/testutil/FakeChunkSource.java  |  7 +++--
 13 files changed, 91 insertions(+), 47 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 7d16f794cdd..211da1d6660 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
@@ -177,8 +177,8 @@ long selectTracks(TrackSelection[] selections, boolean[] mayRetainStreamFlags,
    * and after preparation.
    *
    * @param positionUs The current playback position in microseconds. If playback of this period has
-   *     not yet started, the value will be the starting position minus the duration of any media in
-   *     previous periods still to be played.
+   *     not yet started, the value will be the starting position in this period minus the duration
+   *     of any media in previous periods still to be played.
    * @return True if progress was made, meaning that {@link #getNextLoadPositionUs()} will return
    *     a different value than prior to the call. False otherwise.
    */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
index e40ceab9762..6daa1e847a8 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/SequenceableLoader.java
@@ -53,8 +53,8 @@ interface Callback<T extends SequenceableLoader> {
    * Attempts to continue loading.
    *
    * @param positionUs The current playback position in microseconds. If playback of the period to
-   *     which this loader belongs has not yet started, the value will be the period's starting
-   *     position minus the duration of any media in previous periods still to be played.
+   *     which this loader belongs has not yet started, the value will be the starting position
+   *     in the period minus the duration of any media in previous periods still to be played.
    * @return True if progress was made, meaning that {@link #getNextLoadPositionUs()} will return
    *     a different value than prior to the call. False otherwise.
    */
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 f2609a0ffdd..9d5a405c2fb 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
@@ -351,9 +351,16 @@ public boolean continueLoading(long positionUs) {
       return false;
     }
 
-    chunkSource.getNextChunk(mediaChunks.isEmpty() ? null : mediaChunks.getLast(),
-        pendingResetPositionUs != C.TIME_UNSET ? pendingResetPositionUs : positionUs,
-        nextChunkHolder);
+    MediaChunk previousChunk;
+    long loadPositionUs;
+    if (isPendingReset()) {
+      previousChunk = null;
+      loadPositionUs = pendingResetPositionUs;
+    } else {
+      previousChunk = mediaChunks.getLast();
+      loadPositionUs = previousChunk.endTimeUs;
+    }
+    chunkSource.getNextChunk(previousChunk, positionUs, loadPositionUs, nextChunkHolder);
     boolean endOfStream = nextChunkHolder.endOfStream;
     Chunk loadable = nextChunkHolder.chunk;
     nextChunkHolder.clear();
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
index 00865822e10..6dffc457d6a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
@@ -54,12 +54,17 @@ public interface ChunkSource {
    * end of the stream has not been reached, the {@link ChunkHolder} is not modified.
    *
    * @param previous The most recently loaded media chunk.
-   * @param playbackPositionUs The current playback position. If {@code previous} is null then this
-   *     parameter is the position from which playback is expected to start (or restart) and hence
-   *     should be interpreted as a seek position.
+   * @param playbackPositionUs The current playback position in microseconds. If playback of the
+   *     period to which this chunk source belongs has not yet started, the value will be the
+   *     starting position in the period minus the duration of any media in previous periods still
+   *     to be played.
+   * @param loadPositionUs The current load position in microseconds. If {@code previous} is null,
+   *     this is the starting position from which chunks should be provided. Else it's equal to
+   *     {@code previous.endTimeUs}.
    * @param out A holder to populate.
    */
-  void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHolder out);
+  void getNextChunk(MediaChunk previous, long playbackPositionUs, long loadPositionUs,
+      ChunkHolder out);
 
   /**
    * Called when the {@link ChunkSampleStream} has finished loading a chunk obtained from this
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 b999164f00f..f9eddab2861 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
@@ -201,7 +201,8 @@ public AdaptiveTrackSelection(TrackGroup group, int[] tracks, BandwidthMeter ban
   }
 
   @Override
-  public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
+  public void updateSelectedTrack(long playbackPositionUs, long bufferedDurationUs,
+      long availableDurationUs) {
     long nowMs = SystemClock.elapsedRealtime();
     // Stash the current selection, then make a new one.
     int currentSelectedIndex = selectedIndex;
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 ca43258e3fe..50873d372d7 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
@@ -78,7 +78,8 @@ public FixedTrackSelection(TrackGroup group, int track, int reason, Object data)
   }
 
   @Override
-  public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
+  public void updateSelectedTrack(long playbackPositionUs, long bufferedDurationUs,
+      long availableDurationUs) {
     // Do nothing.
   }
 
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 b70cc8e0d5f..d11344a6f6d 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
@@ -88,7 +88,8 @@ public RandomTrackSelection(TrackGroup group, int[] tracks, Random random) {
   }
 
   @Override
-  public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
+  public void updateSelectedTrack(long playbackPositionUs, long bufferedDurationUs,
+      long availableDurationUs) {
     // Count the number of non-blacklisted formats.
     long nowMs = SystemClock.elapsedRealtime();
     int nonBlacklistedFormatCount = 0;
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 aeb1d1d6e3d..ad02b6c7756 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
@@ -26,7 +26,7 @@
  * {@link 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)}.
+ * track may change as a result of calling {@link #updateSelectedTrack(long, long, long)}.
  */
 public interface TrackSelection {
 
@@ -125,12 +125,21 @@ interface Factory {
   /**
    * Updates the selected track.
    *
-   * @param bufferedDurationUs The duration of media currently buffered in microseconds.
+   * @param playbackPositionUs The current playback position in microseconds. If playback of the
+   *     period to which this track selection belongs has not yet started, the value will be the
+   *     starting position in the period minus the duration of any media in previous periods still
+   *     to be played.
+   * @param bufferedDurationUs The duration of media currently buffered from the current playback
+   *     position, in microseconds. Note that the next load position can be calculated as
+   *     {@code (playbackPositionUs + bufferedDurationUs)}.
    * @param availableDurationUs The duration of media available for buffering from the current
    *     playback position, in microseconds, or {@link C#TIME_UNSET} if media can be buffered
-   *     to the end of the current period.
+   *     to the end of the current period. Note that if not set to {@link C#TIME_UNSET}, the
+   *     position up to which media is available for buffering can be calculated as
+   *     {@code (playbackPositionUs + availableDurationUs)}.
    */
-  void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs);
+  void updateSelectedTrack(long playbackPositionUs, long bufferedDurationUs,
+      long availableDurationUs);
 
   /**
    * May be called periodically by sources that load media in discrete {@link MediaChunk}s and
@@ -143,7 +152,10 @@ interface Factory {
    * significantly higher quality. Discarding chunks may allow faster switching to a higher quality
    * track in this case.
    *
-   * @param playbackPositionUs The current playback position in microseconds.
+   * @param playbackPositionUs The current playback position in microseconds. If playback of the
+   *     period to which this track selection belongs has not yet started, the value will be the
+   *     starting position in the period minus the duration of any media in previous periods still
+   *     to be played.
    * @param queue The queue of buffered {@link MediaChunk}s. Must not be modified.
    * @return The number of chunks to retain in the queue.
    */
@@ -151,10 +163,10 @@ interface Factory {
 
   /**
    * Attempts to blacklist the track at the specified index in the selection, making it ineligible
-   * for selection by calls to {@link #updateSelectedTrack(long, long)} for the specified period of
-   * time. Blacklisting will fail if all other tracks are currently blacklisted. If blacklisting the
-   * currently selected track, note that it will remain selected until the next call to
-   * {@link #updateSelectedTrack(long, long)}.
+   * for selection by calls to {@link #updateSelectedTrack(long, long, long)} for the specified
+   * period of time. Blacklisting will fail if all other tracks are currently blacklisted. If
+   * blacklisting the currently selected track, note that it will remain selected until the next
+   * call to {@link #updateSelectedTrack(long, long, long)}.
    *
    * @param index The index of the track in the selection.
    * @param blacklistDurationMs The duration of time for which the track should be blacklisted, in
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 bb798b0af90..1eac1b56167 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
@@ -175,14 +175,15 @@ public int getPreferredQueueSize(long playbackPositionUs, List<? extends MediaCh
   }
 
   @Override
-  public void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHolder out) {
+  public void getNextChunk(MediaChunk previous, long playbackPositionUs, long loadPositionUs,
+      ChunkHolder out) {
     if (fatalError != null) {
       return;
     }
 
-    long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
+    long bufferedDurationUs = loadPositionUs - playbackPositionUs;
     long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
-    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
+    trackSelection.updateSelectedTrack(playbackPositionUs, bufferedDurationUs, timeToLiveEdgeUs);
 
     RepresentationHolder representationHolder =
         representationHolders[trackSelection.getSelectedIndex()];
@@ -237,7 +238,7 @@ public void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHold
 
     int segmentNum;
     if (previous == null) {
-      segmentNum = Util.constrainValue(representationHolder.getSegmentNum(playbackPositionUs),
+      segmentNum = Util.constrainValue(representationHolder.getSegmentNum(loadPositionUs),
           firstAvailableSegmentNum, lastAvailableSegmentNum);
     } else {
       segmentNum = previous.getNextChunkIndex();
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 b8a0c3ddb74..2b1ece4eeef 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
@@ -204,17 +204,22 @@ public void setIsTimestampMaster(boolean isTimestampMaster) {
    * contain the {@link HlsUrl} that refers to the playlist that needs refreshing.
    *
    * @param previous The most recently loaded media chunk.
-   * @param playbackPositionUs The current playback position. If {@code previous} is null then this
-   *     parameter is the position from which playback is expected to start (or restart) and hence
-   *     should be interpreted as a seek position.
+   * @param playbackPositionUs The current playback position in microseconds. If playback of the
+   *     period to which this chunk source belongs has not yet started, the value will be the
+   *     starting position in the period minus the duration of any media in previous periods still
+   *     to be played.
+   * @param loadPositionUs The current load position in microseconds. If {@code previous} is null,
+   *     this is the starting position from which chunks should be provided. Else it's equal to
+   *     {@code previous.endTimeUs}.
    * @param out A holder to populate.
    */
-  public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChunkHolder out) {
+  public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, long loadPositionUs,
+      HlsChunkHolder out) {
     int oldVariantIndex = previous == null ? C.INDEX_UNSET
         : trackGroup.indexOf(previous.trackFormat);
     expectedPlaylistUrl = null;
-    long bufferedDurationUs = previous == null ? 0 : previous.endTimeUs - playbackPositionUs;
 
+    long bufferedDurationUs = loadPositionUs - playbackPositionUs;
     long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
     if (previous != null && !independentSegments) {
       // Unless segments are known to be independent, switching variant will require downloading
@@ -231,7 +236,7 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     }
 
     // Select the variant.
-    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
+    trackSelection.updateSelectedTrack(playbackPositionUs, bufferedDurationUs, timeToLiveEdgeUs);
     int selectedVariantIndex = trackSelection.getSelectedIndexInTrackGroup();
 
     boolean switchingVariant = oldVariantIndex != selectedVariantIndex;
@@ -250,8 +255,8 @@ public void getNextChunk(HlsMediaChunk previous, long playbackPositionUs, HlsChu
     // Select the chunk.
     int chunkMediaSequence;
     if (previous == null || switchingVariant) {
-      long targetPositionUs = previous == null ? playbackPositionUs
-          : independentSegments ? previous.endTimeUs : previous.startTimeUs;
+      long targetPositionUs = (previous == null || independentSegments) ? loadPositionUs
+          : previous.startTimeUs;
       if (!mediaPlaylist.hasEndTag && targetPositionUs >= mediaPlaylist.getEndTimeUs()) {
         // If the playlist is too old to contain the chunk, we need to refresh it.
         chunkMediaSequence = mediaPlaylist.mediaSequence + mediaPlaylist.segments.size();
@@ -437,7 +442,8 @@ public InitializationTrackSelection(TrackGroup group, int[] tracks) {
     }
 
     @Override
-    public void updateSelectedTrack(long bufferedDurationUs, long availableDurationUs) {
+    public void updateSelectedTrack(long playbackPositionUs, long bufferedDurationUs,
+        long availableDurationUs) {
       long nowMs = SystemClock.elapsedRealtime();
       if (!isBlacklisted(selectedIndex, nowMs)) {
         return;
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 946ae24d172..3eae83624be 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
@@ -255,7 +255,8 @@ public boolean selectTracks(TrackSelection[] selections, boolean[] mayRetainStre
         // may need to be discarded.
         boolean primarySampleQueueDirty = false;
         if (!seenFirstTrackSelection) {
-          primaryTrackSelection.updateSelectedTrack(0, C.TIME_UNSET);
+          long bufferedDurationUs = positionUs < 0 ? -positionUs : 0;
+          primaryTrackSelection.updateSelectedTrack(positionUs, bufferedDurationUs, C.TIME_UNSET);
           int chunkIndex = chunkSource.getTrackGroup().indexOf(mediaChunks.getLast().trackFormat);
           if (primaryTrackSelection.getSelectedIndexInTrackGroup() != chunkIndex) {
             // This is the first selection and the chunk loaded during preparation does not match
@@ -438,9 +439,16 @@ public boolean continueLoading(long positionUs) {
       return false;
     }
 
-    chunkSource.getNextChunk(mediaChunks.isEmpty() ? null : mediaChunks.getLast(),
-        pendingResetPositionUs != C.TIME_UNSET ? pendingResetPositionUs : positionUs,
-        nextChunkHolder);
+    HlsMediaChunk previousChunk;
+    long loadPositionUs;
+    if (isPendingReset()) {
+      previousChunk = null;
+      loadPositionUs = pendingResetPositionUs;
+    } else {
+      previousChunk = mediaChunks.getLast();
+      loadPositionUs = previousChunk.endTimeUs;
+    }
+    chunkSource.getNextChunk(previousChunk, positionUs, loadPositionUs, nextChunkHolder);
     boolean endOfStream = nextChunkHolder.endOfStream;
     Chunk loadable = nextChunkHolder.chunk;
     HlsMasterPlaylist.HlsUrl playlistToLoad = nextChunkHolder.playlist;
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 d9743649c57..5a6493b7020 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
@@ -149,7 +149,8 @@ public int getPreferredQueueSize(long playbackPositionUs, List<? extends MediaCh
   }
 
   @Override
-  public final void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHolder out) {
+  public final void getNextChunk(MediaChunk previous, long playbackPositionUs, long loadPositionUs,
+      ChunkHolder out) {
     if (fatalError != null) {
       return;
     }
@@ -163,7 +164,7 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
 
     int chunkIndex;
     if (previous == null) {
-      chunkIndex = streamElement.getChunkIndex(playbackPositionUs);
+      chunkIndex = streamElement.getChunkIndex(loadPositionUs);
     } else {
       chunkIndex = previous.getNextChunkIndex() - currentManifestChunkOffset;
       if (chunkIndex < 0) {
@@ -179,9 +180,9 @@ public final void getNextChunk(MediaChunk previous, long playbackPositionUs, Chu
       return;
     }
 
-    long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
+    long bufferedDurationUs = loadPositionUs - playbackPositionUs;
     long timeToLiveEdgeUs = resolveTimeToLiveEdgeUs(playbackPositionUs);
-    trackSelection.updateSelectedTrack(bufferedDurationUs, timeToLiveEdgeUs);
+    trackSelection.updateSelectedTrack(playbackPositionUs, bufferedDurationUs, timeToLiveEdgeUs);
 
     long chunkStartTimeUs = streamElement.getStartTimeUs(chunkIndex);
     long chunkEndTimeUs = chunkStartTimeUs + streamElement.getChunkDurationUs(chunkIndex);
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 40c91a5a816..28f5926bfae 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
@@ -82,9 +82,10 @@ public int getPreferredQueueSize(long playbackPositionUs, List<? extends MediaCh
   }
 
   @Override
-  public void getNextChunk(MediaChunk previous, long playbackPositionUs, ChunkHolder out) {
-    long bufferedDurationUs = previous != null ? (previous.endTimeUs - playbackPositionUs) : 0;
-    trackSelection.updateSelectedTrack(bufferedDurationUs, C.TIME_UNSET);
+  public void getNextChunk(MediaChunk previous, long playbackPositionUs, long loadPositionUs,
+      ChunkHolder out) {
+    long bufferedDurationUs = loadPositionUs - playbackPositionUs;
+    trackSelection.updateSelectedTrack(playbackPositionUs, bufferedDurationUs, C.TIME_UNSET);
     int chunkIndex = previous == null ? dataSet.getChunkIndexByPosition(playbackPositionUs)
         : previous.getNextChunkIndex();
     if (chunkIndex >= dataSet.getChunkCount()) {

From 08706f9bfb8d5283d019f55515795677aecb990d Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 19 Oct 2017 06:34:02 -0700
Subject: [PATCH 327/421] Retain playback position on re-preparation

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

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 79c92aeb67c..40268653b04 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
@@ -443,6 +443,10 @@ private void prepareInternal(MediaSource mediaSource, boolean resetPosition) {
     loadControl.onPrepared();
     if (resetPosition) {
       playbackInfo = new PlaybackInfo(0, C.TIME_UNSET);
+    } else {
+      // The new start position is the current playback position.
+      playbackInfo = new PlaybackInfo(playbackInfo.periodId, playbackInfo.positionUs,
+          playbackInfo.contentPositionUs);
     }
     this.mediaSource = mediaSource;
     mediaSource.prepareSource(player, true, this);

From bb3dea5191088ce13e82f2b614f58f713f38a580 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Thu, 19 Oct 2017 06:39:00 -0700
Subject: [PATCH 328/421] Remove USE_CHORD_PITCH

We have been using USE_CHORD_PITCH == false for a while and the quality of
pitch changes seems fine. It's now possible to set the sample rate too, but
this only works if USE_CHORD_PITCH is false, so remove the constant.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172736631
---
 .../android/exoplayer2/audio/Sonic.java       | 58 +------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
index dfd122c397e..daab04e4ab2 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/audio/Sonic.java
@@ -27,7 +27,6 @@
  */
 /* package */ final class Sonic {
 
-  private static final boolean USE_CHORD_PITCH = false;
   private static final int MINIMUM_PITCH = 65;
   private static final int MAXIMUM_PITCH = 400;
   private static final int AMDF_FREQUENCY = 4000;
@@ -326,32 +325,6 @@ private void removePitchSamples(int numSamples) {
     numPitchSamples -= numSamples;
   }
 
-  private void adjustPitch(int originalNumOutputSamples) {
-    // Latency due to pitch changes could be reduced by looking at past samples to determine pitch,
-    // rather than future.
-    if (numOutputSamples == originalNumOutputSamples) {
-      return;
-    }
-    moveNewSamplesToPitchBuffer(originalNumOutputSamples);
-    int position = 0;
-    while (numPitchSamples - position >= maxRequired) {
-      int period = findPitchPeriod(pitchBuffer, position, false);
-      int newPeriod = (int) (period / pitch);
-      enlargeOutputBufferIfNeeded(newPeriod);
-      if (pitch >= 1.0f) {
-        overlapAdd(newPeriod, numChannels, outputBuffer, numOutputSamples, pitchBuffer, position,
-            pitchBuffer, position + period - newPeriod);
-      } else {
-        int separation = newPeriod - period;
-        overlapAddWithSeparation(period, numChannels, separation, outputBuffer, numOutputSamples,
-            pitchBuffer, position, pitchBuffer, position);
-      }
-      numOutputSamples += newPeriod;
-      position += period;
-    }
-    removePitchSamples(position);
-  }
-
   private short interpolate(short[] in, int inPos, int oldSampleRate, int newSampleRate) {
     short left = in[inPos];
     short right = in[inPos + numChannels];
@@ -462,11 +435,7 @@ private void processStreamInput() {
       copyToOutput(inputBuffer, 0, numInputSamples);
       numInputSamples = 0;
     }
-    if (USE_CHORD_PITCH) {
-      if (pitch != 1.0f) {
-        adjustPitch(originalNumOutputSamples);
-      }
-    } else if (r != 1.0f) {
+    if (r != 1.0f) {
       adjustRate(r, originalNumOutputSamples);
     }
   }
@@ -486,29 +455,4 @@ private static void overlapAdd(int numSamples, int numChannels, short[] out, int
     }
   }
 
-  private static void overlapAddWithSeparation(int numSamples, int numChannels, int separation,
-      short[] out, int outPos, short[] rampDown, int rampDownPos, short[] rampUp, int rampUpPos) {
-    for (int i = 0; i < numChannels; i++) {
-      int o = outPos * numChannels + i;
-      int u = rampUpPos * numChannels + i;
-      int d = rampDownPos * numChannels + i;
-      for (int t = 0; t < numSamples + separation; t++) {
-        if (t < separation) {
-          out[o] = (short) (rampDown[d] * (numSamples - t) / numSamples);
-          d += numChannels;
-        } else if (t < numSamples) {
-          out[o] =
-              (short) ((rampDown[d] * (numSamples - t) + rampUp[u] * (t - separation))
-                  / numSamples);
-          d += numChannels;
-          u += numChannels;
-        } else {
-          out[o] = (short) (rampUp[u] * (t - separation) / numSamples);
-          u += numChannels;
-        }
-        o += numChannels;
-      }
-    }
-  }
-
 }

From 7d0ec68d86dbb0a64365d3ab12fd497c03ed8b4e Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 19 Oct 2017 07:35:51 -0700
Subject: [PATCH 329/421] Put DownloadTasks on hold until preceding conflicting
 tasks are complete

Tasks conflict if both of them work on the same media and at least one
of them is remove action.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172741795
---
 .../offline/DownloadManagerTest.java          | 352 ++++++++++++++++++
 .../exoplayer2/offline/DownloadException.java |   5 +
 .../exoplayer2/util/ConditionVariable.java    |  21 +-
 3 files changed, 376 insertions(+), 2 deletions(-)
 create mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
new file mode 100644
index 00000000000..cfc5e1593e7
--- /dev/null
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -0,0 +1,352 @@
+/*
+ * 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.os.ConditionVariable;
+import android.support.annotation.Nullable;
+import android.test.InstrumentationTestCase;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadListener;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadTask;
+import com.google.android.exoplayer2.offline.DownloadManager.DownloadTask.State;
+import com.google.android.exoplayer2.upstream.DummyDataSource;
+import com.google.android.exoplayer2.upstream.cache.Cache;
+import com.google.android.exoplayer2.util.ClosedSource;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.concurrent.Executors;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
+/** Tests {@link DownloadManager}. */
+@ClosedSource(reason = "Not ready yet")
+public class DownloadManagerTest extends InstrumentationTestCase {
+
+  /* Used to check if condition becomes true in this time interval. */
+  private static final int ASSERT_TRUE_TIMEOUT = 1000;
+  /* Used to check if condition stays false for this time interval. */
+  private static final int ASSERT_FALSE_TIME = 1000;
+
+  private DownloadManager downloadManager;
+  private ConditionVariable downloadFinishedCondition;
+  private Throwable downloadError;
+
+  @Override
+  public void setUp() throws Exception {
+    super.setUp();
+    setUpMockito(this);
+
+    downloadManager = new DownloadManager(
+        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY),
+        Executors.newCachedThreadPool());
+
+    downloadFinishedCondition = new ConditionVariable();
+    downloadManager.setListener(new TestDownloadListener());
+  }
+
+  class TestDownloadListener implements DownloadListener {
+    @Override
+    public void onStateChange(DownloadManager downloadManager, DownloadTask downloadTask, int state,
+        Throwable error) {
+      if (state == DownloadTask.STATE_ERROR && downloadError == null) {
+        downloadError = error;
+      }
+      ((FakeDownloadAction) downloadTask.getDownloadAction()).onStateChange();
+    }
+
+    @Override
+    public void onTasksFinished(DownloadManager downloadManager) {
+      downloadFinishedCondition.open();
+    }
+  }
+
+  public void testDownloadActionRuns() throws Throwable {
+    doTestActionRuns(createDownloadAction("media 1"));
+  }
+
+  public void testRemoveActionRuns() throws Throwable {
+    doTestActionRuns(createRemoveAction("media 1"));
+  }
+
+  public void testDifferentMediaDownloadActionsStartInParallel() throws Throwable {
+    doTestActionsRunInParallel(createDownloadAction("media 1"),
+        createDownloadAction("media 2"));
+  }
+
+  public void testDifferentMediaDifferentActionsStartInParallel() throws Throwable {
+    doTestActionsRunInParallel(createDownloadAction("media 1"),
+        createRemoveAction("media 2"));
+  }
+
+  public void testSameMediaDownloadActionsStartInParallel() throws Throwable {
+    doTestActionsRunInParallel(createDownloadAction("media 1"),
+        createDownloadAction("media 1"));
+  }
+
+  public void testSameMediaRemoveActionWaitsDownloadAction() throws Throwable {
+    doTestActionsRunSequentially(createDownloadAction("media 1"),
+        createRemoveAction("media 1"));
+  }
+
+  public void testSameMediaDownloadActionWaitsRemoveAction() throws Throwable {
+    doTestActionsRunSequentially(createRemoveAction("media 1"),
+        createDownloadAction("media 1"));
+  }
+
+  public void testSameMediaRemoveActionWaitsRemoveAction() throws Throwable {
+    doTestActionsRunSequentially(createRemoveAction("media 1"),
+        createRemoveAction("media 1"));
+  }
+
+  public void testSameMediaMultipleActions() throws Throwable {
+    FakeDownloadAction downloadAction1 = createDownloadAction("media 1").ignoreInterrupts();
+    FakeDownloadAction downloadAction2 = createDownloadAction("media 1").ignoreInterrupts();
+    FakeDownloadAction removeAction1 = createRemoveAction("media 1");
+    FakeDownloadAction downloadAction3 = createDownloadAction("media 1");
+    FakeDownloadAction removeAction2 = createRemoveAction("media 1");
+
+    // Two download actions run in parallel.
+    downloadAction1.post().assertStarted();
+    downloadAction2.post().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();
+
+    // downloadAction2 finishes but it isn't enough to start removeAction1.
+    downloadAction2.finishAndAssertFinished();
+    removeAction1.assertDoesNotStart();
+    // downloadAction3 is post to DownloadManager but it waits for removeAction1 to finish.
+    downloadAction3.post().assertDoesNotStart();
+
+    // When downloadAction1 finishes, removeAction1 starts.
+    downloadAction1.finishAndAssertFinished();
+    removeAction1.assertStarted();
+    // downloadAction3 still waits removeAction1
+    downloadAction3.assertDoesNotStart();
+
+    // removeAction2 is posted. removeAction1 and downloadAction3 is canceled so removeAction2
+    // starts immediately.
+    removeAction2.post().assertStarted().finishAndAssertFinished();
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  public void testMultipleWaitingAction() throws Throwable {
+    FakeDownloadAction removeAction1 = createRemoveAction("media 1").ignoreInterrupts();
+    FakeDownloadAction removeAction2 = createRemoveAction("media 1");
+    FakeDownloadAction removeAction3 = createRemoveAction("media 1");
+
+    removeAction1.post().assertStarted();
+    removeAction2.post().assertDoesNotStart();
+    removeAction3.post().assertDoesNotStart();
+
+    removeAction1.finishAndAssertFinished();
+    removeAction2.assertTaskState(DownloadTask.STATE_CANCELLED);
+    removeAction3.assertStarted().finishAndAssertFinished();
+
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  private void doTestActionRuns(FakeDownloadAction action) throws Throwable {
+    action.post().assertStarted().finishAndAssertFinished();
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  private void doTestActionsRunSequentially(FakeDownloadAction action1,
+      FakeDownloadAction action2) throws Throwable {
+    action1.ignoreInterrupts().post().assertStarted();
+    action2.post().assertDoesNotStart();
+
+    action1.finishAndAssertFinished();
+    action2.assertStarted();
+
+    action2.finishAndAssertFinished();
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  private void doTestActionsRunInParallel(FakeDownloadAction action1,
+      FakeDownloadAction action2) throws Throwable {
+    action1.post().assertStarted();
+    action2.post().assertStarted();
+    action1.finishAndAssertFinished();
+    action2.finishAndAssertFinished();
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  private FakeDownloadAction createDownloadAction(String mediaId) {
+    return new FakeDownloadAction(downloadManager, mediaId, false);
+  }
+
+  private FakeDownloadAction createRemoveAction(String mediaId) {
+    return new FakeDownloadAction(downloadManager, mediaId, true);
+  }
+
+  private void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
+    assertTrue(downloadFinishedCondition.block(ASSERT_TRUE_TIMEOUT));
+    downloadFinishedCondition.close();
+    if (downloadError != null) {
+      throw downloadError;
+    }
+  }
+
+  /**
+   * Sets up Mockito for an instrumentation test.
+   */
+  private static void setUpMockito(InstrumentationTestCase instrumentationTestCase) {
+    // Workaround for https://code.google.com/p/dexmaker/issues/detail?id=2.
+    System.setProperty("dexmaker.dexcache",
+        instrumentationTestCase.getInstrumentation().getTargetContext().getCacheDir().getPath());
+    MockitoAnnotations.initMocks(instrumentationTestCase);
+  }
+
+  private static class FakeDownloadAction extends DownloadAction {
+
+    private final DownloadManager downloadManager;
+    private final String mediaId;
+    private final boolean removeAction;
+    private final FakeDownloader downloader;
+    private final ConditionVariable stateChanged;
+    private DownloadTask downloadTask;
+
+    private FakeDownloadAction(DownloadManager downloadManager, String mediaId,
+        boolean removeAction) {
+      this.downloadManager = downloadManager;
+      this.mediaId = mediaId;
+      this.removeAction = removeAction;
+      this.downloader = new FakeDownloader(removeAction);
+      this.stateChanged = new ConditionVariable();
+    }
+
+    @Override
+    protected String getType() {
+      return "FakeDownloadAction";
+    }
+
+    @Override
+    protected void writeToStream(DataOutputStream output) throws IOException {
+      throw new UnsupportedOperationException();
+    }
+
+    @Override
+    protected boolean isRemoveAction() {
+      return removeAction;
+    }
+
+    @Override
+    protected boolean isSameMedia(DownloadAction other) {
+      return other instanceof FakeDownloadAction
+          && mediaId.equals(((FakeDownloadAction) other).mediaId);
+    }
+
+    @Override
+    protected Downloader createDownloader(DownloaderConstructorHelper downloaderConstructorHelper) {
+      return downloader;
+    }
+
+    private FakeDownloadAction post() throws DownloadException {
+      downloadTask = downloadManager.handleAction(this);
+      return this;
+    }
+
+    private FakeDownloadAction assertDoesNotStart() {
+      assertFalse(downloader.started.block(ASSERT_FALSE_TIME));
+      return this;
+    }
+
+    private FakeDownloadAction assertStarted() {
+      assertTrue(downloader.started.block(ASSERT_TRUE_TIMEOUT));
+      assertTaskState(DownloadTask.STATE_STARTED);
+      return this;
+    }
+
+    private FakeDownloadAction assertTaskState(@State int state) {
+      assertTrue(stateChanged.block(ASSERT_TRUE_TIMEOUT));
+      stateChanged.close();
+      assertEquals(state, downloadTask.getState());
+      return this;
+    }
+
+    private FakeDownloadAction finishAndAssertFinished() {
+      downloader.finish.open();
+      assertTaskState(DownloadTask.STATE_ENDED);
+      return this;
+    }
+
+    private FakeDownloadAction ignoreInterrupts() {
+      downloader.ignoreInterrupts = true;
+      return this;
+    }
+
+    private void onStateChange() {
+      stateChanged.open();
+    }
+  }
+
+  private static class FakeDownloader implements Downloader {
+    private final ConditionVariable started;
+    private final com.google.android.exoplayer2.util.ConditionVariable finish;
+    private final boolean removeAction;
+    private boolean ignoreInterrupts;
+
+    private FakeDownloader(boolean removeAction) {
+      this.removeAction = removeAction;
+      this.started = new ConditionVariable();
+      this.finish = new com.google.android.exoplayer2.util.ConditionVariable();
+    }
+
+    @Override
+    public void init() throws InterruptedException, IOException {
+      // do nothing.
+    }
+
+    @Override
+    public void download(@Nullable ProgressListener listener)
+        throws InterruptedException, IOException {
+      assertFalse(removeAction);
+      started.open();
+      blockUntilFinish();
+    }
+
+    @Override
+    public void remove() throws InterruptedException {
+      assertTrue(removeAction);
+      started.open();
+      blockUntilFinish();
+    }
+
+    private void blockUntilFinish() throws InterruptedException {
+      while (true){
+        try {
+          finish.block();
+          break;
+        } catch (InterruptedException e) {
+          if (!ignoreInterrupts) {
+            throw e;
+          }
+        }
+      }
+    }
+
+    @Override
+    public long getDownloadedBytes() {
+      return 0;
+    }
+
+    @Override
+    public float getDownloadPercentage() {
+      return 0;
+    }
+  }
+
+}
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
index 730ce2d3e89..983727c14de 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/offline/DownloadException.java
@@ -25,4 +25,9 @@ public DownloadException(String message) {
     super(message);
   }
 
+  /** @param cause The cause for the exception. */
+  public DownloadException(Throwable cause) {
+    super(cause);
+  }
+
 }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
index b6c6914c504..550cdfbb47c 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
@@ -16,8 +16,8 @@
 package com.google.android.exoplayer2.util;
 
 /**
- * A condition variable whose {@link #open()} and {@link #close()} methods return whether they
- * resulted in a change of state.
+ * An interruptible condition variable whose {@link #open()} and {@link #close()} methods return
+ * whether they resulted in a change of state.
  */
 public final class ConditionVariable {
 
@@ -59,4 +59,21 @@ public synchronized void block() throws InterruptedException {
     }
   }
 
+  /**
+   * Blocks until the condition is opened or until timeout milliseconds have passed.
+   *
+   * @param timeout The maximum time to wait in milliseconds.
+   * @return true If the condition was opened, false if the call returns because of the timeout.
+   * @throws InterruptedException If the thread is interrupted.
+   */
+  public synchronized boolean block(int timeout) throws InterruptedException {
+    long now = System.currentTimeMillis();
+    long end = now + timeout;
+    while (!isOpen && now < end) {
+      wait(end - now);
+      now = System.currentTimeMillis();
+    }
+    return isOpen;
+  }
+
 }

From 64b928e77f605e65a1154eec4d683806e08e7272 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Thu, 19 Oct 2017 17:28:24 +0100
Subject: [PATCH 330/421] Stylistic cleanup

---
 .../extractor/flv/VideoTagPayloadReader.java       |  2 +-
 .../android/exoplayer2/util/ParsableByteArray.java | 13 +++++++------
 .../exoplayer2/util/ParsableByteArrayTest.java     | 14 +++++++-------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
index 7fa45a2a946..92db91e20b1 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/extractor/flv/VideoTagPayloadReader.java
@@ -79,7 +79,7 @@ protected boolean parseHeader(ParsableByteArray data) throws UnsupportedFormatEx
   @Override
   protected void parsePayload(ParsableByteArray data, long timeUs) throws ParserException {
     int packetType = data.readUnsignedByte();
-    int compositionTimeMs = data.readSignedInt24();
+    int compositionTimeMs = data.readInt24();
 
     timeUs += compositionTimeMs * 1000L;
     // Parse avc sequence header in case this was not done before.
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 9de86cc3bcc..57313ea895c 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
@@ -233,7 +233,7 @@ public int readLittleEndianUnsignedShort() {
   }
 
   /**
-   * Reads the next two bytes as an signed value.
+   * Reads the next two bytes as a signed value.
    */
   public short readShort() {
     return (short) ((data[position++] & 0xFF) << 8
@@ -257,11 +257,12 @@ public int readUnsignedInt24() {
   }
 
   /**
-   * Reads the next three bytes as an signed value.
+   * Reads the next three bytes as a signed value.
    */
-  public int readSignedInt24() {
-    int ui24 = readUnsignedInt24();
-    return (ui24 & 0x800000L) >>> 23 == 1 ? (ui24 | 0xff000000) : ui24;
+  public int readInt24() {
+    return ((data[position++] & 0xFF) << 24) >> 8
+        | (data[position++] & 0xFF) << 8
+        | (data[position++] & 0xFF);
   }
 
   /**
@@ -313,7 +314,7 @@ public int readInt() {
   }
 
   /**
-   * Reads the next four bytes as an signed value in little endian order.
+   * Reads the next four bytes as a signed value in little endian order.
    */
   public int readLittleEndianInt() {
     return (data[position++] & 0xFF)
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 56a47404648..947a6926471 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
@@ -328,25 +328,25 @@ public void testReadLittleEndianInt() {
 
   @Test
   public void testReadLittleEndianUnsignedInt24() {
-    byte[] data = { 0x01, 0x02, (byte) 0xFF };
+    byte[] data = {0x01, 0x02, (byte) 0xFF};
     ParsableByteArray byteArray = new ParsableByteArray(data);
     assertThat(byteArray.readLittleEndianUnsignedInt24()).isEqualTo(0xFF0201);
     assertThat(byteArray.getPosition()).isEqualTo(3);
   }
 
   @Test
-  public void testReadPositiveSignedInt24() {
-    byte[] data = { 0x01, 0x02, (byte) 0xFF };
+  public void testReadInt24Positive() {
+    byte[] data = {0x01, 0x02, (byte) 0xFF};
     ParsableByteArray byteArray = new ParsableByteArray(data);
-    assertThat(byteArray.readSignedInt24()).isEqualTo(0x0102FF);
+    assertThat(byteArray.readInt24()).isEqualTo(0x0102FF);
     assertThat(byteArray.getPosition()).isEqualTo(3);
   }
 
   @Test
-  public void testReadNegativeSignedInt24() {
-    byte[] data = { (byte)0xFF, 0x02, (byte) 0x01 };
+  public void testReadInt24Negative() {
+    byte[] data = {(byte) 0xFF, 0x02, (byte) 0x01};
     ParsableByteArray byteArray = new ParsableByteArray(data);
-    assertThat(byteArray.readSignedInt24()).isEqualTo(0xFFFF0201);
+    assertThat(byteArray.readInt24()).isEqualTo(0xFFFF0201);
     assertThat(byteArray.getPosition()).isEqualTo(3);
   }
 

From feff4d3e0272a9c3594fbb3144ed4453202192ac Mon Sep 17 00:00:00 2001
From: Drew Hill <drewhill80@gmail.com>
Date: Thu, 19 Oct 2017 12:49:09 -0400
Subject: [PATCH 331/421] fix missing cause of display refresh rate changing
 between videoframereleasetimehelper constructor and enable being called

---
 .../exoplayer2/video/VideoFrameReleaseTimeHelper.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 af06432261b..596e1046d15 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
@@ -74,7 +74,7 @@ public VideoFrameReleaseTimeHelper() {
    */
   public VideoFrameReleaseTimeHelper(Context context) {
     this(getDefaultDisplayRefreshRate(context));
-    this.context = context;
+    this.context = context.getApplicationContext();
     registerDisplayListener();
   }
 
@@ -89,8 +89,9 @@ public void enable() {
     haveSync = false;
     if (useDefaultDisplayVsync) {
       vsyncSampler.addObserver();
+      setSync(getDefaultDisplayRefreshRate(context));
+      registerDisplayListener();
     }
-    registerDisplayListener();
   }
 
   /**

From c2d05f44050c6fb0f068cbfae08667c146f3bcd3 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 19 Oct 2017 09:52:16 -0700
Subject: [PATCH 332/421] Bump to 2.5.4

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172758309
---
 .hgignore                                     | 71 +++++++++++++++++++
 RELEASENOTES.md                               | 18 +++++
 constants.gradle                              |  2 +-
 demos/cast/src/main/AndroidManifest.xml       |  4 +-
 demos/main/src/main/AndroidManifest.xml       |  4 +-
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 +-
 6 files changed, 97 insertions(+), 8 deletions(-)
 create mode 100644 .hgignore

diff --git a/.hgignore b/.hgignore
new file mode 100644
index 00000000000..f7c3656f650
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,71 @@
+# Mercurial's .hgignore files can only be used in the root directory.
+# You can still apply these rules by adding
+# include:path/to/this/directory/.hgignore to the top-level .hgignore file.
+
+# Ensure same syntax as in .gitignore can be used
+syntax:glob
+
+# Android generated
+bin
+gen
+libs
+obj
+lint.xml
+
+# IntelliJ IDEA
+.idea
+*.iml
+*.ipr
+*.iws
+classes
+gen-external-apklibs
+
+# Eclipse
+.project
+.classpath
+.settings
+.checkstyle
+.cproject
+
+# Gradle
+.gradle
+build
+buildout
+out
+
+# Maven
+target
+release.properties
+pom.xml.*
+
+# Ant
+ant.properties
+local.properties
+proguard.cfg
+proguard-project.txt
+
+# Other
+.DS_Store
+cmake-build-debug
+dist
+tmp
+
+# VP9 extension
+extensions/vp9/src/main/jni/libvpx
+extensions/vp9/src/main/jni/libvpx_android_configs
+extensions/vp9/src/main/jni/libyuv
+
+# Opus extension
+extensions/opus/src/main/jni/libopus
+
+# FLAC extension
+extensions/flac/src/main/jni/flac
+
+# FFmpeg extension
+extensions/ffmpeg/src/main/jni/ffmpeg
+
+# Cronet extension
+extensions/cronet/jniLibs/*
+!extensions/cronet/jniLibs/README.md
+extensions/cronet/libs/*
+!extensions/cronet/libs/README.md
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index c63a20ba946..90b3d15e083 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,23 @@
 # Release notes #
 
+### r2.5.4 ###
+
+* Remove unnecessary media playlist fetches during playback of live HLS streams.
+* Add the ability to inject a HLS playlist parser through `HlsMediaSource`.
+* Fix potential `IndexOutOfBoundsException` when using `ImaMediaSource`
+  ([#3334](https://github.com/google/ExoPlayer/issues/3334)).
+* Fix an issue parsing MP4 content containing non-CENC sinf boxes.
+* Fix memory leak when seeking with repeated periods.
+* Fix playback position when `ExoPlayer.prepare` is called with `resetPosition`
+  set to false.
+* Ignore MP4 edit lists that seem invalid
+  ([#3351](https://github.com/google/ExoPlayer/issues/3351)).
+* Add extractor flag for ignoring all MP4 edit lists
+  ([#3358](https://github.com/google/ExoPlayer/issues/3358)).
+* Improve extensibility by exposing public constructors for
+  `FrameworkMediaCrypto` and by making `DefaultDashChunkSource.getNextChunk`
+  non-final.
+
 ### r2.5.3 ###
 
 * IMA extension: Support skipping of skippable ads on AndroidTV and other
diff --git a/constants.gradle b/constants.gradle
index 4778a0c66f3..282addf7aa0 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -28,7 +28,7 @@ project.ext {
     junitVersion = '4.12'
     truthVersion = '0.35'
     robolectricVersion = '3.4.2'
-    releaseVersion = 'r2.5.3'
+    releaseVersion = 'r2.5.4'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index 95dfb5f8e03..8f0aa69e8c1 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.castdemo"
-    android:versionCode="2503"
-    android:versionName="2.5.3">
+    android:versionCode="2504"
+    android:versionName="2.5.4">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index 4a9eec40025..f70d6152e81 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
-    android:versionCode="2503"
-    android:versionName="2.5.3">
+    android:versionCode="2504"
+    android:versionName="2.5.4">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
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 90385ed6c0d..62ee8c4873b 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
@@ -31,13 +31,13 @@ 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.5.3";
+  public static final String VERSION = "2.5.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.5.3";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.5.4";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -47,7 +47,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 = 2005003;
+  public static final int VERSION_INT = 2005004;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From 84afad0748125142b3612c5fcd24e31b8d59f2a0 Mon Sep 17 00:00:00 2001
From: Drew Hill <drewhill80@gmail.com>
Date: Thu, 19 Oct 2017 16:24:07 -0400
Subject: [PATCH 333/421] adjustments

---
 .../video/VideoFrameReleaseTimeHelper.java     | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

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 596e1046d15..408cd1a09a8 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
@@ -44,10 +44,10 @@ public final class VideoFrameReleaseTimeHelper {
   private DisplayManager.DisplayListener displayListener = null;
   private Context context = null;
 
-  private VSyncSampler vsyncSampler;
-  private boolean useDefaultDisplayVsync;
-  private long vsyncDurationNs;
-  private long vsyncOffsetNs;
+  private VSyncSampler vsyncSampler = null;
+  private final boolean useDefaultDisplayVsync;
+  private long vsyncDurationNs = -1; // Value unused.
+  private long vsyncOffsetNs = -1; // Value unused.
 
   private long lastFramePresentationTimeUs;
   private long adjustedLastFrameTimeNs;
@@ -75,11 +75,10 @@ public VideoFrameReleaseTimeHelper() {
   public VideoFrameReleaseTimeHelper(Context context) {
     this(getDefaultDisplayRefreshRate(context));
     this.context = context.getApplicationContext();
-    registerDisplayListener();
   }
 
   private VideoFrameReleaseTimeHelper(double defaultDisplayRefreshRate) {
-    setSync(defaultDisplayRefreshRate);
+    useDefaultDisplayVsync = defaultDisplayRefreshRate != DISPLAY_REFRESH_RATE_UNKNOWN;
   }
 
   /**
@@ -100,8 +99,8 @@ public void enable() {
   public void disable() {
     if (useDefaultDisplayVsync) {
       vsyncSampler.removeObserver();
+      unregisterDisplayListener();
     }
-    unregisterDisplayListener();
   }
 
   private void registerDisplayListener() {
@@ -128,15 +127,10 @@ private void unregisterDisplayListener() {
 
   private void setSync(double defaultDisplayRefreshRate) {
 
-    useDefaultDisplayVsync = defaultDisplayRefreshRate != DISPLAY_REFRESH_RATE_UNKNOWN;
     if (useDefaultDisplayVsync) {
       vsyncSampler = VSyncSampler.getInstance();
       vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
       vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
-    } else {
-      vsyncSampler = null;
-      vsyncDurationNs = -1; // Value unused.
-      vsyncOffsetNs = -1; // Value unused.
     }
   }
 

From 3830307cd3c012ed4e6e5a764793b640ead00e2b Mon Sep 17 00:00:00 2001
From: Drew Hill <drewhill80@gmail.com>
Date: Thu, 19 Oct 2017 20:28:17 -0400
Subject: [PATCH 334/421] fix not initialized error

---
 .../android/exoplayer2/video/VideoFrameReleaseTimeHelper.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 408cd1a09a8..b3ce65daa44 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
@@ -79,6 +79,9 @@ public VideoFrameReleaseTimeHelper(Context context) {
 
   private VideoFrameReleaseTimeHelper(double defaultDisplayRefreshRate) {
     useDefaultDisplayVsync = defaultDisplayRefreshRate != DISPLAY_REFRESH_RATE_UNKNOWN;
+    if (useDefaultDisplayVsync) {
+      vsyncSampler = VSyncSampler.getInstance();
+    }
   }
 
   /**
@@ -128,7 +131,6 @@ private void unregisterDisplayListener() {
   private void setSync(double defaultDisplayRefreshRate) {
 
     if (useDefaultDisplayVsync) {
-      vsyncSampler = VSyncSampler.getInstance();
       vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
       vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
     }

From 208166759124075727fa5fc319b860f1be4561cd Mon Sep 17 00:00:00 2001
From: Drew Hill <drewhill80@gmail.com>
Date: Tue, 24 Oct 2017 11:19:26 -0400
Subject: [PATCH 335/421] cleanups for videoframereleasetimehelper

---
 .../video/VideoFrameReleaseTimeHelper.java    | 84 ++++++++-----------
 1 file changed, 35 insertions(+), 49 deletions(-)

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 b3ce65daa44..c5ca212a36b 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
@@ -24,6 +24,7 @@
 import android.os.Message;
 import android.view.Choreographer;
 import android.view.Choreographer.FrameCallback;
+import android.view.Display;
 import android.view.WindowManager;
 import com.google.android.exoplayer2.C;
 
@@ -33,7 +34,6 @@
 @TargetApi(16)
 public final class VideoFrameReleaseTimeHelper {
 
-  private static final int DISPLAY_ID_UNKNOWN = -1;
   private static final double DISPLAY_REFRESH_RATE_UNKNOWN = -1;
   private static final long CHOREOGRAPHER_SAMPLE_DELAY_MILLIS = 500;
   private static final long MAX_ALLOWED_DRIFT_NS = 20000000;
@@ -41,10 +41,10 @@ public final class VideoFrameReleaseTimeHelper {
   private static final long VSYNC_OFFSET_PERCENTAGE = 80;
   private static final int MIN_FRAMES_FOR_ADJUSTMENT = 6;
 
-  private DisplayManager.DisplayListener displayListener = null;
   private Context context = null;
 
-  private VSyncSampler vsyncSampler = null;
+  private final DefaultDisplayListener defaultDisplayListener;
+  private final VSyncSampler vsyncSampler;
   private final boolean useDefaultDisplayVsync;
   private long vsyncDurationNs = -1; // Value unused.
   private long vsyncOffsetNs = -1; // Value unused.
@@ -63,7 +63,10 @@ public final class VideoFrameReleaseTimeHelper {
    * the default display's vsync signal.
    */
   public VideoFrameReleaseTimeHelper() {
-    this(DISPLAY_REFRESH_RATE_UNKNOWN);
+    defaultDisplayListener = null;
+    useDefaultDisplayVsync = false;
+    vsyncSampler = null;
+    context = null;
   }
 
   /**
@@ -73,16 +76,13 @@ public VideoFrameReleaseTimeHelper() {
    * @param context A context from which information about the default display can be retrieved.
    */
   public VideoFrameReleaseTimeHelper(Context context) {
-    this(getDefaultDisplayRefreshRate(context));
     this.context = context.getApplicationContext();
+    defaultDisplayListener = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ?
+     new DefaultDisplayListener(context) : null;
+    useDefaultDisplayVsync = true;
+    vsyncSampler = VSyncSampler.getInstance();
   }
 
-  private VideoFrameReleaseTimeHelper(double defaultDisplayRefreshRate) {
-    useDefaultDisplayVsync = defaultDisplayRefreshRate != DISPLAY_REFRESH_RATE_UNKNOWN;
-    if (useDefaultDisplayVsync) {
-      vsyncSampler = VSyncSampler.getInstance();
-    }
-  }
 
   /**
    * Enables the helper.
@@ -92,7 +92,8 @@ public void enable() {
     if (useDefaultDisplayVsync) {
       vsyncSampler.addObserver();
       setSync(getDefaultDisplayRefreshRate(context));
-      registerDisplayListener();
+      if (defaultDisplayListener != null)
+        defaultDisplayListener.register();
     }
   }
 
@@ -102,38 +103,14 @@ public void enable() {
   public void disable() {
     if (useDefaultDisplayVsync) {
       vsyncSampler.removeObserver();
-      unregisterDisplayListener();
-    }
-  }
-
-  private void registerDisplayListener() {
-    if (displayListener == null && context != null &&
-     Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      DisplayManager displayManager = context.getSystemService(DisplayManager.class);
-      if (displayManager != null) {
-        displayListener = new DefaultDisplayListener(context);
-        displayManager.registerDisplayListener(displayListener, null);
-      }
-    }
-  }
-
-  private void unregisterDisplayListener() {
-    if (context != null && displayListener != null &&
-     Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-      DisplayManager displayManager = context.getSystemService(DisplayManager.class);
-      if (displayManager != null) {
-        displayManager.unregisterDisplayListener(displayListener);
-        displayListener = null;
-      }
+      if (defaultDisplayListener != null)
+        defaultDisplayListener.unregister();
     }
   }
 
   private void setSync(double defaultDisplayRefreshRate) {
-
-    if (useDefaultDisplayVsync) {
-      vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
-      vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
-    }
+    vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
+    vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
   }
 
   /**
@@ -234,12 +211,6 @@ private static long closestVsync(long releaseTime, long sampledVsyncTime, long v
     return snappedAfterDiff < snappedBeforeDiff ? snappedAfterNs : snappedBeforeNs;
   }
 
-  private static int getDefaultDisplayId(Context context) {
-    WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-    return manager != null && manager.getDefaultDisplay() != null ?
-     manager.getDefaultDisplay().getDisplayId() : DISPLAY_ID_UNKNOWN;
-  }
-
   private static double getDefaultDisplayRefreshRate(Context context) {
     WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
     return manager != null && manager.getDefaultDisplay() != null ?
@@ -341,12 +312,16 @@ private void removeObserverInternal() {
 
   }
 
-  @TargetApi(17)
+  @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
   private class DefaultDisplayListener implements DisplayManager.DisplayListener {
 
     private final Context context;
+    private final DisplayManager displayManager;
+
     DefaultDisplayListener(Context context) {
       this.context = context;
+      displayManager = context != null ?
+       (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE) : null;
     }
 
     @Override
@@ -359,12 +334,23 @@ public void onDisplayRemoved(int displayId) {
 
     @Override
     public void onDisplayChanged(int displayId) {
-      final int defaultDisplayId = getDefaultDisplayId(context);
-      if (displayId == defaultDisplayId || defaultDisplayId == DISPLAY_ID_UNKNOWN) {
+      if (displayId == Display.DEFAULT_DISPLAY) {
         setSync(getDefaultDisplayRefreshRate(context));
       }
     }
 
+    public void register() {
+      if (displayManager != null && context != null) { // context is used on callback
+        displayManager.registerDisplayListener(this, null);
+      }
+    }
+
+    public void unregister() {
+      if (displayManager != null) {
+        displayManager.unregisterDisplayListener(this);
+      }
+    }
+
   }
 
 }

From 9568802c6d3c1bbd337eae13aac7326c92fd635c Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 20 Oct 2017 06:12:01 -0700
Subject: [PATCH 336/421] Persist DownloadActions in DownloadManager

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=172875067
---
 .../offline/DownloadManagerTest.java          | 45 ++++++++++++-------
 1 file changed, 28 insertions(+), 17 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index cfc5e1593e7..b835ea6a0e6 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -24,7 +24,9 @@
 import com.google.android.exoplayer2.upstream.DummyDataSource;
 import com.google.android.exoplayer2.upstream.cache.Cache;
 import com.google.android.exoplayer2.util.ClosedSource;
+import com.google.android.exoplayer2.util.Util;
 import java.io.DataOutputStream;
+import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Executors;
 import org.mockito.Mockito;
@@ -40,6 +42,7 @@ public class DownloadManagerTest extends InstrumentationTestCase {
   private static final int ASSERT_FALSE_TIME = 1000;
 
   private DownloadManager downloadManager;
+  private File actionFile;
   private ConditionVariable downloadFinishedCondition;
   private Throwable downloadError;
 
@@ -48,28 +51,20 @@ public void setUp() throws Exception {
     super.setUp();
     setUpMockito(this);
 
+    actionFile = Util.createTempFile(getInstrumentation().getContext(), "ExoPlayerTest");
     downloadManager = new DownloadManager(
         new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY),
-        Executors.newCachedThreadPool());
+        Executors.newCachedThreadPool(), actionFile.getAbsolutePath());
 
     downloadFinishedCondition = new ConditionVariable();
     downloadManager.setListener(new TestDownloadListener());
   }
-
-  class TestDownloadListener implements DownloadListener {
-    @Override
-    public void onStateChange(DownloadManager downloadManager, DownloadTask downloadTask, int state,
-        Throwable error) {
-      if (state == DownloadTask.STATE_ERROR && downloadError == null) {
-        downloadError = error;
-      }
-      ((FakeDownloadAction) downloadTask.getDownloadAction()).onStateChange();
-    }
-
-    @Override
-    public void onTasksFinished(DownloadManager downloadManager) {
-      downloadFinishedCondition.open();
-    }
+    
+  @Override
+  public void tearDown() throws Exception {
+    downloadManager.release();
+    actionFile.delete();
+    super.tearDown();
   }
 
   public void testDownloadActionRuns() throws Throwable {
@@ -200,6 +195,22 @@ private void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable
     }
   }
 
+  private class TestDownloadListener implements DownloadListener {
+    @Override
+    public void onStateChange(DownloadManager downloadManager, DownloadTask downloadTask, int state,
+        Throwable error) {
+      if (state == DownloadTask.STATE_ERROR && downloadError == null) {
+        downloadError = error;
+      }
+      ((FakeDownloadAction) downloadTask.getDownloadAction()).onStateChange();
+    }
+
+    @Override
+    public void onTasksFinished(DownloadManager downloadManager) {
+      downloadFinishedCondition.open();
+    }
+  }
+
   /**
    * Sets up Mockito for an instrumentation test.
    */
@@ -235,7 +246,7 @@ protected String getType() {
 
     @Override
     protected void writeToStream(DataOutputStream output) throws IOException {
-      throw new UnsupportedOperationException();
+      // do nothing.
     }
 
     @Override

From 9306b24c6566c9dd5013aba1c310a88d0f3b2114 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 23 Oct 2017 01:23:24 -0700
Subject: [PATCH 337/421] Fix some Android Studio inspection warnings

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173085316
---
 .../main/java/com/google/android/exoplayer2/Renderer.java    | 2 +-
 .../java/com/google/android/exoplayer2/RenderersFactory.java | 2 +-
 .../java/com/google/android/exoplayer2/audio/AudioSink.java  | 3 +--
 .../com/google/android/exoplayer2/drm/DefaultDrmSession.java | 3 +--
 .../java/com/google/android/exoplayer2/drm/ExoMediaDrm.java  | 2 +-
 .../android/exoplayer2/extractor/mkv/MatroskaExtractor.java  | 4 ++--
 .../android/exoplayer2/extractor/mp4/Mp4Extractor.java       | 1 -
 .../android/exoplayer2/metadata/id3/ChapterTocFrame.java     | 4 ++--
 .../android/exoplayer2/source/ClippingMediaSource.java       | 4 +---
 .../android/exoplayer2/source/ConcatenatingMediaSource.java  | 2 +-
 .../android/exoplayer2/source/ExtractorMediaSource.java      | 5 +----
 .../java/com/google/android/exoplayer2/text/cea/CeaUtil.java | 2 +-
 .../exoplayer2/trackselection/DefaultTrackSelector.java      | 2 +-
 .../com/google/android/exoplayer2/upstream/cache/Cache.java  | 2 +-
 .../source/smoothstreaming/manifest/SsManifestTest.java      | 2 +-
 .../main/res/drawable-anydpi-v21/exo_controls_shuffle.xml    | 2 +-
 .../exoplayer2/playbacktests/gts/DashDownloadTest.java       | 2 +-
 .../android/exoplayer2/testutil/FakeSimpleExoPlayer.java     | 4 ++--
 18 files changed, 20 insertions(+), 28 deletions(-)

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 e16caec9808..6def1591da5 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
@@ -226,7 +226,7 @@ void replaceStream(Format[] formats, SampleStream stream, long offsetUs)
 
   /**
    * Whether the renderer is ready for the {@link ExoPlayer} instance to transition to
-   * {@link ExoPlayer#STATE_ENDED}. The player will make this transition as soon as {@code true} is
+   * {@link Player#STATE_ENDED}. The player will make this transition as soon as {@code true} is
    * returned by all of its {@link Renderer}s.
    * <p>
    * This method may be called when the renderer is in the following states:
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 a08ba448a4d..944a6a9e5e2 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
@@ -31,7 +31,7 @@ public interface RenderersFactory {
    *
    * @param eventHandler A handler to use when invoking event listeners and outputs.
    * @param videoRendererEventListener An event listener for video renderers.
-   * @param videoRendererEventListener An event listener for audio renderers.
+   * @param audioRendererEventListener An event listener for audio renderers.
    * @param textRendererOutput An output for text renderers.
    * @param metadataRendererOutput An output for metadata renderers.
    * @return The {@link Renderer instances}.
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 8b39a281821..5408032907e 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
@@ -202,8 +202,7 @@ public WriteException(int errorCode) {
    * @param trimStartSamples The number of audio samples to trim from the start of data written to
    *     the sink after this call.
    * @param trimEndSamples The number of audio samples to trim from data written to the sink
-   *     immediately preceding the next call to {@link #reset()} or
-   *     {@link #configure(String, int, int, int, int, int[], int, int)}.
+   *     immediately preceding the next call to {@link #reset()} or this method.
    * @throws ConfigurationException If an error occurs configuring the sink.
    */
   void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
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 4e5696ef1ff..290c1877de7 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
@@ -86,6 +86,7 @@ public interface ProvisioningManager<T extends ExoMediaCrypto> {
 
   /* package */ final MediaDrmCallback callback;
   /* package */ final UUID uuid;
+  /* package */ final PostResponseHandler postResponseHandler;
 
   private @DrmSession.State int state;
   private int openCount;
@@ -96,8 +97,6 @@ public interface ProvisioningManager<T extends ExoMediaCrypto> {
   private byte[] sessionId;
   private byte[] offlineLicenseKeySetId;
 
-  /* package */ PostResponseHandler postResponseHandler;
-
   /**
    * Instantiates a new DRM session.
    *
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 1930e11f062..e9ee1ce90b9 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
@@ -205,7 +205,7 @@ byte[] provideKeyResponse(byte[] scope, byte[] response)
    *
    * @param initData Opaque initialization data specific to the crypto scheme.
    * @return An object extends {@link ExoMediaCrypto}, using opaque crypto scheme specific data.
-   * @throws MediaCryptoException
+   * @throws MediaCryptoException If the instance can't be created.
    */
   T createMediaCrypto(byte[] initData) throws MediaCryptoException;
 
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 a5fe6ae35b8..5aefd041c41 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
@@ -242,7 +242,7 @@ public Extractor[] createExtractors() {
    * The value by which to divide a time in microseconds to convert it to the unit of the last value
    * in a subrip timecode (milliseconds).
    */
-  private static long SUBRIP_TIMECODE_LAST_VALUE_SCALING_FACTOR = 1000;
+  private static final long SUBRIP_TIMECODE_LAST_VALUE_SCALING_FACTOR = 1000;
   /**
    * The format of a subrip timecode.
    */
@@ -270,7 +270,7 @@ public Extractor[] createExtractors() {
    * The value by which to divide a time in microseconds to convert it to the unit of the last value
    * in an SSA timecode (1/100ths of a second).
    */
-  private static long SSA_TIMECODE_LAST_VALUE_SCALING_FACTOR = 10000;
+  private static final long SSA_TIMECODE_LAST_VALUE_SCALING_FACTOR = 10000;
   /**
    * A special end timecode indicating that an SSA subtitle should be displayed until the next
    * subtitle, or until the end of the media in the case of the last subtitle.
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 473e17e3e0f..f23af98e7f2 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
@@ -28,7 +28,6 @@
 import com.google.android.exoplayer2.extractor.SeekMap;
 import com.google.android.exoplayer2.extractor.TrackOutput;
 import com.google.android.exoplayer2.extractor.mp4.Atom.ContainerAtom;
-import com.google.android.exoplayer2.extractor.mp4.FragmentedMp4Extractor.Flags;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.NalUnitUtil;
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 d71d0863c7f..939c00b9db7 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
@@ -101,8 +101,8 @@ public void writeToParcel(Parcel dest, int flags) {
     dest.writeByte((byte) (isOrdered ? 1 : 0));
     dest.writeStringArray(children);
     dest.writeInt(subFrames.length);
-    for (int i = 0; i < subFrames.length; i++) {
-      dest.writeParcelable(subFrames[i], 0);
+    for (Id3Frame subFrame : subFrames) {
+      dest.writeParcelable(subFrame, 0);
     }
   }
 
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 21de83524a3..161fbb48719 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
@@ -37,7 +37,6 @@ public final class ClippingMediaSource implements MediaSource, MediaSource.Liste
   private final ArrayList<ClippingMediaPeriod> mediaPeriods;
 
   private MediaSource.Listener sourceListener;
-  private ClippingTimeline clippingTimeline;
 
   /**
    * Creates a new clipping source that wraps the specified source.
@@ -117,8 +116,7 @@ public void releaseSource() {
 
   @Override
   public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
-    clippingTimeline = new ClippingTimeline(timeline, startUs, endUs);
-    sourceListener.onSourceInfoRefreshed(clippingTimeline, manifest);
+    sourceListener.onSourceInfoRefreshed(new ClippingTimeline(timeline, startUs, endUs), manifest);
     int count = mediaPeriods.size();
     for (int i = 0; i < count; i++) {
       mediaPeriods.get(i).setClipping(startUs, endUs);
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 4cf3843ea13..bafdebf6cb9 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
@@ -40,10 +40,10 @@ public final class ConcatenatingMediaSource implements MediaSource {
   private final Map<MediaPeriod, Integer> sourceIndexByMediaPeriod;
   private final boolean[] duplicateFlags;
   private final boolean isAtomic;
+  private final ShuffleOrder shuffleOrder;
 
   private Listener listener;
   private ConcatenatedTimeline timeline;
-  private ShuffleOrder shuffleOrder;
 
   /**
    * @param mediaSources The {@link MediaSource}s to concatenate. It is valid for the same
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 51e97571655..be8b3595db3 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.os.Handler;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlayer;
-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;
@@ -84,7 +83,6 @@ public interface EventListener {
   private final int minLoadableRetryCount;
   private final Handler eventHandler;
   private final EventListener eventListener;
-  private final Timeline.Period period;
   private final String customCacheKey;
   private final int continueLoadingCheckIntervalBytes;
 
@@ -149,7 +147,6 @@ public ExtractorMediaSource(Uri uri, DataSource.Factory dataSourceFactory,
     this.eventListener = eventListener;
     this.customCacheKey = customCacheKey;
     this.continueLoadingCheckIntervalBytes = continueLoadingCheckIntervalBytes;
-    period = new Timeline.Period();
   }
 
   @Override
@@ -187,7 +184,7 @@ public void releaseSource() {
   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
+    if ((timelineDurationUs == durationUs && timelineIsSeekable == isSeekable)
         || (timelineDurationUs != C.TIME_UNSET && durationUs == C.TIME_UNSET)) {
       // Suppress no-op source info changes.
       return;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java
index 130c7461f94..ddb3804c3e5 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaUtil.java
@@ -82,7 +82,7 @@ public static void consume(long presentationTimeUs, ParsableByteArray seiBuffer,
    * number of 0xFF bytes and T is the value of the terminating byte.
    *
    * @param buffer The buffer from which to read the value.
-   * @returns The read value, or -1 if the end of the buffer is reached before a value is read.
+   * @return The read value, or -1 if the end of the buffer is reached before a value is read.
    */
   private static int readNon255TerminatedValue(ParsableByteArray buffer) {
     int b;
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 42eeebde11b..c789caded4a 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
@@ -1094,7 +1094,7 @@ public AudioTrackScore(Format format, Parameters parameters, int formatSupport)
      *
      * @param other The other score to compare to.
      * @return A positive integer if this score is better than the other. Zero if they are
-     * equal. A negative integer if this score is worse than the other.
+     *     equal. A negative integer if this score is worse than the other.
      */
     @Override
     public int compareTo(AudioTrackScore other) {
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 0265ef83eab..57cbcafb532 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
@@ -140,7 +140,7 @@ public CacheException(IOException cause) {
    * @param key The key of the data being requested.
    * @param position The position of the data being requested.
    * @return The {@link CacheSpan}.
-   * @throws InterruptedException
+   * @throws InterruptedException If the thread was interrupted.
    */
   CacheSpan startReadWrite(String key, long position) throws InterruptedException, CacheException;
 
diff --git a/library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java b/library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
index 0a221b6932d..f172293c222 100644
--- a/library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
+++ b/library/smoothstreaming/src/androidTest/java/com/google/android/exoplayer2/source/smoothstreaming/manifest/SsManifestTest.java
@@ -32,7 +32,7 @@
  */
 public class SsManifestTest extends TestCase {
 
-  private static ProtectionElement DUMMY_PROTECTION_ELEMENT =
+  private static final ProtectionElement DUMMY_PROTECTION_ELEMENT =
       new ProtectionElement(C.WIDEVINE_UUID, new byte[] {0, 1, 2});
 
   public void testCopy() throws Exception {
diff --git a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
index 28ac6a57861..123c06c43ed 100644
--- a/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
+++ b/library/ui/src/main/res/drawable-anydpi-v21/exo_controls_shuffle.xml
@@ -21,6 +21,6 @@
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20
-17.96 7.46 20 9.5V4h-5.5zm.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04
+17.96 7.46 20 9.5V4h-5.5zm0.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04
 2.04-3.13-3.13z" />
 </vector>
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 7818ddcf122..8e02204c260 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
@@ -170,7 +170,7 @@ private CacheDataSourceFactory newOfflineCacheDataSourceFactory() {
 
   private static class TestProgressListener implements ProgressListener {
 
-    private float stopAt;
+    private final float stopAt;
 
     private TestProgressListener(float stopAt) {
       this.stopAt = stopAt;
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
index 70c0f84051c..efc2637567a 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -134,7 +134,7 @@ public int getPlaybackState() {
 
     @Override
     public void setPlayWhenReady(boolean playWhenReady) {
-      if (playWhenReady != true) {
+      if (!playWhenReady) {
         throw new UnsupportedOperationException();
       }
     }
@@ -339,7 +339,7 @@ public void prepare(MediaSource mediaSource) {
 
     @Override
     public void prepare(final MediaSource mediaSource, boolean resetPosition, boolean resetState) {
-      if (resetPosition != true || resetState != true) {
+      if (!resetPosition || !resetState) {
         throw new UnsupportedOperationException();
       }
       this.mediaSource = mediaSource;

From 82edf01c22db534aef9a355f8c65115c7734bcb1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 23 Oct 2017 04:16:48 -0700
Subject: [PATCH 338/421] Re-use single session when multiSession disabled

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173098862
---
 .../android/exoplayer2/drm/DefaultDrmSessionManager.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 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 52bb0842818..677c784fe5f 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,10 +367,8 @@ public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitDa
       }
     }
 
-    DefaultDrmSession<T> session = null;
     byte[] initData = null;
     String mimeType = null;
-
     if (offlineLicenseKeySetId == null) {
       SchemeData data = getSchemeData(drmInitData, uuid);
       if (data == null) {
@@ -389,8 +387,12 @@ public void run() {
       }
     }
 
+    DefaultDrmSession<T> session;
     if (!multiSession) {
-      // Look for an existing session to use.
+      session = sessions.isEmpty() ? null : sessions.get(0);
+    } else {
+      // Only use an existing session if it has matching init data.
+      session = null;
       for (DefaultDrmSession<T> existingSession : sessions) {
         if (existingSession.hasInitData(initData)) {
           session = existingSession;

From 93423aa8d4cdd10d2e90f8e770abbae30f1e1d0b Mon Sep 17 00:00:00 2001
From: pavlotsky <pavlotsky@google.com>
Date: Mon, 23 Oct 2017 07:23:17 -0700
Subject: [PATCH 339/421] Moved Exo IMA Demo to ExoPlayer.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173112608
---
 demos/ima/README.md                           |   4 +
 demos/ima/build.gradle                        |  39 +++++++
 demos/ima/src/main/AndroidManifest.xml        |  21 ++++
 .../exoplayer2/imademo/DemoPlayer.java        |  97 ++++++++++++++++++
 .../exoplayer2/imademo/MainActivity.java      |  57 ++++++++++
 .../ima/src/main/res/layout/activity_main.xml |  14 +++
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 0 -> 3418 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 0 -> 4208 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 0 -> 2206 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 0 -> 2555 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 0 -> 6114 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 0 -> 7718 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 0 -> 10056 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 0 -> 10486 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 0 -> 14696 bytes
 demos/ima/src/main/res/values/colors.xml      |   6 ++
 demos/ima/src/main/res/values/strings.xml     |   5 +
 demos/ima/src/main/res/values/styles.xml      |  11 ++
 settings.gradle                               |   2 +
 20 files changed, 256 insertions(+)
 create mode 100644 demos/ima/README.md
 create mode 100644 demos/ima/build.gradle
 create mode 100644 demos/ima/src/main/AndroidManifest.xml
 create mode 100644 demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
 create mode 100644 demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
 create mode 100644 demos/ima/src/main/res/layout/activity_main.xml
 create mode 100644 demos/ima/src/main/res/mipmap-hdpi/ic_launcher.png
 create mode 100644 demos/ima/src/main/res/mipmap-hdpi/ic_launcher_round.png
 create mode 100644 demos/ima/src/main/res/mipmap-mdpi/ic_launcher.png
 create mode 100644 demos/ima/src/main/res/mipmap-mdpi/ic_launcher_round.png
 create mode 100644 demos/ima/src/main/res/mipmap-xhdpi/ic_launcher.png
 create mode 100644 demos/ima/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 create mode 100644 demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher.png
 create mode 100644 demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 create mode 100644 demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 create mode 100644 demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 create mode 100644 demos/ima/src/main/res/values/colors.xml
 create mode 100644 demos/ima/src/main/res/values/strings.xml
 create mode 100644 demos/ima/src/main/res/values/styles.xml

diff --git a/demos/ima/README.md b/demos/ima/README.md
new file mode 100644
index 00000000000..8002b566678
--- /dev/null
+++ b/demos/ima/README.md
@@ -0,0 +1,4 @@
+# IMA demo application #
+
+This folder contains a demo application that showcases ExoPlayer integration
+with the IMA SDK.
diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
new file mode 100644
index 00000000000..d93d826b673
--- /dev/null
+++ b/demos/ima/build.gradle
@@ -0,0 +1,39 @@
+// 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.
+apply from: '../../constants.gradle'
+apply plugin: 'com.android.application'
+
+android {
+    compileSdkVersion project.ext.compileSdkVersion
+    buildToolsVersion project.ext.buildToolsVersion
+    defaultConfig {
+        applicationId "com.google.android.exoplayer2.imademo"
+        minSdkVersion 16
+        targetSdkVersion project.ext.targetSdkVersion
+        versionCode 1
+        versionName "1.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:appcompat-v7:' + supportLibraryVersion
+    compile project(modulePrefix + 'library-core')
+    compile project(modulePrefix + 'library-ui')
+    compile project(modulePrefix + 'extension-ima')
+}
diff --git a/demos/ima/src/main/AndroidManifest.xml b/demos/ima/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..d6dfe4571e0
--- /dev/null
+++ b/demos/ima/src/main/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+  package="com.google.android.exoplayer2.imademo">
+
+  <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">
+    <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>
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
new file mode 100644
index 00000000000..d127304437f
--- /dev/null
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
@@ -0,0 +1,97 @@
+/*
+ * 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.imademo;
+
+import android.content.Context;
+import android.net.Uri;
+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.ext.ima.ImaAdsMediaSource;
+import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
+import com.google.android.exoplayer2.extractor.ExtractorsFactory;
+import com.google.android.exoplayer2.source.ExtractorMediaSource;
+import com.google.android.exoplayer2.source.MediaSource;
+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.SimpleExoPlayerView;
+import com.google.android.exoplayer2.upstream.BandwidthMeter;
+import com.google.android.exoplayer2.upstream.DataSource;
+import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
+import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory;
+import com.google.android.exoplayer2.util.Util;
+
+/**
+ * This class deals with ExoPlayer, the IMA plugin, and all video playback.
+ */
+class DemoPlayer {
+
+    private final ImaAdsLoader mAdsLoader;
+    private SimpleExoPlayer mPlayer;
+    private long mContentPosition;
+
+    DemoPlayer(Context context) {
+        String adTag = context.getString(R.string.ad_tag_url);
+        mAdsLoader = new ImaAdsLoader(context, Uri.parse(adTag));
+    }
+
+    void init(Context context, SimpleExoPlayerView simpleExoPlayerView) {
+        // Create a default track selector.
+        BandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
+        TrackSelection.Factory videoTrackSelectionFactory =
+                new AdaptiveTrackSelection.Factory(bandwidthMeter);
+        TrackSelector trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);
+
+        // Create a simple ExoPlayer instance.
+        mPlayer = ExoPlayerFactory.newSimpleInstance(context, trackSelector);
+
+        // Bind the player to the view.
+        simpleExoPlayerView.setPlayer(mPlayer);
+
+        // Produces DataSource instances through which media data is loaded.
+        DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(context,
+                Util.getUserAgent(context, context.getString(R.string.app_name)));
+        // Produces Extractor instances for parsing the media data.
+        ExtractorsFactory extractorsFactory = new DefaultExtractorsFactory();
+        // This is the MediaSource representing the non-ad, content media to be played.
+        String contentUrl = context.getString(R.string.content_url);
+        MediaSource contentMediaSource = new ExtractorMediaSource(
+                Uri.parse(contentUrl), dataSourceFactory, extractorsFactory, null, null);
+        // Compose the content media source into a new ImaAdMediaSource with both ads and content.
+        MediaSource mediaSourceWithAds = new ImaAdsMediaSource(
+                contentMediaSource,
+                dataSourceFactory,
+                mAdsLoader,
+                simpleExoPlayerView.getOverlayFrameLayout());
+        // Prepare the player with the source.
+        mPlayer.seekTo(mContentPosition);
+        mPlayer.prepare(mediaSourceWithAds);
+        mPlayer.setPlayWhenReady(true);
+    }
+
+    void reset() {
+        if (mPlayer != null) {
+            mContentPosition = mPlayer.getContentPosition();
+            mPlayer.release();
+        }
+    }
+
+    void release() {
+        mAdsLoader.release();
+    }
+}
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
new file mode 100644
index 00000000000..6cacdf252f3
--- /dev/null
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
@@ -0,0 +1,57 @@
+/*
+ * 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.imademo;
+
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
+
+/**
+ * Main Activity for the ExoPlayer IMA plugin example. ExoPlayer objects are created by DemoPlayer,
+ * which this class instantiates.
+ */
+public class MainActivity extends AppCompatActivity {
+
+    private DemoPlayer mPlayer;
+    private SimpleExoPlayerView mView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        mView = (SimpleExoPlayerView) findViewById(R.id.simpleExoPlayerView);
+        mPlayer = new DemoPlayer(this);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mPlayer.init(this, mView);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mPlayer.reset();
+    }
+
+    @Override
+    public void onDestroy() {
+        mPlayer.release();
+        super.onDestroy();
+    }
+}
diff --git a/demos/ima/src/main/res/layout/activity_main.xml b/demos/ima/src/main/res/layout/activity_main.xml
new file mode 100644
index 00000000000..180ab3223f1
--- /dev/null
+++ b/demos/ima/src/main/res/layout/activity_main.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:tools="http://schemas.android.com/tools"
+  android:layout_width="match_parent"
+  android:layout_height="match_parent"
+  tools:context="com.google.android.exoplayer2.imademo.MainActivity">
+
+  <com.google.android.exoplayer2.ui.SimpleExoPlayerView
+    android:id="@+id/simpleExoPlayerView"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"/>
+
+</FrameLayout>
diff --git a/demos/ima/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..cde69bcccec65160d92116f20ffce4fce0b5245c
GIT binary patch
literal 3418
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

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a078e3e1a42d474c78470a73c7987cf7ac5d9a0
GIT binary patch
literal 4208
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
GLSTY@)Y2*d

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..c133a0cbd379f5af6dbf1a899a0293ca5eccfad0
GIT binary patch
literal 2206
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

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..efc028a636dd690a51db5a525cf781a5a7daba68
GIT binary patch
literal 2555
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
Rt2+Py002ovPDHLkV1hi2&h!8P

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfa42f0e7b91d006d22352c9ff2f134e504e3c1d
GIT binary patch
literal 4842
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

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..3af2608a4492ef9ae63a77ec3305aedda89594cb
GIT binary patch
literal 6114
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

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..324e72cdd7480cb983fa1bcc7ce686e51ef87fe7
GIT binary patch
literal 7718
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

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bec2e623103ac9713b00cad8502a057c1efda61
GIT binary patch
literal 10056
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

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..aee44e138434630332d88b1680f33c4b24c70ab3
GIT binary patch
literal 10486
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
acChvT-wm8jF7_S`fH(4La<wuRVgChb86-jg

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000000000000000000000000000000000000..34947cd6bbf9c729be83edc96ad08a1d42b82bc9
GIT binary patch
literal 14696
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
AwEzGB

literal 0
HcmV?d00001

diff --git a/demos/ima/src/main/res/values/colors.xml b/demos/ima/src/main/res/values/colors.xml
new file mode 100644
index 00000000000..5a077b3a78f
--- /dev/null
+++ b/demos/ima/src/main/res/values/colors.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="colorPrimary">#3F51B5</color>
+  <color name="colorPrimaryDark">#303F9F</color>
+  <color name="colorAccent">#FF4081</color>
+</resources>
diff --git a/demos/ima/src/main/res/values/strings.xml b/demos/ima/src/main/res/values/strings.xml
new file mode 100644
index 00000000000..9bf928a6b34
--- /dev/null
+++ b/demos/ima/src/main/res/values/strings.xml
@@ -0,0 +1,5 @@
+<resources>
+  <string name="app_name">Exo IMA Demo</string>
+  <string name="content_url"><![CDATA[http://rmcdn.2mdn.net/MotifFiles/html/1248596/android_1330378998288.mp4]]></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>
+</resources>
diff --git a/demos/ima/src/main/res/values/styles.xml b/demos/ima/src/main/res/values/styles.xml
new file mode 100644
index 00000000000..705be277649
--- /dev/null
+++ b/demos/ima/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 f67f0916504..d4530d67b74 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,9 +20,11 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 
 include modulePrefix + 'demo'
 include modulePrefix + 'demo-cast'
+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-ima').projectDir = new File(rootDir, 'demos/ima')
 project(modulePrefix + 'playbacktests').projectDir = new File(rootDir, 'playbacktests')
 
 apply from: 'core_settings.gradle'

From 43d70bdde977bf4662bb9bee792e8acae2249074 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 23 Oct 2017 07:48:44 -0700
Subject: [PATCH 340/421] Ignore seekTo if an ad is playing

Issue: #3309

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

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 6bd6cd4795c..d1c643c05b7 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
@@ -232,6 +232,18 @@ public void seekTo(int windowIndex, long positionMs) {
     if (windowIndex < 0 || (!timeline.isEmpty() && windowIndex >= timeline.getWindowCount())) {
       throw new IllegalSeekPositionException(timeline, windowIndex, positionMs);
     }
+    if (isPlayingAd()) {
+      // TODO: Investigate adding support for seeking during ads. This is complicated to do in
+      // general because the midroll ad preceding the seek destination must be played before the
+      // content position can be played, if a different ad is playing at the moment.
+      Log.w(TAG, "seekTo ignored because an ad is playing");
+      if (pendingSeekAcks == 0) {
+        for (Player.EventListener listener : listeners) {
+          listener.onSeekProcessed();
+        }
+      }
+      return;
+    }
     pendingSeekAcks++;
     maskingWindowIndex = windowIndex;
     if (timeline.isEmpty()) {

From 3289e3e9cbcee9c00e6c2bde1b473841655ce1de Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 23 Oct 2017 08:28:30 -0700
Subject: [PATCH 341/421] Be robust against provideProvisionResponse throwing
 unchecked exceptions

Other catch blocks in this class catch everything. This one should
too.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173118891
---
 .../com/google/android/exoplayer2/drm/DefaultDrmSession.java   | 3 +--
 1 file changed, 1 insertion(+), 2 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 290c1877de7..688fff48fb1 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
@@ -17,7 +17,6 @@
 
 import android.annotation.SuppressLint;
 import android.annotation.TargetApi;
-import android.media.DeniedByServerException;
 import android.media.NotProvisionedException;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -281,7 +280,7 @@ private void onProvisionResponse(Object response) {
 
     try {
       mediaDrm.provideProvisionResponse((byte[]) response);
-    } catch (DeniedByServerException e) {
+    } catch (Exception e) {
       provisioningManager.onProvisionError(e);
       return;
     }

From c4f3cad586bf8fc0ee7260058bf8050fb50d3cbf Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 23 Oct 2017 09:13:44 -0700
Subject: [PATCH 342/421] Better behavior if media doesn't support DRM scheme

We don't expect this case to occur, since track selection is
normally expected to check canAcquireSession before selecting
a track. Nevertheless, if an attempt is made to acquire a
session when the media doesn't support the manager's UUID, we
should fail in a more graceful way.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173124170
---
 .../drm/DefaultDrmSessionManager.java         | 17 ++++--
 .../exoplayer2/drm/ErrorStateDrmSession.java  | 57 +++++++++++++++++++
 2 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java

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 677c784fe5f..2ec5040aef8 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
@@ -26,6 +26,7 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
+import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.OnEventListener;
 import com.google.android.exoplayer2.extractor.mp4.PsshAtomUtil;
 import com.google.android.exoplayer2.util.Assertions;
@@ -372,19 +373,20 @@ public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitDa
     if (offlineLicenseKeySetId == null) {
       SchemeData data = getSchemeData(drmInitData, uuid);
       if (data == null) {
+        final IllegalStateException error = new IllegalStateException(
+            "Media does not support uuid: " + uuid);
         if (eventHandler != null && eventListener != null) {
           eventHandler.post(new Runnable() {
             @Override
             public void run() {
-              eventListener.onDrmSessionManagerError(new IllegalStateException(
-                  "Media does not support uuid: " + uuid));
+              eventListener.onDrmSessionManagerError(error);
             }
           });
         }
-      } else {
-        initData = getSchemeInitData(data, uuid);
-        mimeType = getSchemeMimeType(data, uuid);
+        return new ErrorStateDrmSession<>(new DrmSessionException(error));
       }
+      initData = getSchemeInitData(data, uuid);
+      mimeType = getSchemeMimeType(data, uuid);
     }
 
     DefaultDrmSession<T> session;
@@ -414,6 +416,11 @@ public void run() {
 
   @Override
   public void releaseSession(DrmSession<T> session) {
+    if (session instanceof ErrorStateDrmSession) {
+      // Do nothing.
+      return;
+    }
+
     DefaultDrmSession<T> drmSession = (DefaultDrmSession<T>) session;
     if (drmSession.release()) {
       sessions.remove(drmSession);
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
new file mode 100644
index 00000000000..576f0a08a99
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ErrorStateDrmSession.java
@@ -0,0 +1,57 @@
+/*
+ * 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.drm;
+
+import com.google.android.exoplayer2.util.Assertions;
+import java.util.Map;
+
+/**
+ * A {@link DrmSession} that's in a terminal error state.
+ */
+/* package */ final class ErrorStateDrmSession<T extends ExoMediaCrypto> implements DrmSession<T> {
+
+  private final DrmSessionException error;
+
+  public ErrorStateDrmSession(DrmSessionException error) {
+    this.error = Assertions.checkNotNull(error);
+  }
+
+  @Override
+  public int getState() {
+    return STATE_ERROR;
+  }
+
+  @Override
+  public DrmSessionException getError() {
+    return error;
+  }
+
+  @Override
+  public T getMediaCrypto() {
+    return null;
+  }
+
+  @Override
+  public Map<String, String> queryKeyStatus() {
+    return null;
+  }
+
+  @Override
+  public byte[] getOfflineLicenseKeySetId() {
+    return null;
+  }
+
+}

From 60a81824f58c9bb19021d34e86cef288bce3c7c2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 23 Oct 2017 11:41:11 -0700
Subject: [PATCH 343/421] Clean up IMA demo

Also do some minor cleanup in other demo apps.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173146425
---
 demos/cast/src/main/AndroidManifest.xml       |   1 -
 demos/cast/src/main/res/values/strings.xml    |   4 +-
 demos/ima/build.gradle                        |  18 ++-
 demos/ima/src/main/AndroidManifest.xml        |  40 +++++--
 .../exoplayer2/imademo/DemoPlayer.java        | 109 ++++++++++--------
 .../exoplayer2/imademo/MainActivity.java      |  69 +++++------
 .../ima/src/main/res/layout/activity_main.xml |  14 ---
 .../src/main/res/layout/main_activity.xml}    |  13 +--
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 3418 -> 3394 bytes
 .../res/mipmap-hdpi/ic_launcher_round.png     | Bin 4208 -> 0 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 2206 -> 2184 bytes
 .../res/mipmap-mdpi/ic_launcher_round.png     | Bin 2555 -> 0 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4842 -> 4886 bytes
 .../res/mipmap-xhdpi/ic_launcher_round.png    | Bin 6114 -> 0 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 7718 -> 7492 bytes
 .../res/mipmap-xxhdpi/ic_launcher_round.png   | Bin 10056 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 10486 -> 10801 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png  | Bin 14696 -> 0 bytes
 demos/ima/src/main/res/values/colors.xml      |   6 -
 demos/ima/src/main/res/values/strings.xml     |  21 +++-
 demos/ima/src/main/res/values/styles.xml      |  28 +++--
 demos/main/src/main/res/values/strings.xml    |   1 -
 demos/main/src/main/res/values/styles.xml     |   1 -
 23 files changed, 184 insertions(+), 141 deletions(-)
 delete mode 100644 demos/ima/src/main/res/layout/activity_main.xml
 rename demos/{cast/src/main/res/values/styles.xml => ima/src/main/res/layout/main_activity.xml} (71%)
 delete mode 100644 demos/ima/src/main/res/mipmap-hdpi/ic_launcher_round.png
 delete mode 100644 demos/ima/src/main/res/mipmap-mdpi/ic_launcher_round.png
 delete mode 100644 demos/ima/src/main/res/mipmap-xhdpi/ic_launcher_round.png
 delete mode 100644 demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
 delete mode 100644 demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
 delete mode 100644 demos/ima/src/main/res/values/colors.xml

diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index 8f0aa69e8c1..cd2b51513c1 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -34,7 +34,6 @@
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
         <category android:name="android.intent.category.LAUNCHER"/>
-        <category android:name="android.intent.category.BROWSABLE"/>
       </intent-filter>
     </activity>
 
diff --git a/demos/cast/src/main/res/values/strings.xml b/demos/cast/src/main/res/values/strings.xml
index 503892da276..766e8972d92 100644
--- a/demos/cast/src/main/res/values/strings.xml
+++ b/demos/cast/src/main/res/values/strings.xml
@@ -16,9 +16,9 @@
 
 <resources>
 
-  <string name="application_name">ExoCast Demo</string>
+  <string name="application_name">Exo Cast Demo</string>
 
-  <string name="media_route_menu_title">ExoCast</string>
+  <string name="media_route_menu_title">Cast</string>
 
   <string name="error_unsupported_drm">DRM scheme not supported by this device.</string>
 
diff --git a/demos/ima/build.gradle b/demos/ima/build.gradle
index d93d826b673..c32228de28b 100644
--- a/demos/ima/build.gradle
+++ b/demos/ima/build.gradle
@@ -17,22 +17,30 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion project.ext.compileSdkVersion
     buildToolsVersion project.ext.buildToolsVersion
+
     defaultConfig {
-        applicationId "com.google.android.exoplayer2.imademo"
         minSdkVersion 16
         targetSdkVersion project.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
     }
+
     buildTypes {
         release {
-            minifyEnabled false
+            shrinkResources true
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt')
+        }
+        debug {
+            jniDebuggable = true
         }
     }
+
+    lintOptions {
+        // The demo app does not have translations.
+        disable 'MissingTranslation'
+    }
 }
 
 dependencies {
-    compile 'com.android.support:appcompat-v7:' + supportLibraryVersion
     compile project(modulePrefix + 'library-core')
     compile project(modulePrefix + 'library-ui')
     compile project(modulePrefix + 'extension-ima')
diff --git a/demos/ima/src/main/AndroidManifest.xml b/demos/ima/src/main/AndroidManifest.xml
index d6dfe4571e0..5c6db024177 100644
--- a/demos/ima/src/main/AndroidManifest.xml
+++ b/demos/ima/src/main/AndroidManifest.xml
@@ -1,21 +1,39 @@
 <?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"
-  package="com.google.android.exoplayer2.imademo">
-
-  <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">
-    <activity android:name=".MainActivity">
+    package="com.google.android.exoplayer2.imademo"
+    android:versionCode="2504"
+    android:versionName="2.5.4">
+
+  <uses-permission android:name="android.permission.INTERNET"/>
+  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
+
+  <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
+      android:largeHeap="true" android:allowBackup="false">
+
+    <activity android:name="com.google.android.exoplayer2.imademo.MainActivity"
+        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
+        android:label="@string/application_name"
+        android:theme="@style/PlayerTheme">
       <intent-filter>
         <action android:name="android.intent.action.MAIN"/>
-
         <category android:name="android.intent.category.LAUNCHER"/>
       </intent-filter>
     </activity>
+
   </application>
 
 </manifest>
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
index d127304437f..67d96d7f680 100644
--- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
@@ -17,14 +17,15 @@
 
 import android.content.Context;
 import android.net.Uri;
+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.ext.ima.ImaAdsMediaSource;
 import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
 import com.google.android.exoplayer2.extractor.ExtractorsFactory;
 import com.google.android.exoplayer2.source.ExtractorMediaSource;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.ads.AdsMediaSource;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
 import com.google.android.exoplayer2.trackselection.TrackSelection;
@@ -37,61 +38,69 @@
 import com.google.android.exoplayer2.util.Util;
 
 /**
- * This class deals with ExoPlayer, the IMA plugin, and all video playback.
+ * Manages the {@link ExoPlayer}, the IMA plugin and all video playback.
  */
-class DemoPlayer {
+/* package */ final class DemoPlayer {
 
-    private final ImaAdsLoader mAdsLoader;
-    private SimpleExoPlayer mPlayer;
-    private long mContentPosition;
+  private final ImaAdsLoader adsLoader;
 
-    DemoPlayer(Context context) {
-        String adTag = context.getString(R.string.ad_tag_url);
-        mAdsLoader = new ImaAdsLoader(context, Uri.parse(adTag));
-    }
+  private SimpleExoPlayer player;
+  private long contentPosition;
 
-    void init(Context context, SimpleExoPlayerView simpleExoPlayerView) {
-        // Create a default track selector.
-        BandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
-        TrackSelection.Factory videoTrackSelectionFactory =
-                new AdaptiveTrackSelection.Factory(bandwidthMeter);
-        TrackSelector trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);
-
-        // Create a simple ExoPlayer instance.
-        mPlayer = ExoPlayerFactory.newSimpleInstance(context, trackSelector);
-
-        // Bind the player to the view.
-        simpleExoPlayerView.setPlayer(mPlayer);
-
-        // Produces DataSource instances through which media data is loaded.
-        DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(context,
-                Util.getUserAgent(context, context.getString(R.string.app_name)));
-        // Produces Extractor instances for parsing the media data.
-        ExtractorsFactory extractorsFactory = new DefaultExtractorsFactory();
-        // This is the MediaSource representing the non-ad, content media to be played.
-        String contentUrl = context.getString(R.string.content_url);
-        MediaSource contentMediaSource = new ExtractorMediaSource(
-                Uri.parse(contentUrl), dataSourceFactory, extractorsFactory, null, null);
-        // Compose the content media source into a new ImaAdMediaSource with both ads and content.
-        MediaSource mediaSourceWithAds = new ImaAdsMediaSource(
-                contentMediaSource,
-                dataSourceFactory,
-                mAdsLoader,
-                simpleExoPlayerView.getOverlayFrameLayout());
-        // Prepare the player with the source.
-        mPlayer.seekTo(mContentPosition);
-        mPlayer.prepare(mediaSourceWithAds);
-        mPlayer.setPlayWhenReady(true);
-    }
+  public DemoPlayer(Context context) {
+    String adTag = context.getString(R.string.ad_tag_url);
+    adsLoader = new ImaAdsLoader(context, Uri.parse(adTag));
+  }
+
+  public void init(Context context, SimpleExoPlayerView simpleExoPlayerView) {
+    // Create a default track selector.
+    BandwidthMeter bandwidthMeter = new DefaultBandwidthMeter();
+    TrackSelection.Factory videoTrackSelectionFactory =
+        new AdaptiveTrackSelection.Factory(bandwidthMeter);
+    TrackSelector trackSelector = new DefaultTrackSelector(videoTrackSelectionFactory);
+
+    // Create a player instance.
+    player = ExoPlayerFactory.newSimpleInstance(context, trackSelector);
+
+    // Bind the player to the view.
+    simpleExoPlayerView.setPlayer(player);
+
+    // Produces DataSource instances through which media data is loaded.
+    DataSource.Factory dataSourceFactory = new DefaultDataSourceFactory(context,
+        Util.getUserAgent(context, context.getString(R.string.application_name)));
 
-    void reset() {
-        if (mPlayer != null) {
-            mContentPosition = mPlayer.getContentPosition();
-            mPlayer.release();
-        }
+    // Produces Extractor instances for parsing the content media (i.e. not the ad).
+    ExtractorsFactory extractorsFactory = new DefaultExtractorsFactory();
+
+    // This is the MediaSource representing the content media (i.e. not the ad).
+    String contentUrl = context.getString(R.string.content_url);
+    MediaSource contentMediaSource = new ExtractorMediaSource(
+        Uri.parse(contentUrl), dataSourceFactory, extractorsFactory, null, null);
+
+    // Compose the content media source into a new AdsMediaSource with both ads and content.
+    MediaSource mediaSourceWithAds = new AdsMediaSource(contentMediaSource, dataSourceFactory,
+        adsLoader, simpleExoPlayerView.getOverlayFrameLayout());
+
+    // Prepare the player with the source.
+    player.seekTo(contentPosition);
+    player.prepare(mediaSourceWithAds);
+    player.setPlayWhenReady(true);
+  }
+
+  public void reset() {
+    if (player != null) {
+      contentPosition = player.getContentPosition();
+      player.release();
+      player = null;
     }
+  }
 
-    void release() {
-        mAdsLoader.release();
+  public void release() {
+    if (player != null) {
+      player.release();
+      player = null;
     }
+    adsLoader.release();
+  }
+
 }
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
index 6cacdf252f3..b1e3a53694b 100644
--- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
@@ -15,43 +15,44 @@
  */
 package com.google.android.exoplayer2.imademo;
 
+import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
 
 /**
- * Main Activity for the ExoPlayer IMA plugin example. ExoPlayer objects are created by DemoPlayer,
- * which this class instantiates.
+ * Main Activity for the IMA plugin demo. {@link ExoPlayer} objects are created by
+ * {@link DemoPlayer}, which this class instantiates.
  */
-public class MainActivity extends AppCompatActivity {
-
-    private DemoPlayer mPlayer;
-    private SimpleExoPlayerView mView;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        mView = (SimpleExoPlayerView) findViewById(R.id.simpleExoPlayerView);
-        mPlayer = new DemoPlayer(this);
-    }
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        mPlayer.init(this, mView);
-    }
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        mPlayer.reset();
-    }
-
-    @Override
-    public void onDestroy() {
-        mPlayer.release();
-        super.onDestroy();
-    }
+public final class MainActivity extends Activity {
+
+  private SimpleExoPlayerView playerView;
+  private DemoPlayer player;
+
+  @Override
+  protected void onCreate(Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+    setContentView(R.layout.main_activity);
+    playerView = findViewById(R.id.player_view);
+    player = new DemoPlayer(this);
+  }
+
+  @Override
+  public void onResume() {
+    super.onResume();
+    player.init(this, playerView);
+  }
+
+  @Override
+  public void onPause() {
+    super.onPause();
+    player.reset();
+  }
+
+  @Override
+  public void onDestroy() {
+    player.release();
+    super.onDestroy();
+  }
+
 }
diff --git a/demos/ima/src/main/res/layout/activity_main.xml b/demos/ima/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 180ab3223f1..00000000000
--- a/demos/ima/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  tools:context="com.google.android.exoplayer2.imademo.MainActivity">
-
-  <com.google.android.exoplayer2.ui.SimpleExoPlayerView
-    android:id="@+id/simpleExoPlayerView"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"/>
-
-</FrameLayout>
diff --git a/demos/cast/src/main/res/values/styles.xml b/demos/ima/src/main/res/layout/main_activity.xml
similarity index 71%
rename from demos/cast/src/main/res/values/styles.xml
rename to demos/ima/src/main/res/layout/main_activity.xml
index 1484a68a68d..ad5da62f47b 100644
--- a/demos/cast/src/main/res/values/styles.xml
+++ b/demos/ima/src/main/res/layout/main_activity.xml
@@ -13,10 +13,9 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-  <style name="PlayerTheme" parent="android:Theme.Holo">
-    <item name="android:windowBackground">@android:color/black</item>
-  </style>
-
-</resources>
+<com.google.android.exoplayer2.ui.SimpleExoPlayerView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/player_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:keepScreenOn="true"/>
diff --git a/demos/ima/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-hdpi/ic_launcher.png
index cde69bcccec65160d92116f20ffce4fce0b5245c..adaa93220eb81c58e5c85874d1cf127a3188e419 100644
GIT binary patch
delta 3392
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
WdZo}W<(#De0000<MNUMnLSTY$Sbtmq

literal 3418
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

diff --git a/demos/ima/src/main/res/mipmap-hdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 9a078e3e1a42d474c78470a73c7987cf7ac5d9a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4208
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
GLSTY@)Y2*d

diff --git a/demos/ima/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-mdpi/ic_launcher.png
index c133a0cbd379f5af6dbf1a899a0293ca5eccfad0..9b6f7d5e8065c8a943bb33bc152bcbd1ca887b35 100644
GIT binary patch
delta 2172
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

delta 2195
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
VFwL6zQVak9002ovPDHLkV1j2s3A_LR

diff --git a/demos/ima/src/main/res/mipmap-mdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index efc028a636dd690a51db5a525cf781a5a7daba68..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2555
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
Rt2+Py002ovPDHLkV1hi2&h!8P

diff --git a/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher.png
index bfa42f0e7b91d006d22352c9ff2f134e504e3c1d..2101026c9fe1b48ab11a23fd440cf2f80af2afae 100644
GIT binary patch
literal 4886
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
IM6N<$f{P}YasU7T

literal 4842
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

diff --git a/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index 3af2608a4492ef9ae63a77ec3305aedda89594cb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6114
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

diff --git a/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 324e72cdd7480cb983fa1bcc7ce686e51ef87fe7..223ec8bd1132aab759469bd5ad2232f35f7be2c2 100644
GIT binary patch
literal 7492
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
O0000<MNUMnLSTZ5-A2{`

literal 7718
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

diff --git a/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 9bec2e623103ac9713b00cad8502a057c1efda61..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10056
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

diff --git a/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index aee44e138434630332d88b1680f33c4b24c70ab3..698ed68c429d3c14b617d6ff4bab26e01df89a14 100644
GIT binary patch
literal 10801
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%0Dj^J4_SbOxi?LOAH?pqcJIPrNphD%I2G8C
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

literal 10486
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
acChvT-wm8jF7_S`fH(4La<wuRVgChb86-jg

diff --git a/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/demos/ima/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 34947cd6bbf9c729be83edc96ad08a1d42b82bc9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14696
zcmZvDRa_g57i@5McbB52SShZ--JxiqI20+K;O_nb#i7OBiUcdJ#idwrElxs!oBw^f
z5BC>)+LPVvkvTJySZz%p9yT>L006*KQC84JeD?kCg^7-M*WGZz006}JRTO0P{npNd
zG5qumV7)CN`i{&RgxVgioKN$1J|8zAKUGzbbc}RN6lZ;Ky0~oQ8NKB$i@Y%-vQlJ}
zl`p?}r=`eoGKI1dl4@h-zxvPQ3w9zN|BbbX?`$6W7gEW+^STtfeERnAG~Ic)>6IMt
zBl`dQWW!)8qf+#WBd6t^ig*+cQW9)cT$Dd%#c(vk`n|T@HT2MuhN(an9q^u~L{xOg
zU1n*TG?)`zM?&_B=T|%_zfSk~74hq8Gu#*b3evyT_D-I*igRI*U8lV~b;}Vb5VC6*
zN5E;X4OjRQ!JNdLy-WMcE{=v&^o^U|29wVS-Ai*G+?VeLGPYm%B?5ea`$ETmbLsMV
zuiJFZNk})jLMuRt{=Zje`76#}#&Q3V26Dc8!}UHik>2-WLx2j8wjJtgf9=)R>8Fj`
zFE*av-r!J0xiIKZ=FWHHmEwf_i<&;MI?)S0?HXsgeSf|Vdwciep&c%GwK}|@Gd1%C
zPx_Dvy-tOWYC)cc%IxU5hWFRahFgTL`MW-E!fSGl4@u&*L&JnyUU@iw$)zbe=evjM
zt<fPBZFnCc0ULB<E^3Y?qv?w~qy?n0q>%9xm6Y?gZ!w#c*4uAcV=SSq{@2c~b~PFc
zrLk+YJ%voE`Km;3<O8hjGF1K2QJLywm2gwxYZ#*m*j18FRU*;AE{L|vPHb5*r&cbd
z8%|f5?-W@#?@Ng&SJnNGH~L<;-IBzEZ~q%=txW4>5;%G)d%LORdN*Eq60==n7~OlR
zeDy~0r+Q1hk8Yr?MxH*mAXicCi|m|AtCD8chU&|oBob+$`#`K>Z&%JO`Y%R7uDyRE
zF5g9&e~dLD2ZIEeBG%T{e2<*tRN=!ovhEesu24}&nrdk1yHcs8dDLSfh#?!OG*Y`-
zl)1>&QXhz7mtv_3w+Onw5moujv|FvvhWr@An6%|*_K<dpbJyUt@crwdB<zw{a<`gj
z>+6y-Et^B2k5EJNa(4G6u+gZ#%FB$c>Z9t9-&I7gqC#_q%IHKMf<y`Td2n{+SD--K
z58U7qQ|5J(0&;jTN1RX9ADtRrQ~m?|vP`kNhOqrkpHp&j54#^amRF^+u)EXc*B_?L
z+@|zvqv^*GF!>PBUyrTeUAED`RyOHZ*lE3<zS<`yD6}bx&1u26cMkCEeRD8XE+r+!
zt4|~p1{W3<{^-C0J2CLrPZPs%ip2aucRevPb6FABhkHH0<CXI14GOg$ult8$He%V+
z_AQW_B=`kxWq``A?lx!bMHy^a1ADH}VcQK>cF^YT^w=3_J}LVz_1$5uS^En^FgP{+
zwZh3iSKY!RJ$~CpQSq1M;=4*dXx_~juMzBpA``A*hPr_NET{O^P<PMaYda9cV|l+#
zBUhPO&{ZU-01Ts9!0(Ceg*XF|FQBq70$k8bDI#+S=y`ax`SZvZqLyy%F)hhgwcl8L
znQ-51Oi(dUMP<zLl8XrQ+Oq5GITfsT!*K6Ai<;z*Jw45JSyaE;%F4>osj26|k4(rt
zAHc=6#1`I^bRXZ6#FoV)T^cauC<Q%#l{Z^cMiss4%;vY`o1UDc{atp5rBHb@p2_{~
zIFe&M7q0(l@6gg|6j~*xYiOXpWobv}R6Xs2y$4(`N}P4GGf=EKpLKIkGmGE;U9RS+
zqoeaDZx8vy*jMVQBQ%DF@<X6)2?@Vtj{>unE63*X{8+)QyR!F=o9Dh$t05}au@6(&
z@P4%cYqyp7>VNlWtN+2Ii47Yf^_R^*o!eLUA@OZ@@tb#S1I2#JB@0elUXbp6r|42{
z>Up3u^Vvfrg^Il+stJvBXid@+&EVSOgR-g$BQby8*NSE(u*Tl&f2`!tbTR?=6uY^L
zPmV1#CiH?yp9-)(yE+Z_^%o?|+{o#gn*KyKpZlws&guK|@#kd)uQ)L)!OY!Knx&P|
zNp@L_L}5{}qGnN=<zMI=I~#>&T5asB{T@XK=76W~DvO7em~fhn=gC4PSSYs4SoaDl
z4SR_*-mpJaj#5&eNM^1s-C8E<%k98o<@`+7sc%qs*IIQqXIvO>K%p$Ngxw?&ke>v|
zQcU2egr?SLxJr8NTG$4G?Ck6`0s>$-n!L!VquRp0WfWOX$)?iO$<URFY!%rZl_tUQ
z^qROiIy8}CE#~82M0<yY;NH{PlqJ|~oAMicrfOS`qZF`8nfNNbKzb|N8mX)E>Ajpk
z>7n<<Mkg)<Lm{6{+X_{-n9$#)&)<63e?|c6%sb^&RaKRZ;Y3YL*LqakLf<khdAh1=
zQx;(69o|W%g_S>33vGN>qFeBio7xoe*0`-?Pzmj<t#`=zLhLm&3I0X%3zg#CSJVbW
z%oVx<?zosS$3{mPrHW5a5|N!9JZV9m9F@K1KFg*|*1=U(+$zc!_E~2qN?_4llBTRr
z_V)ib>X)HUP(Z8P<4deLYHj`)OsKl5>O`J@HzDTb{>)gRHJ*Y$4Gs??reV-nqI>o2
z(XleS1}kr_l4fnJdXlE(83<#vCA@UpZwSVI(i<S{8Cw2UgA2<TVjD^c3qxMYa?lGz
z$4)?gKhpeprhotot6yFsH!?c9UBCNo$31UeY4bQnSn9U|Wh%G0cpj?48Cx}rR24@U
zilf)quW_83q0hWTM<m9R$~ZAphVm&dbvZ#z6^y9RFH>aM<D&%`mt#$o1awF|1bH&Z
z13f0|#dznb0GeEe5V8{H4UYd994a2G2wZF0z3KCgLU!or5|~;#I&xUq*;43=aU9Yf
zl9B*#wNmscN24BwS^Z!N*?f?`LnKkR4XeX2%(xhwBE5aa7Y0Z?VjRcKq{hivQYMb2
zdrV!Sfj%jo(fmY?p;c=`pRsn0YLll~^TRJHKBTb9$|?K){q^IV0pfS(;^GR>o<3Y(
zhf!9!Wn^ckZ)}(o6Va(IMQB!vVxOu1rxZ7Rn3G9(3iJ)iX8e$aZ(di)O2MC<+B8nA
zt6QMvIrA%RZ?}|{*_{Gw`j1S~Cw?}N$<0_Xt`_=MjXx`6AeLBGb5g|NCF>X)P-S}6
zSl7H@Q0njQ{*6l%c_D8^F+_7@;f8$aaG_JZNf^3CeT~BiV|W$E`tBMjBEK&7)0DkR
z?z>hY-|gMqd9^Y3P&>pyQ~XmU@z*beD)dzp<>lo(Oj4w6nKcOkTJCP!ABl5Xv&?I_
zJ`cSkJ-$`pFA<N>3ocK~Fx*R>Y$jr@`v(xq>dG?61*zt%i?D-~m)N?sNZb>o+|vyj
z-P1A~|56bKm-o#W{_6P!q7YoBA?8Tah)qBGticj0=B(_p0}|mjGyRel%+YI>KwJ@n
z^qRZ{oO<;bewX{$Tg(ztZtb2DUTkJ;Ry;NPRh5(23IsUxyxtqT+s;{WQv9+Mt@Qnn
zwOx4AP_7(>wYZd6?ZAelWHhVc@(q>`FjOO!A^mLr>aOJ5g1s_}q}0vHBDLpFiR2;j
zOAerCR@xs&%hW_H2B&Pxnz-P2VweWj@N#%B09O_hrLaqC2c=2;PHngFTyZxpNcoK<
z#tIb^`g3OeZ)c)X8zmJX6PkwtK4|I2SVhV)tB4e~U?b0!Ptjea5!rx$zBKs7R9$^i
zZQB%4^xSN0y;FX>r-#a?wlzGahK5R>o}S9uL)J|qXXyck4j60(CW@6y*ea5eCEKme
zkd&$kva){zSj6%yjlOHkJU^XBUn<DC@k*|c31upEv4buGKKwjWeGVJSzb-z^(ww<s
z7B@Qn!B~f~{IzaZ2>ND6@Z+g`<GV8!Vp>p6E798cw4GM^A^H&~p+e`9?j!-{uP4#(
zb2j-bBwJC$yC)}3BE{)hSxWa&b#<cHHKkcB@3!)$@G#AoTHkYMGH}R>RgYzr&HN}Y
z7Ku~xdvis{1PCP~Z7|A9mtqU;tUl_D(q?ktNfV-~ud8FW=J0K}TuOYQ|1@)Dz$(m}
z*-B&|oVY5BAvH_Dt)vnZ1jpFUAN(8xO<S~INdKe8qL`mn0x{pk;Ew1FrTj2ij{{|3
zJ6k6v>ed*0)^dv6r9`S*FlVyM)=V$kmGNY>C2v*9eaBUU8IB93V++|Aux;(T>}Q9T
z%~-`gM2_p~%GaYUXQ<T93`eNkjY1Aqq)qaQTxXTq3TPTXk%s)ZxxUt|(8yZ~O-4>K
z6PXG&_M+yM(zm%?ZkJOon=X)?uop!c=pM`cN8p1RvK;K_r7Y`6uEHZBcV7`a!ZXap
zS|9d^O%X!cL4UbWzuLN2IL*2__5+%{NCa?ti5~o#UQ@%fB$8AG&1<9+uhwK^Wras`
z4DsP7zU=JmoFB)QuLhKV7ryu^cPpdO`Qt|nE9-D-EtA*iNsccovR@v1^ktf4<(4-1
zmB@r8@llgA#O}<8w$)ciOBov1yWA=@;c&Y}EELbm{;OFebqSvNQwp1m>6V4Aw&`%D
zaO*$u6mtCdm)lRIbkBFSgv4(il@~f$Y?&S8;FVc$Pmixi3&3vxL)zCEg<lFM3-E7N
zUl?i7W}^iJ1oZl4yNn_fZVSb{>}l4FuT*behEKMYV~DPF_4H!3MgyAO9k?H)N>5*-
zuIwNe&4JxVO_$Jft`ze)-(CrKC?J>0XliQaR#!V?bR{DPvDb+uQvS_nf}QfCgv{_t
z>Zzu^D;b;aVDRQi=_!HSp}uWPW$80+l7u;@WzcK%yizT(-y2`LPsI^>l8-Cakh{9I
zuUf18fv_c#BTW-Om&f<<S=O<Sp)q~(y<T28gxF>t)e9l<2>wEz%eMmV3ayckm_V0v
z<B`t=u&wHtSy)&yJm-G7-5?J<8R_dw@YAc;-j1YWU)#n&g39Aq$<b4I$6gosv>KFd
zE$!H$nT!BKw35QcH#@e(;PJv%ytPpk1rM4-V_jWOK}N>y`mfcPU+Ndb@UyEk&7r9u
zU(9?8A__JTT`y>%W60>s+?FR2<~HbfJ71$FG2f0A@K9CdAfu+ffv&kGK|r`E&COlS
zFBz&!|LpuN6rQ<AG1hq2>XJ4}39Y4h{-yv3dLzV+j?!$@(B_Fw6cRXUc71(4?Y_}*
zMdaZ%7=>5s!W%*^1pUU-IdheiHkRzvzZxe;oYI<KlbAQ_cfEy%3@}uH$l`zIV?N}H
z%a=v1VU255BO)TQ49gQyi}F7vaZpU(l40Y3{2sLg9ZOtIn2)k|WXOTM(5!Oce`{>O
zx9(9u&!D%#e4WMy6@El9pWaJKO6GgsSoA9W=$tA6J31b}t@=q_&i=m$7XC^2$JLHa
z&P>oe&)aMwK$k!iNJ>egr8rFyfNyhA($Mhlb1n*;incWtZx>5x!V(0v`>DJ1L{ojQ
zKYQdO<ea(RHqt-0rGq@X!o(FeX;;IWX-<bs(HO)3?wzO9d#Afkeg~8PO}->BNWWNA
zwRudxn3hl9E}7Rd?f8q2BCsf(0_ao`48#JMF(Y$V(qW5te)|I`Tj2eaf@_O*8cV`K
zTo8ECnY7JySmSf9rK2<V`eyOP!B@0bS8*4cAQcab!Bh#3K3czU1lcgZ7G(qg^00=;
zX&H^2sxrBdML0YVsI#!$ed~pydYw@Ux|qgJ^Gd?akfHya>K2#xks8>>_PYLV*GvI)
znEV1m27uJ_<vbnMxx9T{&-j8daQ5Wn<m|(%4b2!i&Il^<jw2ZiP0uaC@sN*i3McB$
z1^#;!VTLs00HoJ*9~pE($2H99HtKQ3)EOBWq+C_9hK;fVFRUCK1VxtKN-D^Nr|@5z
z7$Z%~qg&lJir3s?uytJkGVq<z$yr@(QDBra)A+{5MpL<3wv@Fn4eJ>JoyBH~+jV72
z-lkrB*eWrGGckj>1U%yw%Y@=JbY2nc@=)TK+^&%e5HtX+XfT%_brAb5+dswHh*MZv
zZmD!r@7WyhQ7pl2Q9X(`-9yvH3qKHi<(yzMOMA5=yLMO3QBK;gV@I=l;}Xg0R*D+O
z_bFwzTVrpe><vCU#2U$ppg5&F@zz|h^)S(SlwXY*=#|w7B~&Ych%m$y%Ee81lD2n=
zbi|6k{BSnGm=5bAuO%eI+2UNAW#U&*+1EO51|-?l3vL}wC<MEF%G5ra_^MBcnuh#o
z{5^?M8~f{g#h$zR?N&aV;H#VQ39s*kK{kJCN6GUi`Q0sEascSi;lQa&Qm{{7st?`z
zQ;EL}?Y>K(M>d8>JRGbB`=G4yVi^!<dvHui4P`ewyK3ZB^^ApRE@Thxb1x=1NdLZc
ziGkk}1DK`1CJc5`i9a}TxnP>x#!FBuf<k@1FwC|kR|I<)2$TXkV!K(z#k*Yk!_c%s
zyU6#E;K^n?j+^lQuW`n3cH*t3`0_m~m<07Rua;Zmor?Tkb`oko$1)c?45QHe^V{oX
z1}v_zO_D8<4=^=gXfTI;YLi;I>d#E#eeDevkHDD%N%!zBZ&U|w`q>1WzH$Uw$0>gV
zACrR}e_6YXpy+Xl;xX-e7pb5U%OqLFA8k=yf~$C@YP_^~#9SHy0GHRCs-g(WErKK)
zpQE`_;9*!-{@@g~!7GD+4JwZ|O)lWI4E2?Nyx@ntWmOHMcp9Vu8)^+!9rv1KCXx`Y
zQb<aAG2V~!5;)w5pJ*N(&k^NihV-=!Ro3ulG<=I2Mezs+D=45AyqQI(bz2Amyq0Fo
zNWTVQ<Q^$-D+1P<K3j91203E_0s+<|b~mWnW8Lk+qwdClm6T=e-)@-SD_7>eE)fEz
zd0RR4i2`G>k%~T$A@-;172D(;rocpUKna-J-TkunHk>RKfO84n*%fPg9ipvHVUVI1
z9k#VK@ly6~{FyNI-Yg!T`0X(auTwv`U;Qa-{GOy$AD~w9k?OwUxeum*)fu83(cIKD
zj+p%-l(YpB{+`vt?0tM3n)#0`&$ESel1S`a(q{+JyB=*L<!oikz@RInX61}vzH!Yx
zcfSMCL-PcaL;8;$BV2Qqm{uBRfvmNh=5J`68?hR@ySpuy>OMYwC?t3*PUO~RH<2ZB
z+j{q(;O9-<f%D{&3riE9SlTHWG^OU(Ub_kMlLqc{9O^}l__EB!{ULtmQ07sBZF8<_
zZuJko8@EZn!j|G*kY6|qe|vS5Mff8bVhtqx3q`@G2pLq%=IdGBP%y?U((w0(g6Vp$
zGN)@Up+QYjFY@WJu3T21<*r2<*8w!DAX^7i#a)-c>%6uzYvH?_m=ip<!H%|~bm!Am
z21FHpC5`dVzDq3q9PQ6`gwG`l0)dRF)+%(6AD1C7i`3O8e3rf4LvyFE<ys*1NrD9>
zu(NIOfP$xlJIdX{KKdAg+1?<1f;HZ?84C<&d&3s{ftnOasT~pDxYt(WNe@FbP3CEM
zu1hUmmorNN6&?Kr6W@z3k0Zo-Fp3Go0T}$Py_CdC2iEOZ8Fr=uoo3&oNH@(9S}*vJ
zsig1T7FF>>B0c}7N7&FDEmE>9acq70P&+#mEh00XcMUirmRM^!E?%h2taWZf6WR!A
zZMf&x0^xoA9;Ctd(etb{vjgD7G&DLo3h>DBTJ=Uk3=#TM@IT<Wqdj<I4y(cVKE*Ou
z7NiP~UQ}_%G`5TwjicME*?(|V1U-`#=AJA?z>;NKRc@E9<Trq2MM8RcxZ>AJ{u>=6
z6ciL{VhLufW?wY(43K@O-df3Ue8^`LP+45s{95*Gy%^t(Qlsap5@5#T+K_cA3It^F
z1-c~w8oq1asxT}W;e%RETr)oX{rk5$;P&W?bcc)Kn+%+yI|6C=Y&@6Paw;-m>+5yA
z-H>!}C$502{5`uoNL=xiO~;lpNQ<X9*r$JPv1pw#6oJWb9QPPd`SMso?7Q980-j-a
z1oH%3J}rRlH}Nz3so!GfYm^)UNw##a`P<(?UD-lhu?m}eJ^!&7u4-IUQBfU!*ZlT@
z)Levvh#c7gaXvSw&qdfkESaCTOx2u8HHpC^Z(`l4q2HEa%4h(Z3=`VZBNc(+MZ}aD
zzl6Mk-ghKKcjoYfWO5rd5g!%HM@P*O{5(@eiuv9%vXB0r?wC#$grNWq?Vtsp>m49g
z1`o34eh#gInycGeS|mPERe-Fl?93bi42|J{6RGdj7RTkaMOYIU<eXypW^;=c>9M@V
zCOE3ss|<jRja|oY(fw%GjMfM4<Rt?vA^q{l01TzmHJ<-zd*siLy7d)=hE6r=nG_aZ
z(xzgBRD19ut`6oiSE5)SI`R5^3DzjUa~uAiv>p`^0gp|4ttdrhJb68wE@U~~<yebs
z(fAMEcKf1hWikZ4Icz1^_?iJY!t`)nZL%xvv!h;E&*cg^kOPb)(S-v*h%<UyYNQ>c
zD_%J-6yqLy*v=1~N_@#x@RK-iHed3^C-2j63N1r^d)ymxuz}oq^Y8!;O?&-`_)7M^
zch@9iCo8^}*w<#HP%^^j(0v{E1}PE}8+_8fME{$EMAYm~w09Z+c=kG-grCRzXPIc$
z{u1Pf_4VE6@Uf~6h_L@esnE43I}Bx_WF+<d+UFy2pnjMFaeiST_|N?Oje&<hVnKGD
zA`fYAf4DrxFcjAX7%x&}HD=cWT*q~`Dr=I7ko<Ib60aGpj{}wM?8@cQQu6Ww_q#58
zpW;`MbKZYpZk9P+t_R0~R?vWxC^5uGzv3xWwqp}rOv1g0xA6CjV(uzQLd3Du|BS+>
zWy`gP7thYl)Lx-8U<*L@l?zTYnoM+Z|H5GAdpUp&mV&>(*p-%<UHk9y>zGT4rIC1B
zl``%t4U1{S!D`Gax-le(Cj7J=P7w7UZ^*JGn2yByeAEB%8^{}T;!7Ez;qa+gpI^22
zN>d?deiX8?I_h2m=q@oI3*C#Xxuj(Sux?>tVSTp%LHB|E`$Q~CEdnNhU3<#7i{-kH
zYTg-ux2a)f>-X%FZ1ID`slSR16>`um(2JnGjdw)$*b+R$%;>%_3;KA<jibOpW72~)
zP99tumSk<K79MgB9^BG;(#=>e<1I0pceoS9Ox-_z{7@g?+1$RiO_n^csRN`4c~@6f
zid`rpS;^S}hg`1D`9!Z54UOKpHq$__IYh62Y5DoES-LG*QI8mzZR|A~(9ff_A=T}j
zo>QwY4<zoK($R{4Wb<IzI!lwe25+5J4Yqfcd(8K(8&Cvt-XptFpUuI~x+HCdie52-
zl8qQ(U@2S5-W#eZfvBCQVA|WyQUAW_B)p4pe@M#sB`Q^)etDnBx^>B*Voyt}0{Ta%
z*an36!KOEnw*yiB45K<ZIB>ef9OLtOY38v4CbL@0;`%Rs{&8T3Oc41-6wkd)_q*5-
z+ocoDn-o8hwSVkLcmLXzUhk_SGj^L8VYM{}o)|Er-@4q{-n03aI*@2RES2<JX9{oF
zN`!m#CH730y%vmtD*7i;e&+b3^wN7*4>B2jeEhw2<-^hp=UfTIvwupO>zm2!zj+&6
zp5x<(J9su&`exW+=a?Wt1as<=W{}fl@`Hpf{R?s_r9A_cq67*s^_zeo;ufd^Rytv$
zsVpzsZx21y(zE4a=yr~rjRJ@)k~-d4aD_->HCI0WW5h}F*B<bn9X--4WtLG<FJ%kd
ze+1Qc@ddrVcYGV(^V3nlR(b>p548Q`sa<?<GMqM=Q`YWnUU+JbO<N&7K2C?AAFS(`
zxk&2ZZHH$^Y9|l?dvTyUpr<ND+C&MpP5Apm;((UU6}1!>`O|}hX>{j^Qo4VC>DcrN
zgYi}|!8tEr$eDHf389(c{%_{7g^(jki|?ZREG<3#CX%I1kqG&H;62Z3-jPah=dc++
z=CzeV25~3f2j`MTeAG&Uag+#h!aX#5&&g|_&pGEDGGk*Q4rdj=Xz^u_#E^(-i9D8V
zE_B*qm^I1%p>@=>rI+Cwqi{wTJ?4@XXqNK68M?dGZ%ZBNk6W5(r7t;&7WR(|+Vi(`
z44yLg$*5Z%&Es(LKfzDyZLTYf?Gukzf5op3&2#twFd(JKhmoP7?g=!j<-|sB)D)pS
zo<v%;ECua|WVU#RcPGb}b<S__nTfkj2im3V)wYjEzI5Pw!G-_r<@~+ue=7>`IMgu?
zE4{$Id4GWZ+lXpXnti*!fpPR>JXEHE#)MG)HQ1a2C%Ma!P%eFwFn1-&sUd~E6K6Hh
z2))}fX1QV53RlBC(Yi%~b?h=og*aj6Ml+}Xf4NIYV@pO(zG>3wxi8&sZDh2JZ;!LR
zXk@8KcGNqSC;IwdRn_pOe@H$cODSm{IWt!*BcqvZZgqY}o+4Tde)<+jKy9N(I|t|-
zHm91zxt&dc=AfI(%@bi6_gNldI5)@;;3VTD*cp@V_5*ALBb*wP&5(Y}Kwy8#G%Z6h
zr>c$K*TW*5x5=#O$pt&cS!gL);uVpti5<X6Tq%R7efFV(f`av+yG0|n?SC;uENgk(
zAqRue1S3PT-w~7D<6k}G#nk0eHKi9JMkLx9b0N9Rb+gd(#LW~dEQe+sAzc%eEptH4
zc_k<h=tzq8D2U8xI!~3QUf*-PUcrnhnL~&s!(~$nWX;wVI3RgZ|8}Ua0~H<mPyxi@
zW%;8PsRy=S%Brmu5(Hut@7|im{~{`-<pR{mXecYc7xmmz-XPd;Txqbjp^6v_L=k2X
za?p0}{jNI0ZB!TGg|zTN4j?sF;1ZfiZjK9ZnS;v^)cVXZhsgW6Q7OCP+^mlX<xCVO
z-kUbzR1Xxlz9A)kDoH${jh90c8ln(}!)D{}Z$DcslrWB?s4)xuh~IvM2;>@JPxj@a
z@J9(m$&T?v|B50s!MJ37!jXaHH*9Zje;WUT(ZBQZ{FEnwRY4ZALJ`w@&&kdGG`Bf}
zk%DbyIqt&JT)9B3m|)91+b)=Ubis$C1lpNnQz+yJUD}M{<Y$uzA70|wH6CT@$vUF-
zAu+eLbHzi6zn~}XaK?f}^ekIBvIZxXKxp<2f%e_WO$RRZ)mY6vo|Lt}=rOPX&MEkG
zA6ghT_G!O5CIC$5ic!EpU_-;D>@?L`Iy)>Gls(LUJGly(e}7nyrh<EMp?KJgD<7lb
z@vI_1O@MA73lQ`Xsbc~gu!kW7TF16ZXvPL${rfimU5g~Qix1!{7H#$)H{jS@rX2+X
zzavh3@GKKEj~l>*tZ%H&4#7g6WdgtD0C_wgxvK->Szk7_Z!LMQ9)?jHSbtC1Ag$!W
zlZg9VUmCU%b2YEoehLQI2)^h%{E#b%QN#i$ko1M#&TAEx#d@SllI#p)%5aA<CMzj|
z!;!7(htU{;APs|&KYq8%*nLv~C>uHF@7i9#nF6RBM`jXWOJr_tzOgF0>GwBzyRI|c
z>O=XgR4}ZF*qecz)WFDyq4_iOhB4AYY@g8egc8`b)&f}&m9h3hh!fxn{r%?$Am!GS
z`uSWDgn?a@#UI*7T?E>8tGDP`%hf|(d=qJ-CiYU)Sb&CxhI95GhA}fho;jseiuOa;
zEJcVE6c5uXw5-5A7qFpD9Kr};Lw>6Y;x=W#zz%_egAS*^iHn9c=Xcdk@rIu0hgtaT
zL{5)Z5HLu=@%LYN1NV_W*lBYCI$N*V*@pY+@5U_Mzb;`yHDX>Ed%s*yVD(M0BKeuf
z0`3#w_>)LOZXT^(httov`E*i2e%ZtNA>LfF60t{8Uv`Izm+LLt&FHP-0P6k3hIH@v
z0L_SnNU6P!cC7($%idO&!UUlx+_q`Z2DHV)htaGq{Q-?^0p8xXs|a}V?C;UmNXGb0
zfs(#TJ{tey@l!8CPsBKHWgRd@o{eK%xjy3mSY4|15{1U71u{X3IK}Q`gwha(l#W8)
zJ7s)CV<fh6DcU|gr9plrnD%_#Y7)2y=3&}?{#aG!cH2rZRR<Y*YnvSTWr-9JQcfa=
zIy}lx@qG6gM3F=Gd^(!~Xn7S8hIt_w=fSg#8Gx8FO@O4Dk6q+<uNGR;&q8hyj`KOF
z#?nMzsXlmfa>)`{egF7j(!3=auc-|%qzrhnnS>qj2fppNEtW-E;B`-7gA@RU0-I5-
z7-8bMaC}05*=u@!zWMXj2t!v`wU)${!spmm_Y6Rbzs$qMpY<EF378%YsY|lw4_;J8
zC1iaU)GNDXI4Tu8cyJE#0;9K`vt)qni5dYA{1|2WsJj+Y%r(cl?8cUKlBYLg$GF(K
z!)tvyhE?FPY&g0sAlTN%rgz8EY2MQz7|G8VPpzcEa~}6vl=AtHcaauI3@L_Yc8Uy<
zJmtvR*wAwc<c90RO1<x+xx&ufeLB;NfxK6*F#nJof+OKz*ewwP^EE^DY+c?UiY;ZC
z5USBE<#sp9&jFAZ7tVQyoJ0Lgrvk#j37L8s9vLy}d3|{*?Vn?kkMiEXdnM1pmJw%|
zEmxz+kiQ!0iAG2__-ek}o=Ql7l>vewkw~}?vWM-EXeL}2>BwE$1`kO{IS3<V%L18j
zkwGGUd$w49XX9mKtJCXHGi%`$Z?&i`S^C9~pr#QY6Z4TG4c{zF;hYH|Lag9)F`mW-
zF$B1+nUSDD_ff4zpJ>*=->>#4khR&N=kJjl#_IF)X`B46b}#!iPW0)w&0sApO1H~z
zqVJFAqgRV4EQ78bbG`RgJ?G5>v19~^9fE@BpdW<+J8XNR(y%;DkQZvmx8?2<9+qC-
zF?Rwa<%d@+92{;c5tkLOZTrj3o-R|<7a@mm&JVcs5*-vS+D=X<TvFI87J#v4q4j5z
z^hek_rqb>O?{dJNs4xr%>F8yBarda6AHdIz)i*J&QqO`4xF91VOGP*|E&v>2qT<H$
zFAL4Gh=!*?Kby@ySiiWiVBVOCmqr$nh(u&H5;>ewcs^S6=UaaV05@$*`F6Q8crFJ(
zOADo92CkU{Y>vI;<OUX1(%E~EG^K85<t1xe!6ydc7o|W1QYmhc?d<G~eq`}*GYQ0T
z0b+*4GFEA#;+YhpQ3}YJv+en|^1x_FLnOzfhi$IcO#z4-G0-cIFsO|5D|!%bwAkMP
zzv?EG1i!vKr#jqPw!8faG^)3#ZT-c$&55K841>*WwbJvjf#o;Bjkr)dv?9j;MTvPK
zlvPz7KX->b-!p96APge`VR=hAa3>Gl8rzX1<)|lZ30-Y%!hT@rS_Ly;O1bFjmhlDt
zx2}x?QC3#|GB3X>6u^-y^nsW%lW?2UK}5%3)4|6_qJV}?1-e>;PipbxO0Gs(lC9Q{
zk=EPYUn7!`4f$i&%m7U|<IKXF7McLhy>_MBhuzpZMu-lQG4F{PCG?yVK=eF6KOg)3
z`(gI>c9Cp2?1&8_LKLF;PMs{8tR%Qt<^%T7)pw+&H90_F`sa6YYiVcb%kw}-WmjXs
z5(lL5=#tEi`l{C2pIQxMh9#o_Ru6*0U<E}RPjv5BdV`-X+EhV!?1L*`oVWWz3H$mO
z!0;=E#YMlYg1amgM6=Zi!6c6o-h@%A1+CtP2XV`V?`122IT#^$zz}glSyR)sZzj$5
z!DttFly3ofmOf2(*Up?&ZX=n|Bz{8N+}yandk*w7`s-z=jAWt0qx`6S_p1vm5S`0Q
z*1h&ffWqyFyl7BR(60Y2IK`{s8*jR0xZq&NX|M0)=0D4Da$eJ0DY{%x^Aa^vIhKr5
zG*7cs8s29X^@JDNX*rM?CSa4{SJva><CfGb{6?#<)1oKfZoez5rP1iN-iSC7dA-GP
zo}p6)k#Hb&jri}k!ovR>d9^xo;M5nl2|Pvc*)K<CXb-8vi=qgzjEV}@*P!?4b)jAo
zFg3NpuOuPLQRSt5eQ)$Cy1&A1kFhxye+$d0l7$e4z9A@1C${V>JL3P7u!M?a9R9e(
z3K2#tdYG&qZ{G}X=IN-Qcs5&0hr`%(?s*z97=k<i!F05Qgblb_m_Vh39@Cnu7}j#E
zB282!R6+{|ytG2%;6`tw1N70$a_wszB;#W&fui5v&dyw#oEEvx9t1nww|b55Hxj*O
zer?WK@=+Wuv^pD2;^1~8mX3lFj=U(G_D``9Nq{u_H;7zfHXfxXodZDaYLe}xLGxqo
z8oTRZ@V*O$2{gtmiGM2f`3P2Mr+68q%lr6uv=Qj+;(1>Q=}LX4&W5xI>uN~w^Yq4^
z;7~gaH$cLgFtJ1W3zJ!CsXozmCFicmPxf@_5;rgiL2{FX2&OO)jILzA-zxd8fPET1
zZsX!|HpLHt6X$)zJD@$SGJ<}I0h~<XY`X<j>Edc7qobj@{*vMyMWYtPR%XZu=CQ*t
zA(u3yipVyJh$1dOn3JhU11FH*jk+_!0>!YPNSNZB{?X+G<M!>}4i65}5WFrlM2}AV
zD=li$YS)FklOm?zmyaKOFB1GiqaD+()dK<oM6y(b?A-u~QQw1YAJrz*nI~8_bxDu+
z>A8?RX;>kIGJe6=qNLB?V&Uol>%YbbHfc8c09$4Oj&Ml<PWArvp%6&mXzBze;<<Nu
z)UDQDxSw!t4=memY<<^a;Pe?iTW#hbr=ZyCdxzy!E$1MF3#L@OzPTA&YPg&NVMZ8W
zxm94|N}5kE99@=M?b5Kk4#cE>Qd{w@nVI!HlJ`PotRaXXAtSpxU8vNPM$6{>PJi%F
z7B4Iv7xQvw7<c_!f5z?4Psy;=4^`U+IX!=oJ8U)O;Rtsg>iWmh7n)Q;1%$GjBe{b2
z$%}GKgS3D5-yAJMD{<IQkq#m?A%YW~a!Zt>1xHH>dEI_q!ifK~RAX{O@_wjuA>HfL
z0+=B=r5OYDh$I20u?y%(Fua|>W{Qo949lLJ9A^bG2aR6$B^yVy(iBfIgTJ|2Yw5X!
zz+p?kCqbY>FwU5?v<s_Az}e-V@*{m(W~QQ*rFPe0Bw=$6fe+r$`Z|r;w?gD-&TJU>
zn=4^9reSg}$)CQL(>1d{bV@CzM@Qf5>FL=nC3!Lv^wn8*JO~O4XVT(4u$>}Tq(gyQ
zvuABJqUlcH7!IzJREd%cXlFdyfKOrhgi=hy+?nLlf2kvBCpIl(#-sw{s0j;<8*j<S
zt&rHB!)67}-sC$c1&zVbgClz73jh22T29b`gNgb6b)36C0oC_?bbyCut6}b4s#;9B
zVa&lm54tU-S%=3C#{z`~urw!^phzc0nlX*Bc;Ld)(a~`QIS)0Gj!8U;hod?e!p<Em
z&B2ZTJmY2zI)WVRFpe+<+En>`(WaQ-G^Ec_YQx~+7?DFUE-Z4N1s-wVQq4T8-#_OF
z#v~+k3n1{yOh481H;aI!?@&o>sS^{XjoNuc^=`D@JR;CAg^l0e2mB2YAJUNIZqI$}
zW;q9|$HAc?g{7mGeq}$u_ie-4*1)2vx%(rOTQnGIaJZD5W$}!9>`NHDK~+UX<<nRi
z8+Sk1^nX&*R>27-Oon6w18fKe+kBQJnt)-`z|=HuSis+1M~5gZa)2-v!q3UsHxIyS
zHRQPlP=X9r=p9ZG++0H&kfDfwmg9)#HdQQ>p>c#q%K7hbB1S)vN2KQglgc9SYH4J}
zModI@m_vYG(T0SUmNqU@w<XmrugL;aM=k-C(zLp|8tVdkK%Iq}-herQhwBWZMQn{e
zIHXsmux}uT8d^?P*xfBrbDdDULCGb!v#1nnz~EIw$j;kf6j+bQ`Nklt*&<nR(cot;
zF0=#oUzA)#)^7)6u!*9~GS+92{@-{-?vs^JmSe?%Zp5spK|(?A?o%rmc<^1y`{&7p
zG+Ik(2L))jSVhtY{zu=~*oYQGe-I;+fG&qS%Ax-rKkPO{jLj|O6+w{X9P_^16u!bg
zyq`mu*??@lTgBXxu9*Z4W}FOu+ejPJ_m2@+BpW2e#M1-fzlXaPbI|m-Xp@KCoD^^R
zn;LCLY>e7R#5m~pXuqg#xvNSswi#b8BLwA<)PL#-{V52sh?&?b77cU)u5Il?AP}$^
zUdUw_3L-1~cj>3XYcCIJ9slC8X?fMA<S-l!afrZhh}8dkx9`4ypIHoYsppuh_P~TX
z`|s5wINRMo;_HWO)}G%1;O4;GQ6`PJU#wJokHz$o0dI-abA^t1CH|7lg~G;610@nI
zBLDQc5h^T>&dk)SD}Xj12)^*ejMW)xB*KTe<c+s)36qhvdZ7n-7YNS^ngeI9`5!~Y
z?Tr)(wF?n?>i`5IU=|e>^?TuPER-G_+iHHJAH>6ztc$yicfE(h-~G?i%F2ps+!leE
z*69KzGRz{+=`AA|qw-9@UT%I92zvatJUh}8_%O`ejuf!3nO&g?>b!Ok2Zf`MAkh&Q
zZsQ5%<7ZkUw1Q7KRW&_Vb=X}g5OO=+NlN!WKZSoHP}@wYJ3@kZ;b7al91!zZPO-dT
zr>?|o5tFSptSwkY!0(I6Np+E)y12g1w2zZ3BO@c}KBr6PKugb=SJZY%*q-|r(bTOR
zOk>U2POr~QVa3&mpa|XF`{O(7iUTz4L>Tj`qA))X&)IMo8ctR*!CZE?R^%b%bj)2D
zm04i8&JyDF<%>1*<3XOg6b>F9ucC!ax~(w3cEi?4oHjx}Z`L~w?UiRJ;rFl9W9{aG
zCbABfD6G{ZP9nVWb5NYfo*o!BU-%O6Z@b??Qmrfr9Xl3gjG3L5CfDY=PX4eP&!41F
z=ySOl%xQ_Xp{095x=5c1S5jbPpIE^sk@ymjCUP?Gd`v_^;j2-@ZU96XQ3{rzKub6C
zj_7Se6n)~xW&EcH>&<9Mzrszja!qHAET7#|xdx0q#uKJOLgvT4bS)`dOw7??Q|}t3
zq1&Gys8=LUwg$MgYyLi5U5%9oUkf1m<<OH8;bqrF8kI#R+@2@TVUR-6nn3yfJ^Kk8
z!{Ac<zpRJNz{}=55!W>(VEC!AL5xA{Ms$@zE8Ud|&0kqg%FxuKIt1{dIFFYu(wY@L
zVzD?ln|i7X-&{jnjeSg!uq8P+mx6K`J&`{W^YrJ!V3Dzz8GgJ}Oi`Pgr$hs$mF?mM
zM(GPA8CNhu20#8E1m!qF*?G8}J460$se9}=^Q6rNW>I9UCHyne!`iGM^jm^Y2_<f;
z-nh}mPFY!5?1E2DE^0`fj;QAE&0JQ;4w`G=-e~G|Bo0MgvFl3>>xnd9qlBcNr3$ws
z7nGMLJ+8Z`bcndPLc;h1b@%<6bDdecn<OO($qkO%y8QPmeEmqP14;6dKOUtxBAszD
zF^_f#YYwQs7gp6319J$xMY_bX_Wz&??=?Mcl(m>GSWaWuCX15g<Ks)7V|sLyqLvV}
z8_!5SBBU!wN%0`TIqe`^AnNztT@HKv2VMEkAF=49rn770CbTKil-AB2NSsKIK9vYw
z(kx!C_Y=qJR(cEhl_6*itv2Unw;zN9h&52aXR9|@9|No1gG6+ROeNAPF&Zi?yjz+R
zQX+>i+tq&T`pSlYba&veM+dVOfd|;{A6qI-MH;OVU%4_>fhegoxMiuwI*+=1s0rAE
zjHn2)ozp4N&1&Az;zJKhE6_Kc^41k!!{f53ES7CzZf;KW>)8s?RIIf63SG;aHF8&;
zD@4fptoL;9sr!7t?k`4zHprjxGqF+`7~?b$eeQP_uNnUQr%vK0qg@eo9Vs$BsD=S%
z+LNzOMDn<arY61^2=2Ftkmcdh6&T5nB|lNRZp7VuVOJs-<Ll;$FnrQbP^Z3r+|Qe0
zs{M{=e^3!i1j5J=SYz7i6kb?pY2oR4?aDeCq@QA1CZ5=NY_?PO`A%ISa8K!W&6$Ai
zLk7fUwMnDC`#LU~{wmtD@b#_x#AdgvVk8jKU75DkUmDuW`_nRw;VqLD<##_*%uv|s
zAp~|(?TEPdc)0lZe1rF(e~|8ks@h=jc*eaFi8>^TFgQkgo=q?6vMO*u#t9E1M}xUr
z>e{hLG(;iw3Zm*NRSJ$Yj5GJ6stae8K4MWq#m-{!Msy&m0v<tu1WEy$7R2I4djgh^
zq)d5li^93WO3NH~f-^u=GW&EP{@ZJ?bNA3VJy{iBS&LV56(J<Zf1b(}zWhaD>7A+Y
zRP2D$GA5b(?MY$il7$I`v01_A6glGWlG;l+6f>LrwAwGE10tq3N_!hlI@5joTdhv;
zxDlZ(vLJ@OR3;+v@Y?UJ=O_$IN)$L*Fu!axdK1vGfa{-`#RhEm2HXObZ`0G#>Yz_g
zg#*HqIRdsKJ?x?d3-5OS=0aPg$DE-9e;-6bAGx64j4}WCGe^UOmue)!Sd)oES6PAu
zZZEgMs1@*@?ry{RIVRMyxTK`sIJ?y!x!X!~djuWN$?NPDcy5v{<f=C13G^@szf?4s
zU3`e;Q|gdy#z0A5M@L6B5)#sPk0gW@-9pgucbV4H-RVPG2fl0oC~@FGVqkq+c9Z>&
z!LDd9Q_G>xX<ZO9aD_#LD}<5}(<Stirv|2taiLVOQa7SIkq{XyBlw9t`c!>VD8dYv
z85<kBEUUCZ8pf*ULd|_YGc?@Tpyyc{x^hh<7iJk99Qr(v?(_Cq#)UFcS68<VsH9}5
z+jRK1>kIz-Y%CIXINf2C9g}WgxN~2t$M087;`7KU|B!Y?j!hA+tGo_Eg(jZy@4t15
z>-BN}4Gpj#@8fEzF`r%r-k(7^Rw~BQIlxNa(ht+v)Rx>3bi8!QRev}JNoC@=l6Qqv
zcShO+EuHMRt*tHpF9bKG8)y*wfbeDR-yR-%9GY2KZNK5F;(?zdfMGJi7x;xiDjjrB
z8-#I&`#ep-_6e-yX(1o!*V*H*pL`p9SJK1zId0F8?d2n51Ub4=B;UsCeMSN<ioebK
z2&LH(SuQ7*oJ_#jTAS-rO9Cfq)R#1=b;RJ5#-n<-R}X$1WEj>)P7d79G#XB(mxS>G
zF0TaP3?K~11V!Gn#qN6H9EW%>&0$})XijA?@nMYD{-K06@p0g_^QjHvTDx{E_`x8t
ztW?gKO2GS&yjb*MOjovn2ssPup~n*}nW1#B^>Dua@W5z~km(ENNMcO-wsr;onLMfo
ziEw=ATF!d%BibpC0H+k*punkbRklp|*QyQZeDr6NuyqAm{*v!VU8F}c27KY3OI{ww
z@QlC0<oHXdslKuD`krD`PhyVT&y+yxij7w53*-eg`2g~_P&fj7&jRm4zrMT}nJLeX
z`1cVi=DW9Cq!l2%RvkTN<B__DD@SM(aWw4u3uVLR_TW=c3Q4mx$1xyQ8I^u1{Pq?7
z8sZ-VR+4`CFBs~3ySL>pEsa66gSHd--B(AYo<1v1Rugf&!-T6MhGyTBpUr9}NwYYI
zBY~zd6KSXg?eD_at<(P3Hu2Y*I(YNt->t<^u&<d)L^eyeYQSAX9OW$<6Gxm#e!_#Q
zQo=oPs&_^LqbK3(mh83fIV&q98yro$x{q0(W+8dTjvZ```K2W-W=N5lTud1ZgthbH
z5q@Or3gFZvj2fET2r=GM{<DEOW-wrO_4tY<bW7NwK{bi^2PHs7QB$E#&MNHx0O%lK
AwEzGB

diff --git a/demos/ima/src/main/res/values/colors.xml b/demos/ima/src/main/res/values/colors.xml
deleted file mode 100644
index 5a077b3a78f..00000000000
--- a/demos/ima/src/main/res/values/colors.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-  <color name="colorPrimary">#3F51B5</color>
-  <color name="colorPrimaryDark">#303F9F</color>
-  <color name="colorAccent">#FF4081</color>
-</resources>
diff --git a/demos/ima/src/main/res/values/strings.xml b/demos/ima/src/main/res/values/strings.xml
index 9bf928a6b34..67a7f06f8ba 100644
--- a/demos/ima/src/main/res/values/strings.xml
+++ b/demos/ima/src/main/res/values/strings.xml
@@ -1,5 +1,24 @@
+<?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.
+-->
 <resources>
-  <string name="app_name">Exo IMA Demo</string>
+
+  <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="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>
+
 </resources>
diff --git a/demos/ima/src/main/res/values/styles.xml b/demos/ima/src/main/res/values/styles.xml
index 705be277649..1c78ad58df8 100644
--- a/demos/ima/src/main/res/values/styles.xml
+++ b/demos/ima/src/main/res/values/styles.xml
@@ -1,11 +1,23 @@
-<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>
+<?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.
+-->
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <style name="PlayerTheme" parent="android:Theme.Holo">
+    <item name="android:windowNoTitle">true</item>
+    <item name="android:windowBackground">@android:color/black</item>
   </style>
 
 </resources>
diff --git a/demos/main/src/main/res/values/strings.xml b/demos/main/src/main/res/values/strings.xml
index cc6357c5743..b38ccf6e88e 100644
--- a/demos/main/src/main/res/values/strings.xml
+++ b/demos/main/src/main/res/values/strings.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
   <string name="application_name">ExoPlayer</string>
diff --git a/demos/main/src/main/res/values/styles.xml b/demos/main/src/main/res/values/styles.xml
index 751a224210b..5616bb9869c 100644
--- a/demos/main/src/main/res/values/styles.xml
+++ b/demos/main/src/main/res/values/styles.xml
@@ -13,7 +13,6 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
   <style name="PlayerTheme" parent="android:Theme.Holo">

From e5e984f4c693eaeb25faaeffe25f1700e8501bd0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 24 Oct 2017 02:27:10 -0700
Subject: [PATCH 344/421] Re-order events into more of a natural ordering

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173232494
---
 .../android/exoplayer2/ExoPlayerImpl.java     | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 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 d1c643c05b7..13829e2e9d7 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
@@ -472,6 +472,30 @@ public Object getCurrentManifest() {
         }
         break;
       }
+      case ExoPlayerImplInternal.MSG_SOURCE_INFO_REFRESHED: {
+        SourceInfo sourceInfo = (SourceInfo) msg.obj;
+        pendingSeekAcks -= sourceInfo.seekAcks;
+        if (pendingPrepareAcks == 0) {
+          timeline = sourceInfo.timeline;
+          manifest = sourceInfo.manifest;
+          playbackInfo = sourceInfo.playbackInfo;
+          if (pendingSeekAcks == 0 && timeline.isEmpty()) {
+            // Update the masking variables, which are used when the timeline is empty.
+            maskingPeriodIndex = 0;
+            maskingWindowIndex = 0;
+            maskingWindowPositionMs = 0;
+          }
+          for (Player.EventListener listener : listeners) {
+            listener.onTimelineChanged(timeline, manifest);
+          }
+        }
+        if (pendingSeekAcks == 0 && sourceInfo.seekAcks > 0) {
+          for (Player.EventListener listener : listeners) {
+            listener.onSeekProcessed();
+          }
+        }
+        break;
+      }
       case ExoPlayerImplInternal.MSG_TRACKS_CHANGED: {
         if (pendingPrepareAcks == 0) {
           TrackSelectorResult trackSelectorResult = (TrackSelectorResult) msg.obj;
@@ -512,30 +536,6 @@ public Object getCurrentManifest() {
         }
         break;
       }
-      case ExoPlayerImplInternal.MSG_SOURCE_INFO_REFRESHED: {
-        SourceInfo sourceInfo = (SourceInfo) msg.obj;
-        pendingSeekAcks -= sourceInfo.seekAcks;
-        if (pendingPrepareAcks == 0) {
-          timeline = sourceInfo.timeline;
-          manifest = sourceInfo.manifest;
-          playbackInfo = sourceInfo.playbackInfo;
-          if (pendingSeekAcks == 0 && timeline.isEmpty()) {
-            // Update the masking variables, which are used when the timeline is empty.
-            maskingPeriodIndex = 0;
-            maskingWindowIndex = 0;
-            maskingWindowPositionMs = 0;
-          }
-          for (Player.EventListener listener : listeners) {
-            listener.onTimelineChanged(timeline, manifest);
-          }
-        }
-        if (pendingSeekAcks == 0 && sourceInfo.seekAcks > 0) {
-          for (Player.EventListener listener : listeners) {
-            listener.onSeekProcessed();
-          }
-        }
-        break;
-      }
       case ExoPlayerImplInternal.MSG_PLAYBACK_PARAMETERS_CHANGED: {
         PlaybackParameters playbackParameters = (PlaybackParameters) msg.obj;
         if (!this.playbackParameters.equals(playbackParameters)) {

From ea764b1b792fd0b1d087ce963dad2c9d63e606f8 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 24 Oct 2017 06:13:26 -0700
Subject: [PATCH 345/421] Fix retry count for live streams in
 ExtractorMediaPeriod

Also simplify boolean condition in ExtractorMediaSource

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173247443
---
 .../source/ExtractorMediaPeriod.java          | 23 ++++++++++---------
 .../source/ExtractorMediaSource.java          |  3 +--
 2 files changed, 13 insertions(+), 13 deletions(-)

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 511f7f4a8a7..c418c427f72 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
@@ -93,6 +93,7 @@ interface Listener {
   private int[] sampleQueueTrackIds;
   private boolean sampleQueuesBuilt;
   private boolean prepared;
+  private int actualMinLoadableRetryCount;
 
   private boolean seenFirstTrackSelection;
   private boolean notifyDiscontinuity;
@@ -160,6 +161,11 @@ public void run() {
     sampleQueues = new SampleQueue[0];
     pendingResetPositionUs = C.TIME_UNSET;
     length = C.LENGTH_UNSET;
+    // Assume on-demand for MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA, until prepared.
+    actualMinLoadableRetryCount =
+        minLoadableRetryCount == ExtractorMediaSource.MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA
+        ? ExtractorMediaSource.DEFAULT_MIN_LOADABLE_RETRY_COUNT_ON_DEMAND
+        : minLoadableRetryCount;
   }
 
   public void release() {
@@ -359,7 +365,7 @@ public long seekToUs(long positionUs) {
   }
 
   /* package */ void maybeThrowError() throws IOException {
-    loader.maybeThrowError();
+    loader.maybeThrowError(actualMinLoadableRetryCount);
   }
 
   /* package */ int readData(int track, FormatHolder formatHolder, DecoderInputBuffer buffer,
@@ -491,6 +497,10 @@ private void maybeFinishPrepare() {
       haveAudioVideoTracks |= isAudioVideo;
     }
     tracks = new TrackGroupArray(trackArray);
+    if (minLoadableRetryCount == ExtractorMediaSource.MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA
+        && length == C.LENGTH_UNSET && seekMap.getDurationUs() == C.TIME_UNSET) {
+      actualMinLoadableRetryCount = ExtractorMediaSource.DEFAULT_MIN_LOADABLE_RETRY_COUNT_LIVE;
+    }
     prepared = true;
     listener.onSourceInfoRefreshed(durationUs, seekMap.isSeekable());
     callback.onPrepared(this);
@@ -516,16 +526,7 @@ private void startLoading() {
       pendingResetPositionUs = C.TIME_UNSET;
     }
     extractedSamplesCountAtStartOfLoad = getExtractedSamplesCount();
-
-    int minRetryCount = minLoadableRetryCount;
-    if (minRetryCount == ExtractorMediaSource.MIN_RETRY_COUNT_DEFAULT_FOR_MEDIA) {
-      // We assume on-demand before we're prepared.
-      minRetryCount = !prepared || length != C.LENGTH_UNSET
-          || (seekMap != null && seekMap.getDurationUs() != C.TIME_UNSET)
-          ? ExtractorMediaSource.DEFAULT_MIN_LOADABLE_RETRY_COUNT_ON_DEMAND
-          : ExtractorMediaSource.DEFAULT_MIN_LOADABLE_RETRY_COUNT_LIVE;
-    }
-    loader.startLoading(loadable, this, minRetryCount);
+    loader.startLoading(loadable, this, actualMinLoadableRetryCount);
   }
 
   private void configureRetry(ExtractingLoadable loadable) {
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 be8b3595db3..1ba192488db 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
@@ -184,8 +184,7 @@ public void releaseSource() {
   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)
-        || (timelineDurationUs != C.TIME_UNSET && durationUs == C.TIME_UNSET)) {
+    if (timelineDurationUs == durationUs && timelineIsSeekable == isSeekable) {
       // Suppress no-op source info changes.
       return;
     }

From 5a91a71cd0e144919a4138ea146fb94f96fb6e84 Mon Sep 17 00:00:00 2001
From: mishaque <mishaque@google.com>
Date: Tue, 24 Oct 2017 08:49:16 -0700
Subject: [PATCH 346/421] Make CronetDataSource interruptable.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173262660
---
 .../ext/cronet/CronetDataSourceTest.java      | 112 ++++++++++++++++--
 .../ext/cronet/CronetDataSource.java          |  53 ++++++---
 .../exoplayer2/util/ConditionVariable.java    |   2 +-
 3 files changed, 140 insertions(+), 27 deletions(-)

diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index 8107e87440a..e1175cf2c86 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -75,12 +75,13 @@
 public final class CronetDataSourceTest {
 
   private static final int TEST_CONNECT_TIMEOUT_MS = 100;
-  private static final int TEST_READ_TIMEOUT_MS = 50;
+  private static final int TEST_READ_TIMEOUT_MS = 100;
   private static final String TEST_URL = "http://google.com";
   private static final String TEST_CONTENT_TYPE = "test/test";
   private static final byte[] TEST_POST_BODY = "test post body".getBytes();
   private static final long TEST_CONTENT_LENGTH = 16000L;
   private static final int TEST_CONNECTION_STATUS = 5;
+  private static final int TEST_INVALID_CONNECTION_STATUS = -1;
 
   private DataSpec testDataSpec;
   private DataSpec testPostDataSpec;
@@ -576,6 +577,45 @@ public void run() {
     verify(mockTransferListener, never()).onTransferStart(dataSourceUnderTest, testDataSpec);
   }
 
+  @Test
+  public void testConnectInterrupted() {
+    when(mockClock.elapsedRealtime()).thenReturn(0L);
+    final ConditionVariable startCondition = buildUrlRequestStartedCondition();
+    final ConditionVariable timedOutCondition = new ConditionVariable();
+
+    Thread thread =
+        new Thread() {
+          @Override
+          public void run() {
+            try {
+              dataSourceUnderTest.open(testDataSpec);
+              fail();
+            } catch (HttpDataSourceException e) {
+              // Expected.
+              assertTrue(e instanceof CronetDataSource.OpenException);
+              assertTrue(e.getCause() instanceof CronetDataSource.InterruptedIOException);
+              assertEquals(
+                  TEST_INVALID_CONNECTION_STATUS,
+                  ((CronetDataSource.OpenException) e).cronetConnectionStatus);
+              timedOutCondition.open();
+            }
+          }
+        };
+    thread.start();
+    startCondition.block();
+
+    // We should still be trying to open.
+    assertFalse(timedOutCondition.block(50));
+    // We should still be trying to open as we approach the timeout.
+    when(mockClock.elapsedRealtime()).thenReturn((long) TEST_CONNECT_TIMEOUT_MS - 1);
+    assertFalse(timedOutCondition.block(50));
+    // Now we interrupt.
+    thread.interrupt();
+    timedOutCondition.block();
+
+    verify(mockTransferListener, never()).onTransferStart(dataSourceUnderTest, testDataSpec);
+  }
+
   @Test
   public void testConnectResponseBeforeTimeout() {
     when(mockClock.elapsedRealtime()).thenReturn(0L);
@@ -717,6 +757,38 @@ public void testReadFailure() throws HttpDataSourceException {
     }
   }
 
+  @Test
+  public void testReadInterrupted() throws HttpDataSourceException {
+    when(mockClock.elapsedRealtime()).thenReturn(0L);
+    mockResponseStartSuccess();
+    dataSourceUnderTest.open(testDataSpec);
+
+    final ConditionVariable startCondition = buildReadStartedCondition();
+    final ConditionVariable timedOutCondition = new ConditionVariable();
+    byte[] returnedBuffer = new byte[8];
+    Thread thread =
+        new Thread() {
+          @Override
+          public void run() {
+            try {
+              dataSourceUnderTest.read(returnedBuffer, 0, 8);
+              fail();
+            } catch (HttpDataSourceException e) {
+              // Expected.
+              assertTrue(e.getCause() instanceof CronetDataSource.InterruptedIOException);
+              timedOutCondition.open();
+            }
+          }
+        };
+    thread.start();
+    startCondition.block();
+
+    assertFalse(timedOutCondition.block(50));
+    // Now we interrupt.
+    thread.interrupt();
+    timedOutCondition.block();
+  }
+
   @Test
   public void testAllowDirectExecutor() throws HttpDataSourceException {
     testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null);
@@ -834,16 +906,34 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
   }
 
   private void mockReadFailure() {
-    doAnswer(new Answer<Object>() {
-      @Override
-      public Object answer(InvocationOnMock invocation) throws Throwable {
-        dataSourceUnderTest.onFailed(
-            mockUrlRequest,
-            createUrlResponseInfo(500), // statusCode
-            mockNetworkException);
-        return null;
-      }
-    }).when(mockUrlRequest).read(any(ByteBuffer.class));
+    doAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) throws Throwable {
+                dataSourceUnderTest.onFailed(
+                    mockUrlRequest,
+                    createUrlResponseInfo(500), // statusCode
+                    mockNetworkException);
+                return null;
+              }
+            })
+        .when(mockUrlRequest)
+        .read(any(ByteBuffer.class));
+  }
+
+  private ConditionVariable buildReadStartedCondition() {
+    final ConditionVariable startedCondition = new ConditionVariable();
+    doAnswer(
+            new Answer<Object>() {
+              @Override
+              public Object answer(InvocationOnMock invocation) throws Throwable {
+                startedCondition.open();
+                return null;
+              }
+            })
+        .when(mockUrlRequest)
+        .read(any(ByteBuffer.class));
+    return startedCondition;
   }
 
   private ConditionVariable buildUrlRequestStartedCondition() {
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 52d76d61f40..cbc98b895c3 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,6 @@
 package com.google.android.exoplayer2.ext.cronet;
 
 import android.net.Uri;
-import android.os.ConditionVariable;
 import android.text.TextUtils;
 import android.util.Log;
 import com.google.android.exoplayer2.C;
@@ -27,6 +26,7 @@
 import com.google.android.exoplayer2.upstream.TransferListener;
 import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Clock;
+import com.google.android.exoplayer2.util.ConditionVariable;
 import com.google.android.exoplayer2.util.Predicate;
 import java.io.IOException;
 import java.net.CookieManager;
@@ -78,6 +78,14 @@ public OpenException(String errorMessage, DataSpec dataSpec, int cronetConnectio
 
   }
 
+  /** Thrown on catching an InterruptedException. */
+  public static final class InterruptedIOException extends IOException {
+
+    public InterruptedIOException(InterruptedException e) {
+      super(e);
+    }
+  }
+
   static {
     ExoPlayerLibraryInfo.registerModule("goog.exo.cronet");
   }
@@ -266,13 +274,18 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
       throw new OpenException(e, dataSpec, Status.IDLE);
     }
     currentUrlRequest.start();
-    boolean requestStarted = blockUntilConnectTimeout();
 
-    if (exception != null) {
-      throw new OpenException(exception, currentDataSpec, getStatus(currentUrlRequest));
-    } else if (!requestStarted) {
-      // The timeout was reached before the connection was opened.
-      throw new OpenException(new SocketTimeoutException(), dataSpec, getStatus(currentUrlRequest));
+    try {
+      boolean connectionOpened = blockUntilConnectTimeout();
+      if (exception != null) {
+        throw new OpenException(exception, currentDataSpec, getStatus(currentUrlRequest));
+      } else if (!connectionOpened) {
+        // The timeout was reached before the connection was opened.
+        throw new OpenException(
+            new SocketTimeoutException(), dataSpec, getStatus(currentUrlRequest));
+      }
+    } catch (InterruptedException e) {
+      throw new OpenException(new InterruptedIOException(e), dataSpec, Status.INVALID);
     }
 
     // Check for a valid response code.
@@ -340,14 +353,24 @@ public int read(byte[] buffer, int offset, int readLength) throws HttpDataSource
       operation.close();
       readBuffer.clear();
       currentUrlRequest.read(readBuffer);
-      if (!operation.block(readTimeoutMs)) {
-        // We're timing out, but since the operation is still ongoing we'll need to replace
-        // readBuffer to avoid the possibility of it being written to by this operation during a
-        // subsequent request.
+      try {
+        if (!operation.block(readTimeoutMs)) {
+          throw new SocketTimeoutException();
+        }
+      } catch (InterruptedException | SocketTimeoutException e) {
+        // If we're timing out or getting interrupted, the operation is still ongoing.
+        // So we'll need to replace readBuffer to avoid the possibility of it being written to by
+        // this operation during a subsequent request.
         readBuffer = null;
         throw new HttpDataSourceException(
-            new SocketTimeoutException(), currentDataSpec, HttpDataSourceException.TYPE_READ);
-      } else if (exception != null) {
+            e instanceof InterruptedException
+                ? new InterruptedIOException((InterruptedException) e)
+                : (SocketTimeoutException) e,
+            currentDataSpec,
+            HttpDataSourceException.TYPE_READ);
+      }
+
+      if (exception != null) {
         throw new HttpDataSourceException(exception, currentDataSpec,
             HttpDataSourceException.TYPE_READ);
       } else if (finished) {
@@ -541,7 +564,7 @@ private UrlRequest buildRequest(DataSpec dataSpec) throws IOException {
     return requestBuilder.build();
   }
 
-  private boolean blockUntilConnectTimeout() {
+  private boolean blockUntilConnectTimeout() throws InterruptedException {
     long now = clock.elapsedRealtime();
     boolean opened = false;
     while (!opened && now < currentConnectTimeoutMs) {
@@ -639,7 +662,7 @@ private static long getContentLength(UrlResponseInfo info) {
     return contentLength;
   }
 
-  private static int getStatus(UrlRequest request) {
+  private static int getStatus(UrlRequest request) throws InterruptedException {
     final ConditionVariable conditionVariable = new ConditionVariable();
     final int[] statusHolder = new int[1];
     request.getStatus(new UrlRequest.StatusListener() {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java b/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
index 550cdfbb47c..262d120af86 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/util/ConditionVariable.java
@@ -66,7 +66,7 @@ public synchronized void block() throws InterruptedException {
    * @return true If the condition was opened, false if the call returns because of the timeout.
    * @throws InterruptedException If the thread is interrupted.
    */
-  public synchronized boolean block(int timeout) throws InterruptedException {
+  public synchronized boolean block(long timeout) throws InterruptedException {
     long now = System.currentTimeMillis();
     long end = now + timeout;
     while (!isOpen && now < end) {

From ac9233b7f8a6d9ab9214c8a8b1b4ea7860c1a1b8 Mon Sep 17 00:00:00 2001
From: aravinds <aravinds@google.com>
Date: Tue, 24 Oct 2017 20:57:55 -0700
Subject: [PATCH 347/421] Update v27.0.0 from git_oc-mr1-release with build id
 #4399904 & SL from ub-supportlib-27.0 with build id #4397392 to Android
 stable channel

  Branch: git_oc-mr1-release & ub-supportlib-27.0
  Release: 27.0.0
  Build ID: 4399904 & 4397392
  Channel: stable
  Version: 8.1.0

  Global presubmit: []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173351372
---
 .../ext/mediasession/MediaSessionConnector.java           | 8 --------
 1 file changed, 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 565b9c0084b..2781c020d09 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
@@ -736,14 +736,6 @@ public void onStop() {
       }
     }
 
-    @Override
-    public void onSetShuffleModeEnabled(boolean enabled) {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
-        playbackController.onSetShuffleMode(player, enabled
-            ? PlaybackStateCompat.SHUFFLE_MODE_ALL : PlaybackStateCompat.SHUFFLE_MODE_NONE);
-      }
-    }
-
     @Override
     public void onSetShuffleMode(int shuffleMode) {
       if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {

From 7c18baa23f399f800e19317891acd1b208936dc0 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 25 Oct 2017 04:01:31 -0700
Subject: [PATCH 348/421] Add support for float output in DefaultAudioSink

Also switch from using MIME types to C.ENCODING_* encodings in DefaultAudioSink.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173379623
---
 .../java/com/google/android/exoplayer2/C.java |  10 +-
 .../android/exoplayer2/audio/AudioSink.java   |  30 ++---
 .../exoplayer2/audio/DefaultAudioSink.java    | 127 ++++++++----------
 .../audio/MediaCodecAudioRenderer.java        |  20 ++-
 .../audio/SimpleDecoderAudioRenderer.java     |   4 +-
 .../android/exoplayer2/util/MimeTypes.java    |  30 ++++-
 .../google/android/exoplayer2/util/Util.java  |   1 +
 7 files changed, 116 insertions(+), 106 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 9d4049ada9e..592589e2212 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
@@ -127,8 +127,8 @@ private C() {}
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, ENCODING_INVALID, ENCODING_PCM_8BIT, ENCODING_PCM_16BIT,
-      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT, ENCODING_AC3, ENCODING_E_AC3, ENCODING_DTS,
-      ENCODING_DTS_HD})
+      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT, ENCODING_PCM_FLOAT, ENCODING_AC3, ENCODING_E_AC3,
+      ENCODING_DTS, ENCODING_DTS_HD})
   public @interface Encoding {}
 
   /**
@@ -136,7 +136,7 @@ private C() {}
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, ENCODING_INVALID, ENCODING_PCM_8BIT, ENCODING_PCM_16BIT,
-      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT})
+      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT, ENCODING_PCM_FLOAT})
   public @interface PcmEncoding {}
   /**
    * @see AudioFormat#ENCODING_INVALID
@@ -158,6 +158,10 @@ private C() {}
    * PCM encoding with 32 bits per sample.
    */
   public static final int ENCODING_PCM_32BIT = 0x40000000;
+  /**
+   * @see AudioFormat#ENCODING_PCM_FLOAT
+   */
+  public static final int ENCODING_PCM_FLOAT = AudioFormat.ENCODING_PCM_FLOAT;
   /**
    * @see AudioFormat#ENCODING_AC3
    */
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 5408032907e..faf3160018b 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
@@ -25,14 +25,13 @@
  * A sink that consumes audio data.
  * <p>
  * Before starting playback, specify the input audio format by calling
- * {@link #configure(String, int, int, int, int, int[], int, int)}.
+ * {@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(String, 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)}.
+ * 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>
@@ -166,13 +165,12 @@ public WriteException(int errorCode) {
   void setListener(Listener listener);
 
   /**
-   * Returns whether it's possible to play audio in the specified format using encoded audio
-   * passthrough.
+   * Returns whether it's possible to play audio in the specified encoding using passthrough.
    *
-   * @param mimeType The format mime type.
-   * @return Whether it's possible to play audio in the format using encoded audio passthrough.
+   * @param encoding The audio encoding.
+   * @return Whether it's possible to play audio in the specified encoding using passthrough.
    */
-  boolean isPassthroughSupported(String mimeType);
+  boolean isPassthroughSupported(@C.Encoding int encoding);
 
   /**
    * Returns the playback position in the stream starting at zero, in microseconds, or
@@ -186,12 +184,9 @@ public WriteException(int errorCode) {
   /**
    * Configures (or reconfigures) the sink.
    *
-   * @param inputMimeType The MIME type of audio data provided in the input buffers.
+   * @param inputEncoding The encoding of audio data provided in the input buffers.
    * @param inputChannelCount The number of channels.
    * @param inputSampleRate The sample rate in Hz.
-   * @param inputPcmEncoding For PCM formats, the encoding used. One of
-   *     {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT}
-   *     and {@link C#ENCODING_PCM_32BIT}.
    * @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to infer a
    *     suitable buffer size.
    * @param outputChannels A mapping from input to output channels that is applied to this sink's
@@ -205,9 +200,9 @@ public WriteException(int errorCode) {
    *     immediately preceding the next call to {@link #reset()} or this method.
    * @throws ConfigurationException If an error occurs configuring the sink.
    */
-  void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
-      @C.PcmEncoding int inputPcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
-      int trimStartSamples, int trimEndSamples) throws ConfigurationException;
+  void configure(@C.Encoding int inputEncoding, int inputChannelCount, int inputSampleRate,
+      int specifiedBufferSize, @Nullable int[] outputChannels, int trimStartSamples,
+      int trimEndSamples) throws ConfigurationException;
 
   /**
    * Starts or resumes consuming audio if initialized.
@@ -228,8 +223,7 @@ void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
    * 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(String, int, int, int, int, int[], int, int)} that causes the sink to be
-   * reset).
+   * {@link #configure(int, int, int, int, int[], int, int)} that causes the sink to be reset).
    *
    * @param buffer The buffer containing audio data.
    * @param presentationTimeUs The presentation timestamp of the buffer in microseconds.
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 73c0bc20be2..487135a96e5 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
@@ -29,7 +29,6 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.PlaybackParameters;
 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.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -182,13 +181,13 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
    */
   private AudioTrack keepSessionIdAudioTrack;
   private AudioTrack audioTrack;
+  private boolean isInputPcm;
   private int inputSampleRate;
   private int sampleRate;
   private int channelConfig;
-  private @C.Encoding int encoding;
   private @C.Encoding int outputEncoding;
   private AudioAttributes audioAttributes;
-  private boolean passthrough;
+  private boolean processingEnabled;
   private int bufferSize;
   private long bufferSizeUs;
 
@@ -286,9 +285,8 @@ public void setListener(Listener listener) {
   }
 
   @Override
-  public boolean isPassthroughSupported(String mimeType) {
-    return audioCapabilities != null
-        && audioCapabilities.supportsEncoding(getEncodingForMimeType(mimeType));
+  public boolean isPassthroughSupported(@C.Encoding int encoding) {
+    return audioCapabilities != null && audioCapabilities.supportsEncoding(encoding);
   }
 
   @Override
@@ -331,18 +329,20 @@ public long getCurrentPositionUs(boolean sourceEnded) {
   }
 
   @Override
-  public void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
-      @C.PcmEncoding int inputPcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
-      int trimStartSamples, int trimEndSamples) throws ConfigurationException {
+  public void configure(@C.Encoding int inputEncoding, int inputChannelCount, int inputSampleRate,
+      int specifiedBufferSize, @Nullable int[] outputChannels, int trimStartSamples,
+      int trimEndSamples) throws ConfigurationException {
+    boolean flush = false;
     this.inputSampleRate = inputSampleRate;
     int channelCount = inputChannelCount;
     int sampleRate = inputSampleRate;
-    @C.Encoding int encoding;
-    boolean passthrough = !MimeTypes.AUDIO_RAW.equals(inputMimeType);
-    boolean flush = false;
-    if (!passthrough) {
-      encoding = inputPcmEncoding;
-      pcmFrameSize = Util.getPcmFrameSize(inputPcmEncoding, channelCount);
+    isInputPcm = isEncodingPcm(inputEncoding);
+    if (isInputPcm) {
+      pcmFrameSize = Util.getPcmFrameSize(inputEncoding, channelCount);
+    }
+    @C.Encoding int encoding = inputEncoding;
+    boolean processingEnabled = isInputPcm && inputEncoding != C.ENCODING_PCM_FLOAT;
+    if (processingEnabled) {
       trimmingAudioProcessor.setTrimSampleCount(trimStartSamples, trimEndSamples);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
       for (AudioProcessor audioProcessor : availableAudioProcessors) {
@@ -360,8 +360,6 @@ public void configure(String inputMimeType, int inputChannelCount, int inputSamp
       if (flush) {
         resetAudioProcessors();
       }
-    } else {
-      encoding = getEncodingForMimeType(inputMimeType);
     }
 
     int channelConfig;
@@ -411,11 +409,11 @@ public void configure(String inputMimeType, int inputChannelCount, int inputSamp
 
     // Workaround for Nexus Player not reporting support for mono passthrough.
     // (See [Internal: b/34268671].)
-    if (Util.SDK_INT <= 25 && "fugu".equals(Util.DEVICE) && passthrough && channelCount == 1) {
+    if (Util.SDK_INT <= 25 && "fugu".equals(Util.DEVICE) && !isInputPcm && channelCount == 1) {
       channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
     }
 
-    if (!flush && isInitialized() && this.encoding == encoding && this.sampleRate == sampleRate
+    if (!flush && isInitialized() && outputEncoding == encoding && this.sampleRate == sampleRate
         && this.channelConfig == channelConfig) {
       // We already have an audio track with the correct sample rate, channel config and encoding.
       return;
@@ -423,16 +421,24 @@ public void configure(String inputMimeType, int inputChannelCount, int inputSamp
 
     reset();
 
-    this.encoding = encoding;
-    this.passthrough = passthrough;
+    this.processingEnabled = processingEnabled;
     this.sampleRate = sampleRate;
     this.channelConfig = channelConfig;
-    outputEncoding = passthrough ? encoding : C.ENCODING_PCM_16BIT;
-    outputPcmFrameSize = Util.getPcmFrameSize(C.ENCODING_PCM_16BIT, channelCount);
-
+    outputEncoding = encoding;
+    if (isInputPcm) {
+      outputPcmFrameSize = Util.getPcmFrameSize(outputEncoding, channelCount);
+    }
     if (specifiedBufferSize != 0) {
       bufferSize = specifiedBufferSize;
-    } else if (passthrough) {
+    } else if (isInputPcm) {
+      int minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, 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);
+      bufferSize = Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
+    } else {
       // TODO: Set the minimum buffer size using getMinBufferSize when it takes the encoding into
       // account. [Internal: b/25181305]
       if (outputEncoding == C.ENCODING_AC3 || outputEncoding == C.ENCODING_E_AC3) {
@@ -442,18 +448,9 @@ public void configure(String inputMimeType, int inputChannelCount, int inputSamp
         // DTS allows an 'open' bitrate, but we assume the maximum listed value: 1536 kbit/s.
         bufferSize = (int) (PASSTHROUGH_BUFFER_DURATION_US * 192 * 1024 / C.MICROS_PER_SECOND);
       }
-    } else {
-      int minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, 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);
-      bufferSize = multipliedBufferSize < minAppBufferSize ? minAppBufferSize
-          : multipliedBufferSize > maxAppBufferSize ? maxAppBufferSize
-          : multipliedBufferSize;
     }
-    bufferSizeUs = passthrough ? C.TIME_UNSET : framesToDurationUs(bufferSize / outputPcmFrameSize);
+    bufferSizeUs =
+        isInputPcm ? framesToDurationUs(bufferSize / outputPcmFrameSize) : C.TIME_UNSET;
 
     // The old playback parameters may no longer be applicable so try to reset them now.
     setPlaybackParameters(playbackParameters);
@@ -574,7 +571,7 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
         return true;
       }
 
-      if (passthrough && framesPerEncodedSample == 0) {
+      if (!isInputPcm && framesPerEncodedSample == 0) {
         // If this is the first encoded sample, calculate the sample size in frames.
         framesPerEncodedSample = getFramesPerEncodedSample(outputEncoding, buffer);
       }
@@ -618,20 +615,19 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
         }
       }
 
-      if (passthrough) {
-        submittedEncodedFrames += framesPerEncodedSample;
-      } else {
+      if (isInputPcm) {
         submittedPcmBytes += buffer.remaining();
+      } else {
+        submittedEncodedFrames += framesPerEncodedSample;
       }
 
       inputBuffer = buffer;
     }
 
-    if (passthrough) {
-      // Passthrough buffers are not processed.
-      writeBuffer(inputBuffer, presentationTimeUs);
-    } else {
+    if (processingEnabled) {
       processBuffers(presentationTimeUs);
+    } else {
+      writeBuffer(inputBuffer, presentationTimeUs);
     }
 
     if (!inputBuffer.hasRemaining()) {
@@ -679,10 +675,9 @@ private void processBuffers(long avSyncPresentationTimeUs) throws WriteException
   }
 
   @SuppressWarnings("ReferenceEquality")
-  private boolean writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs)
-      throws WriteException {
+  private void writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs) throws WriteException {
     if (!buffer.hasRemaining()) {
-      return true;
+      return;
     }
     if (outputBuffer != null) {
       Assertions.checkArgument(outputBuffer == buffer);
@@ -701,7 +696,7 @@ private boolean writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs)
     }
     int bytesRemaining = buffer.remaining();
     int bytesWritten = 0;
-    if (Util.SDK_INT < 21) { // passthrough == false
+    if (Util.SDK_INT < 21) { // isInputPcm == true
       // Work out how many bytes we can write without the risk of blocking.
       int bytesPending =
           (int) (writtenPcmBytes - (audioTrackUtil.getPlaybackHeadPosition() * outputPcmFrameSize));
@@ -728,17 +723,15 @@ private boolean writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs)
       throw new WriteException(bytesWritten);
     }
 
-    if (!passthrough) {
+    if (isInputPcm) {
       writtenPcmBytes += bytesWritten;
     }
     if (bytesWritten == bytesRemaining) {
-      if (passthrough) {
+      if (!isInputPcm) {
         writtenEncodedFrames += framesPerEncodedSample;
       }
       outputBuffer = null;
-      return true;
     }
-    return false;
   }
 
   @Override
@@ -758,7 +751,7 @@ public void playToEndOfStream() throws WriteException {
   private boolean drainAudioProcessorsToEndOfStream() throws WriteException {
     boolean audioProcessorNeedsEndOfStream = false;
     if (drainingAudioProcessorIndex == C.INDEX_UNSET) {
-      drainingAudioProcessorIndex = passthrough ? audioProcessors.length : 0;
+      drainingAudioProcessorIndex = processingEnabled ? 0 : audioProcessors.length;
       audioProcessorNeedsEndOfStream = true;
     }
     while (drainingAudioProcessorIndex < audioProcessors.length) {
@@ -799,8 +792,8 @@ public boolean hasPendingData() {
 
   @Override
   public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
-    if (passthrough) {
-      // The playback parameters are always the default in passthrough mode.
+    if (!processingEnabled) {
+      // The playback parameters are always the default if processing is disabled.
       this.playbackParameters = PlaybackParameters.DEFAULT;
       return this.playbackParameters;
     }
@@ -1076,7 +1069,7 @@ private void maybeSampleSyncParams() {
           audioTimestampSet = false;
         }
       }
-      if (getLatencyMethod != null && !passthrough) {
+      if (getLatencyMethod != null && isInputPcm) {
         try {
           // Compute the audio track latency, excluding the latency due to the buffer (leaving
           // latency due to the mixer and audio hardware driver).
@@ -1115,11 +1108,11 @@ private long durationUsToFrames(long durationUs) {
   }
 
   private long getSubmittedFrames() {
-    return passthrough ? submittedEncodedFrames : (submittedPcmBytes / pcmFrameSize);
+    return isInputPcm ? (submittedPcmBytes / pcmFrameSize) : submittedEncodedFrames;
   }
 
   private long getWrittenFrames() {
-    return passthrough ? writtenEncodedFrames : (writtenPcmBytes / outputPcmFrameSize);
+    return isInputPcm ? (writtenPcmBytes / outputPcmFrameSize) : writtenEncodedFrames;
   }
 
   private void resetSyncParams() {
@@ -1212,20 +1205,10 @@ private AudioTrack initializeKeepSessionIdAudioTrack(int audioSessionId) {
         MODE_STATIC, audioSessionId);
   }
 
-  @C.Encoding
-  private static int getEncodingForMimeType(String mimeType) {
-    switch (mimeType) {
-      case MimeTypes.AUDIO_AC3:
-        return C.ENCODING_AC3;
-      case MimeTypes.AUDIO_E_AC3:
-        return C.ENCODING_E_AC3;
-      case MimeTypes.AUDIO_DTS:
-        return C.ENCODING_DTS;
-      case MimeTypes.AUDIO_DTS_HD:
-        return C.ENCODING_DTS_HD;
-      default:
-        return C.ENCODING_INVALID;
-    }
+  private static boolean isEncodingPcm(@C.Encoding int encoding) {
+    return encoding == C.ENCODING_PCM_8BIT || encoding == C.ENCODING_PCM_16BIT
+        || encoding == C.ENCODING_PCM_24BIT || encoding == C.ENCODING_PCM_32BIT
+        || encoding == C.ENCODING_PCM_FLOAT;
   }
 
   private static int getFramesPerEncodedSample(@C.Encoding int encoding, ByteBuffer buffer) {
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 f8206e94cf8..18cbcea115f 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
@@ -51,6 +51,7 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   private boolean passthroughEnabled;
   private boolean codecNeedsDiscardChannelsWorkaround;
   private android.media.MediaFormat passthroughMediaFormat;
+  @C.Encoding
   private int pcmEncoding;
   private int channelCount;
   private int encoderDelay;
@@ -226,7 +227,7 @@ protected MediaCodecInfo getDecoderInfo(MediaCodecSelector mediaCodecSelector,
    * @return Whether passthrough playback is supported.
    */
   protected boolean allowPassthrough(String mimeType) {
-    return audioSink.isPassthroughSupported(mimeType);
+    return audioSink.isPassthroughSupported(MimeTypes.getEncoding(mimeType));
   }
 
   @Override
@@ -272,10 +273,15 @@ protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackExceptio
   @Override
   protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat)
       throws ExoPlaybackException {
-    boolean passthrough = passthroughMediaFormat != null;
-    String mimeType = passthrough ? passthroughMediaFormat.getString(MediaFormat.KEY_MIME)
-        : MimeTypes.AUDIO_RAW;
-    MediaFormat format = passthrough ? passthroughMediaFormat : outputFormat;
+    @C.Encoding int encoding;
+    MediaFormat format;
+    if (passthroughMediaFormat != null) {
+      encoding = MimeTypes.getEncoding(passthroughMediaFormat.getString(MediaFormat.KEY_MIME));
+      format = passthroughMediaFormat;
+    } else {
+      encoding = pcmEncoding;
+      format = outputFormat;
+    }
     int channelCount = format.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
     int sampleRate = format.getInteger(MediaFormat.KEY_SAMPLE_RATE);
     int[] channelMap;
@@ -289,8 +295,8 @@ protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat)
     }
 
     try {
-      audioSink.configure(mimeType, channelCount, sampleRate, pcmEncoding, 0, channelMap,
-          encoderDelay, encoderPadding);
+      audioSink.configure(encoding, channelCount, sampleRate, 0, channelMap, encoderDelay,
+          encoderPadding);
     } catch (AudioSink.ConfigurationException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
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 98a84fdff8d..6be4b1d35d3 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
@@ -329,8 +329,8 @@ private boolean drainOutputBuffer() throws ExoPlaybackException, AudioDecoderExc
 
     if (audioTrackNeedsConfigure) {
       Format outputFormat = getOutputFormat();
-      audioSink.configure(outputFormat.sampleMimeType, outputFormat.channelCount,
-          outputFormat.sampleRate, outputFormat.pcmEncoding, 0, null, encoderDelay, encoderPadding);
+      audioSink.configure(outputFormat.pcmEncoding, outputFormat.channelCount,
+          outputFormat.sampleRate, 0, null, encoderDelay, encoderPadding);
       audioTrackNeedsConfigure = false;
     }
 
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 2daf16d3d2c..d48d28caa56 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
@@ -208,12 +208,12 @@ public static String getMediaMimeType(String codec) {
   }
 
   /**
-   * Returns the {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified mime type.
-   * {@link C#TRACK_TYPE_UNKNOWN} if the mime type is not known or the mapping cannot be
+   * Returns the {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified MIME type.
+   * {@link C#TRACK_TYPE_UNKNOWN} if the MIME type is not known or the mapping cannot be
    * established.
    *
-   * @param mimeType The mimeType.
-   * @return The {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified mime type.
+   * @param mimeType The MIME type.
+   * @return The {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified MIME type.
    */
   public static int getTrackType(String mimeType) {
     if (TextUtils.isEmpty(mimeType)) {
@@ -239,6 +239,28 @@ public static int getTrackType(String mimeType) {
     }
   }
 
+  /**
+   * Returns the {@link C}{@code .ENCODING_*} constant that corresponds to a specified MIME type, or
+   * {@link C#ENCODING_INVALID} if the mapping cannot be established.
+   *
+   * @param mimeType The MIME type.
+   * @return The {@link C}{@code .ENCODING_*} constant that corresponds to a specified MIME type.
+   */
+  public static @C.Encoding int getEncoding(String mimeType) {
+    switch (mimeType) {
+      case MimeTypes.AUDIO_AC3:
+        return C.ENCODING_AC3;
+      case MimeTypes.AUDIO_E_AC3:
+        return C.ENCODING_E_AC3;
+      case MimeTypes.AUDIO_DTS:
+        return C.ENCODING_DTS;
+      case MimeTypes.AUDIO_DTS_HD:
+        return C.ENCODING_DTS_HD;
+      default:
+        return C.ENCODING_INVALID;
+    }
+  }
+
   /**
    * Equivalent to {@code getTrackType(getMediaMimeType(codec))}.
    *
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 24132e400c0..bdc85d5130e 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
@@ -790,6 +790,7 @@ public static int getPcmFrameSize(@C.PcmEncoding int pcmEncoding, int channelCou
       case C.ENCODING_PCM_24BIT:
         return channelCount * 3;
       case C.ENCODING_PCM_32BIT:
+      case C.ENCODING_PCM_FLOAT:
         return channelCount * 4;
       default:
         throw new IllegalArgumentException();

From 88b6df1d083eeabd783274b17c706cb09ff027e5 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 25 Oct 2017 04:32:27 -0700
Subject: [PATCH 349/421] Disable secure DummySurface on Samsung devices on API
 level 25

Issue: #3373

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173381588
---
 .../android/exoplayer2/video/DummySurface.java  | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

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 450b4af38cf..2d7a9dfd33e 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
@@ -150,14 +150,9 @@ private static void assertApiLevel17OrHigher() {
    */
   @TargetApi(24)
   private static boolean enableSecureDummySurfaceV24(Context context) {
-    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
-    String eglExtensions = EGL14.eglQueryString(display, EGL10.EGL_EXTENSIONS);
-    if (eglExtensions == null || !eglExtensions.contains("EGL_EXT_protected_content")) {
-      // EGL_EXT_protected_content is required to enable secure dummy surfaces.
-      return false;
-    }
-    if (Util.SDK_INT == 24 && "samsung".equals(Util.MANUFACTURER)) {
-      // Samsung devices running API level 24 are known to be broken [Internal: b/37197802].
+    if (Util.SDK_INT < 26 && "samsung".equals(Util.MANUFACTURER)) {
+      // Samsung devices running Nougat are known to be broken. See
+      // https://github.com/google/ExoPlayer/issues/3373 and [Internal: b/37197802].
       return false;
     }
     if (Util.SDK_INT < 26 && !context.getPackageManager().hasSystemFeature(
@@ -165,6 +160,12 @@ private static boolean enableSecureDummySurfaceV24(Context context) {
       // Pre API level 26 devices were not well tested unless they supported VR mode.
       return false;
     }
+    EGLDisplay display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+    String eglExtensions = EGL14.eglQueryString(display, EGL10.EGL_EXTENSIONS);
+    if (eglExtensions == null || !eglExtensions.contains("EGL_EXT_protected_content")) {
+      // EGL_EXT_protected_content is required to enable secure dummy surfaces.
+      return false;
+    }
     return true;
   }
 

From 3c201a04919a7f2c9a598a4c56fc595052d517ef Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 25 Oct 2017 04:47:30 -0700
Subject: [PATCH 350/421] Pass MediaSource instance through
 onSourceInfoRefreshed

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173382423
---
 .../DynamicConcatenatingMediaSourceTest.java  |  4 +--
 .../exoplayer2/ExoPlayerImplInternal.java     | 32 +++++++++++++++----
 .../source/ClippingMediaSource.java           |  5 +--
 .../source/ConcatenatingMediaSource.java      |  7 ++--
 .../DynamicConcatenatingMediaSource.java      | 10 +++---
 .../source/ExtractorMediaSource.java          |  2 +-
 .../exoplayer2/source/LoopingMediaSource.java |  4 +--
 .../exoplayer2/source/MediaPeriod.java        |  3 +-
 .../exoplayer2/source/MediaSource.java        |  5 ++-
 .../exoplayer2/source/MergingMediaSource.java |  4 +--
 .../source/SingleSampleMediaSource.java       |  2 +-
 .../exoplayer2/source/ads/AdsMediaSource.java |  7 ++--
 .../source/dash/DashMediaSource.java          |  6 ++--
 .../exoplayer2/source/hls/HlsMediaSource.java |  2 +-
 .../source/smoothstreaming/SsMediaSource.java |  2 +-
 .../exoplayer2/testutil/FakeMediaSource.java  |  2 +-
 .../testutil/FakeSimpleExoPlayer.java         |  3 +-
 .../android/exoplayer2/testutil/TestUtil.java |  3 +-
 18 files changed, 67 insertions(+), 36 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index 86c03d1ce80..61eebbc15a5 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -374,7 +374,7 @@ public void testIllegalArguments() {
   private void prepareAndListenToTimelineUpdates(MediaSource mediaSource) {
     mediaSource.prepareSource(new StubExoPlayer(), true, new Listener() {
       @Override
-      public void onSourceInfoRefreshed(Timeline newTimeline, Object manifest) {
+      public void onSourceInfoRefreshed(MediaSource source, Timeline newTimeline, Object manifest) {
         timeline = newTimeline;
         synchronized (DynamicConcatenatingMediaSourceTest.this) {
           timelineUpdated = true;
@@ -434,7 +434,7 @@ private static class LazyMediaSource implements MediaSource {
     private Listener listener;
 
     public void triggerTimelineUpdate(Timeline timeline) {
-      listener.onSourceInfoRefreshed(timeline, null);
+      listener.onSourceInfoRefreshed(this, timeline, null);
     }
 
     @Override
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 40268653b04..0f0bdad75b5 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
@@ -313,8 +313,9 @@ public Looper getPlaybackLooper() {
   // MediaSource.Listener implementation.
 
   @Override
-  public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
-    handler.obtainMessage(MSG_REFRESH_SOURCE_INFO, Pair.create(timeline, manifest)).sendToTarget();
+  public void onSourceInfoRefreshed(MediaSource source, Timeline timeline, Object manifest) {
+    handler.obtainMessage(MSG_REFRESH_SOURCE_INFO,
+        new MediaSourceRefreshInfo(source, timeline, manifest)).sendToTarget();
   }
 
   // MediaPeriod.Callback implementation.
@@ -384,7 +385,7 @@ public boolean handleMessage(Message msg) {
           return true;
         }
         case MSG_REFRESH_SOURCE_INFO: {
-          handleSourceInfoRefreshed((Pair<Timeline, Object>) msg.obj);
+          handleSourceInfoRefreshed((MediaSourceRefreshInfo) msg.obj);
           return true;
         }
         case MSG_SOURCE_CONTINUE_LOADING_REQUESTED: {
@@ -1013,12 +1014,17 @@ private void maybeThrowPeriodPrepareError() throws IOException {
     }
   }
 
-  private void handleSourceInfoRefreshed(Pair<Timeline, Object> timelineAndManifest)
+  private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
       throws ExoPlaybackException {
+    if (sourceRefreshInfo.source != mediaSource) {
+      // Stale event.
+      return;
+    }
+
     Timeline oldTimeline = timeline;
-    timeline = timelineAndManifest.first;
+    timeline = sourceRefreshInfo.timeline;
     mediaPeriodInfoSequence.setTimeline(timeline);
-    Object manifest = timelineAndManifest.second;
+    Object manifest = sourceRefreshInfo.manifest;
 
     if (oldTimeline == null) {
       if (pendingInitialSeekCount > 0) {
@@ -1776,4 +1782,18 @@ public SeekPosition(Timeline timeline, int windowIndex, long windowPositionUs) {
 
   }
 
+  private static final class MediaSourceRefreshInfo {
+
+    public final MediaSource source;
+    public final Timeline timeline;
+    public final Object manifest;
+
+    public MediaSourceRefreshInfo(MediaSource source, Timeline timeline, Object manifest) {
+      this.source = source;
+      this.timeline = timeline;
+      this.manifest = manifest;
+    }
+
+  }
+
 }
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 161fbb48719..c6924e844a4 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
@@ -115,8 +115,9 @@ public void releaseSource() {
   // MediaSource.Listener implementation.
 
   @Override
-  public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
-    sourceListener.onSourceInfoRefreshed(new ClippingTimeline(timeline, startUs, endUs), manifest);
+  public void onSourceInfoRefreshed(MediaSource source, Timeline timeline, Object manifest) {
+    sourceListener.onSourceInfoRefreshed(this, new ClippingTimeline(timeline, startUs, endUs),
+        manifest);
     int count = mediaPeriods.size();
     for (int i = 0; i < count; i++) {
       mediaPeriods.get(i).setClipping(startUs, endUs);
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 bafdebf6cb9..fe8f23c4c03 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
@@ -91,14 +91,15 @@ public ConcatenatingMediaSource(boolean isAtomic, ShuffleOrder shuffleOrder,
   public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
     this.listener = listener;
     if (mediaSources.length == 0) {
-      listener.onSourceInfoRefreshed(Timeline.EMPTY, null);
+      listener.onSourceInfoRefreshed(this, Timeline.EMPTY, null);
     } else {
       for (int i = 0; i < mediaSources.length; i++) {
         if (!duplicateFlags[i]) {
           final int index = i;
           mediaSources[i].prepareSource(player, false, new Listener() {
             @Override
-            public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+            public void onSourceInfoRefreshed(MediaSource source, Timeline timeline,
+                Object manifest) {
               handleSourceInfoRefreshed(index, timeline, manifest);
             }
           });
@@ -161,7 +162,7 @@ private void handleSourceInfoRefreshed(int sourceFirstIndex, Timeline sourceTime
       }
     }
     timeline = new ConcatenatedTimeline(timelines.clone(), isAtomic, shuffleOrder);
-    listener.onSourceInfoRefreshed(timeline, manifests.clone());
+    listener.onSourceInfoRefreshed(this, timeline, manifests.clone());
   }
 
   private static boolean[] buildDuplicateFlags(MediaSource[] mediaSources) {
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 36c674f81a3..92a117ce4e3 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -15,6 +15,7 @@
  */
 package com.google.android.exoplayer2.source;
 
+import android.support.annotation.NonNull;
 import android.util.Pair;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
@@ -299,8 +300,9 @@ public void handleMessage(int messageType, Object message) throws ExoPlaybackExc
 
   private void maybeNotifyListener() {
     if (!preventListenerNotification) {
-      listener.onSourceInfoRefreshed(new ConcatenatedTimeline(mediaSourceHolders, windowCount,
-          periodCount, shuffleOrder), null);
+      listener.onSourceInfoRefreshed(this,
+          new ConcatenatedTimeline(mediaSourceHolders, windowCount, periodCount, shuffleOrder),
+          null);
     }
   }
 
@@ -321,7 +323,7 @@ private void addMediaSourceInternal(int newIndex, MediaSource newMediaSource) {
     mediaSourceHolders.add(newIndex, newMediaSourceHolder);
     newMediaSourceHolder.mediaSource.prepareSource(player, false, new Listener() {
       @Override
-      public void onSourceInfoRefreshed(Timeline newTimeline, Object manifest) {
+      public void onSourceInfoRefreshed(MediaSource source, Timeline newTimeline, Object manifest) {
         updateMediaSourceInternal(newMediaSourceHolder, newTimeline);
       }
     });
@@ -425,7 +427,7 @@ public MediaSourceHolder(MediaSource mediaSource, DeferredTimeline timeline, int
     }
 
     @Override
-    public int compareTo(MediaSourceHolder other) {
+    public int compareTo(@NonNull MediaSourceHolder other) {
       return this.firstPeriodIndexInChild - other.firstPeriodIndexInChild;
     }
   }
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 1ba192488db..bd407f58f21 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
@@ -197,7 +197,7 @@ private void notifySourceInfoRefreshed(long durationUs, boolean isSeekable) {
     timelineDurationUs = durationUs;
     timelineIsSeekable = isSeekable;
     sourceListener.onSourceInfoRefreshed(
-        new SinglePeriodTimeline(timelineDurationUs, timelineIsSeekable), null);
+        this, new SinglePeriodTimeline(timelineDurationUs, timelineIsSeekable), null);
   }
 
 }
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 b23b36dcf3c..583c1ed68c0 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
@@ -63,11 +63,11 @@ public LoopingMediaSource(MediaSource childSource, int loopCount) {
   public void prepareSource(ExoPlayer player, boolean isTopLevelSource, final Listener listener) {
     childSource.prepareSource(player, false, new Listener() {
       @Override
-      public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+      public void onSourceInfoRefreshed(MediaSource source, Timeline timeline, Object manifest) {
         childPeriodCount = timeline.getPeriodCount();
         Timeline loopingTimeline = loopCount != Integer.MAX_VALUE
             ? new LoopingTimeline(timeline, loopCount) : new InfinitelyLoopingTimeline(timeline);
-        listener.onSourceInfoRefreshed(loopingTimeline, manifest);
+        listener.onSourceInfoRefreshed(LoopingMediaSource.this, loopingTimeline, manifest);
       }
     });
   }
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 211da1d6660..c297229d782 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
@@ -53,7 +53,8 @@ interface Callback extends SequenceableLoader.Callback<MediaPeriod> {
    * {@link #maybeThrowPrepareError()} will throw an {@link IOException}.
    * <p>
    * If preparation succeeds and results in a source timeline change (e.g. the period duration
-   * becoming known), {@link MediaSource.Listener#onSourceInfoRefreshed(Timeline, Object)} will be
+   * becoming known),
+   * {@link MediaSource.Listener#onSourceInfoRefreshed(MediaSource, Timeline, Object)} will be
    * called before {@code callback.onPrepared}.
    *
    * @param callback Callback to receive updates from this period, including being notified when
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 11489cfbb80..7288b398974 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
@@ -46,11 +46,14 @@ interface Listener {
 
     /**
      * Called when manifest and/or timeline has been refreshed.
+     * <p>
+     * Called on the playback thread.
      *
+     * @param source The {@link MediaSource} whose info has been refreshed.
      * @param timeline The source's timeline.
      * @param manifest The loaded manifest. May be null.
      */
-    void onSourceInfoRefreshed(Timeline timeline, @Nullable Object manifest);
+    void onSourceInfoRefreshed(MediaSource source, Timeline timeline, @Nullable Object manifest);
 
   }
 
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 642752b35b2..1550970e473 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,7 +98,7 @@ public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener l
       final int sourceIndex = i;
       mediaSources[sourceIndex].prepareSource(player, false, new Listener() {
         @Override
-        public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+        public void onSourceInfoRefreshed(MediaSource source, Timeline timeline, Object manifest) {
           handleSourceInfoRefreshed(sourceIndex, timeline, manifest);
         }
       });
@@ -152,7 +152,7 @@ private void handleSourceInfoRefreshed(int sourceIndex, Timeline timeline, Objec
       primaryManifest = manifest;
     }
     if (pendingTimelineSources.isEmpty()) {
-      listener.onSourceInfoRefreshed(primaryTimeline, primaryManifest);
+      listener.onSourceInfoRefreshed(this, primaryTimeline, primaryManifest);
     }
   }
 
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 99bc60d6fba..5b190078fd1 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
@@ -86,7 +86,7 @@ public SingleSampleMediaSource(Uri uri, DataSource.Factory dataSourceFactory, Fo
 
   @Override
   public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
-    listener.onSourceInfoRefreshed(timeline, null);
+    listener.onSourceInfoRefreshed(this, timeline, null);
   }
 
   @Override
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 9c75b5ee5e9..18aa8a63e7e 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
@@ -143,7 +143,7 @@ public void prepareSource(final ExoPlayer player, boolean isTopLevelSource, List
     playerHandler = new Handler();
     contentMediaSource.prepareSource(player, false, new Listener() {
       @Override
-      public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+      public void onSourceInfoRefreshed(MediaSource source, Timeline timeline, Object manifest) {
         AdsMediaSource.this.onContentSourceInfoRefreshed(timeline, manifest);
       }
     });
@@ -187,7 +187,8 @@ public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
         adGroupMediaSources[adGroupIndex][adIndexInAdGroup] = adMediaSource;
         adMediaSource.prepareSource(player, false, new Listener() {
           @Override
-          public void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+          public void onSourceInfoRefreshed(MediaSource source, Timeline timeline,
+              Object manifest) {
             onAdSourceInfoRefreshed(adGroupIndex, adIndexInAdGroup, timeline);
           }
         });
@@ -275,7 +276,7 @@ private void maybeUpdateSourceInfo() {
               adPlaybackState.adCounts, adPlaybackState.adsLoadedCounts,
               adPlaybackState.adsPlayedCounts, adDurationsUs, adPlaybackState.adResumePositionUs,
               adPlaybackState.contentDurationUs);
-      listener.onSourceInfoRefreshed(timeline, contentManifest);
+      listener.onSourceInfoRefreshed(this, timeline, contentManifest);
     }
   }
 
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 315e87dcd3b..c529fcab4b2 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
@@ -76,8 +76,8 @@ public final class DashMediaSource implements MediaSource {
 
   /**
    * The interval in milliseconds between invocations of
-   * {@link MediaSource.Listener#onSourceInfoRefreshed(Timeline, Object)} when the source's
-   * {@link Timeline} is changing dynamically (for example, for incomplete live streams).
+   * {@link MediaSource.Listener#onSourceInfoRefreshed(MediaSource, Timeline, Object)} when the
+   * source's {@link Timeline} is changing dynamically (for example, for incomplete live streams).
    */
   private static final int NOTIFY_MANIFEST_INTERVAL_MS = 5000;
   /**
@@ -527,7 +527,7 @@ private void processManifest(boolean scheduleRefresh) {
     DashTimeline timeline = new DashTimeline(manifest.availabilityStartTime, windowStartTimeMs,
         firstPeriodId, currentStartTimeUs, windowDurationUs, windowDefaultStartPositionUs,
         manifest);
-    sourceListener.onSourceInfoRefreshed(timeline, manifest);
+    sourceListener.onSourceInfoRefreshed(this, timeline, manifest);
 
     if (!sideloadedManifest) {
       // Remove any pending simulated refresh.
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 f7f26bb37ce..21b27e655de 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
@@ -179,7 +179,7 @@ public void onPrimaryPlaylistRefreshed(HlsMediaPlaylist playlist) {
           playlist.startTimeUs + playlist.durationUs, playlist.durationUs, playlist.startTimeUs,
           windowDefaultStartPositionUs, true, false);
     }
-    sourceListener.onSourceInfoRefreshed(timeline,
+    sourceListener.onSourceInfoRefreshed(this, timeline,
         new HlsManifest(playlistTracker.getMasterPlaylist(), playlist));
   }
 
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 236bee83ab8..548f7877415 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
@@ -328,7 +328,7 @@ private void processManifest() {
       timeline = new SinglePeriodTimeline(startTimeUs + durationUs, durationUs, startTimeUs, 0,
           true /* isSeekable */, false /* isDynamic */);
     }
-    sourceListener.onSourceInfoRefreshed(timeline, manifest);
+    sourceListener.onSourceInfoRefreshed(this, timeline, manifest);
   }
 
   private void scheduleManifestRefresh() {
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 a827fb80c64..cef48285ca9 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
@@ -69,7 +69,7 @@ public void assertReleased() {
   public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
     Assert.assertFalse(preparedSource);
     preparedSource = true;
-    listener.onSourceInfoRefreshed(timeline, manifest);
+    listener.onSourceInfoRefreshed(this, timeline, manifest);
   }
 
   @Override
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
index efc2637567a..01f984b2122 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -364,7 +364,8 @@ public void blockingSendMessages(ExoPlayerMessage... messages) {
     // MediaSource.Listener
 
     @Override
-    public void onSourceInfoRefreshed(final Timeline timeline, final @Nullable Object manifest) {
+    public void onSourceInfoRefreshed(MediaSource source, final Timeline timeline,
+        final @Nullable Object manifest) {
       if (this.timeline != null) {
         throw new UnsupportedOperationException();
       }
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 0f737ec23a1..b5b084fc7bd 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
@@ -141,7 +141,8 @@ public static Timeline extractTimelineFromMediaSource(MediaSource mediaSource) {
     class TimelineListener implements Listener {
       private Timeline timeline;
       @Override
-      public synchronized void onSourceInfoRefreshed(Timeline timeline, Object manifest) {
+      public synchronized void onSourceInfoRefreshed(MediaSource source, Timeline timeline,
+          Object manifest) {
         this.timeline = timeline;
         this.notify();
       }

From 8b3ec4800cd326a60a4baaad1cebffc99d5111e1 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Wed, 25 Oct 2017 06:17:28 -0700
Subject: [PATCH 351/421] Set cause of the exceptions in
 AtomicFile.startWrite()

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173388899
---
 .../java/com/google/android/exoplayer2/util/AtomicFile.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 e85c07fba9e..b33fc2b9227 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
@@ -104,12 +104,12 @@ public OutputStream startWrite() throws IOException {
     } catch (FileNotFoundException e) {
       File parent = baseName.getParentFile();
       if (!parent.mkdirs()) {
-        throw new IOException("Couldn't create directory " + baseName);
+        throw new IOException("Couldn't create directory " + baseName, e);
       }
       try {
         str = new AtomicFileOutputStream(baseName);
       } catch (FileNotFoundException e2) {
-        throw new IOException("Couldn't create " + baseName);
+        throw new IOException("Couldn't create " + baseName, e2);
       }
     }
     return str;

From 3285851147aecca9645a3722f1850aba8e8592a1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 25 Oct 2017 07:00:30 -0700
Subject: [PATCH 352/421] Pass prepareAcks in SourceInfo

This makes it a bit more obvious what's going on during
preparation. In particular, it makes it clear that
MSG_SOURCE_INFO_REFRESHED arrives before MSG_TRACKS_CHANGED.

Issue: #3362

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173392080
---
 .../android/exoplayer2/ExoPlayerImpl.java     |  5 +-
 .../exoplayer2/ExoPlayerImplInternal.java     | 59 +++++++++++--------
 2 files changed, 35 insertions(+), 29 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 13829e2e9d7..57fc421bc65 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
@@ -454,10 +454,6 @@ public Object getCurrentManifest() {
   // Not private so it can be called from an inner class without going through a thunk method.
   /* package */ void handleEvent(Message msg) {
     switch (msg.what) {
-      case ExoPlayerImplInternal.MSG_PREPARE_ACK: {
-        pendingPrepareAcks--;
-        break;
-      }
       case ExoPlayerImplInternal.MSG_STATE_CHANGED: {
         playbackState = msg.arg1;
         for (Player.EventListener listener : listeners) {
@@ -474,6 +470,7 @@ public Object getCurrentManifest() {
       }
       case ExoPlayerImplInternal.MSG_SOURCE_INFO_REFRESHED: {
         SourceInfo sourceInfo = (SourceInfo) msg.obj;
+        pendingPrepareAcks -= sourceInfo.prepareAcks;
         pendingSeekAcks -= sourceInfo.seekAcks;
         if (pendingPrepareAcks == 0) {
           timeline = sourceInfo.timeline;
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 0f0bdad75b5..a9a289d597d 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
@@ -92,12 +92,15 @@ public static final class SourceInfo {
     public final Timeline timeline;
     public final Object manifest;
     public final PlaybackInfo playbackInfo;
+    public final int prepareAcks;
     public final int seekAcks;
 
-    public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo, int seekAcks) {
+    public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
+        int prepareAcks, int seekAcks) {
       this.timeline = timeline;
       this.manifest = manifest;
       this.playbackInfo = playbackInfo;
+      this.prepareAcks = prepareAcks;
       this.seekAcks = seekAcks;
     }
 
@@ -106,15 +109,14 @@ public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
   private static final String TAG = "ExoPlayerImplInternal";
 
   // External messages
-  public static final int MSG_PREPARE_ACK = 0;
-  public static final int MSG_STATE_CHANGED = 1;
-  public static final int MSG_LOADING_CHANGED = 2;
-  public static final int MSG_TRACKS_CHANGED = 3;
-  public static final int MSG_SEEK_ACK = 4;
-  public static final int MSG_POSITION_DISCONTINUITY = 5;
-  public static final int MSG_SOURCE_INFO_REFRESHED = 6;
-  public static final int MSG_PLAYBACK_PARAMETERS_CHANGED = 7;
-  public static final int MSG_ERROR = 8;
+  public static final int MSG_STATE_CHANGED = 0;
+  public static final int MSG_LOADING_CHANGED = 1;
+  public static final int MSG_TRACKS_CHANGED = 2;
+  public static final int MSG_SEEK_ACK = 3;
+  public static final int MSG_POSITION_DISCONTINUITY = 4;
+  public static final int MSG_SOURCE_INFO_REFRESHED = 5;
+  public static final int MSG_PLAYBACK_PARAMETERS_CHANGED = 6;
+  public static final int MSG_ERROR = 7;
 
   // Internal messages
   private static final int MSG_PREPARE = 0;
@@ -181,6 +183,7 @@ public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
   private int customMessagesProcessed;
   private long elapsedRealtimeUs;
 
+  private int pendingPrepareCount;
   private int pendingInitialSeekCount;
   private SeekPosition pendingSeekPosition;
   private long rendererPositionUs;
@@ -439,7 +442,7 @@ private void setIsLoading(boolean isLoading) {
   }
 
   private void prepareInternal(MediaSource mediaSource, boolean resetPosition) {
-    eventHandler.sendEmptyMessage(MSG_PREPARE_ACK);
+    pendingPrepareCount++;
     resetInternal(true);
     loadControl.onPrepared();
     if (resetPosition) {
@@ -1027,6 +1030,8 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
     Object manifest = sourceRefreshInfo.manifest;
 
     if (oldTimeline == null) {
+      int processedPrepareAcks = pendingPrepareCount;
+      pendingPrepareCount = 0;
       if (pendingInitialSeekCount > 0) {
         Pair<Integer, Long> periodPosition = resolveSeekPosition(pendingSeekPosition);
         int processedInitialSeekCount = pendingInitialSeekCount;
@@ -1035,18 +1040,19 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
         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(manifest, processedInitialSeekCount);
+          handleSourceInfoRefreshEndedPlayback(manifest, processedPrepareAcks,
+              processedInitialSeekCount);
         } else {
           int periodIndex = periodPosition.first;
           long positionUs = periodPosition.second;
           MediaPeriodId periodId =
               mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex, positionUs);
           playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : positionUs, positionUs);
-          notifySourceInfoRefresh(manifest, playbackInfo, processedInitialSeekCount);
+          notifySourceInfoRefresh(manifest, processedPrepareAcks, processedInitialSeekCount);
         }
       } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
         if (timeline.isEmpty()) {
-          handleSourceInfoRefreshEndedPlayback(manifest);
+          handleSourceInfoRefreshEndedPlayback(manifest, processedPrepareAcks, 0);
         } else {
           Pair<Integer, Long> defaultPosition = getPeriodPosition(
               timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
@@ -1056,10 +1062,10 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
               startPositionUs);
           playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : startPositionUs,
               startPositionUs);
-          notifySourceInfoRefresh(manifest);
+          notifySourceInfoRefresh(manifest, processedPrepareAcks, 0);
         }
       } else {
-        notifySourceInfoRefresh(manifest);
+        notifySourceInfoRefresh(manifest, processedPrepareAcks, 0);
       }
       return;
     }
@@ -1186,11 +1192,11 @@ private MediaPeriodHolder updatePeriodInfo(MediaPeriodHolder periodHolder, int p
   }
 
   private void handleSourceInfoRefreshEndedPlayback(Object manifest) {
-    handleSourceInfoRefreshEndedPlayback(manifest, 0);
+    handleSourceInfoRefreshEndedPlayback(manifest, 0, 0);
   }
 
-  private void handleSourceInfoRefreshEndedPlayback(Object manifest,
-      int processedInitialSeekCount) {
+  private void handleSourceInfoRefreshEndedPlayback(Object manifest, int prepareAcks,
+      int seekAcks) {
     int firstPeriodIndex = timeline.isEmpty() ? 0 : timeline.getWindow(
         timeline.getFirstWindowIndex(shuffleModeEnabled), window).firstPeriodIndex;
     // Set the internal position to (firstPeriodIndex,TIME_UNSET) so that a subsequent seek to
@@ -1198,20 +1204,23 @@ private void handleSourceInfoRefreshEndedPlayback(Object manifest,
     playbackInfo = new PlaybackInfo(firstPeriodIndex, C.TIME_UNSET);
     setState(Player.STATE_ENDED);
     // Set the playback position to (firstPeriodIndex,0) for notifying the eventHandler.
-    notifySourceInfoRefresh(manifest, new PlaybackInfo(firstPeriodIndex, 0),
-        processedInitialSeekCount);
+    notifySourceInfoRefresh(manifest, prepareAcks, seekAcks, new PlaybackInfo(firstPeriodIndex, 0));
     // Reset, but retain the source so that it can still be used should a seek occur.
     resetInternal(false);
   }
 
   private void notifySourceInfoRefresh(Object manifest) {
-    notifySourceInfoRefresh(manifest, playbackInfo, 0);
+    notifySourceInfoRefresh(manifest, 0, 0);
+  }
+
+  private void notifySourceInfoRefresh(Object manifest, int prepareAcks, int seekAcks) {
+    notifySourceInfoRefresh(manifest, prepareAcks, seekAcks, playbackInfo);
   }
 
-  private void notifySourceInfoRefresh(Object manifest, PlaybackInfo playbackInfo,
-      int processedInitialSeekCount) {
+  private void notifySourceInfoRefresh(Object manifest, int prepareAcks, int seekAcks,
+      PlaybackInfo playbackInfo) {
     eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED,
-        new SourceInfo(timeline, manifest, playbackInfo, processedInitialSeekCount)).sendToTarget();
+        new SourceInfo(timeline, manifest, playbackInfo, prepareAcks, seekAcks)).sendToTarget();
   }
 
   /**

From 69e43b6abce57ee344b4e8c9f170075ef5398f3b Mon Sep 17 00:00:00 2001
From: falhassen <falhassen@google.com>
Date: Wed, 25 Oct 2017 07:42:44 -0700
Subject: [PATCH 353/421] Automated g4 rollback of changelist 171999924.

*** Reason for rollback ***

CookieManager APIs are fundamentally broken (b/67951242)

*** Original change description ***

Cookie-based validation in CronetDataSource

Using cookie validation from streamer, streamer can enforce that only clients who have the cookie are able to stream the video.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173396251
---
 .../ext/cronet/CronetDataSourceTest.java      |  59 +---------
 .../ext/cronet/CronetDataSource.java          | 109 ++----------------
 2 files changed, 8 insertions(+), 160 deletions(-)

diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index e1175cf2c86..ea12edaf530 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -45,7 +45,6 @@
 import com.google.android.exoplayer2.util.Clock;
 import com.google.android.exoplayer2.util.Predicate;
 import java.io.IOException;
-import java.net.CookieManager;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
@@ -104,14 +103,12 @@ public final class CronetDataSourceTest {
   @Mock private CronetEngine mockCronetEngine;
 
   private CronetDataSource dataSourceUnderTest;
-  private boolean redirectCalled;
 
   @Before
   public void setUp() throws Exception {
     System.setProperty("dexmaker.dexcache",
         InstrumentationRegistry.getTargetContext().getCacheDir().getPath());
     initMocks(this);
-    CookieManager cookieManager = new CookieManager();
     dataSourceUnderTest = spy(
         new CronetDataSource(
             mockCronetEngine,
@@ -122,8 +119,7 @@ public void setUp() throws Exception {
             TEST_READ_TIMEOUT_MS,
             true, // resetTimeoutOnRedirects
             mockClock,
-            null,
-            cookieManager));
+            null));
     when(mockContentTypePredicate.evaluate(anyString())).thenReturn(true);
     when(mockCronetEngine.newUrlRequestBuilder(
             anyString(), any(UrlRequest.Callback.class), any(Executor.class)))
@@ -702,27 +698,6 @@ public void run() {
     assertEquals(1, openExceptions.get());
   }
 
-  @Test
-  public void testRedirectParseAndAttachCookie() throws HttpDataSourceException {
-    mockSingleRedirectSuccess();
-
-    testResponseHeader.put("Set-Cookie", "testcookie=testcookie; Path=/video");
-    dataSourceUnderTest.open(testDataSpec);
-    verify(mockUrlRequestBuilder).addHeader(eq("Cookie"), any(String.class));
-    verify(mockUrlRequest, never()).followRedirect();
-    verify(mockUrlRequest, times(2)).start();
-  }
-
-  @Test
-  public void testRedirectNoSetCookieFollowsRedirect() throws HttpDataSourceException {
-    mockSingleRedirectSuccess();
-    mockFollowRedirectSuccess();
-
-    dataSourceUnderTest.open(testDataSpec);
-    verify(mockUrlRequestBuilder, never()).addHeader(eq("Cookie"), any(String.class));
-    verify(mockUrlRequest).followRedirect();
-  }
-
   @Test
   public void testExceptionFromTransferListener() throws HttpDataSourceException {
     mockResponseStartSuccess();
@@ -837,38 +812,6 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     }).when(mockUrlRequest).start();
   }
 
-  private void mockSingleRedirectSuccess() {
-    doAnswer(new Answer<Object>() {
-      @Override
-      public Object answer(InvocationOnMock invocation) throws Throwable {
-        if (!redirectCalled) {
-          redirectCalled = true;
-          dataSourceUnderTest.onRedirectReceived(
-              mockUrlRequest,
-              createUrlResponseInfoWithUrl("http://example.com/video", 300),
-              "http://example.com/video/redirect");
-        } else {
-          dataSourceUnderTest.onResponseStarted(
-              mockUrlRequest,
-              testUrlResponseInfo);
-        }
-        return null;
-      }
-    }).when(mockUrlRequest).start();
-  }
-
-  private void mockFollowRedirectSuccess() {
-    doAnswer(new Answer<Object>() {
-      @Override
-      public Object answer(InvocationOnMock invocation) throws Throwable {
-          dataSourceUnderTest.onResponseStarted(
-              mockUrlRequest,
-              testUrlResponseInfo);
-        return null;
-      }
-    }).when(mockUrlRequest).followRedirect();
-  }
-
   private void mockResponseStartFailure() {
     doAnswer(new Answer<Object>() {
       @Override
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 cbc98b895c3..5f93bc5e23f 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
@@ -29,13 +29,9 @@
 import com.google.android.exoplayer2.util.ConditionVariable;
 import com.google.android.exoplayer2.util.Predicate;
 import java.io.IOException;
-import java.net.CookieManager;
 import java.net.SocketTimeoutException;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.nio.ByteBuffer;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -105,7 +101,6 @@ public InterruptedIOException(InterruptedException e) {
       Pattern.compile("^bytes (\\d+)-(\\d+)/(\\d+)$");
   // The size of read buffer passed to cronet UrlRequest.read().
   private static final int READ_BUFFER_SIZE_BYTES = 32 * 1024;
-  private static final String SET_COOKIE = "Set-Cookie";
 
   private final CronetEngine cronetEngine;
   private final Executor executor;
@@ -118,7 +113,6 @@ public InterruptedIOException(InterruptedException e) {
   private final RequestProperties requestProperties;
   private final ConditionVariable operation;
   private final Clock clock;
-  private final CookieManager cookieManager;
 
   // Accessed by the calling thread only.
   private boolean opened;
@@ -158,7 +152,7 @@ public InterruptedIOException(InterruptedException e) {
   public CronetDataSource(CronetEngine cronetEngine, Executor executor,
       Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener) {
     this(cronetEngine, executor, contentTypePredicate, listener, DEFAULT_CONNECT_TIMEOUT_MILLIS,
-        DEFAULT_READ_TIMEOUT_MILLIS, false, null, /* cookieManager= */ null);
+        DEFAULT_READ_TIMEOUT_MILLIS, false, null);
   }
 
   /**
@@ -182,42 +176,13 @@ public CronetDataSource(CronetEngine cronetEngine, Executor executor,
       int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
       RequestProperties defaultRequestProperties) {
     this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
-        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties,
-        /* cookieManager= */ null);
-  }
-
-
-  /**
-   * @param cronetEngine A CronetEngine.
-   * @param executor The {@link java.util.concurrent.Executor} that will handle responses.
-   *     This may be a direct executor (i.e. executes tasks on the calling thread) in order
-   *     to avoid a thread hop from Cronet's internal network thread to the response handling
-   *     thread. However, to avoid slowing down overall network performance, care must be taken
-   *     to make sure response handling is a fast operation when using a direct executor.
-   * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
-   *     predicate then an {@link InvalidContentTypeException} is thrown from
-   *     {@link #open(DataSpec)}.
-   * @param listener An optional listener.
-   * @param connectTimeoutMs The connection timeout, in milliseconds.
-   * @param readTimeoutMs The read timeout, in milliseconds.
-   * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
-   * @param defaultRequestProperties The default request properties to be used.
-   * @param cookieManager An optional {@link CookieManager} to be used to handle "Set-Cookie"
-   *     requests. If this is null, then "Set-Cookie" requests will be ignored.
-   */
-  public CronetDataSource(CronetEngine cronetEngine, Executor executor,
-      Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
-      int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
-      RequestProperties defaultRequestProperties, CookieManager cookieManager) {
-    this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
-        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties,
-        cookieManager);
+        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties);
   }
 
   /* package */ CronetDataSource(CronetEngine cronetEngine, Executor executor,
       Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
       int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects, Clock clock,
-      RequestProperties defaultRequestProperties, CookieManager cookieManager) {
+      RequestProperties defaultRequestProperties) {
     this.cronetEngine = Assertions.checkNotNull(cronetEngine);
     this.executor = Assertions.checkNotNull(executor);
     this.contentTypePredicate = contentTypePredicate;
@@ -227,7 +192,6 @@ public CronetDataSource(CronetEngine cronetEngine, Executor executor,
     this.resetTimeoutOnRedirects = resetTimeoutOnRedirects;
     this.clock = Assertions.checkNotNull(clock);
     this.defaultRequestProperties = defaultRequestProperties;
-    this.cookieManager = cookieManager;
     requestProperties = new RequestProperties();
     operation = new ConditionVariable();
   }
@@ -267,12 +231,7 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
     operation.close();
     resetConnectTimeout();
     currentDataSpec = dataSpec;
-
-    try {
-      currentUrlRequest = buildRequest(dataSpec);
-    } catch (IOException e) {
-      throw new OpenException(e, dataSpec, Status.IDLE);
-    }
+    currentUrlRequest = buildRequest(dataSpec);
     currentUrlRequest.start();
 
     try {
@@ -443,24 +402,7 @@ public synchronized void onRedirectReceived(UrlRequest request, UrlResponseInfo
     if (resetTimeoutOnRedirects) {
       resetConnectTimeout();
     }
-
-    Map<String, List<String>> headers = info.getAllHeaders();
-    if (cookieManager == null || isEmpty(headers.get(SET_COOKIE))) {
-      request.followRedirect();
-    } else {
-      currentUrlRequest.cancel();
-      UrlRequest.Builder requestBuilder =
-          cronetEngine.newUrlRequestBuilder(newLocationUrl, this, executor).allowDirectExecutor();
-      try {
-        parseCookies(info);
-        attachCookies(newLocationUrl, requestBuilder);
-        currentUrlRequest = requestBuilder.build();
-        currentUrlRequest.start();
-      } catch (IOException e) {
-        exception = e;
-        operation.open();
-      }
-    }
+    request.followRedirect();
   }
 
   @Override
@@ -468,12 +410,7 @@ public synchronized void onResponseStarted(UrlRequest request, UrlResponseInfo i
     if (request != currentUrlRequest) {
       return;
     }
-    try {
-      parseCookies(info);
-      responseInfo = info;
-    } catch (IOException e) {
-      exception = e;
-    }
+    responseInfo = info;
     operation.open();
   }
 
@@ -513,7 +450,7 @@ public synchronized void onFailed(UrlRequest request, UrlResponseInfo info,
 
   // Internal methods.
 
-  private UrlRequest buildRequest(DataSpec dataSpec) throws IOException {
+  private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
     UrlRequest.Builder requestBuilder = cronetEngine.newUrlRequestBuilder(
         dataSpec.uri.toString(), this, executor).allowDirectExecutor();
     // Set the headers.
@@ -560,7 +497,6 @@ private UrlRequest buildRequest(DataSpec dataSpec) throws IOException {
             executor);
       }
     }
-    attachCookies(dataSpec.uri.toString(), requestBuilder);
     return requestBuilder.build();
   }
 
@@ -578,37 +514,6 @@ private void resetConnectTimeout() {
     currentConnectTimeoutMs = clock.elapsedRealtime() + connectTimeoutMs;
   }
 
-  private void parseCookies(UrlResponseInfo info) throws IOException {
-    if (cookieManager == null) {
-      return;
-    }
-    try {
-      cookieManager.put(new URI(info.getUrl()), info.getAllHeaders());
-    } catch (URISyntaxException e) {
-      throw new IOException("Failed to parse cookies", e);
-    }
-  }
-
-  private void attachCookies(String url, UrlRequest.Builder requestBuilder) throws IOException {
-    if (cookieManager == null) {
-      return;
-    }
-    try {
-      for (Entry<String, List<String>> headers :
-          cookieManager.get(new URI(url), Collections.emptyMap()).entrySet()) {
-        StringBuilder cookies = new StringBuilder();
-        for (String cookie : headers.getValue()) {
-          cookies.append(cookie).append("; ");
-        }
-        if (cookies.length() > 0) {
-          requestBuilder.addHeader(headers.getKey(), cookies.substring(0, cookies.length() - 1));
-        }
-      }
-    } catch (URISyntaxException e) {
-      throw new IOException("Failed to attach cookies", e);
-    }
-  }
-
   private static boolean getIsCompressed(UrlResponseInfo info) {
     for (Map.Entry<String, String> entry : info.getAllHeadersAsList()) {
       if (entry.getKey().equalsIgnoreCase("Content-Encoding")) {

From 3602a9a7e41d41f76bfd621b88413873086ec154 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Wed, 25 Oct 2017 09:59:48 -0700
Subject: [PATCH 354/421] Allow specifying a Drawable for the TimeBar scrubber

Issue: #3337

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173411321
---
 .../android/exoplayer2/ui/DefaultTimeBar.java | 86 +++++++++++++++----
 library/ui/src/main/res/values/attrs.xml      |  1 +
 2 files changed, 72 insertions(+), 15 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 d8617888ce5..a4a543ee0d6 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
@@ -23,6 +23,7 @@
 import android.graphics.Paint;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
@@ -86,6 +87,10 @@
  *         <li>Default: {@link #DEFAULT_SCRUBBER_DRAGGED_SIZE_DP}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code scrubber_drawable}</b> - Optional reference to a drawable to draw for the
+ *       scrubber handle. If set, this overrides the default behavior, which is to draw a circle for
+ *       the scrubber handle.
+ *   </li>
  *   <li><b>{@code played_color}</b> - Color for the portion of the time bar representing media
  *       before the current playback position.
  *       <ul>
@@ -181,6 +186,7 @@ public class DefaultTimeBar extends View implements TimeBar {
   private final Paint adMarkerPaint;
   private final Paint playedAdMarkerPaint;
   private final Paint scrubberPaint;
+  private final Drawable scrubberDrawable;
   private final int barHeight;
   private final int touchTargetHeight;
   private final int adMarkerWidth;
@@ -240,6 +246,14 @@ public DefaultTimeBar(Context context, AttributeSet attrs) {
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.DefaultTimeBar, 0,
           0);
       try {
+        scrubberDrawable = a.getDrawable(R.styleable.DefaultTimeBar_scrubber_drawable);
+        if (scrubberDrawable != null) {
+          if (Util.SDK_INT >= 23) {
+            scrubberDrawable.setLayoutDirection(getLayoutDirection());
+          }
+          defaultTouchTargetHeight =
+              Math.max(scrubberDrawable.getMinimumHeight(), defaultTouchTargetHeight);
+        }
         barHeight = a.getDimensionPixelSize(R.styleable.DefaultTimeBar_bar_height,
             defaultBarHeight);
         touchTargetHeight = a.getDimensionPixelSize(R.styleable.DefaultTimeBar_touch_target_height,
@@ -284,6 +298,7 @@ public DefaultTimeBar(Context context, AttributeSet attrs) {
       bufferedPaint.setColor(getDefaultBufferedColor(DEFAULT_PLAYED_COLOR));
       unplayedPaint.setColor(getDefaultUnplayedColor(DEFAULT_PLAYED_COLOR));
       adMarkerPaint.setColor(DEFAULT_AD_MARKER_COLOR);
+      scrubberDrawable = null;
     }
     formatBuilder = new StringBuilder();
     formatter = new Formatter(formatBuilder, Locale.getDefault());
@@ -293,9 +308,13 @@ public void run() {
         stopScrubbing(false);
       }
     };
-    scrubberPadding =
-        (Math.max(scrubberDisabledSize, Math.max(scrubberEnabledSize, scrubberDraggedSize)) + 1)
-            / 2;
+    if (scrubberDrawable != null) {
+      scrubberPadding = (scrubberDrawable.getMinimumWidth() + 1) / 2;
+    } else {
+      scrubberPadding =
+          (Math.max(scrubberDisabledSize, Math.max(scrubberEnabledSize, scrubberDraggedSize)) + 1)
+              / 2;
+    }
     duration = C.TIME_UNSET;
     keyTimeIncrement = C.TIME_UNSET;
     keyCountIncrement = DEFAULT_INCREMENT_COUNT;
@@ -453,6 +472,20 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
     return super.onKeyDown(keyCode, event);
   }
 
+  @Override
+  protected void drawableStateChanged() {
+    super.drawableStateChanged();
+    updateDrawableState();
+  }
+
+  @Override
+  public void jumpDrawablesToCurrentState() {
+    super.jumpDrawablesToCurrentState();
+    if (scrubberDrawable != null) {
+      scrubberDrawable.jumpToCurrentState();
+    }
+  }
+
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     int heightMode = MeasureSpec.getMode(heightMeasureSpec);
@@ -460,6 +493,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
     int height = heightMode == MeasureSpec.UNSPECIFIED ? touchTargetHeight
         : heightMode == MeasureSpec.EXACTLY ? heightSize : Math.min(touchTargetHeight, heightSize);
     setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), height);
+    updateDrawableState();
   }
 
   @Override
@@ -477,8 +511,10 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
   }
 
   @Override
-  protected void onSizeChanged(int width, int height, int oldWidth, int oldHeight) {
-    super.onSizeChanged(width, height, oldWidth, oldHeight);
+  public void onRtlPropertiesChanged(int layoutDirection) {
+    if (scrubberDrawable != null && scrubberDrawable.setLayoutDirection(layoutDirection)) {
+      invalidate();
+    }
   }
 
   @Override
@@ -543,6 +579,7 @@ private void maybeSetImportantForAccessibilityV16() {
 
   private void startScrubbing() {
     scrubbing = true;
+    setPressed(true);
     ViewParent parent = getParent();
     if (parent != null) {
       parent.requestDisallowInterceptTouchEvent(true);
@@ -554,6 +591,7 @@ private void startScrubbing() {
 
   private void stopScrubbing(boolean canceled) {
     scrubbing = false;
+    setPressed(false);
     ViewParent parent = getParent();
     if (parent != null) {
       parent.requestDisallowInterceptTouchEvent(false);
@@ -644,12 +682,30 @@ private void drawPlayhead(Canvas canvas) {
     if (duration <= 0) {
       return;
     }
-    int scrubberSize = (scrubbing || isFocused()) ? scrubberDraggedSize
-        : (isEnabled() ? scrubberEnabledSize : scrubberDisabledSize);
-    int playheadRadius = scrubberSize / 2;
-    int playheadCenter = Util.constrainValue(scrubberBar.right, scrubberBar.left,
-        progressBar.right);
-    canvas.drawCircle(playheadCenter, scrubberBar.centerY(), playheadRadius, scrubberPaint);
+    int playheadX = Util.constrainValue(scrubberBar.right, scrubberBar.left, progressBar.right);
+    int playheadY = scrubberBar.centerY();
+    if (scrubberDrawable == null) {
+      int scrubberSize = (scrubbing || isFocused()) ? scrubberDraggedSize
+          : (isEnabled() ? scrubberEnabledSize : scrubberDisabledSize);
+      int playheadRadius = scrubberSize / 2;
+      canvas.drawCircle(playheadX, playheadY, playheadRadius, scrubberPaint);
+    } else {
+      int scrubberDrawableWidth = scrubberDrawable.getIntrinsicWidth();
+      int scrubberDrawableHeight = scrubberDrawable.getIntrinsicHeight();
+      scrubberDrawable.setBounds(
+          playheadX - scrubberDrawableWidth / 2,
+          playheadY - scrubberDrawableHeight / 2,
+          playheadX + scrubberDrawableWidth / 2,
+          playheadY + scrubberDrawableHeight / 2);
+      scrubberDrawable.draw(canvas);
+    }
+  }
+
+  private void updateDrawableState() {
+    if (scrubberDrawable != null && scrubberDrawable.isStateful()
+        && scrubberDrawable.setState(getDrawableState())) {
+      invalidate();
+    }
   }
 
   private String getProgressText() {
@@ -690,19 +746,19 @@ private static int dpToPx(DisplayMetrics displayMetrics, int dps) {
     return (int) (dps * displayMetrics.density + 0.5f);
   }
 
-  private static int getDefaultScrubberColor(int playedColor) {
+  public static int getDefaultScrubberColor(int playedColor) {
     return 0xFF000000 | playedColor;
   }
 
-  private static int getDefaultUnplayedColor(int playedColor) {
+  public static int getDefaultUnplayedColor(int playedColor) {
     return 0x33000000 | (playedColor & 0x00FFFFFF);
   }
 
-  private static int getDefaultBufferedColor(int playedColor) {
+  public static int getDefaultBufferedColor(int playedColor) {
     return 0xCC000000 | (playedColor & 0x00FFFFFF);
   }
 
-  private static int getDefaultPlayedAdMarkerColor(int adMarkerColor) {
+  public static int getDefaultPlayedAdMarkerColor(int adMarkerColor) {
     return 0x33000000 | (adMarkerColor & 0x00FFFFFF);
   }
 
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index 9b701d5ba51..d02d54ef237 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -76,6 +76,7 @@
     <attr name="scrubber_enabled_size" format="dimension"/>
     <attr name="scrubber_disabled_size" format="dimension"/>
     <attr name="scrubber_dragged_size" format="dimension"/>
+    <attr name="scrubber_drawable" format="reference"/>
     <attr name="played_color" format="color"/>
     <attr name="scrubber_color" format="color"/>
     <attr name="buffered_color" format="color"/>

From cf38900d20bddbb2dddc245f95ddc39515bc7685 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 26 Oct 2017 06:03:25 -0700
Subject: [PATCH 355/421] Simplify non-main demo apps to not care about
 multi-window

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173528055
---
 .../exoplayer2/castdemo/MainActivity.java     | 38 ++-----------------
 1 file changed, 3 insertions(+), 35 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 9a2b76c941a..2894bb8e5f1 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
@@ -30,7 +30,6 @@
 import com.google.android.exoplayer2.ext.cast.CastPlayer;
 import com.google.android.exoplayer2.ui.PlaybackControlView;
 import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
-import com.google.android.exoplayer2.util.Util;
 import com.google.android.gms.cast.framework.CastButtonFactory;
 
 /**
@@ -69,36 +68,17 @@ public boolean onCreateOptionsMenu(Menu menu) {
     return true;
   }
 
-  @Override
-  public void onStart() {
-    super.onStart();
-    if (Util.SDK_INT > 23) {
-      setupPlayerManager();
-    }
-  }
-
   @Override
   public void onResume() {
     super.onResume();
-    if ((Util.SDK_INT <= 23)) {
-      setupPlayerManager();
-    }
+    playerManager = new PlayerManager(simpleExoPlayerView, castControlView, this);
   }
 
   @Override
   public void onPause() {
     super.onPause();
-    if (Util.SDK_INT <= 23) {
-      releasePlayerManager();
-    }
-  }
-
-  @Override
-  public void onStop() {
-    super.onStop();
-    if (Util.SDK_INT > 23) {
-      releasePlayerManager();
-    }
+    playerManager.release();
+    playerManager = null;
   }
 
   // Activity input.
@@ -109,18 +89,6 @@ public boolean dispatchKeyEvent(KeyEvent event) {
     return super.dispatchKeyEvent(event) || playerManager.dispatchKeyEvent(event);
   }
 
-  // Internal methods.
-
-  private void setupPlayerManager() {
-    playerManager = new PlayerManager(simpleExoPlayerView, castControlView,
-        getApplicationContext());
-  }
-
-  private void releasePlayerManager() {
-    playerManager.release();
-    playerManager = null;
-  }
-
   // User controls.
 
   private final class SampleListAdapter extends ArrayAdapter<CastDemoUtil.Sample> {

From 46bf2540337c20fc51686399dd9f64e356f41900 Mon Sep 17 00:00:00 2001
From: falhassen <falhassen@google.com>
Date: Thu, 26 Oct 2017 06:54:39 -0700
Subject: [PATCH 356/421] Add option for handling "Set-Cookie" requests in
 CronetDataSource.

This time, we avoid using the problematic CookieManager and HttpCookie framework APIs by just forwarding the cookie request only when the client has enabled the feature and the server responds with a "Set-Cookie" response header.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173532023
---
 .../ext/cronet/CronetDataSourceTest.java      | 143 +++++++++++++++---
 .../ext/cronet/CronetDataSource.java          |  63 +++++++-
 2 files changed, 183 insertions(+), 23 deletions(-)

diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index ea12edaf530..62b5fb261a7 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -103,6 +103,7 @@ public final class CronetDataSourceTest {
   @Mock private CronetEngine mockCronetEngine;
 
   private CronetDataSource dataSourceUnderTest;
+  private boolean redirectCalled;
 
   @Before
   public void setUp() throws Exception {
@@ -119,10 +120,11 @@ public void setUp() throws Exception {
             TEST_READ_TIMEOUT_MS,
             true, // resetTimeoutOnRedirects
             mockClock,
-            null));
+            null,
+            false));
     when(mockContentTypePredicate.evaluate(anyString())).thenReturn(true);
     when(mockCronetEngine.newUrlRequestBuilder(
-            anyString(), any(UrlRequest.Callback.class), any(Executor.class)))
+        anyString(), any(UrlRequest.Callback.class), any(Executor.class)))
         .thenReturn(mockUrlRequestBuilder);
     when(mockUrlRequestBuilder.allowDirectExecutor()).thenReturn(mockUrlRequestBuilder);
     when(mockUrlRequestBuilder.build()).thenReturn(mockUrlRequest);
@@ -698,6 +700,77 @@ public void run() {
     assertEquals(1, openExceptions.get());
   }
 
+  @Test
+  public void testRedirectParseAndAttachCookie_dataSourceDoesNotHandleSetCookie_followsRedirect()
+      throws HttpDataSourceException {
+    mockSingleRedirectSuccess();
+    mockFollowRedirectSuccess();
+
+    testResponseHeader.put("Set-Cookie", "testcookie=testcookie; Path=/video");
+
+    dataSourceUnderTest.open(testDataSpec);
+    verify(mockUrlRequestBuilder, never()).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequest).followRedirect();
+  }
+
+  @Test
+  public void testRedirectParseAndAttachCookie_dataSourceHandlesSetCookie()
+      throws HttpDataSourceException {
+    dataSourceUnderTest = spy(
+        new CronetDataSource(
+            mockCronetEngine,
+            mockExecutor,
+            mockContentTypePredicate,
+            mockTransferListener,
+            TEST_CONNECT_TIMEOUT_MS,
+            TEST_READ_TIMEOUT_MS,
+            true, // resetTimeoutOnRedirects
+            mockClock,
+            null,
+            true));
+    mockSingleRedirectSuccess();
+
+    testResponseHeader.put("Set-Cookie", "testcookie=testcookie; Path=/video");
+
+    dataSourceUnderTest.open(testDataSpec);
+    verify(mockUrlRequestBuilder).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequest, never()).followRedirect();
+    verify(mockUrlRequest, times(2)).start();
+  }
+
+  @Test
+  public void testRedirectNoSetCookieFollowsRedirect() throws HttpDataSourceException {
+    mockSingleRedirectSuccess();
+    mockFollowRedirectSuccess();
+
+    dataSourceUnderTest.open(testDataSpec);
+    verify(mockUrlRequestBuilder, never()).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequest).followRedirect();
+  }
+
+  @Test
+  public void testRedirectNoSetCookieFollowsRedirect_dataSourceHandlesSetCookie()
+      throws HttpDataSourceException {
+    dataSourceUnderTest = spy(
+        new CronetDataSource(
+            mockCronetEngine,
+            mockExecutor,
+            mockContentTypePredicate,
+            mockTransferListener,
+            TEST_CONNECT_TIMEOUT_MS,
+            TEST_READ_TIMEOUT_MS,
+            true, // resetTimeoutOnRedirects
+            mockClock,
+            null,
+            true));
+    mockSingleRedirectSuccess();
+    mockFollowRedirectSuccess();
+
+    dataSourceUnderTest.open(testDataSpec);
+    verify(mockUrlRequestBuilder, never()).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequest).followRedirect();
+  }
+
   @Test
   public void testExceptionFromTransferListener() throws HttpDataSourceException {
     mockResponseStartSuccess();
@@ -812,6 +885,38 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
     }).when(mockUrlRequest).start();
   }
 
+  private void mockSingleRedirectSuccess() {
+    doAnswer(new Answer<Object>() {
+      @Override
+      public Object answer(InvocationOnMock invocation) throws Throwable {
+        if (!redirectCalled) {
+          redirectCalled = true;
+          dataSourceUnderTest.onRedirectReceived(
+              mockUrlRequest,
+              createUrlResponseInfoWithUrl("http://example.com/video", 300),
+              "http://example.com/video/redirect");
+        } else {
+          dataSourceUnderTest.onResponseStarted(
+              mockUrlRequest,
+              testUrlResponseInfo);
+        }
+        return null;
+      }
+    }).when(mockUrlRequest).start();
+  }
+
+  private void mockFollowRedirectSuccess() {
+    doAnswer(new Answer<Object>() {
+      @Override
+      public Object answer(InvocationOnMock invocation) throws Throwable {
+        dataSourceUnderTest.onResponseStarted(
+            mockUrlRequest,
+            testUrlResponseInfo);
+        return null;
+      }
+    }).when(mockUrlRequest).followRedirect();
+  }
+
   private void mockResponseStartFailure() {
     doAnswer(new Answer<Object>() {
       @Override
@@ -850,16 +955,16 @@ public Void answer(InvocationOnMock invocation) throws Throwable {
 
   private void mockReadFailure() {
     doAnswer(
-            new Answer<Object>() {
-              @Override
-              public Object answer(InvocationOnMock invocation) throws Throwable {
-                dataSourceUnderTest.onFailed(
-                    mockUrlRequest,
-                    createUrlResponseInfo(500), // statusCode
-                    mockNetworkException);
-                return null;
-              }
-            })
+        new Answer<Object>() {
+          @Override
+          public Object answer(InvocationOnMock invocation) throws Throwable {
+            dataSourceUnderTest.onFailed(
+                mockUrlRequest,
+                createUrlResponseInfo(500), // statusCode
+                mockNetworkException);
+            return null;
+          }
+        })
         .when(mockUrlRequest)
         .read(any(ByteBuffer.class));
   }
@@ -867,13 +972,13 @@ public Object answer(InvocationOnMock invocation) throws Throwable {
   private ConditionVariable buildReadStartedCondition() {
     final ConditionVariable startedCondition = new ConditionVariable();
     doAnswer(
-            new Answer<Object>() {
-              @Override
-              public Object answer(InvocationOnMock invocation) throws Throwable {
-                startedCondition.open();
-                return null;
-              }
-            })
+        new Answer<Object>() {
+          @Override
+          public Object answer(InvocationOnMock invocation) throws Throwable {
+            startedCondition.open();
+            return null;
+          }
+        })
         .when(mockUrlRequest)
         .read(any(ByteBuffer.class));
     return startedCondition;
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 5f93bc5e23f..546aba159d8 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
@@ -97,6 +97,9 @@ public InterruptedIOException(InterruptedException e) {
 
   private static final String TAG = "CronetDataSource";
   private static final String CONTENT_TYPE = "Content-Type";
+  private static final String SET_COOKIE = "Set-Cookie";
+  private static final String COOKIE = "Cookie";
+
   private static final Pattern CONTENT_RANGE_HEADER_PATTERN =
       Pattern.compile("^bytes (\\d+)-(\\d+)/(\\d+)$");
   // The size of read buffer passed to cronet UrlRequest.read().
@@ -109,6 +112,7 @@ public InterruptedIOException(InterruptedException e) {
   private final int connectTimeoutMs;
   private final int readTimeoutMs;
   private final boolean resetTimeoutOnRedirects;
+  private final boolean handleSetCookieRequests;
   private final RequestProperties defaultRequestProperties;
   private final RequestProperties requestProperties;
   private final ConditionVariable operation;
@@ -152,7 +156,7 @@ public InterruptedIOException(InterruptedException e) {
   public CronetDataSource(CronetEngine cronetEngine, Executor executor,
       Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener) {
     this(cronetEngine, executor, contentTypePredicate, listener, DEFAULT_CONNECT_TIMEOUT_MILLIS,
-        DEFAULT_READ_TIMEOUT_MILLIS, false, null);
+        DEFAULT_READ_TIMEOUT_MILLIS, false, null, false);
   }
 
   /**
@@ -176,13 +180,40 @@ public CronetDataSource(CronetEngine cronetEngine, Executor executor,
       int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
       RequestProperties defaultRequestProperties) {
     this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
-        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties);
+        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties, false);
+  }
+
+  /**
+   * @param cronetEngine A CronetEngine.
+   * @param executor The {@link java.util.concurrent.Executor} that will handle responses.
+   *     This may be a direct executor (i.e. executes tasks on the calling thread) in order
+   *     to avoid a thread hop from Cronet's internal network thread to the response handling
+   *     thread. However, to avoid slowing down overall network performance, care must be taken
+   *     to make sure response handling is a fast operation when using a direct executor.
+   * @param contentTypePredicate An optional {@link Predicate}. If a content type is rejected by the
+   *     predicate then an {@link InvalidContentTypeException} is thrown from
+   *     {@link #open(DataSpec)}.
+   * @param listener An optional listener.
+   * @param connectTimeoutMs The connection timeout, in milliseconds.
+   * @param readTimeoutMs The read timeout, in milliseconds.
+   * @param resetTimeoutOnRedirects Whether the connect timeout is reset when a redirect occurs.
+   * @param defaultRequestProperties The default request properties to be used.
+   * @param handleSetCookieRequests Whether "Set-Cookie" requests on redirect should be forwarded to
+   *     the redirect url in the "Cookie" header.
+   */
+  public CronetDataSource(CronetEngine cronetEngine, Executor executor,
+      Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
+      int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects,
+      RequestProperties defaultRequestProperties, boolean handleSetCookieRequests) {
+    this(cronetEngine, executor, contentTypePredicate, listener, connectTimeoutMs,
+        readTimeoutMs, resetTimeoutOnRedirects, Clock.DEFAULT, defaultRequestProperties,
+        handleSetCookieRequests);
   }
 
   /* package */ CronetDataSource(CronetEngine cronetEngine, Executor executor,
       Predicate<String> contentTypePredicate, TransferListener<? super CronetDataSource> listener,
       int connectTimeoutMs, int readTimeoutMs, boolean resetTimeoutOnRedirects, Clock clock,
-      RequestProperties defaultRequestProperties) {
+      RequestProperties defaultRequestProperties, boolean handleSetCookieRequests) {
     this.cronetEngine = Assertions.checkNotNull(cronetEngine);
     this.executor = Assertions.checkNotNull(executor);
     this.contentTypePredicate = contentTypePredicate;
@@ -192,6 +223,7 @@ public CronetDataSource(CronetEngine cronetEngine, Executor executor,
     this.resetTimeoutOnRedirects = resetTimeoutOnRedirects;
     this.clock = Assertions.checkNotNull(clock);
     this.defaultRequestProperties = defaultRequestProperties;
+    this.handleSetCookieRequests = handleSetCookieRequests;
     requestProperties = new RequestProperties();
     operation = new ConditionVariable();
   }
@@ -402,7 +434,19 @@ public synchronized void onRedirectReceived(UrlRequest request, UrlResponseInfo
     if (resetTimeoutOnRedirects) {
       resetConnectTimeout();
     }
-    request.followRedirect();
+
+    Map<String, List<String>> headers = info.getAllHeaders();
+    if (!handleSetCookieRequests || isEmpty(headers.get(SET_COOKIE))) {
+      request.followRedirect();
+    } else {
+      UrlRequest.Builder requestBuilder =
+          cronetEngine.newUrlRequestBuilder(newLocationUrl, /* callback= */ this, executor);
+      currentUrlRequest.cancel();
+      String cookieHeadersValue = parseCookies(headers.get(SET_COOKIE));
+      attachCookies(requestBuilder, cookieHeadersValue);
+      currentUrlRequest = requestBuilder.build();
+      currentUrlRequest.start();
+    }
   }
 
   @Override
@@ -567,6 +611,17 @@ private static long getContentLength(UrlResponseInfo info) {
     return contentLength;
   }
 
+  private static String parseCookies(List<String> setCookieHeaders) {
+    return TextUtils.join(";", setCookieHeaders);
+  }
+
+  private static void attachCookies(UrlRequest.Builder requestBuilder, String cookies) {
+    if (TextUtils.isEmpty(cookies)) {
+      return;
+    }
+    requestBuilder.addHeader(COOKIE, cookies);
+  }
+
   private static int getStatus(UrlRequest request) throws InterruptedException {
     final ConditionVariable conditionVariable = new ConditionVariable();
     final int[] statusHolder = new int[1];

From cd07ff764e42b8485b76952bd796d17fa72fea29 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 27 Oct 2017 01:32:17 -0700
Subject: [PATCH 357/421] Update gradle tools to 3.0.0 and support library to
 27.0.0.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173645345
---
 build.gradle     | 2 +-
 constants.gradle | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index d260f491da2..2623db66fc2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta7'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.novoda:bintray-release:0.5.0'
     }
     // Workaround for the following test coverage issue. Remove when fixed:
diff --git a/constants.gradle b/constants.gradle
index 282addf7aa0..c2209cbbe65 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -21,7 +21,7 @@ project.ext {
     targetSdkVersion = 26
     buildToolsVersion = '26.0.2'
     testSupportLibraryVersion = '0.5'
-    supportLibraryVersion = '26.1.0'
+    supportLibraryVersion = '27.0.0'
     playServicesLibraryVersion = '11.4.2'
     dexmakerVersion = '1.2'
     mockitoVersion = '1.9.5'

From 30f95cdcac926313cb6840182d596b86cc7f3a03 Mon Sep 17 00:00:00 2001
From: hdmoon <hdmoon@google.com>
Date: Fri, 27 Oct 2017 01:34:58 -0700
Subject: [PATCH 358/421] Remove shuffleMode(boolean) usages in ExoPlayer

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173645536
---
 .../ext/mediasession/DefaultPlaybackController.java         | 2 +-
 .../exoplayer2/ext/mediasession/MediaSessionConnector.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 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 dcb6f8ca107..1eb3ffd13d2 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
@@ -40,7 +40,7 @@ public class DefaultPlaybackController implements MediaSessionConnector.Playback
 
   private static final long BASE_ACTIONS = PlaybackStateCompat.ACTION_PLAY_PAUSE
       | PlaybackStateCompat.ACTION_PLAY | PlaybackStateCompat.ACTION_PAUSE
-      | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED
+      | PlaybackStateCompat.ACTION_STOP | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE
       | PlaybackStateCompat.ACTION_SET_REPEAT_MODE;
 
   protected final long rewindIncrementMs;
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 2781c020d09..aa007ea1d6e 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
@@ -152,7 +152,7 @@ public interface PlaybackController extends CommandReceiver {
         | 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_ENABLED;
+        | PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE;
 
     /**
      * Returns the actions which are supported by the controller. The supported actions must be a
@@ -161,7 +161,7 @@ public interface PlaybackController extends CommandReceiver {
      * {@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_ENABLED}.
+     * {@link PlaybackStateCompat#ACTION_SET_SHUFFLE_MODE}.
      *
      * @param player The player.
      * @return The bitmask of the supported media actions.
@@ -738,7 +738,7 @@ public void onStop() {
 
     @Override
     public void onSetShuffleMode(int shuffleMode) {
-      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE_ENABLED)) {
+      if (canDispatchToPlaybackController(PlaybackStateCompat.ACTION_SET_SHUFFLE_MODE)) {
         playbackController.onSetShuffleMode(player, shuffleMode);
       }
     }

From 345084b8feb3a6e49f35593564b3857eb5ae7cab Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 27 Oct 2017 03:15:44 -0700
Subject: [PATCH 359/421] Align naming across demo apps.

- Dropped class name prefixes that correspond to whole app name
- Anything that wraps the player is called PlayerManager

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173652288
---
 .../{CastDemoUtil.java => DemoUtil.java}       |  4 ++--
 .../exoplayer2/castdemo/MainActivity.java      |  6 +++---
 .../exoplayer2/castdemo/PlayerManager.java     | 18 +++++++++---------
 .../exoplayer2/imademo/MainActivity.java       |  6 +++---
 .../{DemoPlayer.java => PlayerManager.java}    |  4 ++--
 5 files changed, 19 insertions(+), 19 deletions(-)
 rename demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/{CastDemoUtil.java => DemoUtil.java} (97%)
 rename demos/ima/src/main/java/com/google/android/exoplayer2/imademo/{DemoPlayer.java => PlayerManager.java} (98%)

diff --git a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
similarity index 97%
rename from demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
rename to demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
index 68c5904362b..d36f8c319e4 100644
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/CastDemoUtil.java
+++ b/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
@@ -24,7 +24,7 @@
 /**
  * Utility methods and constants for the Cast demo application.
  */
-/* package */ final class CastDemoUtil {
+/* package */ final class DemoUtil {
 
   public static final String MIME_TYPE_DASH = "application/dash+xml";
   public static final String MIME_TYPE_HLS = "application/vnd.apple.mpegurl";
@@ -87,6 +87,6 @@ public String toString() {
 
   }
 
-  private CastDemoUtil() {}
+  private DemoUtil() {}
 
 }
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 2894bb8e5f1..094e9f9e6e4 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
@@ -91,10 +91,10 @@ public boolean dispatchKeyEvent(KeyEvent event) {
 
   // User controls.
 
-  private final class SampleListAdapter extends ArrayAdapter<CastDemoUtil.Sample> {
+  private final class SampleListAdapter extends ArrayAdapter<DemoUtil.Sample> {
 
     public SampleListAdapter() {
-      super(getApplicationContext(), android.R.layout.simple_list_item_1, CastDemoUtil.SAMPLES);
+      super(getApplicationContext(), android.R.layout.simple_list_item_1, DemoUtil.SAMPLES);
     }
 
     @Override
@@ -112,7 +112,7 @@ private class SampleClickListener implements AdapterView.OnItemClickListener {
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
       if (parent.getSelectedItemPosition() != position) {
-        CastDemoUtil.Sample currentSample = CastDemoUtil.SAMPLES.get(position);
+        DemoUtil.Sample currentSample = DemoUtil.SAMPLES.get(position);
         playerManager.setCurrentSample(currentSample, 0, true);
       }
     }
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 2538b031023..77dc018a73a 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
@@ -61,7 +61,7 @@
   private final CastPlayer castPlayer;
 
   private int playbackLocation;
-  private CastDemoUtil.Sample currentSample;
+  private DemoUtil.Sample currentSample;
 
   /**
    * @param exoPlayerView The {@link SimpleExoPlayerView} for local playback.
@@ -88,11 +88,11 @@ public PlayerManager(SimpleExoPlayerView exoPlayerView, PlaybackControlView cast
   /**
    * Starts playback of the given sample at the given position.
    *
-   * @param currentSample The {@link CastDemoUtil} to play.
+   * @param currentSample The {@link DemoUtil} to play.
    * @param positionMs The position at which playback should start.
    * @param playWhenReady Whether the player should proceed when ready to do so.
    */
-  public void setCurrentSample(CastDemoUtil.Sample currentSample, long positionMs,
+  public void setCurrentSample(DemoUtil.Sample currentSample, long positionMs,
       boolean playWhenReady) {
     this.currentSample = currentSample;
     if (playbackLocation == PLAYBACK_REMOTE) {
@@ -144,7 +144,7 @@ public void onCastSessionUnavailable() {
 
   // Internal methods.
 
-  private static MediaQueueItem buildMediaQueueItem(CastDemoUtil.Sample sample) {
+  private static MediaQueueItem buildMediaQueueItem(DemoUtil.Sample sample) {
     MediaMetadata movieMetadata = new MediaMetadata(MediaMetadata.MEDIA_TYPE_MOVIE);
     movieMetadata.putString(MediaMetadata.KEY_TITLE, sample.name);
     MediaInfo mediaInfo = new MediaInfo.Builder(sample.uri)
@@ -153,18 +153,18 @@ private static MediaQueueItem buildMediaQueueItem(CastDemoUtil.Sample sample) {
     return new MediaQueueItem.Builder(mediaInfo).build();
   }
 
-  private static MediaSource buildMediaSource(CastDemoUtil.Sample sample) {
+  private static MediaSource buildMediaSource(DemoUtil.Sample sample) {
     Uri uri = Uri.parse(sample.uri);
     switch (sample.mimeType) {
-      case CastDemoUtil.MIME_TYPE_SS:
+      case DemoUtil.MIME_TYPE_SS:
         return new SsMediaSource(uri, DATA_SOURCE_FACTORY,
             new DefaultSsChunkSource.Factory(DATA_SOURCE_FACTORY), null, null);
-      case CastDemoUtil.MIME_TYPE_DASH:
+      case DemoUtil.MIME_TYPE_DASH:
         return new DashMediaSource(uri, DATA_SOURCE_FACTORY,
             new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), null, null);
-      case CastDemoUtil.MIME_TYPE_HLS:
+      case DemoUtil.MIME_TYPE_HLS:
         return new HlsMediaSource(uri, DATA_SOURCE_FACTORY, null, null);
-      case CastDemoUtil.MIME_TYPE_VIDEO_MP4:
+      case DemoUtil.MIME_TYPE_VIDEO_MP4:
         return new ExtractorMediaSource(uri, DATA_SOURCE_FACTORY, new DefaultExtractorsFactory(),
             null, null);
       default: {
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
index b1e3a53694b..fb9cd05cd4a 100644
--- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/MainActivity.java
@@ -22,19 +22,19 @@
 
 /**
  * Main Activity for the IMA plugin demo. {@link ExoPlayer} objects are created by
- * {@link DemoPlayer}, which this class instantiates.
+ * {@link PlayerManager}, which this class instantiates.
  */
 public final class MainActivity extends Activity {
 
   private SimpleExoPlayerView playerView;
-  private DemoPlayer player;
+  private PlayerManager player;
 
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.main_activity);
     playerView = findViewById(R.id.player_view);
-    player = new DemoPlayer(this);
+    player = new PlayerManager(this);
   }
 
   @Override
diff --git a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
similarity index 98%
rename from demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
rename to demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
index 67d96d7f680..e11c840d123 100644
--- a/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/DemoPlayer.java
+++ b/demos/ima/src/main/java/com/google/android/exoplayer2/imademo/PlayerManager.java
@@ -40,14 +40,14 @@
 /**
  * Manages the {@link ExoPlayer}, the IMA plugin and all video playback.
  */
-/* package */ final class DemoPlayer {
+/* package */ final class PlayerManager {
 
   private final ImaAdsLoader adsLoader;
 
   private SimpleExoPlayer player;
   private long contentPosition;
 
-  public DemoPlayer(Context context) {
+  public PlayerManager(Context context) {
     String adTag = context.getString(R.string.ad_tag_url);
     adsLoader = new ImaAdsLoader(context, Uri.parse(adTag));
   }

From 4cf90e32233e135b550673af3b6f1bc2d5dfbb5b Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Fri, 27 Oct 2017 03:34:50 -0700
Subject: [PATCH 360/421] Fix listener in ImaAdsMediaSource.

As MediaSource listeners now return the MediaSource in on SourceInfoRefreshed,
we need to make sure that media sources wrapping another source don't just
forward the listener, but also provide a listener wrapper. This allows to
inject the wrapper source instance in the callback.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173653307
---
 .../exoplayer2/ext/ima/ImaAdsMediaSource.java        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 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 c3574c414bb..02aa4807a56 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
@@ -19,6 +19,7 @@
 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.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.ads.AdsMediaSource;
@@ -69,8 +70,15 @@ public ImaAdsMediaSource(MediaSource contentMediaSource, DataSource.Factory data
   }
 
   @Override
-  public void prepareSource(final ExoPlayer player, boolean isTopLevelSource, Listener listener) {
-    adsMediaSource.prepareSource(player, isTopLevelSource, listener);
+  public void prepareSource(final ExoPlayer player, boolean isTopLevelSource,
+      final Listener listener) {
+    adsMediaSource.prepareSource(player, false, new Listener() {
+      @Override
+      public void onSourceInfoRefreshed(MediaSource source, Timeline timeline,
+          @Nullable Object manifest) {
+        listener.onSourceInfoRefreshed(ImaAdsMediaSource.this, timeline, manifest);
+      }
+    });
   }
 
   @Override

From dd5905a9fba3e5f0005560581e53c0384e42e192 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 27 Oct 2017 07:33:34 -0700
Subject: [PATCH 361/421] Don't query empty timeline for next/previous windows

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173668909
---
 .../java/com/google/android/exoplayer2/ExoPlayerImpl.java | 8 ++++----
 .../main/java/com/google/android/exoplayer2/Timeline.java | 2 +-
 2 files changed, 5 insertions(+), 5 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 57fc421bc65..7f9b25b6067 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
@@ -331,14 +331,14 @@ public int getCurrentWindowIndex() {
 
   @Override
   public int getNextWindowIndex() {
-    return timeline.getNextWindowIndex(getCurrentWindowIndex(), getRepeatMode(),
-        getShuffleModeEnabled());
+    return timeline.isEmpty() ? C.INDEX_UNSET
+        : timeline.getNextWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
   }
 
   @Override
   public int getPreviousWindowIndex() {
-    return timeline.getPreviousWindowIndex(getCurrentWindowIndex(), getRepeatMode(),
-        getShuffleModeEnabled());
+    return timeline.isEmpty() ? C.INDEX_UNSET
+        : timeline.getPreviousWindowIndex(getCurrentWindowIndex(), repeatMode, shuffleModeEnabled);
   }
 
   @Override
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 b83a99295a3..783278a1215 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
@@ -564,7 +564,7 @@ public int getNextWindowIndex(int windowIndex, @Player.RepeatMode int repeatMode
       boolean shuffleModeEnabled) {
     switch (repeatMode) {
       case Player.REPEAT_MODE_OFF:
-        return windowIndex == getLastWindowIndex(shuffleModeEnabled)  ? C.INDEX_UNSET
+        return windowIndex == getLastWindowIndex(shuffleModeEnabled) ? C.INDEX_UNSET
             : windowIndex + 1;
       case Player.REPEAT_MODE_ONE:
         return windowIndex;

From d02e1df4b42edaaaae171c0677730bec677fdc58 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 27 Oct 2017 19:22:59 +0100
Subject: [PATCH 362/421] Clean up VideoFrameReleaseTimeHelper

---
 .../video/VideoFrameReleaseTimeHelper.java    | 174 +++++++++---------
 1 file changed, 88 insertions(+), 86 deletions(-)

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 c5ca212a36b..9036b19a754 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
@@ -18,15 +18,16 @@
 import android.annotation.TargetApi;
 import android.content.Context;
 import android.hardware.display.DisplayManager;
-import android.os.Build;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.Message;
+import android.support.annotation.Nullable;
 import android.view.Choreographer;
 import android.view.Choreographer.FrameCallback;
 import android.view.Display;
 import android.view.WindowManager;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.util.Util;
 
 /**
  * Makes a best effort to adjust frame release timestamps for a smoother visual result.
@@ -34,20 +35,18 @@
 @TargetApi(16)
 public final class VideoFrameReleaseTimeHelper {
 
-  private static final double DISPLAY_REFRESH_RATE_UNKNOWN = -1;
   private static final long CHOREOGRAPHER_SAMPLE_DELAY_MILLIS = 500;
   private static final long MAX_ALLOWED_DRIFT_NS = 20000000;
 
   private static final long VSYNC_OFFSET_PERCENTAGE = 80;
   private static final int MIN_FRAMES_FOR_ADJUSTMENT = 6;
 
-  private Context context = null;
-
-  private final DefaultDisplayListener defaultDisplayListener;
+  private final WindowManager windowManager;
   private final VSyncSampler vsyncSampler;
-  private final boolean useDefaultDisplayVsync;
-  private long vsyncDurationNs = -1; // Value unused.
-  private long vsyncOffsetNs = -1; // Value unused.
+  private final DefaultDisplayListener displayListener;
+
+  private long vsyncDurationNs;
+  private long vsyncOffsetNs;
 
   private long lastFramePresentationTimeUs;
   private long adjustedLastFrameTimeNs;
@@ -63,10 +62,7 @@ public final class VideoFrameReleaseTimeHelper {
    * the default display's vsync signal.
    */
   public VideoFrameReleaseTimeHelper() {
-    defaultDisplayListener = null;
-    useDefaultDisplayVsync = false;
-    vsyncSampler = null;
-    context = null;
+    this(null);
   }
 
   /**
@@ -75,46 +71,48 @@ public VideoFrameReleaseTimeHelper() {
    *
    * @param context A context from which information about the default display can be retrieved.
    */
-  public VideoFrameReleaseTimeHelper(Context context) {
-    this.context = context.getApplicationContext();
-    defaultDisplayListener = Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ?
-     new DefaultDisplayListener(context) : null;
-    useDefaultDisplayVsync = true;
-    vsyncSampler = VSyncSampler.getInstance();
+  public VideoFrameReleaseTimeHelper(@Nullable Context context) {
+    windowManager = context == null ? null
+        : (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
+    if (windowManager != null) {
+      displayListener = Util.SDK_INT >= 17 ? maybeBuildDefaultDisplayListenerV17(context) : null;
+      vsyncSampler = VSyncSampler.getInstance();
+    } else {
+      displayListener = null;
+      vsyncSampler = null;
+    }
+    vsyncDurationNs = C.TIME_UNSET;
+    vsyncOffsetNs = C.TIME_UNSET;
   }
 
-
   /**
-   * Enables the helper.
+   * Enables the helper. Must be called from the playback thread.
    */
   public void enable() {
     haveSync = false;
-    if (useDefaultDisplayVsync) {
+    if (windowManager != null) {
       vsyncSampler.addObserver();
-      setSync(getDefaultDisplayRefreshRate(context));
-      if (defaultDisplayListener != null)
-        defaultDisplayListener.register();
+      if (displayListener != null) {
+        displayListener.register();
+      }
+      updateDefaultDisplayRefreshRateParams();
     }
   }
 
   /**
-   * Disables the helper.
+   * Disables the helper. Must be called from the playback thread.
    */
   public void disable() {
-    if (useDefaultDisplayVsync) {
+    if (windowManager != null) {
+      if (displayListener != null) {
+        displayListener.unregister();
+      }
       vsyncSampler.removeObserver();
-      if (defaultDisplayListener != null)
-        defaultDisplayListener.unregister();
     }
   }
 
-  private void setSync(double defaultDisplayRefreshRate) {
-    vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
-    vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
-  }
-
   /**
-   * Adjusts a frame release timestamp.
+   * Adjusts a frame release timestamp. Must be called from the playback thread.
    *
    * @param framePresentationTimeUs The frame's presentation time, in microseconds.
    * @param unadjustedReleaseTimeNs The frame's unadjusted release time, in nanoseconds and in
@@ -167,25 +165,39 @@ public long adjustReleaseTime(long framePresentationTimeUs, long unadjustedRelea
       syncUnadjustedReleaseTimeNs = unadjustedReleaseTimeNs;
       frameCount = 0;
       haveSync = true;
-      onSynced();
     }
 
     lastFramePresentationTimeUs = framePresentationTimeUs;
     pendingAdjustedFrameTimeNs = adjustedFrameTimeNs;
 
-    if (vsyncSampler == null || vsyncSampler.sampledVsyncTimeNs == 0) {
+    if (vsyncSampler == null || vsyncDurationNs == C.TIME_UNSET) {
+      return adjustedReleaseTimeNs;
+    }
+    long sampledVsyncTimeNs = vsyncSampler.sampledVsyncTimeNs;
+    if (sampledVsyncTimeNs == C.TIME_UNSET) {
       return adjustedReleaseTimeNs;
     }
 
     // Find the timestamp of the closest vsync. This is the vsync that we're targeting.
-    long snappedTimeNs = closestVsync(adjustedReleaseTimeNs,
-        vsyncSampler.sampledVsyncTimeNs, vsyncDurationNs);
+    long snappedTimeNs = closestVsync(adjustedReleaseTimeNs, sampledVsyncTimeNs, vsyncDurationNs);
     // Apply an offset so that we release before the target vsync, but after the previous one.
     return snappedTimeNs - vsyncOffsetNs;
   }
 
-  protected void onSynced() {
-    // Do nothing.
+  @TargetApi(17)
+  private DefaultDisplayListener maybeBuildDefaultDisplayListenerV17(Context context) {
+    DisplayManager manager = (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE);
+    return manager == null ? null : new DefaultDisplayListener(manager);
+  }
+
+  private void updateDefaultDisplayRefreshRateParams() {
+    // Note: If we fail to update the parameters, we leave them set to their previous values.
+    Display defaultDisplay = windowManager.getDefaultDisplay();
+    if (defaultDisplay != null) {
+      double defaultDisplayRefreshRate = defaultDisplay.getRefreshRate();
+      vsyncDurationNs = (long) (C.NANOS_PER_SECOND / defaultDisplayRefreshRate);
+      vsyncOffsetNs = (vsyncDurationNs * VSYNC_OFFSET_PERCENTAGE) / 100;
+    }
   }
 
   private boolean isDriftTooLarge(long frameTimeNs, long releaseTimeNs) {
@@ -211,10 +223,40 @@ private static long closestVsync(long releaseTime, long sampledVsyncTime, long v
     return snappedAfterDiff < snappedBeforeDiff ? snappedAfterNs : snappedBeforeNs;
   }
 
-  private static double getDefaultDisplayRefreshRate(Context context) {
-    WindowManager manager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-    return manager != null && manager.getDefaultDisplay() != null ?
-     manager.getDefaultDisplay().getRefreshRate() : DISPLAY_REFRESH_RATE_UNKNOWN;
+  @TargetApi(17)
+  private final class DefaultDisplayListener implements DisplayManager.DisplayListener {
+
+    private final DisplayManager displayManager;
+
+    public DefaultDisplayListener(DisplayManager displayManager) {
+      this.displayManager = displayManager;
+    }
+
+    public void register() {
+      displayManager.registerDisplayListener(this, null);
+    }
+
+    public void unregister() {
+      displayManager.unregisterDisplayListener(this);
+    }
+
+    @Override
+    public void onDisplayAdded(int displayId) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onDisplayRemoved(int displayId) {
+      // Do nothing.
+    }
+
+    @Override
+    public void onDisplayChanged(int displayId) {
+      if (displayId == Display.DEFAULT_DISPLAY) {
+        updateDefaultDisplayRefreshRateParams();
+      }
+    }
+
   }
 
   /**
@@ -242,6 +284,7 @@ public static VSyncSampler getInstance() {
     }
 
     private VSyncSampler() {
+      sampledVsyncTimeNs = C.TIME_UNSET;
       choreographerOwnerThread = new HandlerThread("ChoreographerOwner:Handler");
       choreographerOwnerThread.start();
       handler = new Handler(choreographerOwnerThread.getLooper(), this);
@@ -306,48 +349,7 @@ private void removeObserverInternal() {
       observerCount--;
       if (observerCount == 0) {
         choreographer.removeFrameCallback(this);
-        sampledVsyncTimeNs = 0;
-      }
-    }
-
-  }
-
-  @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
-  private class DefaultDisplayListener implements DisplayManager.DisplayListener {
-
-    private final Context context;
-    private final DisplayManager displayManager;
-
-    DefaultDisplayListener(Context context) {
-      this.context = context;
-      displayManager = context != null ?
-       (DisplayManager) context.getSystemService(Context.DISPLAY_SERVICE) : null;
-    }
-
-    @Override
-    public void onDisplayAdded(int displayId) {
-    }
-
-    @Override
-    public void onDisplayRemoved(int displayId) {
-    }
-
-    @Override
-    public void onDisplayChanged(int displayId) {
-      if (displayId == Display.DEFAULT_DISPLAY) {
-        setSync(getDefaultDisplayRefreshRate(context));
-      }
-    }
-
-    public void register() {
-      if (displayManager != null && context != null) { // context is used on callback
-        displayManager.registerDisplayListener(this, null);
-      }
-    }
-
-    public void unregister() {
-      if (displayManager != null) {
-        displayManager.unregisterDisplayListener(this);
+        sampledVsyncTimeNs = C.TIME_UNSET;
       }
     }
 

From 8c793184d908b387a3f6856cc518a4d0ccbaf3cf Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 30 Oct 2017 03:04:47 -0700
Subject: [PATCH 363/421] Fix crash when bad VTT timestamp encountered

Issue: #3396

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173868849
---
 .../assets/webvtt/typical_with_bad_timestamps      | 14 ++++++++++++++
 .../exoplayer2/text/webvtt/WebvttDecoderTest.java  | 12 ++++++++++++
 .../exoplayer2/text/webvtt/WebvttParserUtil.java   | 10 +++++++---
 3 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 library/core/src/androidTest/assets/webvtt/typical_with_bad_timestamps

diff --git a/library/core/src/androidTest/assets/webvtt/typical_with_bad_timestamps b/library/core/src/androidTest/assets/webvtt/typical_with_bad_timestamps
new file mode 100644
index 00000000000..bb70a9fa26a
--- /dev/null
+++ b/library/core/src/androidTest/assets/webvtt/typical_with_bad_timestamps
@@ -0,0 +1,14 @@
+WEBVTT # This comment is allowed
+
+# First timestamp is missing the 1/1000ths component, but parse anyway.
+00:00 --> 00:01.234
+This is the first subtitle.
+
+02.345 --> 00:03.456
+This is the second subtitle.
+
+0.0.0 --> 00:05.678
+This should be discarded (too many dots).
+
+00:06.789 --> not-a-timestamp
+This should be discarded (not a timestamp).
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
index e48a2b8b03b..7d3c06b42ea 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
@@ -36,6 +36,7 @@
 public class WebvttDecoderTest extends InstrumentationTestCase {
 
   private static final String TYPICAL_FILE = "webvtt/typical";
+  private static final String TYPICAL_WITH_BAD_TIMESTAMPS = "webvtt/typical_with_bad_timestamps";
   private static final String TYPICAL_WITH_IDS_FILE = "webvtt/typical_with_identifiers";
   private static final String TYPICAL_WITH_COMMENTS_FILE = "webvtt/typical_with_comments";
   private static final String WITH_POSITIONING_FILE = "webvtt/with_positioning";
@@ -67,6 +68,17 @@ public void testDecodeTypical() throws IOException, SubtitleDecoderException {
     assertCue(subtitle, 2, 2345000, 3456000, "This is the second subtitle.");
   }
 
+  public void testDecodeTypicalWithBadTimestamps() throws IOException, SubtitleDecoderException {
+    WebvttSubtitle subtitle = getSubtitleForTestAsset(TYPICAL_WITH_BAD_TIMESTAMPS);
+
+    // Test event count.
+    assertEquals(4, subtitle.getEventTimeCount());
+
+    // Test cues.
+    assertCue(subtitle, 0, 0, 1234000, "This is the first subtitle.");
+    assertCue(subtitle, 2, 2345000, 3456000, "This is the second subtitle.");
+  }
+
   public void testDecodeTypicalWithIds() throws IOException, SubtitleDecoderException {
     WebvttSubtitle subtitle = getSubtitleForTestAsset(TYPICAL_WITH_IDS_FILE);
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
index 4d0cd173044..d0c3eda494f 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
@@ -56,9 +56,13 @@ public static long parseTimestampUs(String timestamp) throws NumberFormatExcepti
     String[] parts = timestamp.split("\\.", 2);
     String[] subparts = parts[0].split(":");
     for (String subpart : subparts) {
-      value = value * 60 + Long.parseLong(subpart);
+      value = (value * 60) + Long.parseLong(subpart);
     }
-    return (value * 1000 + Long.parseLong(parts[1])) * 1000;
+    value *= 1000;
+    if (parts.length == 2) {
+      value += Long.parseLong(parts[1]);
+    }
+    return value * 1000;
   }
 
   /**
@@ -74,7 +78,7 @@ public static float parsePercentage(String s) throws NumberFormatException {
     }
     return Float.parseFloat(s.substring(0, s.length() - 1)) / 100;
   }
-  
+
   /**
    * Reads lines up to and including the next WebVTT cue header.
    *

From 8eee7c0d698f030feb612e62fe0776bd17f35922 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 30 Oct 2017 03:36:48 -0700
Subject: [PATCH 364/421] Remove apparently unused field

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173871144
---
 .../android/exoplayer2/source/dash/DashMediaPeriod.java     | 6 ++----
 1 file changed, 2 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 81b4a4ceedb..35f3c2e1294 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
@@ -64,7 +64,6 @@
   private CompositeSequenceableLoader sequenceableLoader;
   private DashManifest manifest;
   private int periodIndex;
-  private List<AdaptationSet> adaptationSets;
 
   public DashMediaPeriod(int id, DashManifest manifest, int periodIndex,
       DashChunkSource.Factory chunkSourceFactory,  int minLoadableRetryCount,
@@ -81,8 +80,8 @@ public DashMediaPeriod(int id, DashManifest manifest, int periodIndex,
     this.allocator = allocator;
     sampleStreams = newSampleStreamArray(0);
     sequenceableLoader = new CompositeSequenceableLoader(sampleStreams);
-    adaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
-    Pair<TrackGroupArray, TrackGroupInfo[]> result = buildTrackGroups(adaptationSets);
+    Pair<TrackGroupArray, TrackGroupInfo[]> result =
+        buildTrackGroups(manifest.getPeriod(periodIndex).adaptationSets);
     trackGroups = result.first;
     trackGroupInfos = result.second;
   }
@@ -90,7 +89,6 @@ public DashMediaPeriod(int id, DashManifest manifest, int periodIndex,
   public void updateManifest(DashManifest manifest, int periodIndex) {
     this.manifest = manifest;
     this.periodIndex = periodIndex;
-    adaptationSets = manifest.getPeriod(periodIndex).adaptationSets;
     if (sampleStreams != null) {
       for (ChunkSampleStream<DashChunkSource> sampleStream : sampleStreams) {
         sampleStream.getChunkSource().updateManifest(manifest, periodIndex);

From 9b9a294fd883b3c535f087b75836d42638ac63ab Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Mon, 30 Oct 2017 05:20:51 -0700
Subject: [PATCH 365/421] Fix javadoc @see for TrimmingAudioProcessor.

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

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 068a867f066..9ff1c158ddc 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
@@ -56,7 +56,7 @@ public TrimmingAudioProcessor() {
    *
    * @param trimStartSamples The number of audio samples to trim from the start of audio.
    * @param trimEndSamples The number of audio samples to trim from the end of audio.
-   * @see AudioSink#configure(String, int, int, int, int, int[], int, int)
+   * @see AudioSink#configure(int, int, int, int, int[], int, int)
    */
   public void setTrimSampleCount(int trimStartSamples, int trimEndSamples) {
     this.trimStartSamples = trimStartSamples;

From f150856567747be1f6995b36a40ca133e57efff0 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 30 Oct 2017 10:11:00 -0700
Subject: [PATCH 366/421] Fix masking step 1

1. Move Timeline/Manifest into PlaybackInfo
2. Don't update externally visible Timeline/Manifest during preparation
3. Ignore MSG_POSITION_DISCONTINUITY during preparation
4. Correctly set masking variables at start of preparation, and use them

Once this change goes in, PlaybackInfo will contain timeline, manifest
and position, which should always be self-consistent with one another.
The next step would then be to move a bunch of logic in ExoPlayerImpl
that derives state from timeline and position into PlaybackInfo, and
split that into its own top level class that can be easily tested to make
sure it never IndexOutOfBounds.

I think we could also replace the masking variables and instead just assign
a new PlaybackInfo to the playbackInfo variable whenever we're doing
something that requires masking. This should be possible because we no
longer update playbackInfo whenever we have pending acks. It would
require allowing PlaybackInfo to mask the window position internally when
the timeline is empty, but I think this is ok, and again is something we
could test pretty easily.

Issue: #3362

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=173909791
---
 .../android/exoplayer2/ExoPlayerTest.java     |   2 +-
 .../android/exoplayer2/ExoPlayerImpl.java     | 115 +++++++-----
 .../exoplayer2/ExoPlayerImplInternal.java     | 177 +++++++++---------
 3 files changed, 157 insertions(+), 137 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
index eb9dc6f9d8f..56d5f05d00f 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/ExoPlayerTest.java
@@ -56,7 +56,7 @@ public void testPlayEmptyTimeline() throws Exception {
         .setTimeline(timeline).setRenderers(renderer)
         .build().start().blockUntilEnded(TIMEOUT_MS);
     testRunner.assertPositionDiscontinuityCount(0);
-    testRunner.assertTimelinesEqual(timeline);
+    testRunner.assertTimelinesEqual();
     assertEquals(0, renderer.formatReadCount);
     assertEquals(0, renderer.bufferReadCount);
     assertFalse(renderer.isEnded);
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 7f9b25b6067..92f5d0c8446 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
@@ -22,7 +22,6 @@
 import android.support.annotation.Nullable;
 import android.util.Log;
 import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo;
-import com.google.android.exoplayer2.ExoPlayerImplInternal.SourceInfo;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -105,9 +104,9 @@ public void handleMessage(Message msg) {
         ExoPlayerImpl.this.handleEvent(msg);
       }
     };
-    playbackInfo = new ExoPlayerImplInternal.PlaybackInfo(0, 0);
+    playbackInfo = new ExoPlayerImplInternal.PlaybackInfo(timeline, manifest, 0, 0);
     internalPlayer = new ExoPlayerImplInternal(renderers, trackSelector, loadControl, playWhenReady,
-        repeatMode, shuffleModeEnabled, eventHandler, playbackInfo, this);
+        repeatMode, shuffleModeEnabled, eventHandler, this);
   }
 
   @Override
@@ -137,6 +136,15 @@ public void prepare(MediaSource mediaSource) {
 
   @Override
   public void prepare(MediaSource mediaSource, boolean resetPosition, boolean resetState) {
+    if (!resetPosition) {
+      maskingWindowIndex = getCurrentWindowIndex();
+      maskingPeriodIndex = getCurrentPeriodIndex();
+      maskingWindowPositionMs = getCurrentPosition();
+    } else {
+      maskingWindowIndex = 0;
+      maskingPeriodIndex = 0;
+      maskingWindowPositionMs = 0;
+    }
     if (resetState) {
       if (!timeline.isEmpty() || manifest != null) {
         timeline = Timeline.EMPTY;
@@ -263,6 +271,7 @@ public void seekTo(int windowIndex, long positionMs) {
       maskingPeriodIndex = periodIndex;
     }
     if (positionMs == C.TIME_UNSET) {
+      // TODO: Work out when to call onPositionDiscontinuity on listeners for this case.
       maskingWindowPositionMs = 0;
       internalPlayer.seekTo(timeline, windowIndex, C.TIME_UNSET);
     } else {
@@ -313,7 +322,7 @@ public void blockingSendMessages(ExoPlayerMessage... messages) {
 
   @Override
   public int getCurrentPeriodIndex() {
-    if (timeline.isEmpty() || pendingSeekAcks > 0) {
+    if (shouldMaskPosition()) {
       return maskingPeriodIndex;
     } else {
       return playbackInfo.periodId.periodIndex;
@@ -322,7 +331,7 @@ public int getCurrentPeriodIndex() {
 
   @Override
   public int getCurrentWindowIndex() {
-    if (timeline.isEmpty() || pendingSeekAcks > 0) {
+    if (shouldMaskPosition()) {
       return maskingWindowIndex;
     } else {
       return timeline.getPeriod(playbackInfo.periodId.periodIndex, period).windowIndex;
@@ -358,7 +367,7 @@ public long getDuration() {
 
   @Override
   public long getCurrentPosition() {
-    if (timeline.isEmpty() || pendingSeekAcks > 0) {
+    if (shouldMaskPosition()) {
       return maskingWindowPositionMs;
     } else {
       return playbackInfoPositionUsToWindowPositionMs(playbackInfo.positionUs);
@@ -368,7 +377,7 @@ public long getCurrentPosition() {
   @Override
   public long getBufferedPosition() {
     // TODO - Implement this properly.
-    if (timeline.isEmpty() || pendingSeekAcks > 0) {
+    if (shouldMaskPosition()) {
       return maskingWindowPositionMs;
     } else {
       return playbackInfoPositionUsToWindowPositionMs(playbackInfo.bufferedPositionUs);
@@ -398,7 +407,7 @@ public boolean isCurrentWindowSeekable() {
 
   @Override
   public boolean isPlayingAd() {
-    return !timeline.isEmpty() && pendingSeekAcks == 0 && playbackInfo.periodId.isAd();
+    return !shouldMaskPosition() && playbackInfo.periodId.isAd();
   }
 
   @Override
@@ -469,28 +478,9 @@ public Object getCurrentManifest() {
         break;
       }
       case ExoPlayerImplInternal.MSG_SOURCE_INFO_REFRESHED: {
-        SourceInfo sourceInfo = (SourceInfo) msg.obj;
-        pendingPrepareAcks -= sourceInfo.prepareAcks;
-        pendingSeekAcks -= sourceInfo.seekAcks;
-        if (pendingPrepareAcks == 0) {
-          timeline = sourceInfo.timeline;
-          manifest = sourceInfo.manifest;
-          playbackInfo = sourceInfo.playbackInfo;
-          if (pendingSeekAcks == 0 && timeline.isEmpty()) {
-            // Update the masking variables, which are used when the timeline is empty.
-            maskingPeriodIndex = 0;
-            maskingWindowIndex = 0;
-            maskingWindowPositionMs = 0;
-          }
-          for (Player.EventListener listener : listeners) {
-            listener.onTimelineChanged(timeline, manifest);
-          }
-        }
-        if (pendingSeekAcks == 0 && sourceInfo.seekAcks > 0) {
-          for (Player.EventListener listener : listeners) {
-            listener.onSeekProcessed();
-          }
-        }
+        int prepareAcks = msg.arg1;
+        int seekAcks = msg.arg2;
+        handlePlaybackInfo((PlaybackInfo) msg.obj, prepareAcks, seekAcks, false);
         break;
       }
       case ExoPlayerImplInternal.MSG_TRACKS_CHANGED: {
@@ -507,30 +497,12 @@ public Object getCurrentManifest() {
         break;
       }
       case ExoPlayerImplInternal.MSG_SEEK_ACK: {
-        if (--pendingSeekAcks == 0) {
-          playbackInfo = (ExoPlayerImplInternal.PlaybackInfo) msg.obj;
-          if (timeline.isEmpty()) {
-            // Update the masking variables, which are used when the timeline is empty.
-            maskingPeriodIndex = 0;
-            maskingWindowIndex = 0;
-            maskingWindowPositionMs = 0;
-          }
-          for (Player.EventListener listener : listeners) {
-            if (msg.arg1 != 0) {
-              listener.onPositionDiscontinuity(DISCONTINUITY_REASON_INTERNAL);
-            }
-            listener.onSeekProcessed();
-          }
-        }
+        boolean seekPositionAdjusted = msg.arg1 != 0;
+        handlePlaybackInfo((PlaybackInfo) msg.obj, 0, 1, seekPositionAdjusted);
         break;
       }
       case ExoPlayerImplInternal.MSG_POSITION_DISCONTINUITY: {
-        if (pendingSeekAcks == 0) {
-          playbackInfo = (ExoPlayerImplInternal.PlaybackInfo) msg.obj;
-          for (Player.EventListener listener : listeners) {
-            listener.onPositionDiscontinuity(DISCONTINUITY_REASON_PERIOD_TRANSITION);
-          }
-        }
+        handlePlaybackInfo((PlaybackInfo) msg.obj, 0, 0, true);
         break;
       }
       case ExoPlayerImplInternal.MSG_PLAYBACK_PARAMETERS_CHANGED: {
@@ -555,6 +527,43 @@ public Object getCurrentManifest() {
     }
   }
 
+  private void handlePlaybackInfo(PlaybackInfo playbackInfo, int prepareAcks, int seekAcks,
+      boolean positionDiscontinuity) {
+    Assertions.checkNotNull(playbackInfo.timeline);
+    pendingPrepareAcks -= prepareAcks;
+    pendingSeekAcks -= seekAcks;
+    if (pendingPrepareAcks == 0 && pendingSeekAcks == 0) {
+      this.playbackInfo = playbackInfo;
+      boolean timelineOrManifestChanged = timeline != playbackInfo.timeline
+          || manifest != playbackInfo.manifest;
+      timeline = playbackInfo.timeline;
+      manifest = playbackInfo.manifest;
+      if (timeline.isEmpty()) {
+        // Update the masking variables, which are used when the timeline is empty.
+        maskingPeriodIndex = 0;
+        maskingWindowIndex = 0;
+        maskingWindowPositionMs = 0;
+      }
+      if (timelineOrManifestChanged) {
+        for (Player.EventListener listener : listeners) {
+          listener.onTimelineChanged(timeline, manifest);
+        }
+      }
+      if (positionDiscontinuity) {
+        for (Player.EventListener listener : listeners) {
+          listener.onPositionDiscontinuity(
+              seekAcks > 0 ? DISCONTINUITY_REASON_INTERNAL : DISCONTINUITY_REASON_PERIOD_TRANSITION
+          );
+        }
+      }
+    }
+    if (pendingSeekAcks == 0 && seekAcks > 0) {
+      for (Player.EventListener listener : listeners) {
+        listener.onSeekProcessed();
+      }
+    }
+  }
+
   private long playbackInfoPositionUsToWindowPositionMs(long positionUs) {
     long positionMs = C.usToMs(positionUs);
     if (!playbackInfo.periodId.isAd()) {
@@ -564,4 +573,8 @@ private long playbackInfoPositionUsToWindowPositionMs(long positionUs) {
     return positionMs;
   }
 
+  private boolean shouldMaskPosition() {
+    return timeline.isEmpty() || pendingSeekAcks > 0 || pendingPrepareAcks > 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 a9a289d597d..fec3b3c65a0 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
@@ -54,6 +54,8 @@
    */
   public static final class PlaybackInfo {
 
+    public final Timeline timeline;
+    public final Object manifest;
     public final MediaPeriodId periodId;
     public final long startPositionUs;
     public final long contentPositionUs;
@@ -61,15 +63,14 @@ public static final class PlaybackInfo {
     public volatile long positionUs;
     public volatile long bufferedPositionUs;
 
-    public PlaybackInfo(int periodIndex, long startPositionUs) {
-      this(new MediaPeriodId(periodIndex), startPositionUs);
-    }
-
-    public PlaybackInfo(MediaPeriodId periodId, long startPositionUs) {
-      this(periodId, startPositionUs, C.TIME_UNSET);
+    public PlaybackInfo(Timeline timeline, Object manifest, int periodIndex, long startPositionUs) {
+      this(timeline, manifest, new MediaPeriodId(periodIndex), startPositionUs, C.TIME_UNSET);
     }
 
-    public PlaybackInfo(MediaPeriodId periodId, long startPositionUs, long contentPositionUs) {
+    public PlaybackInfo(Timeline timeline, Object manifest, MediaPeriodId periodId,
+        long startPositionUs, long contentPositionUs) {
+      this.timeline = timeline;
+      this.manifest = manifest;
       this.periodId = periodId;
       this.startPositionUs = startPositionUs;
       this.contentPositionUs = contentPositionUs;
@@ -77,31 +78,33 @@ public PlaybackInfo(MediaPeriodId periodId, long startPositionUs, long contentPo
       bufferedPositionUs = startPositionUs;
     }
 
-    public PlaybackInfo copyWithPeriodIndex(int periodIndex) {
-      PlaybackInfo playbackInfo = new PlaybackInfo(periodId.copyWithPeriodIndex(periodIndex),
-          startPositionUs, contentPositionUs);
-      playbackInfo.positionUs = positionUs;
-      playbackInfo.bufferedPositionUs = bufferedPositionUs;
-      return playbackInfo;
+    public PlaybackInfo fromNewPosition(int periodIndex, long startPositionUs,
+        long contentPositionUs) {
+      return fromNewPosition(new MediaPeriodId(periodIndex), startPositionUs, contentPositionUs);
     }
 
-  }
+    public PlaybackInfo fromNewPosition(MediaPeriodId periodId, long startPositionUs,
+        long contentPositionUs) {
+      return new PlaybackInfo(timeline, manifest, periodId, startPositionUs, contentPositionUs);
+    }
 
-  public static final class SourceInfo {
+    public PlaybackInfo copyWithPeriodIndex(int periodIndex) {
+      PlaybackInfo playbackInfo = new PlaybackInfo(timeline, manifest,
+          periodId.copyWithPeriodIndex(periodIndex), startPositionUs, contentPositionUs);
+      copyMutablePositions(this, playbackInfo);
+      return playbackInfo;
+    }
 
-    public final Timeline timeline;
-    public final Object manifest;
-    public final PlaybackInfo playbackInfo;
-    public final int prepareAcks;
-    public final int seekAcks;
+    public PlaybackInfo copyWithTimeline(Timeline timeline, Object manifest) {
+      PlaybackInfo playbackInfo = new PlaybackInfo(timeline, manifest, periodId, startPositionUs,
+          contentPositionUs);
+      copyMutablePositions(this, playbackInfo);
+      return playbackInfo;
+    }
 
-    public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
-        int prepareAcks, int seekAcks) {
-      this.timeline = timeline;
-      this.manifest = manifest;
-      this.playbackInfo = playbackInfo;
-      this.prepareAcks = prepareAcks;
-      this.seekAcks = seekAcks;
+    private static void copyMutablePositions(PlaybackInfo from, PlaybackInfo to) {
+      to.positionUs = from.positionUs;
+      to.bufferedPositionUs = from.bufferedPositionUs;
     }
 
   }
@@ -192,12 +195,9 @@ public SourceInfo(Timeline timeline, Object manifest, PlaybackInfo playbackInfo,
   private MediaPeriodHolder readingPeriodHolder;
   private MediaPeriodHolder playingPeriodHolder;
 
-  private Timeline timeline;
-
   public ExoPlayerImplInternal(Renderer[] renderers, TrackSelector trackSelector,
       LoadControl loadControl, boolean playWhenReady, @Player.RepeatMode int repeatMode,
-      boolean shuffleModeEnabled, Handler eventHandler, PlaybackInfo playbackInfo,
-      ExoPlayer player) {
+      boolean shuffleModeEnabled, Handler eventHandler, ExoPlayer player) {
     this.renderers = renderers;
     this.trackSelector = trackSelector;
     this.loadControl = loadControl;
@@ -206,9 +206,9 @@ public ExoPlayerImplInternal(Renderer[] renderers, TrackSelector trackSelector,
     this.shuffleModeEnabled = shuffleModeEnabled;
     this.eventHandler = eventHandler;
     this.state = Player.STATE_IDLE;
-    this.playbackInfo = playbackInfo;
     this.player = player;
 
+    playbackInfo = new PlaybackInfo(null, null, 0, C.TIME_UNSET);
     rendererCapabilities = new RendererCapabilities[renderers.length];
     for (int i = 0; i < renderers.length; i++) {
       renderers[i].setIndex(i);
@@ -446,10 +446,10 @@ private void prepareInternal(MediaSource mediaSource, boolean resetPosition) {
     resetInternal(true);
     loadControl.onPrepared();
     if (resetPosition) {
-      playbackInfo = new PlaybackInfo(0, C.TIME_UNSET);
+      playbackInfo = new PlaybackInfo(null, null, 0, C.TIME_UNSET);
     } else {
       // The new start position is the current playback position.
-      playbackInfo = new PlaybackInfo(playbackInfo.periodId, playbackInfo.positionUs,
+      playbackInfo = new PlaybackInfo(null, null, playbackInfo.periodId, playbackInfo.positionUs,
           playbackInfo.contentPositionUs);
     }
     this.mediaSource = mediaSource;
@@ -496,8 +496,9 @@ private void validateExistingPeriodHolders() throws ExoPlaybackException {
       return;
     }
     while (true) {
-      int nextPeriodIndex = timeline.getNextPeriodIndex(lastValidPeriodHolder.info.id.periodIndex,
-          period, window, repeatMode, shuffleModeEnabled);
+      int nextPeriodIndex = playbackInfo.timeline.getNextPeriodIndex(
+          lastValidPeriodHolder.info.id.periodIndex, period, window, repeatMode,
+          shuffleModeEnabled);
       while (lastValidPeriodHolder.next != null
           && !lastValidPeriodHolder.info.isLastInTimelinePeriod) {
         lastValidPeriodHolder = lastValidPeriodHolder.next;
@@ -534,7 +535,8 @@ private void validateExistingPeriodHolders() throws ExoPlaybackException {
       // position of the playing period to make sure none of the removed period is played.
       MediaPeriodId periodId = playingPeriodHolder.info.id;
       long newPositionUs = seekToPeriodPosition(periodId, playbackInfo.positionUs);
-      playbackInfo = new PlaybackInfo(periodId, newPositionUs, playbackInfo.contentPositionUs);
+      playbackInfo = playbackInfo.fromNewPosition(periodId, newPositionUs,
+          playbackInfo.contentPositionUs);
     }
   }
 
@@ -696,6 +698,7 @@ private void scheduleNextWork(long thisOperationStartTimeMs, long intervalMs) {
   }
 
   private void seekToInternal(SeekPosition seekPosition) throws ExoPlaybackException {
+    Timeline timeline = playbackInfo.timeline;
     if (timeline == null) {
       pendingInitialSeekCount++;
       pendingSeekPosition = seekPosition;
@@ -710,10 +713,10 @@ private void seekToInternal(SeekPosition seekPosition) throws ExoPlaybackExcepti
       // timeline has changed and a suitable seek position could not be resolved in the new one.
       // Set the internal position to (firstPeriodIndex,TIME_UNSET) so that a subsequent seek to
       // (firstPeriodIndex,0) isn't ignored.
-      playbackInfo = new PlaybackInfo(firstPeriodIndex, C.TIME_UNSET);
+      playbackInfo = playbackInfo.fromNewPosition(firstPeriodIndex, C.TIME_UNSET, C.TIME_UNSET);
       setState(Player.STATE_ENDED);
-      eventHandler.obtainMessage(MSG_SEEK_ACK, 1, 0, new PlaybackInfo(firstPeriodIndex, 0))
-          .sendToTarget();
+      eventHandler.obtainMessage(MSG_SEEK_ACK, 1, 0,
+          playbackInfo.fromNewPosition(firstPeriodIndex, 0, C.TIME_UNSET)).sendToTarget();
       // Reset, but retain the source so that it can still be used should a seek occur.
       resetInternal(false);
       return;
@@ -739,7 +742,7 @@ private void seekToInternal(SeekPosition seekPosition) throws ExoPlaybackExcepti
       seekPositionAdjusted |= periodPositionUs != newPeriodPositionUs;
       periodPositionUs = newPeriodPositionUs;
     } finally {
-      playbackInfo = new PlaybackInfo(periodId, periodPositionUs, contentPositionUs);
+      playbackInfo = playbackInfo.fromNewPosition(periodId, periodPositionUs, contentPositionUs);
       eventHandler.obtainMessage(MSG_SEEK_ACK, seekPositionAdjusted ? 1 : 0, 0, playbackInfo)
           .sendToTarget();
     }
@@ -809,7 +812,7 @@ && shouldKeepPeriodHolder(periodId, periodPositionUs, periodHolder)) {
   private boolean shouldKeepPeriodHolder(MediaPeriodId seekPeriodId, long positionUs,
       MediaPeriodHolder holder) {
     if (seekPeriodId.equals(holder.info.id) && holder.prepared) {
-      timeline.getPeriod(holder.info.id.periodIndex, period);
+      playbackInfo.timeline.getPeriod(holder.info.id.periodIndex, period);
       int nextAdGroupIndex = period.getAdGroupIndexAfterPositionUs(positionUs);
       if (nextAdGroupIndex == C.INDEX_UNSET
           || period.getAdGroupTimeUs(nextAdGroupIndex) == holder.info.endPositionUs) {
@@ -884,7 +887,7 @@ private void resetInternal(boolean releaseMediaSource) {
         mediaSource = null;
       }
       mediaPeriodInfoSequence.setTimeline(null);
-      timeline = null;
+      playbackInfo = playbackInfo.copyWithTimeline(null, null);
     }
   }
 
@@ -1024,10 +1027,11 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
       return;
     }
 
-    Timeline oldTimeline = timeline;
-    timeline = sourceRefreshInfo.timeline;
-    mediaPeriodInfoSequence.setTimeline(timeline);
+    Timeline oldTimeline = playbackInfo.timeline;
+    Timeline timeline = sourceRefreshInfo.timeline;
     Object manifest = sourceRefreshInfo.manifest;
+    mediaPeriodInfoSequence.setTimeline(timeline);
+    playbackInfo = playbackInfo.copyWithTimeline(timeline, manifest);
 
     if (oldTimeline == null) {
       int processedPrepareAcks = pendingPrepareCount;
@@ -1040,32 +1044,32 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
         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(manifest, processedPrepareAcks,
-              processedInitialSeekCount);
+          handleSourceInfoRefreshEndedPlayback(processedPrepareAcks, processedInitialSeekCount);
         } else {
           int periodIndex = periodPosition.first;
           long positionUs = periodPosition.second;
           MediaPeriodId periodId =
               mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex, positionUs);
-          playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : positionUs, positionUs);
-          notifySourceInfoRefresh(manifest, processedPrepareAcks, processedInitialSeekCount);
+          playbackInfo = playbackInfo.fromNewPosition(periodId, periodId.isAd() ? 0 : positionUs,
+              positionUs);
+          notifySourceInfoRefresh(processedPrepareAcks, processedInitialSeekCount);
         }
       } else if (playbackInfo.startPositionUs == C.TIME_UNSET) {
         if (timeline.isEmpty()) {
-          handleSourceInfoRefreshEndedPlayback(manifest, processedPrepareAcks, 0);
+          handleSourceInfoRefreshEndedPlayback(processedPrepareAcks, 0);
         } else {
-          Pair<Integer, Long> defaultPosition = getPeriodPosition(
+          Pair<Integer, Long> defaultPosition = getPeriodPosition(timeline,
               timeline.getFirstWindowIndex(shuffleModeEnabled), C.TIME_UNSET);
           int periodIndex = defaultPosition.first;
           long startPositionUs = defaultPosition.second;
           MediaPeriodId periodId = mediaPeriodInfoSequence.resolvePeriodPositionForAds(periodIndex,
               startPositionUs);
-          playbackInfo = new PlaybackInfo(periodId, periodId.isAd() ? 0 : startPositionUs,
-              startPositionUs);
-          notifySourceInfoRefresh(manifest, processedPrepareAcks, 0);
+          playbackInfo = playbackInfo.fromNewPosition(periodId,
+              periodId.isAd() ? 0 : startPositionUs, startPositionUs);
+          notifySourceInfoRefresh(processedPrepareAcks, 0);
         }
       } else {
-        notifySourceInfoRefresh(manifest, processedPrepareAcks, 0);
+        notifySourceInfoRefresh(processedPrepareAcks, 0);
       }
       return;
     }
@@ -1074,7 +1078,7 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
     MediaPeriodHolder periodHolder = playingPeriodHolder != null ? playingPeriodHolder
         : loadingPeriodHolder;
     if (periodHolder == null && playingPeriodIndex >= oldTimeline.getPeriodCount()) {
-      notifySourceInfoRefresh(manifest);
+      notifySourceInfoRefresh();
       return;
     }
     Object playingPeriodUid = periodHolder == null
@@ -1086,11 +1090,11 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
       int newPeriodIndex = resolveSubsequentPeriod(playingPeriodIndex, oldTimeline, timeline);
       if (newPeriodIndex == C.INDEX_UNSET) {
         // We failed to resolve a suitable restart position.
-        handleSourceInfoRefreshEndedPlayback(manifest);
+        handleSourceInfoRefreshEndedPlayback();
         return;
       }
       // We resolved a subsequent period. Seek to the default position in the corresponding window.
-      Pair<Integer, Long> defaultPosition = getPeriodPosition(
+      Pair<Integer, Long> defaultPosition = getPeriodPosition(timeline,
           timeline.getPeriod(newPeriodIndex, period).windowIndex, C.TIME_UNSET);
       newPeriodIndex = defaultPosition.first;
       long newPositionUs = defaultPosition.second;
@@ -1113,8 +1117,8 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
       // Actually do the seek.
       MediaPeriodId periodId = new MediaPeriodId(newPeriodIndex);
       newPositionUs = seekToPeriodPosition(periodId, newPositionUs);
-      playbackInfo = new PlaybackInfo(periodId, newPositionUs);
-      notifySourceInfoRefresh(manifest);
+      playbackInfo = playbackInfo.fromNewPosition(periodId, newPositionUs, C.TIME_UNSET);
+      notifySourceInfoRefresh();
       return;
     }
 
@@ -1130,15 +1134,15 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
       if (!periodId.isAd() || periodId.adIndexInAdGroup != playbackInfo.periodId.adIndexInAdGroup) {
         long newPositionUs = seekToPeriodPosition(periodId, playbackInfo.contentPositionUs);
         long contentPositionUs = periodId.isAd() ? playbackInfo.contentPositionUs : C.TIME_UNSET;
-        playbackInfo = new PlaybackInfo(periodId, newPositionUs, contentPositionUs);
-        notifySourceInfoRefresh(manifest);
+        playbackInfo = playbackInfo.fromNewPosition(periodId, newPositionUs, contentPositionUs);
+        notifySourceInfoRefresh();
         return;
       }
     }
 
     if (periodHolder == null) {
       // We don't have any period holders, so we're done.
-      notifySourceInfoRefresh(manifest);
+      notifySourceInfoRefresh();
       return;
     }
 
@@ -1163,7 +1167,7 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
           // position of the playing period to make sure none of the removed period is played.
           long newPositionUs =
               seekToPeriodPosition(playingPeriodHolder.info.id, playbackInfo.positionUs);
-          playbackInfo = new PlaybackInfo(playingPeriodHolder.info.id, newPositionUs,
+          playbackInfo = playbackInfo.fromNewPosition(playingPeriodHolder.info.id, newPositionUs,
               playbackInfo.contentPositionUs);
         } else {
           // Update the loading period to be the last period that's still valid, and release all
@@ -1177,7 +1181,7 @@ private void handleSourceInfoRefreshed(MediaSourceRefreshInfo sourceRefreshInfo)
       }
     }
 
-    notifySourceInfoRefresh(manifest);
+    notifySourceInfoRefresh();
   }
 
   private MediaPeriodHolder updatePeriodInfo(MediaPeriodHolder periodHolder, int periodIndex) {
@@ -1191,36 +1195,36 @@ private MediaPeriodHolder updatePeriodInfo(MediaPeriodHolder periodHolder, int p
     }
   }
 
-  private void handleSourceInfoRefreshEndedPlayback(Object manifest) {
-    handleSourceInfoRefreshEndedPlayback(manifest, 0, 0);
+  private void handleSourceInfoRefreshEndedPlayback() {
+    handleSourceInfoRefreshEndedPlayback(0, 0);
   }
 
-  private void handleSourceInfoRefreshEndedPlayback(Object manifest, int prepareAcks,
-      int seekAcks) {
+  private void handleSourceInfoRefreshEndedPlayback(int prepareAcks, int seekAcks) {
+    Timeline timeline = playbackInfo.timeline;
     int firstPeriodIndex = timeline.isEmpty() ? 0 : timeline.getWindow(
         timeline.getFirstWindowIndex(shuffleModeEnabled), window).firstPeriodIndex;
     // Set the internal position to (firstPeriodIndex,TIME_UNSET) so that a subsequent seek to
     // (firstPeriodIndex,0) isn't ignored.
-    playbackInfo = new PlaybackInfo(firstPeriodIndex, C.TIME_UNSET);
+    playbackInfo = playbackInfo.fromNewPosition(firstPeriodIndex, C.TIME_UNSET, C.TIME_UNSET);
     setState(Player.STATE_ENDED);
     // Set the playback position to (firstPeriodIndex,0) for notifying the eventHandler.
-    notifySourceInfoRefresh(manifest, prepareAcks, seekAcks, new PlaybackInfo(firstPeriodIndex, 0));
+    notifySourceInfoRefresh(prepareAcks, seekAcks,
+        playbackInfo.fromNewPosition(firstPeriodIndex, 0, C.TIME_UNSET));
     // Reset, but retain the source so that it can still be used should a seek occur.
     resetInternal(false);
   }
 
-  private void notifySourceInfoRefresh(Object manifest) {
-    notifySourceInfoRefresh(manifest, 0, 0);
+  private void notifySourceInfoRefresh() {
+    notifySourceInfoRefresh(0, 0);
   }
 
-  private void notifySourceInfoRefresh(Object manifest, int prepareAcks, int seekAcks) {
-    notifySourceInfoRefresh(manifest, prepareAcks, seekAcks, playbackInfo);
+  private void notifySourceInfoRefresh(int prepareAcks, int seekAcks) {
+    notifySourceInfoRefresh(prepareAcks, seekAcks, playbackInfo);
   }
 
-  private void notifySourceInfoRefresh(Object manifest, int prepareAcks, int seekAcks,
-      PlaybackInfo playbackInfo) {
-    eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED,
-        new SourceInfo(timeline, manifest, playbackInfo, prepareAcks, seekAcks)).sendToTarget();
+  private void notifySourceInfoRefresh(int prepareAcks, int seekAcks, PlaybackInfo playbackInfo) {
+    eventHandler.obtainMessage(MSG_SOURCE_INFO_REFRESHED, prepareAcks, seekAcks, playbackInfo)
+        .sendToTarget();
   }
 
   /**
@@ -1260,6 +1264,7 @@ private int resolveSubsequentPeriod(int oldPeriodIndex, Timeline oldTimeline,
    *     bounds of the timeline.
    */
   private Pair<Integer, Long> resolveSeekPosition(SeekPosition seekPosition) {
+    Timeline timeline = playbackInfo.timeline;
     Timeline seekTimeline = seekPosition.timeline;
     if (seekTimeline.isEmpty()) {
       // The application performed a blind seek without a non-empty timeline (most likely based on
@@ -1291,7 +1296,8 @@ private Pair<Integer, Long> resolveSeekPosition(SeekPosition seekPosition) {
     periodIndex = resolveSubsequentPeriod(periodPosition.first, seekTimeline, timeline);
     if (periodIndex != C.INDEX_UNSET) {
       // We found one. Map the SeekPosition onto the corresponding default position.
-      return getPeriodPosition(timeline.getPeriod(periodIndex, period).windowIndex, C.TIME_UNSET);
+      return getPeriodPosition(timeline, timeline.getPeriod(periodIndex, period).windowIndex,
+          C.TIME_UNSET);
     }
     // We didn't find one. Give up.
     return null;
@@ -1301,12 +1307,13 @@ private Pair<Integer, Long> resolveSeekPosition(SeekPosition seekPosition) {
    * Calls {@link Timeline#getPeriodPosition(Timeline.Window, Timeline.Period, int, long)} using the
    * current timeline.
    */
-  private Pair<Integer, Long> getPeriodPosition(int windowIndex, long windowPositionUs) {
+  private Pair<Integer, Long> getPeriodPosition(Timeline timeline, int windowIndex,
+      long windowPositionUs) {
     return timeline.getPeriodPosition(window, period, windowIndex, windowPositionUs);
   }
 
   private void updatePeriods() throws ExoPlaybackException, IOException {
-    if (timeline == null) {
+    if (playbackInfo.timeline == null) {
       // We're waiting to get information about periods.
       mediaSource.maybeThrowSourceInfoRefreshError();
       return;
@@ -1332,7 +1339,7 @@ private void updatePeriods() throws ExoPlaybackException, IOException {
       // the end of the playing period, so advance playback to the next period.
       playingPeriodHolder.release();
       setPlayingPeriodHolder(playingPeriodHolder.next);
-      playbackInfo = new PlaybackInfo(playingPeriodHolder.info.id,
+      playbackInfo = playbackInfo.fromNewPosition(playingPeriodHolder.info.id,
           playingPeriodHolder.info.startPositionUs, playingPeriodHolder.info.contentPositionUs);
       updatePlaybackPositions();
       eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();
@@ -1439,7 +1446,7 @@ private void maybeUpdateLoadingPeriod() throws IOException {
         ? RENDERER_TIMESTAMP_OFFSET_US
         : (loadingPeriodHolder.getRendererOffset() + loadingPeriodHolder.info.durationUs);
     int holderIndex = loadingPeriodHolder == null ? 0 : loadingPeriodHolder.index + 1;
-    Object uid = timeline.getPeriod(info.id.periodIndex, period, true).uid;
+    Object uid = playbackInfo.timeline.getPeriod(info.id.periodIndex, period, true).uid;
     MediaPeriodHolder newPeriodHolder = new MediaPeriodHolder(renderers, rendererCapabilities,
         rendererPositionOffsetUs, trackSelector, loadControl, mediaSource, uid, holderIndex, info);
     if (loadingPeriodHolder != null) {

From 199b983d42e0cf9c3f3eed68f286cd587cef27ca Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 31 Oct 2017 06:56:47 -0700
Subject: [PATCH 367/421] Split PlaybackInfo into its own file

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174030901
---
 .../android/exoplayer2/ExoPlayerImpl.java     | 44 +++++------
 .../exoplayer2/ExoPlayerImplInternal.java     | 61 ---------------
 .../exoplayer2/MediaPeriodInfoSequence.java   |  1 -
 .../android/exoplayer2/PlaybackInfo.java      | 78 +++++++++++++++++++
 4 files changed, 98 insertions(+), 86 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java

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 92f5d0c8446..d8c6184d3f3 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
@@ -21,7 +21,6 @@
 import android.os.Message;
 import android.support.annotation.Nullable;
 import android.util.Log;
-import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 import com.google.android.exoplayer2.source.TrackGroupArray;
@@ -57,8 +56,6 @@
   private int pendingSeekAcks;
   private int pendingPrepareAcks;
   private boolean isLoading;
-  private Timeline timeline;
-  private Object manifest;
   private TrackGroupArray trackGroups;
   private TrackSelectionArray trackSelections;
   private PlaybackParameters playbackParameters;
@@ -91,7 +88,6 @@ public ExoPlayerImpl(Renderer[] renderers, TrackSelector trackSelector, LoadCont
     this.playbackState = Player.STATE_IDLE;
     this.listeners = new CopyOnWriteArraySet<>();
     emptyTrackSelections = new TrackSelectionArray(new TrackSelection[renderers.length]);
-    timeline = Timeline.EMPTY;
     window = new Timeline.Window();
     period = new Timeline.Period();
     trackGroups = TrackGroupArray.EMPTY;
@@ -104,7 +100,7 @@ public void handleMessage(Message msg) {
         ExoPlayerImpl.this.handleEvent(msg);
       }
     };
-    playbackInfo = new ExoPlayerImplInternal.PlaybackInfo(timeline, manifest, 0, 0);
+    playbackInfo = new PlaybackInfo(Timeline.EMPTY, null, 0, 0);
     internalPlayer = new ExoPlayerImplInternal(renderers, trackSelector, loadControl, playWhenReady,
         repeatMode, shuffleModeEnabled, eventHandler, this);
   }
@@ -146,11 +142,10 @@ public void prepare(MediaSource mediaSource, boolean resetPosition, boolean rese
       maskingWindowPositionMs = 0;
     }
     if (resetState) {
-      if (!timeline.isEmpty() || manifest != null) {
-        timeline = Timeline.EMPTY;
-        manifest = null;
+      if (!playbackInfo.timeline.isEmpty() || playbackInfo.manifest != null) {
+        playbackInfo = playbackInfo.copyWithTimeline(Timeline.EMPTY, null);
         for (Player.EventListener listener : listeners) {
-          listener.onTimelineChanged(timeline, manifest);
+          listener.onTimelineChanged(playbackInfo.timeline, playbackInfo.manifest);
         }
       }
       if (tracksSelected) {
@@ -237,6 +232,7 @@ public void seekTo(long positionMs) {
 
   @Override
   public void seekTo(int windowIndex, long positionMs) {
+    Timeline timeline = playbackInfo.timeline;
     if (windowIndex < 0 || (!timeline.isEmpty() && windowIndex >= timeline.getWindowCount())) {
       throw new IllegalSeekPositionException(timeline, windowIndex, positionMs);
     }
@@ -334,24 +330,27 @@ public int getCurrentWindowIndex() {
     if (shouldMaskPosition()) {
       return maskingWindowIndex;
     } else {
-      return timeline.getPeriod(playbackInfo.periodId.periodIndex, period).windowIndex;
+      return playbackInfo.timeline.getPeriod(playbackInfo.periodId.periodIndex, period).windowIndex;
     }
   }
 
   @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() {
+    Timeline timeline = playbackInfo.timeline;
     if (timeline.isEmpty()) {
       return C.TIME_UNSET;
     }
@@ -386,9 +385,6 @@ public long getBufferedPosition() {
 
   @Override
   public int getBufferedPercentage() {
-    if (timeline.isEmpty()) {
-      return 0;
-    }
     long position = getBufferedPosition();
     long duration = getDuration();
     return position == C.TIME_UNSET || duration == C.TIME_UNSET ? 0
@@ -397,11 +393,13 @@ public int getBufferedPercentage() {
 
   @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;
   }
 
@@ -423,7 +421,7 @@ public int getCurrentAdIndexInAdGroup() {
   @Override
   public long getContentPosition() {
     if (isPlayingAd()) {
-      timeline.getPeriod(playbackInfo.periodId.periodIndex, period);
+      playbackInfo.timeline.getPeriod(playbackInfo.periodId.periodIndex, period);
       return period.getPositionInWindowMs() + C.usToMs(playbackInfo.contentPositionUs);
     } else {
       return getCurrentPosition();
@@ -452,12 +450,12 @@ public TrackSelectionArray getCurrentTrackSelections() {
 
   @Override
   public Timeline getCurrentTimeline() {
-    return timeline;
+    return playbackInfo.timeline;
   }
 
   @Override
   public Object getCurrentManifest() {
-    return manifest;
+    return playbackInfo.manifest;
   }
 
   // Not private so it can be called from an inner class without going through a thunk method.
@@ -533,12 +531,10 @@ private void handlePlaybackInfo(PlaybackInfo playbackInfo, int prepareAcks, int
     pendingPrepareAcks -= prepareAcks;
     pendingSeekAcks -= seekAcks;
     if (pendingPrepareAcks == 0 && pendingSeekAcks == 0) {
+      boolean timelineOrManifestChanged = this.playbackInfo.timeline != playbackInfo.timeline
+          || this.playbackInfo.manifest != playbackInfo.manifest;
       this.playbackInfo = playbackInfo;
-      boolean timelineOrManifestChanged = timeline != playbackInfo.timeline
-          || manifest != playbackInfo.manifest;
-      timeline = playbackInfo.timeline;
-      manifest = playbackInfo.manifest;
-      if (timeline.isEmpty()) {
+      if (playbackInfo.timeline.isEmpty()) {
         // Update the masking variables, which are used when the timeline is empty.
         maskingPeriodIndex = 0;
         maskingWindowIndex = 0;
@@ -546,7 +542,7 @@ private void handlePlaybackInfo(PlaybackInfo playbackInfo, int prepareAcks, int
       }
       if (timelineOrManifestChanged) {
         for (Player.EventListener listener : listeners) {
-          listener.onTimelineChanged(timeline, manifest);
+          listener.onTimelineChanged(playbackInfo.timeline, playbackInfo.manifest);
         }
       }
       if (positionDiscontinuity) {
@@ -567,14 +563,14 @@ private void handlePlaybackInfo(PlaybackInfo playbackInfo, int prepareAcks, int
   private long playbackInfoPositionUsToWindowPositionMs(long positionUs) {
     long positionMs = C.usToMs(positionUs);
     if (!playbackInfo.periodId.isAd()) {
-      timeline.getPeriod(playbackInfo.periodId.periodIndex, period);
+      playbackInfo.timeline.getPeriod(playbackInfo.periodId.periodIndex, period);
       positionMs += period.getPositionInWindowMs();
     }
     return positionMs;
   }
 
   private boolean shouldMaskPosition() {
-    return timeline.isEmpty() || pendingSeekAcks > 0 || pendingPrepareAcks > 0;
+    return playbackInfo.timeline.isEmpty() || pendingSeekAcks > 0 || pendingPrepareAcks > 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 fec3b3c65a0..b79f5c70a34 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
@@ -48,67 +48,6 @@
 /* package */ final class ExoPlayerImplInternal implements Handler.Callback,
     MediaPeriod.Callback, TrackSelector.InvalidationListener, MediaSource.Listener {
 
-  /**
-   * Playback position information which is read on the application's thread by
-   * {@link ExoPlayerImpl} and read/written internally on the player's thread.
-   */
-  public static final class PlaybackInfo {
-
-    public final Timeline timeline;
-    public final Object manifest;
-    public final MediaPeriodId periodId;
-    public final long startPositionUs;
-    public final long contentPositionUs;
-
-    public volatile long positionUs;
-    public volatile long bufferedPositionUs;
-
-    public PlaybackInfo(Timeline timeline, Object manifest, int periodIndex, long startPositionUs) {
-      this(timeline, manifest, new MediaPeriodId(periodIndex), startPositionUs, C.TIME_UNSET);
-    }
-
-    public PlaybackInfo(Timeline timeline, Object manifest, MediaPeriodId periodId,
-        long startPositionUs, long contentPositionUs) {
-      this.timeline = timeline;
-      this.manifest = manifest;
-      this.periodId = periodId;
-      this.startPositionUs = startPositionUs;
-      this.contentPositionUs = contentPositionUs;
-      positionUs = startPositionUs;
-      bufferedPositionUs = startPositionUs;
-    }
-
-    public PlaybackInfo fromNewPosition(int periodIndex, long startPositionUs,
-        long contentPositionUs) {
-      return fromNewPosition(new MediaPeriodId(periodIndex), startPositionUs, contentPositionUs);
-    }
-
-    public PlaybackInfo fromNewPosition(MediaPeriodId periodId, long startPositionUs,
-        long contentPositionUs) {
-      return new PlaybackInfo(timeline, manifest, periodId, startPositionUs, contentPositionUs);
-    }
-
-    public PlaybackInfo copyWithPeriodIndex(int periodIndex) {
-      PlaybackInfo playbackInfo = new PlaybackInfo(timeline, manifest,
-          periodId.copyWithPeriodIndex(periodIndex), startPositionUs, contentPositionUs);
-      copyMutablePositions(this, playbackInfo);
-      return playbackInfo;
-    }
-
-    public PlaybackInfo copyWithTimeline(Timeline timeline, Object manifest) {
-      PlaybackInfo playbackInfo = new PlaybackInfo(timeline, manifest, periodId, startPositionUs,
-          contentPositionUs);
-      copyMutablePositions(this, playbackInfo);
-      return playbackInfo;
-    }
-
-    private static void copyMutablePositions(PlaybackInfo from, PlaybackInfo to) {
-      to.positionUs = from.positionUs;
-      to.bufferedPositionUs = from.bufferedPositionUs;
-    }
-
-  }
-
   private static final String TAG = "ExoPlayerImplInternal";
 
   // External messages
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
index 6fd0d48e574..6cb76e54712 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/MediaPeriodInfoSequence.java
@@ -16,7 +16,6 @@
 package com.google.android.exoplayer2;
 
 import android.util.Pair;
-import com.google.android.exoplayer2.ExoPlayerImplInternal.PlaybackInfo;
 import com.google.android.exoplayer2.Player.RepeatMode;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
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
new file mode 100644
index 00000000000..a2ffa43c4b6
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/PlaybackInfo.java
@@ -0,0 +1,78 @@
+/*
+ * 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;
+
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
+
+/**
+ * Information about an ongoing playback.
+ */
+/* package */ final class PlaybackInfo {
+
+  public final Timeline timeline;
+  public final Object manifest;
+  public final MediaPeriodId periodId;
+  public final long startPositionUs;
+  public final long contentPositionUs;
+
+  public volatile long positionUs;
+  public volatile long bufferedPositionUs;
+
+  public PlaybackInfo(Timeline timeline, Object manifest, int periodIndex, long startPositionUs) {
+    this(timeline, manifest, new MediaPeriodId(periodIndex), startPositionUs, C.TIME_UNSET);
+  }
+
+  public PlaybackInfo(Timeline timeline, Object manifest, MediaPeriodId periodId,
+      long startPositionUs, long contentPositionUs) {
+    this.timeline = timeline;
+    this.manifest = manifest;
+    this.periodId = periodId;
+    this.startPositionUs = startPositionUs;
+    this.contentPositionUs = contentPositionUs;
+    positionUs = startPositionUs;
+    bufferedPositionUs = startPositionUs;
+  }
+
+  public PlaybackInfo fromNewPosition(int periodIndex, long startPositionUs,
+      long contentPositionUs) {
+    return fromNewPosition(new MediaPeriodId(periodIndex), startPositionUs, contentPositionUs);
+  }
+
+  public PlaybackInfo fromNewPosition(MediaPeriodId periodId, long startPositionUs,
+      long contentPositionUs) {
+    return new PlaybackInfo(timeline, manifest, periodId, startPositionUs, contentPositionUs);
+  }
+
+  public PlaybackInfo copyWithPeriodIndex(int periodIndex) {
+    PlaybackInfo playbackInfo = new PlaybackInfo(timeline, manifest,
+        periodId.copyWithPeriodIndex(periodIndex), startPositionUs, contentPositionUs);
+    copyMutablePositions(this, playbackInfo);
+    return playbackInfo;
+  }
+
+  public PlaybackInfo copyWithTimeline(Timeline timeline, Object manifest) {
+    PlaybackInfo playbackInfo = new PlaybackInfo(timeline, manifest, periodId, startPositionUs,
+        contentPositionUs);
+    copyMutablePositions(this, playbackInfo);
+    return playbackInfo;
+  }
+
+  private static void copyMutablePositions(PlaybackInfo from, PlaybackInfo to) {
+    to.positionUs = from.positionUs;
+    to.bufferedPositionUs = from.bufferedPositionUs;
+  }
+
+}

From 37d33f58af2889cc8b33b887b4e0ceb67e94ef1a Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Tue, 31 Oct 2017 08:01:57 -0700
Subject: [PATCH 368/421] Execute DownloadTask threads manually

Instead of using an Executor to run DownloadTasks creates and manages
threads internally.

Also added DownloadThread internal class to better separate the code
that doesn't run on the main thread.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174036872
---
 .../offline/DownloadManagerTest.java          | 99 +++++++++++++++----
 1 file changed, 80 insertions(+), 19 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index b835ea6a0e6..1c911981212 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -28,7 +28,6 @@
 import java.io.DataOutputStream;
 import java.io.File;
 import java.io.IOException;
-import java.util.concurrent.Executors;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 
@@ -54,7 +53,7 @@ public void setUp() throws Exception {
     actionFile = Util.createTempFile(getInstrumentation().getContext(), "ExoPlayerTest");
     downloadManager = new DownloadManager(
         new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY),
-        Executors.newCachedThreadPool(), actionFile.getAbsolutePath());
+        100, actionFile.getAbsolutePath());
 
     downloadFinishedCondition = new ConditionVariable();
     downloadManager.setListener(new TestDownloadListener());
@@ -120,24 +119,24 @@ public void testSameMediaMultipleActions() throws Throwable {
     removeAction1.post().assertDoesNotStart();
 
     // downloadAction2 finishes but it isn't enough to start removeAction1.
-    downloadAction2.finishAndAssertFinished();
+    downloadAction2.finish().assertCancelled();
     removeAction1.assertDoesNotStart();
     // downloadAction3 is post to DownloadManager but it waits for removeAction1 to finish.
     downloadAction3.post().assertDoesNotStart();
 
     // When downloadAction1 finishes, removeAction1 starts.
-    downloadAction1.finishAndAssertFinished();
+    downloadAction1.finish().assertCancelled();
     removeAction1.assertStarted();
     // downloadAction3 still waits removeAction1
     downloadAction3.assertDoesNotStart();
 
     // removeAction2 is posted. removeAction1 and downloadAction3 is canceled so removeAction2
     // starts immediately.
-    removeAction2.post().assertStarted().finishAndAssertFinished();
+    removeAction2.post().assertStarted().finish().assertEnded();
     blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
-  public void testMultipleWaitingAction() throws Throwable {
+  public void testMultipleRemoveActionWaitsLastCancelsAllOther() throws Throwable {
     FakeDownloadAction removeAction1 = createRemoveAction("media 1").ignoreInterrupts();
     FakeDownloadAction removeAction2 = createRemoveAction("media 1");
     FakeDownloadAction removeAction3 = createRemoveAction("media 1");
@@ -146,15 +145,70 @@ public void testMultipleWaitingAction() throws Throwable {
     removeAction2.post().assertDoesNotStart();
     removeAction3.post().assertDoesNotStart();
 
-    removeAction1.finishAndAssertFinished();
-    removeAction2.assertTaskState(DownloadTask.STATE_CANCELLED);
-    removeAction3.assertStarted().finishAndAssertFinished();
+    removeAction2.assertCancelled();
+
+    removeAction1.finish().assertCancelled();
+    removeAction3.assertStarted().finish().assertEnded();
+
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  public void testMultipleWaitingDownloadActionStartsInParallel() throws Throwable {
+    FakeDownloadAction removeAction = createRemoveAction("media 1").ignoreInterrupts();
+    FakeDownloadAction downloadAction1 = createDownloadAction("media 1");
+    FakeDownloadAction downloadAction2 = createDownloadAction("media 1");
+
+    removeAction.post().assertStarted();
+    downloadAction1.post().assertDoesNotStart();
+    downloadAction2.post().assertDoesNotStart();
+
+    removeAction.finish().assertEnded();
+    downloadAction1.assertStarted();
+    downloadAction2.assertStarted();
+    downloadAction1.finish().assertEnded();
+    downloadAction2.finish().assertEnded();
+
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  public void testDifferentMediaDownloadActionsPreserveOrder() throws Throwable {
+    FakeDownloadAction removeAction = createRemoveAction("media 1").ignoreInterrupts();
+    FakeDownloadAction downloadAction1 = createDownloadAction("media 1");
+    FakeDownloadAction downloadAction2 = createDownloadAction("media 2");
+
+    removeAction.post().assertStarted();
+    downloadAction1.post().assertDoesNotStart();
+    downloadAction2.post().assertDoesNotStart();
+
+    removeAction.finish().assertEnded();
+    downloadAction1.assertStarted();
+    downloadAction2.assertStarted();
+    downloadAction1.finish().assertEnded();
+    downloadAction2.finish().assertEnded();
+
+    blockUntilTasksCompleteAndThrowAnyDownloadError();
+  }
+
+  public void testDifferentMediaRemoveActionsDoNotPreserveOrder() throws Throwable {
+    FakeDownloadAction downloadAction = createDownloadAction("media 1").ignoreInterrupts();
+    FakeDownloadAction removeAction1 = createRemoveAction("media 1");
+    FakeDownloadAction removeAction2 = createRemoveAction("media 2");
+
+    downloadAction.post().assertStarted();
+    removeAction1.post().assertDoesNotStart();
+    removeAction2.post().assertStarted();
+
+    downloadAction.finish().assertCancelled();
+    removeAction2.finish().assertEnded();
+
+    removeAction1.assertStarted();
+    removeAction1.finish().assertEnded();
 
     blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   private void doTestActionRuns(FakeDownloadAction action) throws Throwable {
-    action.post().assertStarted().finishAndAssertFinished();
+    action.post().assertStarted().finish().assertEnded();
     blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
@@ -163,10 +217,10 @@ private void doTestActionsRunSequentially(FakeDownloadAction action1,
     action1.ignoreInterrupts().post().assertStarted();
     action2.post().assertDoesNotStart();
 
-    action1.finishAndAssertFinished();
+    action1.finish();
     action2.assertStarted();
 
-    action2.finishAndAssertFinished();
+    action2.finish().assertEnded();
     blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
@@ -174,8 +228,8 @@ private void doTestActionsRunInParallel(FakeDownloadAction action1,
       FakeDownloadAction action2) throws Throwable {
     action1.post().assertStarted();
     action2.post().assertStarted();
-    action1.finishAndAssertFinished();
-    action2.finishAndAssertFinished();
+    action1.finish().assertEnded();
+    action2.finish().assertEnded();
     blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
@@ -265,7 +319,7 @@ protected Downloader createDownloader(DownloaderConstructorHelper downloaderCons
       return downloader;
     }
 
-    private FakeDownloadAction post() throws DownloadException {
+    private FakeDownloadAction post() {
       downloadTask = downloadManager.handleAction(this);
       return this;
     }
@@ -277,20 +331,27 @@ private FakeDownloadAction assertDoesNotStart() {
 
     private FakeDownloadAction assertStarted() {
       assertTrue(downloader.started.block(ASSERT_TRUE_TIMEOUT));
-      assertTaskState(DownloadTask.STATE_STARTED);
+      assertState(DownloadTask.STATE_STARTED);
       return this;
     }
 
-    private FakeDownloadAction assertTaskState(@State int state) {
+    private FakeDownloadAction assertEnded() {
+      return assertState(DownloadTask.STATE_ENDED);
+    }
+
+    private FakeDownloadAction assertCancelled() {
+      return assertState(DownloadTask.STATE_CANCELED);
+    }
+
+    private FakeDownloadAction assertState(@State int state) {
       assertTrue(stateChanged.block(ASSERT_TRUE_TIMEOUT));
       stateChanged.close();
       assertEquals(state, downloadTask.getState());
       return this;
     }
 
-    private FakeDownloadAction finishAndAssertFinished() {
+    private FakeDownloadAction finish() {
       downloader.finish.open();
-      assertTaskState(DownloadTask.STATE_ENDED);
       return this;
     }
 

From 72b679166062019a03694d80d549a5f5bea052ee Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 31 Oct 2017 08:28:06 -0700
Subject: [PATCH 369/421] Use resolved position for masking when seeking to
 C.TIME_UNSET

Also fire onPositionDiscontinuity in this case

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174039483
---
 .../android/exoplayer2/ExoPlayerImpl.java     | 21 +++++++------------
 1 file changed, 8 insertions(+), 13 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 d8c6184d3f3..8ee8af59804 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
@@ -251,31 +251,26 @@ public void seekTo(int windowIndex, long positionMs) {
     pendingSeekAcks++;
     maskingWindowIndex = windowIndex;
     if (timeline.isEmpty()) {
+      maskingWindowPositionMs = positionMs == C.TIME_UNSET ? 0 : positionMs;
       maskingPeriodIndex = 0;
     } else {
       timeline.getWindow(windowIndex, window);
-      long resolvedPositionUs =
-          positionMs == C.TIME_UNSET ? window.getDefaultPositionUs() : C.msToUs(positionMs);
+      long windowPositionUs = positionMs == C.TIME_UNSET ? window.getDefaultPositionUs()
+          : C.msToUs(positionMs);
       int periodIndex = window.firstPeriodIndex;
-      long periodPositionUs = window.getPositionInFirstPeriodUs() + resolvedPositionUs;
+      long periodPositionUs = window.getPositionInFirstPeriodUs() + windowPositionUs;
       long periodDurationUs = timeline.getPeriod(periodIndex, period).getDurationUs();
       while (periodDurationUs != C.TIME_UNSET && periodPositionUs >= periodDurationUs
           && periodIndex < window.lastPeriodIndex) {
         periodPositionUs -= periodDurationUs;
         periodDurationUs = timeline.getPeriod(++periodIndex, period).getDurationUs();
       }
+      maskingWindowPositionMs = C.usToMs(windowPositionUs);
       maskingPeriodIndex = periodIndex;
     }
-    if (positionMs == C.TIME_UNSET) {
-      // TODO: Work out when to call onPositionDiscontinuity on listeners for this case.
-      maskingWindowPositionMs = 0;
-      internalPlayer.seekTo(timeline, windowIndex, C.TIME_UNSET);
-    } else {
-      maskingWindowPositionMs = positionMs;
-      internalPlayer.seekTo(timeline, windowIndex, C.msToUs(positionMs));
-      for (Player.EventListener listener : listeners) {
-        listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK);
-      }
+    internalPlayer.seekTo(timeline, windowIndex, C.msToUs(positionMs));
+    for (Player.EventListener listener : listeners) {
+      listener.onPositionDiscontinuity(DISCONTINUITY_REASON_SEEK);
     }
   }
 

From 46172ffd0f473e1ba7c80f75436371bfdddad965 Mon Sep 17 00:00:00 2001
From: falhassen <falhassen@google.com>
Date: Tue, 31 Oct 2017 12:30:25 -0700
Subject: [PATCH 370/421] Preserve original  on redirect with the set-cookie
 flow.

We need to make sure the original header is retained when we redirect.

I filed a request on Cronet to allow headers to be provided to the UrlRequest#followRedirect method:
https://bugs.chromium.org/p/chromium/issues/detail?id=779611

Until that API is changed, i.e., pulled into GMSCore, and most clients are using the version of GMSCore with the API change, we can stick with this approach.

FYI

Cronet generally uses the original headers on redirect:

http://[]

but modifies the headers for these special cases:

hhttp://[]

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174074572
---
 .../ext/cronet/CronetDataSourceTest.java      | 36 ++++++++++++++++++-
 .../ext/cronet/CronetDataSource.java          | 34 ++++++++++++------
 2 files changed, 58 insertions(+), 12 deletions(-)

diff --git a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
index 62b5fb261a7..4c6a42849fe 100644
--- a/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
+++ b/extensions/cronet/src/androidTest/java/com/google/android/exoplayer2/ext/cronet/CronetDataSourceTest.java
@@ -714,7 +714,7 @@ public void testRedirectParseAndAttachCookie_dataSourceDoesNotHandleSetCookie_fo
   }
 
   @Test
-  public void testRedirectParseAndAttachCookie_dataSourceHandlesSetCookie()
+  public void testRedirectParseAndAttachCookie_dataSourceHandlesSetCookie_andPreservesOriginalRequestHeaders()
       throws HttpDataSourceException {
     dataSourceUnderTest = spy(
         new CronetDataSource(
@@ -728,12 +728,46 @@ public void testRedirectParseAndAttachCookie_dataSourceHandlesSetCookie()
             mockClock,
             null,
             true));
+    dataSourceUnderTest.setRequestProperty("Content-Type", TEST_CONTENT_TYPE);
+
+    mockSingleRedirectSuccess();
+
+    testResponseHeader.put("Set-Cookie", "testcookie=testcookie; Path=/video");
+
+    dataSourceUnderTest.open(testDataSpec);
+    verify(mockUrlRequestBuilder).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequestBuilder, never()).addHeader(eq("Range"), any(String.class));
+    verify(mockUrlRequestBuilder, times(2)).addHeader("Content-Type", TEST_CONTENT_TYPE);
+    verify(mockUrlRequest, never()).followRedirect();
+    verify(mockUrlRequest, times(2)).start();
+  }
+
+  @Test
+  public void testRedirectParseAndAttachCookie_dataSourceHandlesSetCookie_andPreservesOriginalRequestHeadersIncludingByteRangeHeader()
+      throws HttpDataSourceException {
+    testDataSpec = new DataSpec(Uri.parse(TEST_URL), 1000, 5000, null);
+    dataSourceUnderTest = spy(
+        new CronetDataSource(
+            mockCronetEngine,
+            mockExecutor,
+            mockContentTypePredicate,
+            mockTransferListener,
+            TEST_CONNECT_TIMEOUT_MS,
+            TEST_READ_TIMEOUT_MS,
+            true, // resetTimeoutOnRedirects
+            mockClock,
+            null,
+            true));
+    dataSourceUnderTest.setRequestProperty("Content-Type", TEST_CONTENT_TYPE);
+
     mockSingleRedirectSuccess();
 
     testResponseHeader.put("Set-Cookie", "testcookie=testcookie; Path=/video");
 
     dataSourceUnderTest.open(testDataSpec);
     verify(mockUrlRequestBuilder).addHeader(eq("Cookie"), any(String.class));
+    verify(mockUrlRequestBuilder, times(2)).addHeader("Range", "bytes=1000-5999");
+    verify(mockUrlRequestBuilder, times(2)).addHeader("Content-Type", TEST_CONTENT_TYPE);
     verify(mockUrlRequest, never()).followRedirect();
     verify(mockUrlRequest, times(2)).start();
   }
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 546aba159d8..536155a70f8 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
@@ -263,7 +263,11 @@ public long open(DataSpec dataSpec) throws HttpDataSourceException {
     operation.close();
     resetConnectTimeout();
     currentDataSpec = dataSpec;
-    currentUrlRequest = buildRequest(dataSpec);
+    try {
+      currentUrlRequest = buildRequestBuilder(dataSpec).build();
+    } catch (IOException e) {
+      throw new OpenException(e, currentDataSpec, Status.IDLE);
+    }
     currentUrlRequest.start();
 
     try {
@@ -439,9 +443,18 @@ public synchronized void onRedirectReceived(UrlRequest request, UrlResponseInfo
     if (!handleSetCookieRequests || isEmpty(headers.get(SET_COOKIE))) {
       request.followRedirect();
     } else {
-      UrlRequest.Builder requestBuilder =
-          cronetEngine.newUrlRequestBuilder(newLocationUrl, /* callback= */ this, executor);
       currentUrlRequest.cancel();
+      DataSpec redirectUrlDataSpec = new DataSpec(Uri.parse(newLocationUrl),
+          currentDataSpec.postBody, currentDataSpec.absoluteStreamPosition,
+          currentDataSpec.position, currentDataSpec.length, currentDataSpec.key,
+          currentDataSpec.flags);
+      UrlRequest.Builder requestBuilder;
+      try {
+        requestBuilder = buildRequestBuilder(redirectUrlDataSpec);
+      } catch (IOException e) {
+        exception = e;
+        return;
+      }
       String cookieHeadersValue = parseCookies(headers.get(SET_COOKIE));
       attachCookies(requestBuilder, cookieHeadersValue);
       currentUrlRequest = requestBuilder.build();
@@ -494,7 +507,7 @@ public synchronized void onFailed(UrlRequest request, UrlResponseInfo info,
 
   // Internal methods.
 
-  private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
+  private UrlRequest.Builder buildRequestBuilder(DataSpec dataSpec) throws IOException {
     UrlRequest.Builder requestBuilder = cronetEngine.newUrlRequestBuilder(
         dataSpec.uri.toString(), this, executor).allowDirectExecutor();
     // Set the headers.
@@ -513,17 +526,16 @@ private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
       requestBuilder.addHeader(key, headerEntry.getValue());
     }
     if (dataSpec.postBody != null && dataSpec.postBody.length != 0 && !isContentTypeHeaderSet) {
-      throw new OpenException("POST request with non-empty body must set Content-Type", dataSpec,
-          Status.IDLE);
+      throw new IOException("POST request with non-empty body must set Content-Type");
     }
     // Set the Range header.
-    if (currentDataSpec.position != 0 || currentDataSpec.length != C.LENGTH_UNSET) {
+    if (dataSpec.position != 0 || dataSpec.length != C.LENGTH_UNSET) {
       StringBuilder rangeValue = new StringBuilder();
       rangeValue.append("bytes=");
-      rangeValue.append(currentDataSpec.position);
+      rangeValue.append(dataSpec.position);
       rangeValue.append("-");
-      if (currentDataSpec.length != C.LENGTH_UNSET) {
-        rangeValue.append(currentDataSpec.position + currentDataSpec.length - 1);
+      if (dataSpec.length != C.LENGTH_UNSET) {
+        rangeValue.append(dataSpec.position + dataSpec.length - 1);
       }
       requestBuilder.addHeader("Range", rangeValue.toString());
     }
@@ -541,7 +553,7 @@ private UrlRequest buildRequest(DataSpec dataSpec) throws OpenException {
             executor);
       }
     }
-    return requestBuilder.build();
+    return requestBuilder;
   }
 
   private boolean blockUntilConnectTimeout() throws InterruptedException {

From 8c424798c44cebf1a5feafa95de7d4fd34e7c1aa Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Wed, 1 Nov 2017 08:49:57 -0700
Subject: [PATCH 371/421] Fill manifest drm info with media files' pssh when
 needed

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174185407
---
 .../com/google/android/exoplayer2/Format.java | 43 +++++++++-
 .../drm/DefaultDrmSessionManager.java         | 17 ++--
 .../android/exoplayer2/drm/DrmInitData.java   | 41 +++++++--
 .../exoplayer2/drm/DrmSessionManager.java     |  4 +-
 .../dash/manifest/DashManifestParser.java     | 86 ++++++++++++-------
 5 files changed, 144 insertions(+), 47 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 ba68d6de338..4bd23e2cb6c 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
@@ -21,6 +21,7 @@
 import android.os.Parcel;
 import android.os.Parcelable;
 import com.google.android.exoplayer2.drm.DrmInitData;
+import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.metadata.Metadata;
 import com.google.android.exoplayer2.util.MimeTypes;
 import com.google.android.exoplayer2.util.Util;
@@ -464,8 +465,8 @@ public Format copyWithManifestFormatInfo(Format manifestFormat) {
     float frameRate = this.frameRate == NO_VALUE ? manifestFormat.frameRate : this.frameRate;
     @C.SelectionFlags int selectionFlags = this.selectionFlags |  manifestFormat.selectionFlags;
     String language = this.language == null ? manifestFormat.language : this.language;
-    DrmInitData drmInitData = manifestFormat.drmInitData != null ? manifestFormat.drmInitData
-        : this.drmInitData;
+    DrmInitData drmInitData = manifestFormat.drmInitData != null
+        ? getFilledManifestDrmData(manifestFormat.drmInitData) : this.drmInitData;
     return new Format(id, containerMimeType, sampleMimeType, codecs, bitrate, maxInputSize, width,
         height, frameRate, rotationDegrees, pixelWidthHeightRatio, projectionData, stereoMode,
         colorInfo, channelCount, sampleRate, pcmEncoding, encoderDelay, encoderPadding,
@@ -731,4 +732,42 @@ public Format[] newArray(int size) {
 
   };
 
+  private DrmInitData getFilledManifestDrmData(DrmInitData manifestDrmData) {
+    // All exposed SchemeDatas must include key request information.
+    ArrayList<SchemeData> exposedSchemeDatas = new ArrayList<>();
+    ArrayList<SchemeData> emptySchemeDatas = new ArrayList<>();
+    for (int i = 0; i < manifestDrmData.schemeDataCount; i++) {
+      SchemeData schemeData = manifestDrmData.get(i);
+      if (schemeData.hasData()) {
+        exposedSchemeDatas.add(schemeData);
+      } else /* needs initialization data filling */ {
+        emptySchemeDatas.add(schemeData);
+      }
+    }
+
+    if (emptySchemeDatas.isEmpty()) {
+      // Manifest DRM information is complete.
+      return manifestDrmData;
+    } else if (drmInitData == null) {
+      // The manifest DRM data needs filling but this format does not include enough information to
+      // do it. A subset of the manifest's scheme datas should not be exposed because a
+      // DrmSessionManager could decide it does not support the format, while the missing
+      // information comes in a format feed immediately after.
+      return null;
+    }
+
+    int needFillingCount = emptySchemeDatas.size();
+    for (int i = 0; i < drmInitData.schemeDataCount; i++) {
+      SchemeData mediaSchemeData = drmInitData.get(i);
+      for (int j = 0; j < needFillingCount; j++) {
+        if (mediaSchemeData.canReplace(emptySchemeDatas.get(j))) {
+          exposedSchemeDatas.add(mediaSchemeData);
+          break;
+        }
+      }
+    }
+    return exposedSchemeDatas.isEmpty() ? null : new DrmInitData(manifestDrmData.schemeType,
+        exposedSchemeDatas.toArray(new SchemeData[exposedSchemeDatas.size()]));
+  }
+
 }
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 2ec5040aef8..badacca9ac8 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
@@ -340,7 +340,7 @@ public void setMode(@Mode int mode, byte[] offlineLicenseKeySetId) {
 
   @Override
   public boolean canAcquireSession(@NonNull DrmInitData drmInitData) {
-    SchemeData schemeData = getSchemeData(drmInitData, uuid);
+    SchemeData schemeData = getSchemeData(drmInitData, uuid, true);
     if (schemeData == null) {
       // No data for this manager's scheme.
       return false;
@@ -371,7 +371,7 @@ public DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitDa
     byte[] initData = null;
     String mimeType = null;
     if (offlineLicenseKeySetId == null) {
-      SchemeData data = getSchemeData(drmInitData, uuid);
+      SchemeData data = getSchemeData(drmInitData, uuid, false);
       if (data == null) {
         final IllegalStateException error = new IllegalStateException(
             "Media does not support uuid: " + uuid);
@@ -467,15 +467,19 @@ public void onProvisionError(Exception error) {
    *
    * @param drmInitData The {@link DrmInitData} from which to extract the {@link SchemeData}.
    * @param uuid The UUID.
+   * @param allowMissingData Whether a {@link SchemeData} with null {@link SchemeData#data} may be
+   *     returned.
    * @return The extracted {@link SchemeData}, or null if no suitable data is present.
    */
-  private static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid) {
+  private static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid,
+      boolean allowMissingData) {
     // Look for matching scheme data (matching the Common PSSH box for ClearKey).
     List<SchemeData> matchingSchemeDatas = new ArrayList<>(drmInitData.schemeDataCount);
     for (int i = 0; i < drmInitData.schemeDataCount; i++) {
       SchemeData schemeData = drmInitData.get(i);
-      if (schemeData.matches(uuid)
-          || (C.CLEARKEY_UUID.equals(uuid) && schemeData.matches(C.COMMON_PSSH_UUID))) {
+      boolean uuidMatches = schemeData.matches(uuid)
+          || (C.CLEARKEY_UUID.equals(uuid) && schemeData.matches(C.COMMON_PSSH_UUID));
+      if (uuidMatches && (schemeData.data != null || allowMissingData)) {
         matchingSchemeDatas.add(schemeData);
       }
     }
@@ -488,7 +492,8 @@ private static SchemeData getSchemeData(DrmInitData drmInitData, UUID uuid) {
     if (C.WIDEVINE_UUID.equals(uuid)) {
       for (int i = 0; i < matchingSchemeDatas.size(); i++) {
         SchemeData matchingSchemeData = matchingSchemeDatas.get(i);
-        int version = PsshAtomUtil.parseVersion(matchingSchemeData.data);
+        int version = matchingSchemeData.hasData()
+            ? PsshAtomUtil.parseVersion(matchingSchemeData.data) : -1;
         if (Util.SDK_INT < 23 && version == 0) {
           return matchingSchemeData;
         } else if (Util.SDK_INT >= 23 && version == 1) {
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 703efcb452c..73b443dcecc 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
@@ -54,6 +54,14 @@ public DrmInitData(List<SchemeData> schemeDatas) {
     this(null, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
   }
 
+  /**
+   * @param schemeType See {@link #schemeType}.
+   * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
+   */
+  public DrmInitData(String schemeType, List<SchemeData> schemeDatas) {
+    this(schemeType, false, schemeDatas.toArray(new SchemeData[schemeDatas.size()]));
+  }
+
   /**
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
@@ -62,7 +70,7 @@ public DrmInitData(SchemeData... schemeDatas) {
   }
 
   /**
-   * @param schemeType The protection scheme type, or null if not applicable or unknown.
+   * @param schemeType See {@link #schemeType}.
    * @param schemeDatas Scheme initialization data for possibly multiple DRM schemes.
    */
   public DrmInitData(@Nullable String schemeType, SchemeData... schemeDatas) {
@@ -203,7 +211,7 @@ public static final class SchemeData implements Parcelable {
      */
     public final String mimeType;
     /**
-     * The initialization data.
+     * The initialization data. May be null for scheme support checks only.
      */
     public final byte[] data;
     /**
@@ -214,8 +222,8 @@ public static final class SchemeData implements Parcelable {
     /**
      * @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is
      *     universal (i.e. applies to all schemes).
-     * @param mimeType The mimeType of the initialization data.
-     * @param data The initialization data.
+     * @param mimeType See {@link #mimeType}.
+     * @param data See {@link #data}.
      */
     public SchemeData(UUID uuid, String mimeType, byte[] data) {
       this(uuid, mimeType, data, false);
@@ -224,14 +232,14 @@ public SchemeData(UUID uuid, String mimeType, byte[] data) {
     /**
      * @param uuid The {@link UUID} of the DRM scheme, or {@link C#UUID_NIL} if the data is
      *     universal (i.e. applies to all schemes).
-     * @param mimeType The mimeType of the initialization data.
-     * @param data The initialization data.
-     * @param requiresSecureDecryption Whether secure decryption is required.
+     * @param mimeType See {@link #mimeType}.
+     * @param data See {@link #data}.
+     * @param requiresSecureDecryption See {@link #requiresSecureDecryption}.
      */
     public SchemeData(UUID uuid, String mimeType, byte[] data, boolean requiresSecureDecryption) {
       this.uuid = Assertions.checkNotNull(uuid);
       this.mimeType = Assertions.checkNotNull(mimeType);
-      this.data = Assertions.checkNotNull(data);
+      this.data = data;
       this.requiresSecureDecryption = requiresSecureDecryption;
     }
 
@@ -252,6 +260,23 @@ public boolean matches(UUID schemeUuid) {
       return C.UUID_NIL.equals(uuid) || schemeUuid.equals(uuid);
     }
 
+    /**
+     * Returns whether this {@link SchemeData} can be used to replace {@code other}.
+     *
+     * @param other A {@link SchemeData}.
+     * @return Whether this {@link SchemeData} can be used to replace {@code other}.
+     */
+    public boolean canReplace(SchemeData other) {
+      return hasData() && !other.hasData() && matches(other.uuid);
+    }
+
+    /**
+     * Returns whether {@link #data} is non-null.
+     */
+    public boolean hasData() {
+      return data != null;
+    }
+
     @Override
     public boolean equals(Object obj) {
       if (!(obj instanceof SchemeData)) {
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 e4b70598609..cf3d97d0b29 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
@@ -17,6 +17,7 @@
 
 import android.annotation.TargetApi;
 import android.os.Looper;
+import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 
 /**
  * Manages a DRM session.
@@ -39,7 +40,8 @@ public interface DrmSessionManager<T extends ExoMediaCrypto> {
    * must be returned to {@link #releaseSession(DrmSession)} when it is no longer required.
    *
    * @param playbackLooper The looper associated with the media playback thread.
-   * @param drmInitData DRM initialization data.
+   * @param drmInitData DRM initialization data. All contained {@link SchemeData}s must contain
+   *     non-null {@link SchemeData#data}.
    * @return The DRM session.
    */
   DrmSession<T> acquireSession(Looper playbackLooper, DrmInitData drmInitData);
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 410fd7e41e9..0c35ef0d107 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
@@ -346,45 +346,54 @@ protected int getContentType(Format format) {
   protected Pair<String, SchemeData> parseContentProtection(XmlPullParser xpp)
       throws XmlPullParserException, IOException {
     String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
-    boolean isPlayReady = "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95".equals(schemeIdUri);
     String schemeType = null;
     byte[] data = null;
     UUID uuid = null;
     boolean requiresSecureDecoder = false;
 
-    if ("urn:mpeg:dash:mp4protection:2011".equals(schemeIdUri)) {
-      schemeType = xpp.getAttributeValue(null, "value");
-      String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
-      if (defaultKid != null && !"00000000-0000-0000-0000-000000000000".equals(defaultKid)) {
-        UUID keyId = UUID.fromString(defaultKid);
-        data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null);
-        uuid = C.COMMON_PSSH_UUID;
-      }
+    switch (schemeIdUri) {
+      case "urn:mpeg:dash:mp4protection:2011":
+        schemeType = xpp.getAttributeValue(null, "value");
+        String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
+        if (defaultKid != null && !"00000000-0000-0000-0000-000000000000".equals(defaultKid)) {
+          UUID keyId = UUID.fromString(defaultKid);
+          data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null);
+          uuid = C.COMMON_PSSH_UUID;
+        }
+        break;
+      case "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95":
+        uuid = C.PLAYREADY_UUID;
+        break;
+      case "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed":
+        uuid = C.WIDEVINE_UUID;
+        break;
+      default:
+        break;
     }
 
     do {
       xpp.next();
-      if (data == null && XmlPullParserUtil.isStartTag(xpp, "cenc: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 && isPlayReady && 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));
-        uuid = C.PLAYREADY_UUID;
-      } else if (XmlPullParserUtil.isStartTag(xpp, "widevine:license")) {
+      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.isStartTag(xpp, "cenc: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 (uuid == C.PLAYREADY_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));
+        }
       }
     } while (!XmlPullParserUtil.isEndTag(xpp, "ContentProtection"));
-    SchemeData schemeData = data != null
+    SchemeData schemeData = uuid != null
         ? new SchemeData(uuid, MimeTypes.VIDEO_MP4, data, requiresSecureDecoder) : null;
     return Pair.create(schemeType, schemeData);
   }
@@ -518,10 +527,8 @@ protected Representation buildRepresentation(RepresentationInfo representationIn
     ArrayList<SchemeData> drmSchemeDatas = representationInfo.drmSchemeDatas;
     drmSchemeDatas.addAll(extraDrmSchemeDatas);
     if (!drmSchemeDatas.isEmpty()) {
-      DrmInitData drmInitData = new DrmInitData(drmSchemeDatas);
-      if (drmSchemeType != null) {
-        drmInitData = drmInitData.copyWithSchemeType(drmSchemeType);
-      }
+      filterRedundantIncompleteSchemeDatas(drmSchemeDatas);
+      DrmInitData drmInitData = new DrmInitData(drmSchemeType, drmSchemeDatas);
       format = format.copyWithDrmInitData(drmInitData);
     }
     ArrayList<Descriptor> inbandEventStreams = representationInfo.inbandEventStreams;
@@ -728,6 +735,25 @@ protected int parseAudioChannelConfiguration(XmlPullParser xpp)
 
   // Utility methods.
 
+  /**
+   * Removes unnecessary {@link SchemeData}s with null {@link SchemeData#data}.
+   */
+  private static void filterRedundantIncompleteSchemeDatas(ArrayList<SchemeData> schemeDatas) {
+    for (int i = schemeDatas.size() - 1; i >= 0; i--) {
+      SchemeData schemeData = schemeDatas.get(i);
+      if (!schemeData.hasData()) {
+        for (int j = 0; j < schemeDatas.size(); j++) {
+          if (schemeDatas.get(j).canReplace(schemeData)) {
+            // schemeData is incomplete, but there is another matching SchemeData which does contain
+            // data, so we remove the incomplete one.
+            schemeDatas.remove(i);
+            break;
+          }
+        }
+      }
+    }
+  }
+
   /**
    * Derives a sample mimeType from a container mimeType and codecs attribute.
    *

From 3021897383162f1520d12b399f848bdd1a688924 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 1 Nov 2017 11:54:34 -0700
Subject: [PATCH 372/421] Allow multiple listeners on TimeBar

Issue: #3406

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174214296
---
 .../android/exoplayer2/ui/DefaultTimeBar.java | 21 ++++++++++++-------
 .../exoplayer2/ui/PlaybackControlView.java    |  2 +-
 .../google/android/exoplayer2/ui/TimeBar.java | 17 ++++++++++-----
 3 files changed, 27 insertions(+), 13 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 a4a543ee0d6..52a873a1c87 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
@@ -40,6 +40,7 @@
 import com.google.android.exoplayer2.util.Util;
 import java.util.Formatter;
 import java.util.Locale;
+import java.util.concurrent.CopyOnWriteArraySet;
 
 /**
  * A time bar that shows a current position, buffered position, duration and ad markers.
@@ -198,8 +199,8 @@ public class DefaultTimeBar extends View implements TimeBar {
   private final StringBuilder formatBuilder;
   private final Formatter formatter;
   private final Runnable stopScrubbingRunnable;
+  private final CopyOnWriteArraySet<OnScrubListener> listeners;
 
-  private OnScrubListener listener;
   private int keyCountIncrement;
   private long keyTimeIncrement;
   private int lastCoarseScrubXPosition;
@@ -231,6 +232,7 @@ public DefaultTimeBar(Context context, AttributeSet attrs) {
     playedAdMarkerPaint = new Paint();
     scrubberPaint = new Paint();
     scrubberPaint.setAntiAlias(true);
+    listeners = new CopyOnWriteArraySet<>();
 
     // Calculate the dimensions and paints for drawn elements.
     Resources res = context.getResources();
@@ -325,8 +327,13 @@ public void run() {
   }
 
   @Override
-  public void setListener(OnScrubListener listener) {
-    this.listener = listener;
+  public void addListener(OnScrubListener listener) {
+    listeners.add(listener);
+  }
+
+  @Override
+  public void removeListener(OnScrubListener listener) {
+    listeners.remove(listener);
   }
 
   @Override
@@ -421,7 +428,7 @@ public boolean onTouchEvent(MotionEvent event) {
             positionScrubber(x);
           }
           scrubPosition = getScrubberPosition();
-          if (listener != null) {
+          for (OnScrubListener listener : listeners) {
             listener.onScrubMove(this, scrubPosition);
           }
           update();
@@ -584,7 +591,7 @@ private void startScrubbing() {
     if (parent != null) {
       parent.requestDisallowInterceptTouchEvent(true);
     }
-    if (listener != null) {
+    for (OnScrubListener listener : listeners) {
       listener.onScrubStart(this, getScrubberPosition());
     }
   }
@@ -597,7 +604,7 @@ private void stopScrubbing(boolean canceled) {
       parent.requestDisallowInterceptTouchEvent(false);
     }
     invalidate();
-    if (listener != null) {
+    for (OnScrubListener listener : listeners) {
       listener.onScrubStop(this, getScrubberPosition(), canceled);
     }
   }
@@ -735,7 +742,7 @@ private boolean scrubIncrementally(long positionChange) {
     if (!scrubbing) {
       startScrubbing();
     }
-    if (listener != null) {
+    for (OnScrubListener listener : listeners) {
       listener.onScrubMove(this, scrubPosition);
     }
     update();
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 964eda7de06..a96ed3a622d 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
@@ -341,7 +341,7 @@ public PlaybackControlView(Context context, AttributeSet attrs, int defStyleAttr
     positionView = findViewById(R.id.exo_position);
     timeBar = findViewById(R.id.exo_progress);
     if (timeBar != null) {
-      timeBar.setListener(componentListener);
+      timeBar.addListener(componentListener);
     }
     playButton = findViewById(R.id.exo_play);
     if (playButton != null) {
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 4b448738d33..866921c2f9b 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
@@ -25,16 +25,23 @@
 public interface TimeBar {
 
   /**
-   * @see View#isEnabled()
+   * Adds a listener for scrubbing events.
+   *
+   * @param listener The listener to add.
    */
-  void setEnabled(boolean enabled);
+  void addListener(OnScrubListener listener);
 
   /**
-   * Sets the listener for the scrubbing events.
+   * Removes a listener for scrubbing events.
    *
-   * @param listener The listener for scrubbing events.
+   * @param listener The listener to remove.
+   */
+  void removeListener(OnScrubListener listener);
+
+  /**
+   * @see View#isEnabled()
    */
-  void setListener(OnScrubListener listener);
+  void setEnabled(boolean enabled);
 
   /**
    * Sets the position increment for key presses and accessibility actions, in milliseconds.

From 233a1d165f5c2296e39a9b2fe44fc9f8898a0066 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 1 Nov 2017 11:57:16 -0700
Subject: [PATCH 373/421] Explicitly document internal onXError are for
 reporting only

Issue: #3366

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174214690
---
 .../android/exoplayer2/drm/DefaultDrmSessionManager.java  | 8 ++++++++
 .../source/AdaptiveMediaSourceEventListener.java          | 8 ++++++++
 .../android/exoplayer2/source/ExtractorMediaSource.java   | 8 ++++++++
 3 files changed, 24 insertions(+)

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 badacca9ac8..08defdcceec 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
@@ -24,6 +24,7 @@
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.drm.DefaultDrmSession.ProvisioningManager;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
 import com.google.android.exoplayer2.drm.DrmSession.DrmSessionException;
@@ -58,6 +59,13 @@ public interface EventListener {
 
     /**
      * Called when a drm error occurs.
+     * <p>
+     * This method being called does not indicate that playback has failed, or that it will fail.
+     * The player may be able to recover from the error and continue. Hence applications should
+     * <em>not</em> implement this method to display a user visible error or initiate an application
+     * level retry ({@link Player.EventListener#onPlayerError} is the appropriate place to implement
+     * such behavior). This method is called to provide the application with an opportunity to log
+     * the error if it wishes to do so.
      *
      * @param e The corresponding exception.
      */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java b/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java
index f97d4a15420..be07cbb5dcc 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/AdaptiveMediaSourceEventListener.java
@@ -19,6 +19,7 @@
 import android.os.SystemClock;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.IOException;
@@ -111,6 +112,13 @@ void onLoadCanceled(DataSpec dataSpec, int dataType, int trackType, Format track
    * The error may or may not have resulted in the load being canceled, as indicated by the
    * {@code wasCanceled} parameter. If the load was canceled, {@link #onLoadCanceled} will
    * <em>not</em> be called in addition to this method.
+   * <p>
+   * This method being called does not indicate that playback has failed, or that it will fail. The
+   * player may be able to recover from the error and continue. Hence applications should
+   * <em>not</em> implement this method to display a user visible error or initiate an application
+   * level retry ({@link Player.EventListener#onPlayerError} is the appropriate place to implement
+   * such behavior). This method is called to provide the application with an opportunity to log the
+   * error if it wishes to do so.
    *
    * @param dataSpec Defines the data being loaded.
    * @param dataType One of the {@link C} {@code DATA_TYPE_*} constants defining the type of data
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 bd407f58f21..1b3f6cb95c0 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,6 +19,7 @@
 import android.os.Handler;
 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;
 import com.google.android.exoplayer2.extractor.ExtractorsFactory;
@@ -47,6 +48,13 @@ public interface EventListener {
 
     /**
      * Called when an error occurs loading media data.
+     * <p>
+     * This method being called does not indicate that playback has failed, or that it will fail.
+     * The player may be able to recover from the error and continue. Hence applications should
+     * <em>not</em> implement this method to display a user visible error or initiate an application
+     * level retry ({@link Player.EventListener#onPlayerError} is the appropriate place to implement
+     * such behavior). This method is called to provide the application with an opportunity to log
+     * the error if it wishes to do so.
      *
      * @param error The load error.
      */

From 9abc1d29741b0d2516c8ce6af058517833b63375 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Thu, 2 Nov 2017 07:31:48 -0700
Subject: [PATCH 374/421] Don't call Drawable.setLayoutDirection pre-API-23

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174323423
---
 .../google/android/exoplayer2/ui/DefaultTimeBar.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 52a873a1c87..048bb3ffffc 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
@@ -250,9 +250,7 @@ public DefaultTimeBar(Context context, AttributeSet attrs) {
       try {
         scrubberDrawable = a.getDrawable(R.styleable.DefaultTimeBar_scrubber_drawable);
         if (scrubberDrawable != null) {
-          if (Util.SDK_INT >= 23) {
-            scrubberDrawable.setLayoutDirection(getLayoutDirection());
-          }
+          setDrawableLayoutDirection(scrubberDrawable, getLayoutDirection());
           defaultTouchTargetHeight =
               Math.max(scrubberDrawable.getMinimumHeight(), defaultTouchTargetHeight);
         }
@@ -519,7 +517,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
   @Override
   public void onRtlPropertiesChanged(int layoutDirection) {
-    if (scrubberDrawable != null && scrubberDrawable.setLayoutDirection(layoutDirection)) {
+    if (scrubberDrawable != null && setDrawableLayoutDirection(scrubberDrawable, layoutDirection)) {
       invalidate();
     }
   }
@@ -753,6 +751,10 @@ private static int dpToPx(DisplayMetrics displayMetrics, int dps) {
     return (int) (dps * displayMetrics.density + 0.5f);
   }
 
+  private static boolean setDrawableLayoutDirection(Drawable drawable, int layoutDirection) {
+    return Util.SDK_INT >= 23 && drawable.setLayoutDirection(layoutDirection);
+  }
+
   public static int getDefaultScrubberColor(int playedColor) {
     return 0xFF000000 | playedColor;
   }

From 4cb2be2a4641890ab862c8a1e29fc90d5290753b Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Thu, 2 Nov 2017 08:14:29 -0700
Subject: [PATCH 375/421] Replace Queue with ArrayDequeue in HlsPlaylistParser

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174327876
---
 .../exoplayer2/source/hls/playlist/HlsPlaylistParser.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 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 c18f31f47e9..c63ded62754 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
@@ -32,10 +32,10 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
+import java.util.ArrayDeque;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.LinkedList;
 import java.util.List;
 import java.util.Queue;
 import java.util.regex.Matcher;
@@ -124,7 +124,7 @@ public final class HlsPlaylistParser implements ParsingLoadable.Parser<HlsPlayli
   @Override
   public HlsPlaylist parse(Uri uri, InputStream inputStream) throws IOException {
     BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
-    Queue<String> extraLines = new LinkedList<>();
+    Queue<String> extraLines = new ArrayDeque<>();
     String line;
     try {
       if (!checkPlaylistHeader(reader)) {

From 321bc9c24e847e7368edf836854323e3c6f4ce44 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 2 Nov 2017 09:24:50 -0700
Subject: [PATCH 376/421] Simplify DownloadService by removing broadcasting

Client can add this functionality by extending DownloadService.

Also made DownloadManager accept multiple listeners. So instead of
broadcast event, client can listen to DownloadManager directly.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174335820
---
 .../offline/DownloadManagerTest.java          | 46 +++++++++++--------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
index 1c911981212..791b4a9d355 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
@@ -42,8 +42,7 @@ public class DownloadManagerTest extends InstrumentationTestCase {
 
   private DownloadManager downloadManager;
   private File actionFile;
-  private ConditionVariable downloadFinishedCondition;
-  private Throwable downloadError;
+  private TestDownloadListener testDownloadListener;
 
   @Override
   public void setUp() throws Exception {
@@ -55,8 +54,8 @@ public void setUp() throws Exception {
         new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY),
         100, actionFile.getAbsolutePath());
 
-    downloadFinishedCondition = new ConditionVariable();
-    downloadManager.setListener(new TestDownloadListener());
+    testDownloadListener = new TestDownloadListener();
+    downloadManager.addListener(testDownloadListener);
   }
     
   @Override
@@ -133,7 +132,7 @@ public void testSameMediaMultipleActions() throws Throwable {
     // removeAction2 is posted. removeAction1 and downloadAction3 is canceled so removeAction2
     // starts immediately.
     removeAction2.post().assertStarted().finish().assertEnded();
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   public void testMultipleRemoveActionWaitsLastCancelsAllOther() throws Throwable {
@@ -150,7 +149,7 @@ public void testMultipleRemoveActionWaitsLastCancelsAllOther() throws Throwable
     removeAction1.finish().assertCancelled();
     removeAction3.assertStarted().finish().assertEnded();
 
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   public void testMultipleWaitingDownloadActionStartsInParallel() throws Throwable {
@@ -168,7 +167,7 @@ public void testMultipleWaitingDownloadActionStartsInParallel() throws Throwable
     downloadAction1.finish().assertEnded();
     downloadAction2.finish().assertEnded();
 
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   public void testDifferentMediaDownloadActionsPreserveOrder() throws Throwable {
@@ -186,7 +185,7 @@ public void testDifferentMediaDownloadActionsPreserveOrder() throws Throwable {
     downloadAction1.finish().assertEnded();
     downloadAction2.finish().assertEnded();
 
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   public void testDifferentMediaRemoveActionsDoNotPreserveOrder() throws Throwable {
@@ -204,12 +203,12 @@ public void testDifferentMediaRemoveActionsDoNotPreserveOrder() throws Throwable
     removeAction1.assertStarted();
     removeAction1.finish().assertEnded();
 
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   private void doTestActionRuns(FakeDownloadAction action) throws Throwable {
     action.post().assertStarted().finish().assertEnded();
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   private void doTestActionsRunSequentially(FakeDownloadAction action1,
@@ -221,7 +220,7 @@ private void doTestActionsRunSequentially(FakeDownloadAction action1,
     action2.assertStarted();
 
     action2.finish().assertEnded();
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   private void doTestActionsRunInParallel(FakeDownloadAction action1,
@@ -230,7 +229,7 @@ private void doTestActionsRunInParallel(FakeDownloadAction action1,
     action2.post().assertStarted();
     action1.finish().assertEnded();
     action2.finish().assertEnded();
-    blockUntilTasksCompleteAndThrowAnyDownloadError();
+    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
   }
 
   private FakeDownloadAction createDownloadAction(String mediaId) {
@@ -241,15 +240,15 @@ private FakeDownloadAction createRemoveAction(String mediaId) {
     return new FakeDownloadAction(downloadManager, mediaId, true);
   }
 
-  private void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
-    assertTrue(downloadFinishedCondition.block(ASSERT_TRUE_TIMEOUT));
-    downloadFinishedCondition.close();
-    if (downloadError != null) {
-      throw downloadError;
+  private static class TestDownloadListener implements DownloadListener {
+
+    private ConditionVariable downloadFinishedCondition;
+    private Throwable downloadError;
+
+    private TestDownloadListener() {
+      downloadFinishedCondition = new ConditionVariable();
     }
-  }
 
-  private class TestDownloadListener implements DownloadListener {
     @Override
     public void onStateChange(DownloadManager downloadManager, DownloadTask downloadTask, int state,
         Throwable error) {
@@ -263,6 +262,15 @@ public void onStateChange(DownloadManager downloadManager, DownloadTask download
     public void onTasksFinished(DownloadManager downloadManager) {
       downloadFinishedCondition.open();
     }
+
+    private void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
+      assertTrue(downloadFinishedCondition.block(ASSERT_TRUE_TIMEOUT));
+      downloadFinishedCondition.close();
+      if (downloadError != null) {
+        throw downloadError;
+      }
+    }
+
   }
 
   /**

From b6b09ad40b2151ab40a63e57bbb3a7add36d3e35 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 3 Nov 2017 04:03:46 -0700
Subject: [PATCH 377/421] Automated g4 rollback of changelist 173379623.

*** Reason for rollback ***

Breaks setting PlaybackParameters before start of playback

*** Original change description ***

Add support for float output in DefaultAudioSink

Also switch from using MIME types to C.ENCODING_* encodings in DefaultAudioSink.

***

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174445506
---
 .../java/com/google/android/exoplayer2/C.java |  10 +-
 .../android/exoplayer2/audio/AudioSink.java   |  30 +++--
 .../exoplayer2/audio/DefaultAudioSink.java    | 127 ++++++++++--------
 .../audio/MediaCodecAudioRenderer.java        |  20 +--
 .../audio/SimpleDecoderAudioRenderer.java     |   4 +-
 .../android/exoplayer2/util/MimeTypes.java    |  30 +----
 .../google/android/exoplayer2/util/Util.java  |   1 -
 7 files changed, 106 insertions(+), 116 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 592589e2212..9d4049ada9e 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
@@ -127,8 +127,8 @@ private C() {}
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, ENCODING_INVALID, ENCODING_PCM_8BIT, ENCODING_PCM_16BIT,
-      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT, ENCODING_PCM_FLOAT, ENCODING_AC3, ENCODING_E_AC3,
-      ENCODING_DTS, ENCODING_DTS_HD})
+      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT, ENCODING_AC3, ENCODING_E_AC3, ENCODING_DTS,
+      ENCODING_DTS_HD})
   public @interface Encoding {}
 
   /**
@@ -136,7 +136,7 @@ private C() {}
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({Format.NO_VALUE, ENCODING_INVALID, ENCODING_PCM_8BIT, ENCODING_PCM_16BIT,
-      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT, ENCODING_PCM_FLOAT})
+      ENCODING_PCM_24BIT, ENCODING_PCM_32BIT})
   public @interface PcmEncoding {}
   /**
    * @see AudioFormat#ENCODING_INVALID
@@ -158,10 +158,6 @@ private C() {}
    * PCM encoding with 32 bits per sample.
    */
   public static final int ENCODING_PCM_32BIT = 0x40000000;
-  /**
-   * @see AudioFormat#ENCODING_PCM_FLOAT
-   */
-  public static final int ENCODING_PCM_FLOAT = AudioFormat.ENCODING_PCM_FLOAT;
   /**
    * @see AudioFormat#ENCODING_AC3
    */
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 faf3160018b..5408032907e 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
@@ -25,13 +25,14 @@
  * 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)}.
+ * {@link #configure(String, 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)}.
+ * Call {@link #configure(String, 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>
@@ -165,12 +166,13 @@ public WriteException(int errorCode) {
   void setListener(Listener listener);
 
   /**
-   * Returns whether it's possible to play audio in the specified encoding using passthrough.
+   * Returns whether it's possible to play audio in the specified format using encoded audio
+   * passthrough.
    *
-   * @param encoding The audio encoding.
-   * @return Whether it's possible to play audio in the specified encoding using passthrough.
+   * @param mimeType The format mime type.
+   * @return Whether it's possible to play audio in the format using encoded audio passthrough.
    */
-  boolean isPassthroughSupported(@C.Encoding int encoding);
+  boolean isPassthroughSupported(String mimeType);
 
   /**
    * Returns the playback position in the stream starting at zero, in microseconds, or
@@ -184,9 +186,12 @@ public WriteException(int errorCode) {
   /**
    * Configures (or reconfigures) the sink.
    *
-   * @param inputEncoding The encoding of audio data provided in the input buffers.
+   * @param inputMimeType The MIME type of audio data provided in the input buffers.
    * @param inputChannelCount The number of channels.
    * @param inputSampleRate The sample rate in Hz.
+   * @param inputPcmEncoding For PCM formats, the encoding used. One of
+   *     {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_16BIT}, {@link C#ENCODING_PCM_24BIT}
+   *     and {@link C#ENCODING_PCM_32BIT}.
    * @param specifiedBufferSize A specific size for the playback buffer in bytes, or 0 to infer a
    *     suitable buffer size.
    * @param outputChannels A mapping from input to output channels that is applied to this sink's
@@ -200,9 +205,9 @@ public WriteException(int errorCode) {
    *     immediately preceding the next call to {@link #reset()} or this method.
    * @throws ConfigurationException If an error occurs configuring the sink.
    */
-  void configure(@C.Encoding int inputEncoding, int inputChannelCount, int inputSampleRate,
-      int specifiedBufferSize, @Nullable int[] outputChannels, int trimStartSamples,
-      int trimEndSamples) throws ConfigurationException;
+  void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
+      @C.PcmEncoding int inputPcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
+      int trimStartSamples, int trimEndSamples) throws ConfigurationException;
 
   /**
    * Starts or resumes consuming audio if initialized.
@@ -223,7 +228,8 @@ void configure(@C.Encoding int inputEncoding, int inputChannelCount, int inputSa
    * 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).
+   * {@link #configure(String, int, int, int, int, int[], int, int)} that causes the sink to be
+   * reset).
    *
    * @param buffer The buffer containing audio data.
    * @param presentationTimeUs The presentation timestamp of the buffer in microseconds.
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 487135a96e5..73c0bc20be2 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
@@ -29,6 +29,7 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.PlaybackParameters;
 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.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -181,13 +182,13 @@ public InvalidAudioTrackTimestampException(String detailMessage) {
    */
   private AudioTrack keepSessionIdAudioTrack;
   private AudioTrack audioTrack;
-  private boolean isInputPcm;
   private int inputSampleRate;
   private int sampleRate;
   private int channelConfig;
+  private @C.Encoding int encoding;
   private @C.Encoding int outputEncoding;
   private AudioAttributes audioAttributes;
-  private boolean processingEnabled;
+  private boolean passthrough;
   private int bufferSize;
   private long bufferSizeUs;
 
@@ -285,8 +286,9 @@ public void setListener(Listener listener) {
   }
 
   @Override
-  public boolean isPassthroughSupported(@C.Encoding int encoding) {
-    return audioCapabilities != null && audioCapabilities.supportsEncoding(encoding);
+  public boolean isPassthroughSupported(String mimeType) {
+    return audioCapabilities != null
+        && audioCapabilities.supportsEncoding(getEncodingForMimeType(mimeType));
   }
 
   @Override
@@ -329,20 +331,18 @@ public long getCurrentPositionUs(boolean sourceEnded) {
   }
 
   @Override
-  public void configure(@C.Encoding int inputEncoding, int inputChannelCount, int inputSampleRate,
-      int specifiedBufferSize, @Nullable int[] outputChannels, int trimStartSamples,
-      int trimEndSamples) throws ConfigurationException {
-    boolean flush = false;
+  public void configure(String inputMimeType, int inputChannelCount, int inputSampleRate,
+      @C.PcmEncoding int inputPcmEncoding, int specifiedBufferSize, @Nullable int[] outputChannels,
+      int trimStartSamples, int trimEndSamples) throws ConfigurationException {
     this.inputSampleRate = inputSampleRate;
     int channelCount = inputChannelCount;
     int sampleRate = inputSampleRate;
-    isInputPcm = isEncodingPcm(inputEncoding);
-    if (isInputPcm) {
-      pcmFrameSize = Util.getPcmFrameSize(inputEncoding, channelCount);
-    }
-    @C.Encoding int encoding = inputEncoding;
-    boolean processingEnabled = isInputPcm && inputEncoding != C.ENCODING_PCM_FLOAT;
-    if (processingEnabled) {
+    @C.Encoding int encoding;
+    boolean passthrough = !MimeTypes.AUDIO_RAW.equals(inputMimeType);
+    boolean flush = false;
+    if (!passthrough) {
+      encoding = inputPcmEncoding;
+      pcmFrameSize = Util.getPcmFrameSize(inputPcmEncoding, channelCount);
       trimmingAudioProcessor.setTrimSampleCount(trimStartSamples, trimEndSamples);
       channelMappingAudioProcessor.setChannelMap(outputChannels);
       for (AudioProcessor audioProcessor : availableAudioProcessors) {
@@ -360,6 +360,8 @@ public void configure(@C.Encoding int inputEncoding, int inputChannelCount, int
       if (flush) {
         resetAudioProcessors();
       }
+    } else {
+      encoding = getEncodingForMimeType(inputMimeType);
     }
 
     int channelConfig;
@@ -409,11 +411,11 @@ public void configure(@C.Encoding int inputEncoding, int inputChannelCount, int
 
     // Workaround for Nexus Player not reporting support for mono passthrough.
     // (See [Internal: b/34268671].)
-    if (Util.SDK_INT <= 25 && "fugu".equals(Util.DEVICE) && !isInputPcm && channelCount == 1) {
+    if (Util.SDK_INT <= 25 && "fugu".equals(Util.DEVICE) && passthrough && channelCount == 1) {
       channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
     }
 
-    if (!flush && isInitialized() && outputEncoding == encoding && this.sampleRate == sampleRate
+    if (!flush && isInitialized() && this.encoding == encoding && this.sampleRate == sampleRate
         && this.channelConfig == channelConfig) {
       // We already have an audio track with the correct sample rate, channel config and encoding.
       return;
@@ -421,24 +423,16 @@ public void configure(@C.Encoding int inputEncoding, int inputChannelCount, int
 
     reset();
 
-    this.processingEnabled = processingEnabled;
+    this.encoding = encoding;
+    this.passthrough = passthrough;
     this.sampleRate = sampleRate;
     this.channelConfig = channelConfig;
-    outputEncoding = encoding;
-    if (isInputPcm) {
-      outputPcmFrameSize = Util.getPcmFrameSize(outputEncoding, channelCount);
-    }
+    outputEncoding = passthrough ? encoding : C.ENCODING_PCM_16BIT;
+    outputPcmFrameSize = Util.getPcmFrameSize(C.ENCODING_PCM_16BIT, channelCount);
+
     if (specifiedBufferSize != 0) {
       bufferSize = specifiedBufferSize;
-    } else if (isInputPcm) {
-      int minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, 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);
-      bufferSize = Util.constrainValue(multipliedBufferSize, minAppBufferSize, maxAppBufferSize);
-    } else {
+    } else if (passthrough) {
       // TODO: Set the minimum buffer size using getMinBufferSize when it takes the encoding into
       // account. [Internal: b/25181305]
       if (outputEncoding == C.ENCODING_AC3 || outputEncoding == C.ENCODING_E_AC3) {
@@ -448,9 +442,18 @@ public void configure(@C.Encoding int inputEncoding, int inputChannelCount, int
         // DTS allows an 'open' bitrate, but we assume the maximum listed value: 1536 kbit/s.
         bufferSize = (int) (PASSTHROUGH_BUFFER_DURATION_US * 192 * 1024 / C.MICROS_PER_SECOND);
       }
+    } else {
+      int minBufferSize = AudioTrack.getMinBufferSize(sampleRate, channelConfig, 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);
+      bufferSize = multipliedBufferSize < minAppBufferSize ? minAppBufferSize
+          : multipliedBufferSize > maxAppBufferSize ? maxAppBufferSize
+          : multipliedBufferSize;
     }
-    bufferSizeUs =
-        isInputPcm ? framesToDurationUs(bufferSize / outputPcmFrameSize) : C.TIME_UNSET;
+    bufferSizeUs = passthrough ? C.TIME_UNSET : framesToDurationUs(bufferSize / outputPcmFrameSize);
 
     // The old playback parameters may no longer be applicable so try to reset them now.
     setPlaybackParameters(playbackParameters);
@@ -571,7 +574,7 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
         return true;
       }
 
-      if (!isInputPcm && framesPerEncodedSample == 0) {
+      if (passthrough && framesPerEncodedSample == 0) {
         // If this is the first encoded sample, calculate the sample size in frames.
         framesPerEncodedSample = getFramesPerEncodedSample(outputEncoding, buffer);
       }
@@ -615,19 +618,20 @@ public boolean handleBuffer(ByteBuffer buffer, long presentationTimeUs)
         }
       }
 
-      if (isInputPcm) {
-        submittedPcmBytes += buffer.remaining();
-      } else {
+      if (passthrough) {
         submittedEncodedFrames += framesPerEncodedSample;
+      } else {
+        submittedPcmBytes += buffer.remaining();
       }
 
       inputBuffer = buffer;
     }
 
-    if (processingEnabled) {
-      processBuffers(presentationTimeUs);
-    } else {
+    if (passthrough) {
+      // Passthrough buffers are not processed.
       writeBuffer(inputBuffer, presentationTimeUs);
+    } else {
+      processBuffers(presentationTimeUs);
     }
 
     if (!inputBuffer.hasRemaining()) {
@@ -675,9 +679,10 @@ private void processBuffers(long avSyncPresentationTimeUs) throws WriteException
   }
 
   @SuppressWarnings("ReferenceEquality")
-  private void writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs) throws WriteException {
+  private boolean writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs)
+      throws WriteException {
     if (!buffer.hasRemaining()) {
-      return;
+      return true;
     }
     if (outputBuffer != null) {
       Assertions.checkArgument(outputBuffer == buffer);
@@ -696,7 +701,7 @@ private void writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs) throw
     }
     int bytesRemaining = buffer.remaining();
     int bytesWritten = 0;
-    if (Util.SDK_INT < 21) { // isInputPcm == true
+    if (Util.SDK_INT < 21) { // passthrough == false
       // Work out how many bytes we can write without the risk of blocking.
       int bytesPending =
           (int) (writtenPcmBytes - (audioTrackUtil.getPlaybackHeadPosition() * outputPcmFrameSize));
@@ -723,15 +728,17 @@ private void writeBuffer(ByteBuffer buffer, long avSyncPresentationTimeUs) throw
       throw new WriteException(bytesWritten);
     }
 
-    if (isInputPcm) {
+    if (!passthrough) {
       writtenPcmBytes += bytesWritten;
     }
     if (bytesWritten == bytesRemaining) {
-      if (!isInputPcm) {
+      if (passthrough) {
         writtenEncodedFrames += framesPerEncodedSample;
       }
       outputBuffer = null;
+      return true;
     }
+    return false;
   }
 
   @Override
@@ -751,7 +758,7 @@ public void playToEndOfStream() throws WriteException {
   private boolean drainAudioProcessorsToEndOfStream() throws WriteException {
     boolean audioProcessorNeedsEndOfStream = false;
     if (drainingAudioProcessorIndex == C.INDEX_UNSET) {
-      drainingAudioProcessorIndex = processingEnabled ? 0 : audioProcessors.length;
+      drainingAudioProcessorIndex = passthrough ? audioProcessors.length : 0;
       audioProcessorNeedsEndOfStream = true;
     }
     while (drainingAudioProcessorIndex < audioProcessors.length) {
@@ -792,8 +799,8 @@ public boolean hasPendingData() {
 
   @Override
   public PlaybackParameters setPlaybackParameters(PlaybackParameters playbackParameters) {
-    if (!processingEnabled) {
-      // The playback parameters are always the default if processing is disabled.
+    if (passthrough) {
+      // The playback parameters are always the default in passthrough mode.
       this.playbackParameters = PlaybackParameters.DEFAULT;
       return this.playbackParameters;
     }
@@ -1069,7 +1076,7 @@ private void maybeSampleSyncParams() {
           audioTimestampSet = false;
         }
       }
-      if (getLatencyMethod != null && isInputPcm) {
+      if (getLatencyMethod != null && !passthrough) {
         try {
           // Compute the audio track latency, excluding the latency due to the buffer (leaving
           // latency due to the mixer and audio hardware driver).
@@ -1108,11 +1115,11 @@ private long durationUsToFrames(long durationUs) {
   }
 
   private long getSubmittedFrames() {
-    return isInputPcm ? (submittedPcmBytes / pcmFrameSize) : submittedEncodedFrames;
+    return passthrough ? submittedEncodedFrames : (submittedPcmBytes / pcmFrameSize);
   }
 
   private long getWrittenFrames() {
-    return isInputPcm ? (writtenPcmBytes / outputPcmFrameSize) : writtenEncodedFrames;
+    return passthrough ? writtenEncodedFrames : (writtenPcmBytes / outputPcmFrameSize);
   }
 
   private void resetSyncParams() {
@@ -1205,10 +1212,20 @@ private AudioTrack initializeKeepSessionIdAudioTrack(int audioSessionId) {
         MODE_STATIC, audioSessionId);
   }
 
-  private static boolean isEncodingPcm(@C.Encoding int encoding) {
-    return encoding == C.ENCODING_PCM_8BIT || encoding == C.ENCODING_PCM_16BIT
-        || encoding == C.ENCODING_PCM_24BIT || encoding == C.ENCODING_PCM_32BIT
-        || encoding == C.ENCODING_PCM_FLOAT;
+  @C.Encoding
+  private static int getEncodingForMimeType(String mimeType) {
+    switch (mimeType) {
+      case MimeTypes.AUDIO_AC3:
+        return C.ENCODING_AC3;
+      case MimeTypes.AUDIO_E_AC3:
+        return C.ENCODING_E_AC3;
+      case MimeTypes.AUDIO_DTS:
+        return C.ENCODING_DTS;
+      case MimeTypes.AUDIO_DTS_HD:
+        return C.ENCODING_DTS_HD;
+      default:
+        return C.ENCODING_INVALID;
+    }
   }
 
   private static int getFramesPerEncodedSample(@C.Encoding int encoding, ByteBuffer buffer) {
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 18cbcea115f..f8206e94cf8 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
@@ -51,7 +51,6 @@ public class MediaCodecAudioRenderer extends MediaCodecRenderer implements Media
   private boolean passthroughEnabled;
   private boolean codecNeedsDiscardChannelsWorkaround;
   private android.media.MediaFormat passthroughMediaFormat;
-  @C.Encoding
   private int pcmEncoding;
   private int channelCount;
   private int encoderDelay;
@@ -227,7 +226,7 @@ protected MediaCodecInfo getDecoderInfo(MediaCodecSelector mediaCodecSelector,
    * @return Whether passthrough playback is supported.
    */
   protected boolean allowPassthrough(String mimeType) {
-    return audioSink.isPassthroughSupported(MimeTypes.getEncoding(mimeType));
+    return audioSink.isPassthroughSupported(mimeType);
   }
 
   @Override
@@ -273,15 +272,10 @@ protected void onInputFormatChanged(Format newFormat) throws ExoPlaybackExceptio
   @Override
   protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat)
       throws ExoPlaybackException {
-    @C.Encoding int encoding;
-    MediaFormat format;
-    if (passthroughMediaFormat != null) {
-      encoding = MimeTypes.getEncoding(passthroughMediaFormat.getString(MediaFormat.KEY_MIME));
-      format = passthroughMediaFormat;
-    } else {
-      encoding = pcmEncoding;
-      format = outputFormat;
-    }
+    boolean passthrough = passthroughMediaFormat != null;
+    String mimeType = passthrough ? passthroughMediaFormat.getString(MediaFormat.KEY_MIME)
+        : MimeTypes.AUDIO_RAW;
+    MediaFormat format = passthrough ? passthroughMediaFormat : outputFormat;
     int channelCount = format.getInteger(MediaFormat.KEY_CHANNEL_COUNT);
     int sampleRate = format.getInteger(MediaFormat.KEY_SAMPLE_RATE);
     int[] channelMap;
@@ -295,8 +289,8 @@ protected void onOutputFormatChanged(MediaCodec codec, MediaFormat outputFormat)
     }
 
     try {
-      audioSink.configure(encoding, channelCount, sampleRate, 0, channelMap, encoderDelay,
-          encoderPadding);
+      audioSink.configure(mimeType, channelCount, sampleRate, pcmEncoding, 0, channelMap,
+          encoderDelay, encoderPadding);
     } catch (AudioSink.ConfigurationException e) {
       throw ExoPlaybackException.createForRenderer(e, getIndex());
     }
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 6be4b1d35d3..98a84fdff8d 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
@@ -329,8 +329,8 @@ private boolean drainOutputBuffer() throws ExoPlaybackException, AudioDecoderExc
 
     if (audioTrackNeedsConfigure) {
       Format outputFormat = getOutputFormat();
-      audioSink.configure(outputFormat.pcmEncoding, outputFormat.channelCount,
-          outputFormat.sampleRate, 0, null, encoderDelay, encoderPadding);
+      audioSink.configure(outputFormat.sampleMimeType, outputFormat.channelCount,
+          outputFormat.sampleRate, outputFormat.pcmEncoding, 0, null, encoderDelay, encoderPadding);
       audioTrackNeedsConfigure = false;
     }
 
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 d48d28caa56..2daf16d3d2c 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
@@ -208,12 +208,12 @@ public static String getMediaMimeType(String codec) {
   }
 
   /**
-   * Returns the {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified MIME type.
-   * {@link C#TRACK_TYPE_UNKNOWN} if the MIME type is not known or the mapping cannot be
+   * Returns the {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified mime type.
+   * {@link C#TRACK_TYPE_UNKNOWN} if the mime type is not known or the mapping cannot be
    * established.
    *
-   * @param mimeType The MIME type.
-   * @return The {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified MIME type.
+   * @param mimeType The mimeType.
+   * @return The {@link C}{@code .TRACK_TYPE_*} constant that corresponds to a specified mime type.
    */
   public static int getTrackType(String mimeType) {
     if (TextUtils.isEmpty(mimeType)) {
@@ -239,28 +239,6 @@ public static int getTrackType(String mimeType) {
     }
   }
 
-  /**
-   * Returns the {@link C}{@code .ENCODING_*} constant that corresponds to a specified MIME type, or
-   * {@link C#ENCODING_INVALID} if the mapping cannot be established.
-   *
-   * @param mimeType The MIME type.
-   * @return The {@link C}{@code .ENCODING_*} constant that corresponds to a specified MIME type.
-   */
-  public static @C.Encoding int getEncoding(String mimeType) {
-    switch (mimeType) {
-      case MimeTypes.AUDIO_AC3:
-        return C.ENCODING_AC3;
-      case MimeTypes.AUDIO_E_AC3:
-        return C.ENCODING_E_AC3;
-      case MimeTypes.AUDIO_DTS:
-        return C.ENCODING_DTS;
-      case MimeTypes.AUDIO_DTS_HD:
-        return C.ENCODING_DTS_HD;
-      default:
-        return C.ENCODING_INVALID;
-    }
-  }
-
   /**
    * Equivalent to {@code getTrackType(getMediaMimeType(codec))}.
    *
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 bdc85d5130e..24132e400c0 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
@@ -790,7 +790,6 @@ public static int getPcmFrameSize(@C.PcmEncoding int pcmEncoding, int channelCou
       case C.ENCODING_PCM_24BIT:
         return channelCount * 3;
       case C.ENCODING_PCM_32BIT:
-      case C.ENCODING_PCM_FLOAT:
         return channelCount * 4;
       default:
         throw new IllegalArgumentException();

From d90d04190e3643435fd4b4a3515cbd9fbe784cc1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 3 Nov 2017 05:09:43 -0700
Subject: [PATCH 378/421] Allow chunk cancelation only if nothing has been
 consumed from it.

The mediaChunks.size() > 1 check was supposed to ensure this, and
did roughly the right thing when there was only a single stream
(although it was unnecessarily restrictive in preventing chunk
cancelation for the first chunk, where bytesLoaded != 0 and none
of the samples had been consumed).

Now we have multiple streams the check doesn't do the right thing,
and adding a back-buffer feature will make even more incorrect.
This change switches to checking the condition we actually want
to check directly :).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174449398
---
 .../source/chunk/ChunkSampleStream.java        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

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 9d5a405c2fb..b64dec59bfc 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
@@ -315,7 +315,7 @@ public int onLoadError(Chunk loadable, long elapsedRealtimeMs, long loadDuration
       IOException error) {
     long bytesLoaded = loadable.bytesLoaded();
     boolean isMediaChunk = isMediaChunk(loadable);
-    boolean cancelable = !isMediaChunk || bytesLoaded == 0 || mediaChunks.size() > 1;
+    boolean cancelable = bytesLoaded == 0 || !isMediaChunk || !haveReadFromLastMediaChunk();
     boolean canceled = false;
     if (chunkSource.onChunkLoadError(loadable, cancelable, error)) {
       canceled = true;
@@ -415,6 +415,22 @@ private boolean isMediaChunk(Chunk chunk) {
     return chunk instanceof BaseMediaChunk;
   }
 
+  /**
+   * Returns whether samples have been read from {@code mediaChunks.getLast()}.
+   */
+  private boolean haveReadFromLastMediaChunk() {
+    BaseMediaChunk lastChunk = mediaChunks.getLast();
+    if (primarySampleQueue.getReadIndex() > lastChunk.getFirstSampleIndex(0)) {
+      return true;
+    }
+    for (int i = 0; i < embeddedSampleQueues.length; i++) {
+      if (embeddedSampleQueues[i].getReadIndex() > lastChunk.getFirstSampleIndex(i + 1)) {
+        return true;
+      }
+    }
+    return false;
+  }
+
   /* package */ boolean isPendingReset() {
     return pendingResetPositionUs != C.TIME_UNSET;
   }

From 872cfc131ad1c1746365e5c358a08f63e6ed33a0 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 3 Nov 2017 05:32:00 -0700
Subject: [PATCH 379/421] Fix unnecessary CachedContentIndex store() calls

First fix, prevents forced rewriting when cipher is set but encrypt is
false.

Second, removes the store() call in SimpleCache.initialize() so
initialization doesn't fail because of CachedContentIndex write issues.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174450586
---
 .../exoplayer2/upstream/cache/Cache.java       |  2 +-
 .../upstream/cache/CachedContentIndex.java     | 15 +++++++--------
 .../exoplayer2/upstream/cache/SimpleCache.java | 18 +++++-------------
 3 files changed, 13 insertions(+), 22 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 57cbcafb532..80ad698fa41 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
@@ -72,7 +72,7 @@ public CacheException(String message) {
       super(message);
     }
 
-    public CacheException(IOException cause) {
+    public CacheException(Throwable cause) {
       super(cause);
     }
 
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 5d92c51dcc8..64144bc5ef6 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
@@ -92,7 +92,8 @@ public CachedContentIndex(File cacheDir, byte[] secretKey) {
    *
    * @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 When false, a plaintext index will be written.
+   * @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) {
     this.encrypt = encrypt;
@@ -105,6 +106,7 @@ public CachedContentIndex(File cacheDir, byte[] secretKey, boolean encrypt) {
         throw new IllegalStateException(e); // Should never happen.
       }
     } else {
+      Assertions.checkState(!encrypt);
       cipher = null;
       secretKeySpec = null;
     }
@@ -259,10 +261,8 @@ private boolean readFile() {
           throw new IllegalStateException(e);
         }
         input = new DataInputStream(new CipherInputStream(inputStream, cipher));
-      } else {
-        if (cipher != null) {
-          changed = true; // Force index to be rewritten encrypted after read.
-        }
+      } else if (encrypt) {
+        changed = true; // Force index to be rewritten encrypted after read.
       }
 
       int count = input.readInt();
@@ -300,11 +300,10 @@ private void writeFile() throws CacheException {
       output = new DataOutputStream(bufferedOutputStream);
       output.writeInt(VERSION);
 
-      boolean writeEncrypted = encrypt && cipher != null;
-      int flags = writeEncrypted ? FLAG_ENCRYPTED_INDEX : 0;
+      int flags = encrypt ? FLAG_ENCRYPTED_INDEX : 0;
       output.writeInt(flags);
 
-      if (writeEncrypted) {
+      if (encrypt) {
         byte[] initializationVector = new byte[16];
         new Random().nextBytes(initializationVector);
         output.write(initializationVector);
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 2fe16287db4..9739f219230 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
@@ -37,7 +37,6 @@ public final class SimpleCache implements Cache {
   private final CachedContentIndex index;
   private final HashMap<String, ArrayList<Listener>> listeners;
   private long totalSpace = 0;
-  private CacheException initializationException;
 
   /**
    * Constructs the cache. The cache will delete any unrecognized files from the directory. Hence
@@ -71,7 +70,8 @@ public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey) {
    * @param evictor The evictor to be used.
    * @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 When false, a plaintext index will be written.
+   * @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) {
     this(cacheDir, evictor, new CachedContentIndex(cacheDir, secretKey, encrypt));
@@ -98,11 +98,7 @@ public SimpleCache(File cacheDir, CacheEvictor evictor, byte[] secretKey, boolea
       public void run() {
         synchronized (SimpleCache.this) {
           conditionVariable.open();
-          try {
-            initialize();
-          } catch (CacheException e) {
-            initializationException = e;
-          }
+          initialize();
           SimpleCache.this.evictor.onCacheInitialized();
         }
       }
@@ -169,10 +165,6 @@ public synchronized SimpleCacheSpan startReadWrite(String key, long position)
   @Override
   public synchronized SimpleCacheSpan startReadWriteNonBlocking(String key, long position)
       throws CacheException {
-    if (initializationException != null) {
-      throw initializationException;
-    }
-
     SimpleCacheSpan cacheSpan = getSpan(key, position);
 
     // Read case.
@@ -270,7 +262,7 @@ private SimpleCacheSpan getSpan(String key, long position) throws CacheException
   /**
    * Ensures that the cache's in-memory representation has been initialized.
    */
-  private void initialize() throws CacheException {
+  private void initialize() {
     if (!cacheDir.exists()) {
       cacheDir.mkdirs();
       return;
@@ -296,7 +288,7 @@ private void initialize() throws CacheException {
     }
 
     index.removeEmpty();
-    index.store();
+    // Don't call index.store() here so initialization doesn't fail because of write issues.
   }
 
   /**

From 069466988ff0c07e4b698c9fcc04ac14dac3f26d Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Fri, 3 Nov 2017 09:00:45 -0700
Subject: [PATCH 380/421] Bump to 2.6.0

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174467964
---
 RELEASENOTES.md                               | 50 +++++++++++++++++++
 constants.gradle                              |  2 +-
 demos/cast/src/main/AndroidManifest.xml       |  4 +-
 demos/ima/src/main/AndroidManifest.xml        |  4 +-
 demos/main/src/main/AndroidManifest.xml       |  4 +-
 .../exoplayer2/ExoPlayerLibraryInfo.java      |  6 +--
 6 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 90b3d15e083..42bf526de00 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,5 +1,55 @@
 # Release notes #
 
+### r2.6.0 ###
+
+* New `Player.DefaultEventListener` abstract class can be extended to avoid
+  having to implement all methods defined by `Player.EventListener`.
+* Added a reason to `EventListener.onPositionDiscontinuity`
+  ([#3252](https://github.com/google/ExoPlayer/issues/3252)).
+* New `setShuffleModeEnabled` method for enabling shuffled playback.
+* Support for `Renderer`s that don't consume any media
+  ([#3212](https://github.com/google/ExoPlayer/issues/3212)).
+* Fix potential `IndexOutOfBoundsException` when calling `ExoPlayer.getDuration`
+  ([#3362](https://github.com/google/ExoPlayer/issues/3362)).
+* Fix playbacks involving looping, concatenation and ads getting stuck when
+  media contains tracks with uneven durations
+  ([#1874](https://github.com/google/ExoPlayer/issues/1874)).
+* Better playback experience when the video decoder cannot keep up, by skipping
+  to key-frames. This is particularly relevant for variable speed playbacks.
+* SimpleExoPlayer: Support for multiple video, text and metadata outputs.
+* Audio: New `AudioSink` interface allows customization of audio output path.
+* Offline: Added `Downloader` implementations for DASH, HLS, SmoothStreaming
+  and progressive streams.
+* Track selection:
+  * Fixed adaptive track selection logic for live playbacks
+    ([#3017](https://github.com/google/ExoPlayer/issues/3017)).
+  * Added ability to select the lowest bitrate tracks.
+* HLS:
+  * Support for Widevine protected FMP4 variants.
+* DRM:
+  * Improved compatibility with ClearKey content
+    ([#3138](https://github.com/google/ExoPlayer/issues/3138)).
+  * Support multiple PSSH boxes of the same type.
+  * Retry initial provisioning and key requests if they fail
+  * Fix incorrect parsing of non-CENC sinf boxes.
+* IMA extension:
+  * Expose `AdsLoader` via getter
+    ([#3322](https://github.com/google/ExoPlayer/issues/3322)).
+  * Handle `setPlayWhenReady` calls during ad playbacks
+    ([#3303](https://github.com/google/ExoPlayer/issues/3303)).
+  * Ignore seeks if an ad is playing
+    ([#3309](https://github.com/google/ExoPlayer/issues/3309)).
+* UI:
+  * Allow specifying a `Drawable` for the `TimeBar` scrubber
+    ([#3337](https://github.com/google/ExoPlayer/issues/3337)).
+  * Allow multiple listeners on `TimeBar`
+    ([#3406](https://github.com/google/ExoPlayer/issues/3406)).
+* New Leanback extension: Simplifies binding Exoplayer to Leanback UI
+  components.
+* New Cast extension: Simplifies toggling between local and Cast playbacks.
+* Unit tests moved to Robolectric.
+* Misc bugfixes.
+
 ### r2.5.4 ###
 
 * Remove unnecessary media playlist fetches during playback of live HLS streams.
diff --git a/constants.gradle b/constants.gradle
index c2209cbbe65..644d47b8aa8 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -28,7 +28,7 @@ project.ext {
     junitVersion = '4.12'
     truthVersion = '0.35'
     robolectricVersion = '3.4.2'
-    releaseVersion = 'r2.5.4'
+    releaseVersion = 'r2.6.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
index cd2b51513c1..11f8e39b538 100644
--- a/demos/cast/src/main/AndroidManifest.xml
+++ b/demos/cast/src/main/AndroidManifest.xml
@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.castdemo"
-    android:versionCode="2504"
-    android:versionName="2.5.4">
+    android:versionCode="2600"
+    android:versionName="2.6.0">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
diff --git a/demos/ima/src/main/AndroidManifest.xml b/demos/ima/src/main/AndroidManifest.xml
index 5c6db024177..5252d2feeb0 100644
--- a/demos/ima/src/main/AndroidManifest.xml
+++ b/demos/ima/src/main/AndroidManifest.xml
@@ -15,8 +15,8 @@
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.imademo"
-    android:versionCode="2504"
-    android:versionName="2.5.4">
+    android:versionCode="2600"
+    android:versionName="2.6.0">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
diff --git a/demos/main/src/main/AndroidManifest.xml b/demos/main/src/main/AndroidManifest.xml
index f70d6152e81..d041e24d805 100644
--- a/demos/main/src/main/AndroidManifest.xml
+++ b/demos/main/src/main/AndroidManifest.xml
@@ -16,8 +16,8 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.google.android.exoplayer2.demo"
-    android:versionCode="2504"
-    android:versionName="2.5.4">
+    android:versionCode="2600"
+    android:versionName="2.6.0">
 
   <uses-permission android:name="android.permission.INTERNET"/>
   <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
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 62ee8c4873b..f13a7de0ca0 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
@@ -31,13 +31,13 @@ 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.5.4";
+  public static final String VERSION = "2.6.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.5.4";
+  public static final String VERSION_SLASHY = "ExoPlayerLib/2.6.0";
 
   /**
    * The version of the library expressed as an integer, for example 1002003.
@@ -47,7 +47,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 = 2005004;
+  public static final int VERSION_INT = 2006000;
 
   /**
    * Whether the library was compiled with {@link com.google.android.exoplayer2.util.Assertions}

From e4a0e977cd06b945d4faf149908dbeb5aa4e0a55 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 3 Nov 2017 16:23:21 +0000
Subject: [PATCH 381/421] Remove DownloadManager test

---
 .../offline/DownloadManagerTest.java          | 432 ------------------
 1 file changed, 432 deletions(-)
 delete mode 100644 library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
deleted file mode 100644
index 791b4a9d355..00000000000
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/offline/DownloadManagerTest.java
+++ /dev/null
@@ -1,432 +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.os.ConditionVariable;
-import android.support.annotation.Nullable;
-import android.test.InstrumentationTestCase;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadListener;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadTask;
-import com.google.android.exoplayer2.offline.DownloadManager.DownloadTask.State;
-import com.google.android.exoplayer2.upstream.DummyDataSource;
-import com.google.android.exoplayer2.upstream.cache.Cache;
-import com.google.android.exoplayer2.util.ClosedSource;
-import com.google.android.exoplayer2.util.Util;
-import java.io.DataOutputStream;
-import java.io.File;
-import java.io.IOException;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-
-/** Tests {@link DownloadManager}. */
-@ClosedSource(reason = "Not ready yet")
-public class DownloadManagerTest extends InstrumentationTestCase {
-
-  /* Used to check if condition becomes true in this time interval. */
-  private static final int ASSERT_TRUE_TIMEOUT = 1000;
-  /* Used to check if condition stays false for this time interval. */
-  private static final int ASSERT_FALSE_TIME = 1000;
-
-  private DownloadManager downloadManager;
-  private File actionFile;
-  private TestDownloadListener testDownloadListener;
-
-  @Override
-  public void setUp() throws Exception {
-    super.setUp();
-    setUpMockito(this);
-
-    actionFile = Util.createTempFile(getInstrumentation().getContext(), "ExoPlayerTest");
-    downloadManager = new DownloadManager(
-        new DownloaderConstructorHelper(Mockito.mock(Cache.class), DummyDataSource.FACTORY),
-        100, actionFile.getAbsolutePath());
-
-    testDownloadListener = new TestDownloadListener();
-    downloadManager.addListener(testDownloadListener);
-  }
-    
-  @Override
-  public void tearDown() throws Exception {
-    downloadManager.release();
-    actionFile.delete();
-    super.tearDown();
-  }
-
-  public void testDownloadActionRuns() throws Throwable {
-    doTestActionRuns(createDownloadAction("media 1"));
-  }
-
-  public void testRemoveActionRuns() throws Throwable {
-    doTestActionRuns(createRemoveAction("media 1"));
-  }
-
-  public void testDifferentMediaDownloadActionsStartInParallel() throws Throwable {
-    doTestActionsRunInParallel(createDownloadAction("media 1"),
-        createDownloadAction("media 2"));
-  }
-
-  public void testDifferentMediaDifferentActionsStartInParallel() throws Throwable {
-    doTestActionsRunInParallel(createDownloadAction("media 1"),
-        createRemoveAction("media 2"));
-  }
-
-  public void testSameMediaDownloadActionsStartInParallel() throws Throwable {
-    doTestActionsRunInParallel(createDownloadAction("media 1"),
-        createDownloadAction("media 1"));
-  }
-
-  public void testSameMediaRemoveActionWaitsDownloadAction() throws Throwable {
-    doTestActionsRunSequentially(createDownloadAction("media 1"),
-        createRemoveAction("media 1"));
-  }
-
-  public void testSameMediaDownloadActionWaitsRemoveAction() throws Throwable {
-    doTestActionsRunSequentially(createRemoveAction("media 1"),
-        createDownloadAction("media 1"));
-  }
-
-  public void testSameMediaRemoveActionWaitsRemoveAction() throws Throwable {
-    doTestActionsRunSequentially(createRemoveAction("media 1"),
-        createRemoveAction("media 1"));
-  }
-
-  public void testSameMediaMultipleActions() throws Throwable {
-    FakeDownloadAction downloadAction1 = createDownloadAction("media 1").ignoreInterrupts();
-    FakeDownloadAction downloadAction2 = createDownloadAction("media 1").ignoreInterrupts();
-    FakeDownloadAction removeAction1 = createRemoveAction("media 1");
-    FakeDownloadAction downloadAction3 = createDownloadAction("media 1");
-    FakeDownloadAction removeAction2 = createRemoveAction("media 1");
-
-    // Two download actions run in parallel.
-    downloadAction1.post().assertStarted();
-    downloadAction2.post().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();
-
-    // downloadAction2 finishes but it isn't enough to start removeAction1.
-    downloadAction2.finish().assertCancelled();
-    removeAction1.assertDoesNotStart();
-    // downloadAction3 is post to DownloadManager but it waits for removeAction1 to finish.
-    downloadAction3.post().assertDoesNotStart();
-
-    // When downloadAction1 finishes, removeAction1 starts.
-    downloadAction1.finish().assertCancelled();
-    removeAction1.assertStarted();
-    // downloadAction3 still waits removeAction1
-    downloadAction3.assertDoesNotStart();
-
-    // removeAction2 is posted. removeAction1 and downloadAction3 is canceled so removeAction2
-    // starts immediately.
-    removeAction2.post().assertStarted().finish().assertEnded();
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  public void testMultipleRemoveActionWaitsLastCancelsAllOther() throws Throwable {
-    FakeDownloadAction removeAction1 = createRemoveAction("media 1").ignoreInterrupts();
-    FakeDownloadAction removeAction2 = createRemoveAction("media 1");
-    FakeDownloadAction removeAction3 = createRemoveAction("media 1");
-
-    removeAction1.post().assertStarted();
-    removeAction2.post().assertDoesNotStart();
-    removeAction3.post().assertDoesNotStart();
-
-    removeAction2.assertCancelled();
-
-    removeAction1.finish().assertCancelled();
-    removeAction3.assertStarted().finish().assertEnded();
-
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  public void testMultipleWaitingDownloadActionStartsInParallel() throws Throwable {
-    FakeDownloadAction removeAction = createRemoveAction("media 1").ignoreInterrupts();
-    FakeDownloadAction downloadAction1 = createDownloadAction("media 1");
-    FakeDownloadAction downloadAction2 = createDownloadAction("media 1");
-
-    removeAction.post().assertStarted();
-    downloadAction1.post().assertDoesNotStart();
-    downloadAction2.post().assertDoesNotStart();
-
-    removeAction.finish().assertEnded();
-    downloadAction1.assertStarted();
-    downloadAction2.assertStarted();
-    downloadAction1.finish().assertEnded();
-    downloadAction2.finish().assertEnded();
-
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  public void testDifferentMediaDownloadActionsPreserveOrder() throws Throwable {
-    FakeDownloadAction removeAction = createRemoveAction("media 1").ignoreInterrupts();
-    FakeDownloadAction downloadAction1 = createDownloadAction("media 1");
-    FakeDownloadAction downloadAction2 = createDownloadAction("media 2");
-
-    removeAction.post().assertStarted();
-    downloadAction1.post().assertDoesNotStart();
-    downloadAction2.post().assertDoesNotStart();
-
-    removeAction.finish().assertEnded();
-    downloadAction1.assertStarted();
-    downloadAction2.assertStarted();
-    downloadAction1.finish().assertEnded();
-    downloadAction2.finish().assertEnded();
-
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  public void testDifferentMediaRemoveActionsDoNotPreserveOrder() throws Throwable {
-    FakeDownloadAction downloadAction = createDownloadAction("media 1").ignoreInterrupts();
-    FakeDownloadAction removeAction1 = createRemoveAction("media 1");
-    FakeDownloadAction removeAction2 = createRemoveAction("media 2");
-
-    downloadAction.post().assertStarted();
-    removeAction1.post().assertDoesNotStart();
-    removeAction2.post().assertStarted();
-
-    downloadAction.finish().assertCancelled();
-    removeAction2.finish().assertEnded();
-
-    removeAction1.assertStarted();
-    removeAction1.finish().assertEnded();
-
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  private void doTestActionRuns(FakeDownloadAction action) throws Throwable {
-    action.post().assertStarted().finish().assertEnded();
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  private void doTestActionsRunSequentially(FakeDownloadAction action1,
-      FakeDownloadAction action2) throws Throwable {
-    action1.ignoreInterrupts().post().assertStarted();
-    action2.post().assertDoesNotStart();
-
-    action1.finish();
-    action2.assertStarted();
-
-    action2.finish().assertEnded();
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  private void doTestActionsRunInParallel(FakeDownloadAction action1,
-      FakeDownloadAction action2) throws Throwable {
-    action1.post().assertStarted();
-    action2.post().assertStarted();
-    action1.finish().assertEnded();
-    action2.finish().assertEnded();
-    testDownloadListener.blockUntilTasksCompleteAndThrowAnyDownloadError();
-  }
-
-  private FakeDownloadAction createDownloadAction(String mediaId) {
-    return new FakeDownloadAction(downloadManager, mediaId, false);
-  }
-
-  private FakeDownloadAction createRemoveAction(String mediaId) {
-    return new FakeDownloadAction(downloadManager, mediaId, true);
-  }
-
-  private static class TestDownloadListener implements DownloadListener {
-
-    private ConditionVariable downloadFinishedCondition;
-    private Throwable downloadError;
-
-    private TestDownloadListener() {
-      downloadFinishedCondition = new ConditionVariable();
-    }
-
-    @Override
-    public void onStateChange(DownloadManager downloadManager, DownloadTask downloadTask, int state,
-        Throwable error) {
-      if (state == DownloadTask.STATE_ERROR && downloadError == null) {
-        downloadError = error;
-      }
-      ((FakeDownloadAction) downloadTask.getDownloadAction()).onStateChange();
-    }
-
-    @Override
-    public void onTasksFinished(DownloadManager downloadManager) {
-      downloadFinishedCondition.open();
-    }
-
-    private void blockUntilTasksCompleteAndThrowAnyDownloadError() throws Throwable {
-      assertTrue(downloadFinishedCondition.block(ASSERT_TRUE_TIMEOUT));
-      downloadFinishedCondition.close();
-      if (downloadError != null) {
-        throw downloadError;
-      }
-    }
-
-  }
-
-  /**
-   * Sets up Mockito for an instrumentation test.
-   */
-  private static void setUpMockito(InstrumentationTestCase instrumentationTestCase) {
-    // Workaround for https://code.google.com/p/dexmaker/issues/detail?id=2.
-    System.setProperty("dexmaker.dexcache",
-        instrumentationTestCase.getInstrumentation().getTargetContext().getCacheDir().getPath());
-    MockitoAnnotations.initMocks(instrumentationTestCase);
-  }
-
-  private static class FakeDownloadAction extends DownloadAction {
-
-    private final DownloadManager downloadManager;
-    private final String mediaId;
-    private final boolean removeAction;
-    private final FakeDownloader downloader;
-    private final ConditionVariable stateChanged;
-    private DownloadTask downloadTask;
-
-    private FakeDownloadAction(DownloadManager downloadManager, String mediaId,
-        boolean removeAction) {
-      this.downloadManager = downloadManager;
-      this.mediaId = mediaId;
-      this.removeAction = removeAction;
-      this.downloader = new FakeDownloader(removeAction);
-      this.stateChanged = new ConditionVariable();
-    }
-
-    @Override
-    protected String getType() {
-      return "FakeDownloadAction";
-    }
-
-    @Override
-    protected void writeToStream(DataOutputStream output) throws IOException {
-      // do nothing.
-    }
-
-    @Override
-    protected boolean isRemoveAction() {
-      return removeAction;
-    }
-
-    @Override
-    protected boolean isSameMedia(DownloadAction other) {
-      return other instanceof FakeDownloadAction
-          && mediaId.equals(((FakeDownloadAction) other).mediaId);
-    }
-
-    @Override
-    protected Downloader createDownloader(DownloaderConstructorHelper downloaderConstructorHelper) {
-      return downloader;
-    }
-
-    private FakeDownloadAction post() {
-      downloadTask = downloadManager.handleAction(this);
-      return this;
-    }
-
-    private FakeDownloadAction assertDoesNotStart() {
-      assertFalse(downloader.started.block(ASSERT_FALSE_TIME));
-      return this;
-    }
-
-    private FakeDownloadAction assertStarted() {
-      assertTrue(downloader.started.block(ASSERT_TRUE_TIMEOUT));
-      assertState(DownloadTask.STATE_STARTED);
-      return this;
-    }
-
-    private FakeDownloadAction assertEnded() {
-      return assertState(DownloadTask.STATE_ENDED);
-    }
-
-    private FakeDownloadAction assertCancelled() {
-      return assertState(DownloadTask.STATE_CANCELED);
-    }
-
-    private FakeDownloadAction assertState(@State int state) {
-      assertTrue(stateChanged.block(ASSERT_TRUE_TIMEOUT));
-      stateChanged.close();
-      assertEquals(state, downloadTask.getState());
-      return this;
-    }
-
-    private FakeDownloadAction finish() {
-      downloader.finish.open();
-      return this;
-    }
-
-    private FakeDownloadAction ignoreInterrupts() {
-      downloader.ignoreInterrupts = true;
-      return this;
-    }
-
-    private void onStateChange() {
-      stateChanged.open();
-    }
-  }
-
-  private static class FakeDownloader implements Downloader {
-    private final ConditionVariable started;
-    private final com.google.android.exoplayer2.util.ConditionVariable finish;
-    private final boolean removeAction;
-    private boolean ignoreInterrupts;
-
-    private FakeDownloader(boolean removeAction) {
-      this.removeAction = removeAction;
-      this.started = new ConditionVariable();
-      this.finish = new com.google.android.exoplayer2.util.ConditionVariable();
-    }
-
-    @Override
-    public void init() throws InterruptedException, IOException {
-      // do nothing.
-    }
-
-    @Override
-    public void download(@Nullable ProgressListener listener)
-        throws InterruptedException, IOException {
-      assertFalse(removeAction);
-      started.open();
-      blockUntilFinish();
-    }
-
-    @Override
-    public void remove() throws InterruptedException {
-      assertTrue(removeAction);
-      started.open();
-      blockUntilFinish();
-    }
-
-    private void blockUntilFinish() throws InterruptedException {
-      while (true){
-        try {
-          finish.block();
-          break;
-        } catch (InterruptedException e) {
-          if (!ignoreInterrupts) {
-            throw e;
-          }
-        }
-      }
-    }
-
-    @Override
-    public long getDownloadedBytes() {
-      return 0;
-    }
-
-    @Override
-    public float getDownloadPercentage() {
-      return 0;
-    }
-  }
-
-}

From c9ede155521ac8da81aa74c2b8ae4c73f27c05b3 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 3 Nov 2017 09:36:43 -0700
Subject: [PATCH 382/421] Relax string comparison in DASH
 parseContentProtection

... by making it case insensitive and null-tolerant for schemeId (as was before
adding playlist drm data merging).

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174472123
---
 .../dash/manifest/DashManifestParser.java     | 40 ++++++++++---------
 1 file changed, 21 insertions(+), 19 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 0c35ef0d107..72df69f7e9d 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
@@ -345,30 +345,32 @@ protected int getContentType(Format format) {
    */
   protected Pair<String, SchemeData> parseContentProtection(XmlPullParser xpp)
       throws XmlPullParserException, IOException {
-    String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
     String schemeType = null;
     byte[] data = null;
     UUID uuid = null;
     boolean requiresSecureDecoder = false;
 
-    switch (schemeIdUri) {
-      case "urn:mpeg:dash:mp4protection:2011":
-        schemeType = xpp.getAttributeValue(null, "value");
-        String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
-        if (defaultKid != null && !"00000000-0000-0000-0000-000000000000".equals(defaultKid)) {
-          UUID keyId = UUID.fromString(defaultKid);
-          data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null);
-          uuid = C.COMMON_PSSH_UUID;
-        }
-        break;
-      case "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95":
-        uuid = C.PLAYREADY_UUID;
-        break;
-      case "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed":
-        uuid = C.WIDEVINE_UUID;
-        break;
-      default:
-        break;
+    String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
+    if (schemeIdUri != null) {
+      switch (schemeIdUri.toLowerCase()) {
+        case "urn:mpeg:dash:mp4protection:2011":
+          schemeType = xpp.getAttributeValue(null, "value");
+          String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
+          if (defaultKid != null && !"00000000-0000-0000-0000-000000000000".equals(defaultKid)) {
+            UUID keyId = UUID.fromString(defaultKid);
+            data = PsshAtomUtil.buildPsshAtom(C.COMMON_PSSH_UUID, new UUID[] {keyId}, null);
+            uuid = C.COMMON_PSSH_UUID;
+          }
+          break;
+        case "urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95":
+          uuid = C.PLAYREADY_UUID;
+          break;
+        case "urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed":
+          uuid = C.WIDEVINE_UUID;
+          break;
+        default:
+          break;
+      }
     }
 
     do {

From 061bcdd136d5dd7a66f6280a920b9139751ff77c Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Fri, 3 Nov 2017 10:01:15 -0700
Subject: [PATCH 383/421] Allow playback to continue even after
 SingleSampleMediaPeriod load errors

This prevents users from having to check sideloaded subtitles URLs before
preparing a SingleSampleMediaSource with it.

Issue:#3140

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174475274
---
 .../source/SingleSampleMediaPeriod.java       | 40 ++++++++++++-------
 .../source/SingleSampleMediaSource.java       | 37 +++++++++++++++--
 2 files changed, 60 insertions(+), 17 deletions(-)

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 b19f398d86e..6101c79b7f0 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
@@ -27,7 +27,6 @@
 import com.google.android.exoplayer2.upstream.DataSpec;
 import com.google.android.exoplayer2.upstream.Loader;
 import com.google.android.exoplayer2.upstream.Loader.Loadable;
-import com.google.android.exoplayer2.util.Assertions;
 import com.google.android.exoplayer2.util.Util;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -52,16 +51,20 @@
   private final int eventSourceId;
   private final TrackGroupArray tracks;
   private final ArrayList<SampleStreamImpl> sampleStreams;
+  // Package private to avoid thunk methods.
   /* package */ final Loader loader;
   /* package */ final Format format;
+  /* package */ final boolean treatLoadErrorsAsEndOfStream;
 
   /* package */ boolean loadingFinished;
+  /* package */ boolean loadingSucceeded;
   /* package */ byte[] sampleData;
   /* package */ int sampleSize;
+  private int errorCount;
 
   public SingleSampleMediaPeriod(Uri uri, DataSource.Factory dataSourceFactory, Format format,
       int minLoadableRetryCount, Handler eventHandler, EventListener eventListener,
-      int eventSourceId) {
+      int eventSourceId, boolean treatLoadErrorsAsEndOfStream) {
     this.uri = uri;
     this.dataSourceFactory = dataSourceFactory;
     this.format = format;
@@ -69,6 +72,7 @@ public SingleSampleMediaPeriod(Uri uri, DataSource.Factory dataSourceFactory, Fo
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
     this.eventSourceId = eventSourceId;
+    this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
     tracks = new TrackGroupArray(new TrackGroup(format));
     sampleStreams = new ArrayList<>();
     loader = new Loader("Loader:SingleSampleMediaPeriod");
@@ -85,7 +89,7 @@ public void prepare(Callback callback, long positionUs) {
 
   @Override
   public void maybeThrowPrepareError() throws IOException {
-    loader.maybeThrowError();
+    // Do nothing.
   }
 
   @Override
@@ -157,6 +161,7 @@ public void onLoadCompleted(SourceLoadable loadable, long elapsedRealtimeMs,
     sampleSize = loadable.sampleSize;
     sampleData = loadable.sampleData;
     loadingFinished = true;
+    loadingSucceeded = true;
   }
 
   @Override
@@ -169,6 +174,11 @@ public void onLoadCanceled(SourceLoadable loadable, long elapsedRealtimeMs, long
   public int onLoadError(SourceLoadable loadable, long elapsedRealtimeMs, long loadDurationMs,
       IOException error) {
     notifyLoadError(error);
+    errorCount++;
+    if (treatLoadErrorsAsEndOfStream && errorCount >= minLoadableRetryCount) {
+      loadingFinished = true;
+      return Loader.DONT_RETRY;
+    }
     return Loader.RETRY;
   }
 
@@ -206,7 +216,9 @@ public boolean isReady() {
 
     @Override
     public void maybeThrowError() throws IOException {
-      loader.maybeThrowError();
+      if (!treatLoadErrorsAsEndOfStream) {
+        loader.maybeThrowError();
+      }
     }
 
     @Override
@@ -219,19 +231,19 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
         formatHolder.format = format;
         streamState = STREAM_STATE_SEND_SAMPLE;
         return C.RESULT_FORMAT_READ;
-      }
-
-      Assertions.checkState(streamState == STREAM_STATE_SEND_SAMPLE);
-      if (!loadingFinished) {
-        return C.RESULT_NOTHING_READ;
-      } else {
-        buffer.timeUs = 0;
-        buffer.addFlag(C.BUFFER_FLAG_KEY_FRAME);
-        buffer.ensureSpaceForWrite(sampleSize);
-        buffer.data.put(sampleData, 0, sampleSize);
+      } else if (loadingFinished) {
+        if (loadingSucceeded) {
+          buffer.timeUs = 0;
+          buffer.addFlag(C.BUFFER_FLAG_KEY_FRAME);
+          buffer.ensureSpaceForWrite(sampleSize);
+          buffer.data.put(sampleData, 0, sampleSize);
+        } else {
+          buffer.addFlag(C.BUFFER_FLAG_END_OF_STREAM);
+        }
         streamState = STREAM_STATE_END_OF_STREAM;
         return C.RESULT_BUFFER_READ;
       }
+      return C.RESULT_NOTHING_READ;
     }
 
     @Override
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 5b190078fd1..dd901958fd7 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
@@ -57,21 +57,51 @@ public interface EventListener {
   private final Handler eventHandler;
   private final EventListener eventListener;
   private final int eventSourceId;
+  private final boolean treatLoadErrorsAsEndOfStream;
   private final Timeline timeline;
 
+  /**
+   * @param uri The {@link Uri} of the media stream.
+   * @param dataSourceFactory The factory from which the {@link DataSource} to read the media will
+   *     be obtained.
+   * @param format The {@link Format} associated with the output track.
+   * @param durationUs The duration of the media stream in microseconds.
+   */
   public SingleSampleMediaSource(Uri uri, DataSource.Factory dataSourceFactory, Format format,
       long durationUs) {
     this(uri, dataSourceFactory, format, durationUs, DEFAULT_MIN_LOADABLE_RETRY_COUNT);
   }
 
+  /**
+   * @param uri The {@link Uri} of the media stream.
+   * @param dataSourceFactory The factory from which the {@link DataSource} to read the media will
+   *     be obtained.
+   * @param format The {@link Format} associated with the output track.
+   * @param durationUs The duration of the media stream in microseconds.
+   * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs.
+   */
   public SingleSampleMediaSource(Uri uri, DataSource.Factory dataSourceFactory, Format format,
       long durationUs, int minLoadableRetryCount) {
-    this(uri, dataSourceFactory, format, durationUs, minLoadableRetryCount, null, null, 0);
+    this(uri, dataSourceFactory, format, durationUs, minLoadableRetryCount, null, null, 0, false);
   }
 
+  /**
+   * @param uri The {@link Uri} of the media stream.
+   * @param dataSourceFactory The factory from which the {@link DataSource} to read the media will
+   *     be obtained.
+   * @param format The {@link Format} associated with the output track.
+   * @param durationUs The duration of the media stream in microseconds.
+   * @param minLoadableRetryCount The minimum number of times to retry if a loading error occurs.
+   * @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.
+   * @param eventSourceId An identifier that gets passed to {@code eventListener} methods.
+   * @param treatLoadErrorsAsEndOfStream If true, load errors will not be propagated by sample
+   *     streams, treating them as ended instead. If false, load errors will be propagated normally
+   *     by {@link SampleStream#maybeThrowError()}.
+   */
   public SingleSampleMediaSource(Uri uri, DataSource.Factory dataSourceFactory, Format format,
       long durationUs, int minLoadableRetryCount, Handler eventHandler, EventListener eventListener,
-      int eventSourceId) {
+      int eventSourceId, boolean treatLoadErrorsAsEndOfStream) {
     this.uri = uri;
     this.dataSourceFactory = dataSourceFactory;
     this.format = format;
@@ -79,6 +109,7 @@ public SingleSampleMediaSource(Uri uri, DataSource.Factory dataSourceFactory, Fo
     this.eventHandler = eventHandler;
     this.eventListener = eventListener;
     this.eventSourceId = eventSourceId;
+    this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
     timeline = new SinglePeriodTimeline(durationUs, true);
   }
 
@@ -98,7 +129,7 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     Assertions.checkArgument(id.periodIndex == 0);
     return new SingleSampleMediaPeriod(uri, dataSourceFactory, format, minLoadableRetryCount,
-        eventHandler, eventListener, eventSourceId);
+        eventHandler, eventListener, eventSourceId, treatLoadErrorsAsEndOfStream);
   }
 
   @Override

From b7f13686965fd321699ade8994501103baed1f10 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 6 Nov 2017 03:37:16 -0800
Subject: [PATCH 384/421] Simplify ContentDataSourceTest

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174685374
---
 .../upstream/ContentDataSourceTest.java        | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

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 2b70c83ca5f..6a85483dd12 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
@@ -23,7 +23,6 @@
 import android.net.Uri;
 import android.support.annotation.NonNull;
 import android.test.InstrumentationTestCase;
-import android.test.MoreAsserts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.FileNotFoundException;
@@ -38,9 +37,6 @@ public final class ContentDataSourceTest extends InstrumentationTestCase {
   private static final String AUTHORITY = "com.google.android.exoplayer2.core.test";
   private static final String DATA_PATH = "binary/1024_incrementing_bytes.mp3";
 
-  private static final int TEST_DATA_OFFSET = 1;
-  private static final int TEST_DATA_LENGTH = 1023;
-
   public void testReadValidUri() throws Exception {
     ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
     Uri contentUri = new Uri.Builder()
@@ -77,15 +73,11 @@ public void testReadFromOffsetToEndOfInput() throws Exception {
         .authority(AUTHORITY)
         .path(DATA_PATH).build();
     try {
-      DataSpec dataSpec = new DataSpec(contentUri, TEST_DATA_OFFSET, C.LENGTH_UNSET, null);
-      long length = dataSource.open(dataSpec);
-      assertEquals(TEST_DATA_LENGTH, length);
-      byte[] expectedData = Arrays.copyOfRange(
-          TestUtil.getByteArray(getInstrumentation(), DATA_PATH), TEST_DATA_OFFSET,
-          TEST_DATA_OFFSET + TEST_DATA_LENGTH);
-      byte[] readData = TestUtil.readToEnd(dataSource);
-      MoreAsserts.assertEquals(expectedData, readData);
-      assertEquals(C.RESULT_END_OF_INPUT, dataSource.read(new byte[1], 0, 1));
+      int testOffset = 1;
+      DataSpec dataSpec = new DataSpec(contentUri, testOffset, C.LENGTH_UNSET, null);
+      byte[] completeData = TestUtil.getByteArray(getInstrumentation(), DATA_PATH);
+      byte[] expectedData = Arrays.copyOfRange(completeData, testOffset, completeData.length);
+      TestUtil.assertDataSourceContent(dataSource, dataSpec, expectedData);
     } finally {
       dataSource.close();
     }

From 585e70c139de1f9afa8df5ea6a8be76be7e71dbb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 6 Nov 2017 04:02:06 -0800
Subject: [PATCH 385/421] Broaden Samsung workaround to API level 25 + J7

Issue: #3257

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174686747
---
 .../android/exoplayer2/mediacodec/MediaCodecRenderer.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 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 d965b662be4..ef7d691c5be 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
@@ -1141,8 +1141,9 @@ private static boolean codecNeedsFlushWorkaround(String name) {
    * @return The mode specifying when the adaptation workaround should be enabled.
    */
   private @AdaptationWorkaroundMode int codecAdaptationWorkaroundMode(String name) {
-    if (Util.SDK_INT <= 24 && "OMX.Exynos.avc.dec.secure".equals(name)
-        && (Util.MODEL.startsWith("SM-T585") || Util.MODEL.startsWith("SM-A520"))) {
+    if (Util.SDK_INT <= 25 && "OMX.Exynos.avc.dec.secure".equals(name)
+        && (Util.MODEL.startsWith("SM-T585") || Util.MODEL.startsWith("SM-A510")
+        || Util.MODEL.startsWith("SM-A520") || Util.MODEL.startsWith("SM-J700"))) {
       return ADAPTATION_WORKAROUND_MODE_ALWAYS;
     } else if (Util.SDK_INT < 24
         && ("OMX.Nvidia.h264.decode".equals(name) || "OMX.Nvidia.h264.decode.secure".equals(name))

From e6e75a536aad6d412dba4d749ea63f91a16726e6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 6 Nov 2017 07:03:09 -0800
Subject: [PATCH 386/421] Don't use InputStream.available in ContentDataSource

Issue: #3426

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174700804
---
 .../upstream/AssetDataSourceTest.java         |   4 +-
 .../upstream/ContentDataSourceTest.java       | 110 +++++++++++++-----
 .../upstream/ContentDataSource.java           |  17 ++-
 .../android/exoplayer2/testutil/TestUtil.java |  19 ++-
 4 files changed, 104 insertions(+), 46 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
index 102c89ec2b0..d582d25ab1b 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/upstream/AssetDataSourceTest.java
@@ -30,14 +30,14 @@ public void testReadFileUri() throws Exception {
     AssetDataSource dataSource = new AssetDataSource(getInstrumentation().getContext());
     DataSpec dataSpec = new DataSpec(Uri.parse("file:///android_asset/" + DATA_PATH));
     TestUtil.assertDataSourceContent(dataSource, dataSpec,
-        TestUtil.getByteArray(getInstrumentation(), DATA_PATH));
+        TestUtil.getByteArray(getInstrumentation(), DATA_PATH), true);
   }
 
   public void testReadAssetUri() throws Exception {
     AssetDataSource dataSource = new AssetDataSource(getInstrumentation().getContext());
     DataSpec dataSpec = new DataSpec(Uri.parse("asset:///" + DATA_PATH));
     TestUtil.assertDataSourceContent(dataSource, dataSpec,
-        TestUtil.getByteArray(getInstrumentation(), DATA_PATH));
+        TestUtil.getByteArray(getInstrumentation(), DATA_PATH), true);
   }
 
 }
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 6a85483dd12..e19f7ad033e 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
@@ -15,17 +15,22 @@
  */
 package com.google.android.exoplayer2.upstream;
 
+import android.app.Instrumentation;
 import android.content.ContentProvider;
 import android.content.ContentResolver;
 import android.content.ContentValues;
 import android.content.res.AssetFileDescriptor;
 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 android.test.InstrumentationTestCase;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.testutil.TestUtil;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Arrays;
 
@@ -37,23 +42,33 @@ public final class ContentDataSourceTest extends InstrumentationTestCase {
   private static final String AUTHORITY = "com.google.android.exoplayer2.core.test";
   private static final String DATA_PATH = "binary/1024_incrementing_bytes.mp3";
 
-  public void testReadValidUri() throws Exception {
-    ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
-    Uri contentUri = new Uri.Builder()
-        .scheme(ContentResolver.SCHEME_CONTENT)
-        .authority(AUTHORITY)
-        .path(DATA_PATH).build();
-    DataSpec dataSpec = new DataSpec(contentUri);
-    TestUtil.assertDataSourceContent(dataSource, dataSpec,
-        TestUtil.getByteArray(getInstrumentation(), DATA_PATH));
+  public void testRead() throws Exception {
+    assertData(getInstrumentation(), 0, C.LENGTH_UNSET, false);
+  }
+
+  public void testReadPipeMode() throws Exception {
+    assertData(getInstrumentation(), 0, C.LENGTH_UNSET, true);
+  }
+
+  public void testReadFixedLength() throws Exception {
+    assertData(getInstrumentation(), 0, 100, false);
+  }
+
+  public void testReadFromOffsetToEndOfInput() throws Exception {
+    assertData(getInstrumentation(), 1, C.LENGTH_UNSET, false);
+  }
+
+  public void testReadFromOffsetToEndOfInputPipeMode() throws Exception {
+    assertData(getInstrumentation(), 1, C.LENGTH_UNSET, true);
+  }
+
+  public void testReadFromOffsetFixedLength() throws Exception {
+    assertData(getInstrumentation(), 1, 100, false);
   }
 
   public void testReadInvalidUri() throws Exception {
     ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
-    Uri contentUri = new Uri.Builder()
-        .scheme(ContentResolver.SCHEME_CONTENT)
-        .authority(AUTHORITY)
-        .build();
+    Uri contentUri = TestContentProvider.buildUri("does/not.exist", false);
     DataSpec dataSpec = new DataSpec(contentUri);
     try {
       dataSource.open(dataSpec);
@@ -66,18 +81,16 @@ public void testReadInvalidUri() throws Exception {
     }
   }
 
-  public void testReadFromOffsetToEndOfInput() throws Exception {
-    ContentDataSource dataSource = new ContentDataSource(getInstrumentation().getContext());
-    Uri contentUri = new Uri.Builder()
-        .scheme(ContentResolver.SCHEME_CONTENT)
-        .authority(AUTHORITY)
-        .path(DATA_PATH).build();
+  private static void assertData(Instrumentation instrumentation, int offset, int length,
+      boolean pipeMode) throws IOException {
+    Uri contentUri = TestContentProvider.buildUri(DATA_PATH, pipeMode);
+    ContentDataSource dataSource = new ContentDataSource(instrumentation.getContext());
     try {
-      int testOffset = 1;
-      DataSpec dataSpec = new DataSpec(contentUri, testOffset, C.LENGTH_UNSET, null);
-      byte[] completeData = TestUtil.getByteArray(getInstrumentation(), DATA_PATH);
-      byte[] expectedData = Arrays.copyOfRange(completeData, testOffset, completeData.length);
-      TestUtil.assertDataSourceContent(dataSource, dataSpec, expectedData);
+      DataSpec dataSpec = new DataSpec(contentUri, offset, length, null);
+      byte[] completeData = TestUtil.getByteArray(instrumentation, DATA_PATH);
+      byte[] expectedData = Arrays.copyOfRange(completeData, offset,
+          length == C.LENGTH_UNSET ? completeData.length : offset + length);
+      TestUtil.assertDataSourceContent(dataSource, dataSpec, expectedData, !pipeMode);
     } finally {
       dataSource.close();
     }
@@ -86,7 +99,21 @@ public void testReadFromOffsetToEndOfInput() throws Exception {
   /**
    * A {@link ContentProvider} for the test.
    */
-  public static final class TestContentProvider extends ContentProvider {
+  public static final class TestContentProvider extends ContentProvider
+      implements ContentProvider.PipeDataWriter<Object> {
+
+    private static final String PARAM_PIPE_MODE = "pipe-mode";
+
+    public static Uri buildUri(String filePath, boolean pipeMode) {
+      Uri.Builder builder = new Uri.Builder()
+          .scheme(ContentResolver.SCHEME_CONTENT)
+          .authority(AUTHORITY)
+          .path(filePath);
+      if (pipeMode) {
+        builder.appendQueryParameter(TestContentProvider.PARAM_PIPE_MODE, "1");
+      }
+      return builder.build();
+    }
 
     @Override
     public boolean onCreate() {
@@ -106,7 +133,14 @@ public AssetFileDescriptor openAssetFile(@NonNull Uri uri, @NonNull String mode)
         return null;
       }
       try {
-        return getContext().getAssets().openFd(uri.getPath().replaceFirst("/", ""));
+        String fileName = getFileName(uri);
+        boolean pipeMode = uri.getQueryParameter(PARAM_PIPE_MODE) != null;
+        if (pipeMode) {
+          ParcelFileDescriptor fileDescriptor = openPipeHelper(uri, null, null, null, this);
+          return new AssetFileDescriptor(fileDescriptor, 0, C.LENGTH_UNSET);
+        } else {
+          return getContext().getAssets().openFd(fileName);
+        }
       } catch (IOException e) {
         FileNotFoundException exception = new FileNotFoundException(e.getMessage());
         exception.initCause(e);
@@ -125,17 +159,33 @@ public Uri insert(@NonNull Uri uri, ContentValues values) {
     }
 
     @Override
-    public int delete(@NonNull Uri uri, String selection,
-        String[] selectionArgs) {
+    public int delete(@NonNull Uri uri, String selection, String[] selectionArgs) {
       throw new UnsupportedOperationException();
     }
 
     @Override
-    public int update(@NonNull Uri uri, ContentValues values,
-        String selection, String[] selectionArgs) {
+    public int update(@NonNull Uri uri, ContentValues values, String selection,
+        String[] selectionArgs) {
       throw new UnsupportedOperationException();
     }
 
+    @Override
+    public void writeDataToPipe(@NonNull ParcelFileDescriptor output, @NonNull Uri uri,
+        @NonNull String mimeType, @Nullable Bundle opts, @Nullable Object args) {
+      try {
+        byte[] data = TestUtil.getByteArray(getContext(), getFileName(uri));
+        FileOutputStream outputStream = new FileOutputStream(output.getFileDescriptor());
+        outputStream.write(data);
+        outputStream.close();
+      } catch (IOException e) {
+        throw new RuntimeException("Error writing to pipe", e);
+      }
+    }
+
+    private static String getFileName(Uri uri) {
+      return uri.getPath().replaceFirst("/", "");
+    }
+
   }
 
 }
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 c37599eccc4..87642e0eba7 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
@@ -24,7 +24,7 @@
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.io.InputStream;
+import java.nio.channels.FileChannel;
 
 /**
  * A {@link DataSource} for reading from a content URI.
@@ -47,7 +47,7 @@ public ContentDataSourceException(IOException cause) {
 
   private Uri uri;
   private AssetFileDescriptor assetFileDescriptor;
-  private InputStream inputStream;
+  private FileInputStream inputStream;
   private long bytesRemaining;
   private boolean opened;
 
@@ -88,14 +88,11 @@ public long open(DataSpec dataSpec) throws ContentDataSourceException {
       } else {
         long assetFileDescriptorLength = assetFileDescriptor.getLength();
         if (assetFileDescriptorLength == AssetFileDescriptor.UNKNOWN_LENGTH) {
-          // The asset must extend to the end of the file.
-          bytesRemaining = inputStream.available();
-          if (bytesRemaining == 0) {
-            // FileInputStream.available() returns 0 if the remaining length cannot be determined,
-            // or if it's greater than Integer.MAX_VALUE. We don't know the true length in either
-            // case, so treat as unbounded.
-            bytesRemaining = C.LENGTH_UNSET;
-          }
+          // The asset must extend to the end of the file. If FileInputStream.getChannel().size()
+          // returns 0 then the remaining length cannot be determined.
+          FileChannel channel = inputStream.getChannel();
+          long channelSize = channel.size();
+          bytesRemaining = channelSize == 0 ? C.LENGTH_UNSET : channelSize - channel.position();
         } else {
           bytesRemaining = assetFileDescriptorLength - skipped;
         }
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 b5b084fc7bd..61d1ecaeea7 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
@@ -16,6 +16,7 @@
 package com.google.android.exoplayer2.testutil;
 
 import android.app.Instrumentation;
+import android.content.Context;
 import android.test.MoreAsserts;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
@@ -121,12 +122,20 @@ public static byte[] joinByteArrays(byte[]... byteArrays) {
 
   public static byte[] getByteArray(Instrumentation instrumentation, String fileName)
       throws IOException {
-    return Util.toByteArray(getInputStream(instrumentation, fileName));
+    return getByteArray(instrumentation.getContext(), fileName);
+  }
+
+  public static byte[] getByteArray(Context context, String fileName) throws IOException {
+    return Util.toByteArray(getInputStream(context, fileName));
   }
 
   public static InputStream getInputStream(Instrumentation instrumentation, String fileName)
       throws IOException {
-    return instrumentation.getContext().getResources().getAssets().open(fileName);
+    return getInputStream(instrumentation.getContext(), fileName);
+  }
+
+  public static InputStream getInputStream(Context context, String fileName) throws IOException {
+    return context.getResources().getAssets().open(fileName);
   }
 
   public static String getString(Instrumentation instrumentation, String fileName)
@@ -167,13 +176,15 @@ public synchronized void onSourceInfoRefreshed(MediaSource source, Timeline time
    * @param dataSource The {@link DataSource} through which to read.
    * @param dataSpec The {@link DataSpec} to use when opening the {@link DataSource}.
    * @param expectedData The expected data.
+   * @param expectKnownLength Whether to assert that {@link DataSource#open} returns the expected
+   *     data length. If false then it's asserted that {@link C#LENGTH_UNSET} is returned.
    * @throws IOException If an error occurs reading fom the {@link DataSource}.
    */
   public static void assertDataSourceContent(DataSource dataSource, DataSpec dataSpec,
-      byte[] expectedData) throws IOException {
+      byte[] expectedData, boolean expectKnownLength) throws IOException {
     try {
       long length = dataSource.open(dataSpec);
-      Assert.assertEquals(expectedData.length, length);
+      Assert.assertEquals(expectKnownLength ? expectedData.length : C.LENGTH_UNSET, length);
       byte[] readData = TestUtil.readToEnd(dataSource);
       MoreAsserts.assertEquals(expectedData, readData);
     } finally {

From 298a66fc0e2fd6c9309b8c526418651673bed5eb Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 6 Nov 2017 09:21:01 -0800
Subject: [PATCH 387/421] Relax parsing of ctts sample deltas

Issue: #3384

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174715851
---
 .../android/exoplayer2/extractor/mp4/AtomParsers.java     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 1c4ca995f69..588282bc9bc 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
@@ -247,7 +247,13 @@ public static TrackSampleTable parseStbl(Track track, Atom.ContainerAtom stblAto
         remainingSamplesAtTimestampDelta--;
         if (remainingSamplesAtTimestampDelta == 0 && remainingTimestampDeltaChanges > 0) {
           remainingSamplesAtTimestampDelta = stts.readUnsignedIntToInt();
-          timestampDeltaInTimeUnits = stts.readUnsignedIntToInt();
+          // The BMFF spec (ISO 14496-12) states that sample deltas should be unsigned integers
+          // in stts boxes, however some streams violate the spec and use signed integers instead.
+          // See https://github.com/google/ExoPlayer/issues/3384. It's safe to always decode sample
+          // deltas as signed integers here, because unsigned integers will still be parsed
+          // correctly (unless their top bit is set, which is never true in practice because sample
+          // deltas are always small).
+          timestampDeltaInTimeUnits = stts.readInt();
           remainingTimestampDeltaChanges--;
         }
 

From 065091cfe3c73ecb7cbe74a63c19d1216700a35a Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 7 Nov 2017 02:51:43 -0800
Subject: [PATCH 388/421] Use helper method to disable Renderers.

Removes duplicated code and starts cleaning up handling of media clocks.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174829840
---
 .../exoplayer2/ExoPlayerImplInternal.java     | 32 ++++++++-----------
 1 file changed, 13 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 b79f5c70a34..f00a5ce02d4 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
@@ -718,11 +718,9 @@ && shouldKeepPeriodHolder(periodId, periodPositionUs, periodHolder)) {
     if (playingPeriodHolder != newPlayingPeriodHolder
         || playingPeriodHolder != readingPeriodHolder) {
       for (Renderer renderer : enabledRenderers) {
-        renderer.disable();
+        disableRenderer(renderer);
       }
       enabledRenderers = new Renderer[0];
-      rendererMediaClock = null;
-      rendererMediaClockSource = null;
       playingPeriodHolder = null;
     }
 
@@ -801,13 +799,10 @@ private void resetInternal(boolean releaseMediaSource) {
     handler.removeMessages(MSG_DO_SOME_WORK);
     rebuffering = false;
     standaloneMediaClock.stop();
-    rendererMediaClock = null;
-    rendererMediaClockSource = null;
     rendererPositionUs = RENDERER_TIMESTAMP_OFFSET_US;
     for (Renderer renderer : enabledRenderers) {
       try {
-        ensureStopped(renderer);
-        renderer.disable();
+        disableRenderer(renderer);
       } catch (ExoPlaybackException | RuntimeException e) {
         // There's nothing we can do.
         Log.e(TAG, "Stop failed.", e);
@@ -853,6 +848,15 @@ private void ensureStopped(Renderer renderer) throws ExoPlaybackException {
     }
   }
 
+  private void disableRenderer(Renderer renderer) throws ExoPlaybackException {
+    if (renderer == rendererMediaClockSource) {
+      rendererMediaClock = null;
+      rendererMediaClockSource = null;
+    }
+    ensureStopped(renderer);
+    renderer.disable();
+  }
+
   private void reselectTracksInternal() throws ExoPlaybackException {
     if (playingPeriodHolder == null) {
       // We don't have tracks yet, so we don't care.
@@ -905,12 +909,7 @@ private void reselectTracksInternal() throws ExoPlaybackException {
         if (rendererWasEnabledFlags[i]) {
           if (sampleStream != renderer.getStream()) {
             // We need to disable the renderer.
-            if (renderer == rendererMediaClockSource) {
-              rendererMediaClock = null;
-              rendererMediaClockSource = null;
-            }
-            ensureStopped(renderer);
-            renderer.disable();
+            disableRenderer(renderer);
           } else if (streamResetFlags[i]) {
             // The renderer will continue to consume from its current stream, but needs to be reset.
             renderer.resetPosition(rendererPositionUs);
@@ -1453,12 +1452,7 @@ private void setPlayingPeriodHolder(MediaPeriodHolder periodHolder) throws ExoPl
         // The renderer should be disabled before playing the next period, either because it's not
         // needed to play the next period, or because we need to re-enable it as its current stream
         // is final and it's not reading ahead.
-        if (renderer == rendererMediaClockSource) {
-          rendererMediaClock = null;
-          rendererMediaClockSource = null;
-        }
-        ensureStopped(renderer);
-        renderer.disable();
+        disableRenderer(renderer);
       }
     }
 

From 3472eda6dc06841c76c2562fa466782b78f1847e Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 7 Nov 2017 04:30:48 -0800
Subject: [PATCH 389/421] Be more robust against load callback failures

Issue: #2795

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174836960
---
 .../google/android/exoplayer2/upstream/Loader.java    | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

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 bd701505736..9e495f42bf5 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
@@ -380,7 +380,13 @@ public void handleMessage(Message msg) {
           callback.onLoadCanceled(loadable, nowMs, durationMs, false);
           break;
         case MSG_END_OF_SOURCE:
-          callback.onLoadCompleted(loadable, nowMs, durationMs);
+          try {
+            callback.onLoadCompleted(loadable, nowMs, durationMs);
+          } catch (RuntimeException e) {
+            // This should never happen, but handle it anyway.
+            Log.e(TAG, "Unexpected exception handling load completed", e);
+            fatalError = new UnexpectedLoaderException(e);
+          }
           break;
         case MSG_IO_EXCEPTION:
           currentError = (IOException) msg.obj;
@@ -392,6 +398,9 @@ public void handleMessage(Message msg) {
             start(getRetryDelayMillis());
           }
           break;
+        default:
+          // Never happens.
+          break;
       }
     }
 

From 26366f6c8004377d1fff50bafd9af73c3a9b028e Mon Sep 17 00:00:00 2001
From: hoangtc <hoangtc@google.com>
Date: Tue, 7 Nov 2017 05:22:48 -0800
Subject: [PATCH 390/421] Fix an issue with seeking that can lead to STATE_END
 not delivered.

GitHub: #1897

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174841175
---
 .../source/CompositeSequenceableLoader.java   |   6 +-
 .../CompositeSequenceableLoaderTest.java      | 274 ++++++++++++++++++
 2 files changed, 279 insertions(+), 1 deletion(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java
index 343d4f0bbe7..a85d5897623 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/CompositeSequenceableLoader.java
@@ -63,7 +63,11 @@ public final boolean continueLoading(long positionUs) {
         break;
       }
       for (SequenceableLoader loader : loaders) {
-        if (loader.getNextLoadPositionUs() == nextLoadPositionUs) {
+        long loaderNextLoadPositionUs = loader.getNextLoadPositionUs();
+        boolean isLoaderBehind =
+            loaderNextLoadPositionUs != C.TIME_END_OF_SOURCE
+                && loaderNextLoadPositionUs <= positionUs;
+        if (loaderNextLoadPositionUs == nextLoadPositionUs || isLoaderBehind) {
           madeProgressThisIteration |= loader.continueLoading(positionUs);
         }
       }
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
new file mode 100644
index 00000000000..e3ac104754f
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/CompositeSequenceableLoaderTest.java
@@ -0,0 +1,274 @@
+/*
+ * 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.android.exoplayer2.C;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link CompositeSequenceableLoader}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class CompositeSequenceableLoaderTest {
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#getBufferedPositionUs()} returns minimum buffered
+   * position among all sub-loaders.
+   */
+  @Test
+  public void testGetBufferedPositionUsReturnsMinimumLoaderBufferedPosition() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2001);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+    assertThat(compositeSequenceableLoader.getBufferedPositionUs()).isEqualTo(1000);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#getBufferedPositionUs()} returns minimum buffered
+   * position that is not {@link C#TIME_END_OF_SOURCE} among all sub-loaders.
+   */
+  @Test
+  public void testGetBufferedPositionUsReturnsMinimumNonEndOfSourceLoaderBufferedPosition() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader3 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ C.TIME_END_OF_SOURCE,
+            /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2, loader3});
+    assertThat(compositeSequenceableLoader.getBufferedPositionUs()).isEqualTo(1000);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#getBufferedPositionUs()} returns
+   * {@link C#TIME_END_OF_SOURCE} when all sub-loaders have buffered till end-of-source.
+   */
+  @Test
+  public void testGetBufferedPositionUsReturnsEndOfSourceWhenAllLoaderBufferedTillEndOfSource() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ C.TIME_END_OF_SOURCE,
+            /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ C.TIME_END_OF_SOURCE,
+            /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+    assertThat(compositeSequenceableLoader.getBufferedPositionUs()).isEqualTo(C.TIME_END_OF_SOURCE);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#getNextLoadPositionUs()} returns minimum next
+   * load position among all sub-loaders.
+   */
+  @Test
+  public void testGetNextLoadPositionUsReturnMinimumLoaderNextLoadPositionUs() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2001);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2000);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+    assertThat(compositeSequenceableLoader.getNextLoadPositionUs()).isEqualTo(2000);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#getNextLoadPositionUs()} returns minimum next
+   * load position that is not {@link C#TIME_END_OF_SOURCE} among all sub-loaders.
+   */
+  @Test
+  public void testGetNextLoadPositionUsReturnMinimumNonEndOfSourceLoaderNextLoadPositionUs() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2001);
+    FakeSequenceableLoader loader3 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2, loader3});
+    assertThat(compositeSequenceableLoader.getNextLoadPositionUs()).isEqualTo(2000);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#getNextLoadPositionUs()} returns
+   * {@link C#TIME_END_OF_SOURCE} when all sub-loaders have next load position at end-of-source.
+   */
+  @Test
+  public void testGetNextLoadPositionUsReturnsEndOfSourceWhenAllLoaderLoadingLastChunk() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+    assertThat(compositeSequenceableLoader.getNextLoadPositionUs()).isEqualTo(C.TIME_END_OF_SOURCE);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#continueLoading(long)} only allows the loader
+   * with minimum next load position to continue loading if next load positions are not behind
+   * current playback position.
+   */
+  @Test
+  public void testContinueLoadingOnlyAllowFurthestBehindLoaderToLoadIfNotBehindPlaybackPosition() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2001);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+    compositeSequenceableLoader.continueLoading(100);
+
+    assertThat(loader1.numInvocations).isEqualTo(1);
+    assertThat(loader2.numInvocations).isEqualTo(0);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#continueLoading(long)} allows all loaders
+   * with next load position behind current playback position to continue loading.
+   */
+  @Test
+  public void testContinueLoadingReturnAllowAllLoadersBehindPlaybackPositionToLoad() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2001);
+    FakeSequenceableLoader loader3 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1002, /* nextLoadPositionUs */ 2002);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2, loader3});
+    compositeSequenceableLoader.continueLoading(3000);
+
+    assertThat(loader1.numInvocations).isEqualTo(1);
+    assertThat(loader2.numInvocations).isEqualTo(1);
+    assertThat(loader3.numInvocations).isEqualTo(1);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#continueLoading(long)} does not allow loader
+   * with next load position at end-of-source to continue loading.
+   */
+  @Test
+  public void testContinueLoadingOnlyNotAllowEndOfSourceLoaderToLoad() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(
+            /* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ C.TIME_END_OF_SOURCE);
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+    compositeSequenceableLoader.continueLoading(3000);
+
+    assertThat(loader1.numInvocations).isEqualTo(0);
+    assertThat(loader2.numInvocations).isEqualTo(0);
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#continueLoading(long)} returns true if the loader
+   * with minimum next load position can make progress if next load positions are not behind
+   * current playback position.
+   */
+  @Test
+  public void testContinueLoadingReturnTrueIfFurthestBehindLoaderCanMakeProgress() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2001);
+    loader1.setNextChunkDurationUs(1000);
+
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+
+    assertThat(compositeSequenceableLoader.continueLoading(100)).isTrue();
+  }
+
+  /**
+   * Tests that {@link CompositeSequenceableLoader#continueLoading(long)} returns true if any loader
+   * that are behind current playback position can make progress, even if it is not the one with
+   * minimum next load position.
+   */
+  @Test
+  public void testContinueLoadingReturnTrueIfLoaderBehindPlaybackPositionCanMakeProgress() {
+    FakeSequenceableLoader loader1 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1000, /* nextLoadPositionUs */ 2000);
+    FakeSequenceableLoader loader2 =
+        new FakeSequenceableLoader(/* bufferedPositionUs */ 1001, /* nextLoadPositionUs */ 2001);
+    // loader2 is not the furthest behind, but it can make progress if allowed.
+    loader2.setNextChunkDurationUs(1000);
+
+    CompositeSequenceableLoader compositeSequenceableLoader = new CompositeSequenceableLoader(
+        new SequenceableLoader[] {loader1, loader2});
+
+    assertThat(compositeSequenceableLoader.continueLoading(3000)).isTrue();
+  }
+
+  private static class FakeSequenceableLoader implements SequenceableLoader {
+
+    private long bufferedPositionUs;
+    private long nextLoadPositionUs;
+    private int numInvocations;
+    private int nextChunkDurationUs;
+
+    private FakeSequenceableLoader(long bufferedPositionUs, long nextLoadPositionUs) {
+      this.bufferedPositionUs = bufferedPositionUs;
+      this.nextLoadPositionUs = nextLoadPositionUs;
+    }
+
+    @Override
+    public long getBufferedPositionUs() {
+      return bufferedPositionUs;
+    }
+
+    @Override
+    public long getNextLoadPositionUs() {
+      return nextLoadPositionUs;
+    }
+
+    @Override
+    public boolean continueLoading(long positionUs) {
+      numInvocations++;
+      boolean loaded = nextChunkDurationUs != 0;
+      // The current chunk has been loaded, advance to next chunk.
+      bufferedPositionUs = nextLoadPositionUs;
+      nextLoadPositionUs += nextChunkDurationUs;
+      nextChunkDurationUs = 0;
+      return loaded;
+    }
+
+    private void setNextChunkDurationUs(int nextChunkDurationUs) {
+      this.nextChunkDurationUs = nextChunkDurationUs;
+    }
+
+  }
+
+}

From 336c697b9de0851f93a5bff07e2f1d67e4be43b1 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 7 Nov 2017 07:36:45 -0800
Subject: [PATCH 391/421] Update 2.6.0 release notes

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174853112
---
 RELEASENOTES.md | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 42bf526de00..9bc7005ffc3 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -7,6 +7,7 @@
 * Added a reason to `EventListener.onPositionDiscontinuity`
   ([#3252](https://github.com/google/ExoPlayer/issues/3252)).
 * New `setShuffleModeEnabled` method for enabling shuffled playback.
+* SimpleExoPlayer: Support for multiple video, text and metadata outputs.
 * Support for `Renderer`s that don't consume any media
   ([#3212](https://github.com/google/ExoPlayer/issues/3212)).
 * Fix potential `IndexOutOfBoundsException` when calling `ExoPlayer.getDuration`
@@ -14,9 +15,12 @@
 * Fix playbacks involving looping, concatenation and ads getting stuck when
   media contains tracks with uneven durations
   ([#1874](https://github.com/google/ExoPlayer/issues/1874)).
+* Fix issue with `ContentDataSource` when reading from certain `ContentProvider`
+  implementations ([#3426](https://github.com/google/ExoPlayer/issues/3426)).
 * Better playback experience when the video decoder cannot keep up, by skipping
   to key-frames. This is particularly relevant for variable speed playbacks.
-* SimpleExoPlayer: Support for multiple video, text and metadata outputs.
+* Allow `SingleSampleMediaSource` to suppress load errors
+  ([#3140](https://github.com/google/ExoPlayer/issues/3140)).
 * Audio: New `AudioSink` interface allows customization of audio output path.
 * Offline: Added `Downloader` implementations for DASH, HLS, SmoothStreaming
   and progressive streams.
@@ -24,8 +28,14 @@
   * Fixed adaptive track selection logic for live playbacks
     ([#3017](https://github.com/google/ExoPlayer/issues/3017)).
   * Added ability to select the lowest bitrate tracks.
+* DASH:
+  * Don't crash when a malformed or unexpected manifest update occurs
+    ([#2795](https://github.com/google/ExoPlayer/issues/2795)).
 * HLS:
   * Support for Widevine protected FMP4 variants.
+  * Support CEA-608 in FMP4 variants.
+  * Support extractor injection
+    ([#2748](https://github.com/google/ExoPlayer/issues/2748)).
 * DRM:
   * Improved compatibility with ClearKey content
     ([#3138](https://github.com/google/ExoPlayer/issues/3138)).

From 52224944ae90b07c04e44cf18b0e0f05ac8744d8 Mon Sep 17 00:00:00 2001
From: aquilescanta <aquilescanta@google.com>
Date: Tue, 7 Nov 2017 07:50:35 -0800
Subject: [PATCH 392/421] Fix DefaultHlsExtractorFactory javadoc

Issue:#2748

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=174854541
---
 .../exoplayer2/source/hls/DefaultHlsExtractorFactory.java       | 2 --
 1 file changed, 2 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 9f0989e4440..957aefcdbc5 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
@@ -34,8 +34,6 @@
 
 /**
  * Default {@link HlsExtractorFactory} implementation.
- *
- * <p>This class can be extended to override {@link TsExtractor} instantiation.</p>
  */
 public final class DefaultHlsExtractorFactory implements HlsExtractorFactory {
 

From 681a05d004cee9b66b58d0575f8a3d0e241995ba Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 8 Nov 2017 07:56:16 -0800
Subject: [PATCH 393/421] Work around incorrect ClearKey encoding prior to
 O-MR1

Issue: #3138

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175006223
---
 .../android/exoplayer2/drm/ClearKeyUtil.java  | 109 ++++++++++++++++++
 .../exoplayer2/drm/DefaultDrmSession.java     |  22 +++-
 .../exoplayer2/drm/FrameworkMediaDrm.java     |   3 +-
 .../google/android/exoplayer2/util/Util.java  |  10 ++
 .../exoplayer2/drm/ClearKeyUtilTest.java      |  64 ++++++++++
 5 files changed, 205 insertions(+), 3 deletions(-)
 create mode 100644 library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java b/library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java
new file mode 100644
index 00000000000..ee337dcc512
--- /dev/null
+++ b/library/core/src/main/java/com/google/android/exoplayer2/drm/ClearKeyUtil.java
@@ -0,0 +1,109 @@
+/*
+ * 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.drm;
+
+import android.util.Log;
+import com.google.android.exoplayer2.util.Util;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+/**
+ * Utility methods for ClearKey.
+ */
+/* package */ final class ClearKeyUtil {
+
+  private static final String TAG = "ClearKeyUtil";
+  private static final Pattern REQUEST_KIDS_PATTERN = Pattern.compile("\"kids\":\\[\"(.*?)\"]");
+
+  private ClearKeyUtil() {}
+
+  /**
+   * Adjusts ClearKey request data obtained from the Android ClearKey CDM to be spec compliant.
+   *
+   * @param request The request data.
+   * @return The adjusted request data.
+   */
+  public static byte[] adjustRequestData(byte[] request) {
+    if (Util.SDK_INT >= 27) {
+      return request;
+    }
+    // Prior to O-MR1 the ClearKey CDM encoded the values in the "kids" array using Base64 rather
+    // than Base64Url. See [Internal: b/64388098]. Any "/" characters that ended up in the request
+    // as a result were not escaped as "\/". We know the exact request format from the platform's
+    // InitDataParser.cpp, so we can use a regexp rather than parsing the JSON.
+    String requestString = Util.fromUtf8Bytes(request);
+    Matcher requestKidsMatcher = REQUEST_KIDS_PATTERN.matcher(requestString);
+    if (!requestKidsMatcher.find()) {
+      Log.e(TAG, "Failed to adjust request data: " + requestString);
+      return request;
+    }
+    int kidsStartIndex = requestKidsMatcher.start(1);
+    int kidsEndIndex = requestKidsMatcher.end(1);
+    StringBuilder adjustedRequestBuilder = new StringBuilder(requestString);
+    base64ToBase64Url(adjustedRequestBuilder, kidsStartIndex, kidsEndIndex);
+    return Util.getUtf8Bytes(adjustedRequestBuilder.toString());
+  }
+
+  /**
+   * Adjusts ClearKey response data to be suitable for providing to the Android ClearKey CDM.
+   *
+   * @param response The response data.
+   * @return The adjusted response data.
+   */
+  public static byte[] adjustResponseData(byte[] response) {
+    if (Util.SDK_INT >= 27) {
+      return response;
+    }
+    // Prior to O-MR1 the ClearKey CDM expected Base64 encoding rather than Base64Url encoding for
+    // the "k" and "kid" strings. See [Internal: b/64388098].
+    try {
+      JSONObject responseJson = new JSONObject(Util.fromUtf8Bytes(response));
+      JSONArray keysArray = responseJson.getJSONArray("keys");
+      for (int i = 0; i < keysArray.length(); i++) {
+        JSONObject key = keysArray.getJSONObject(i);
+        key.put("k", base64UrlToBase64(key.getString("k")));
+        key.put("kid", base64UrlToBase64(key.getString("kid")));
+      }
+      return Util.getUtf8Bytes(responseJson.toString());
+    } catch (JSONException e) {
+      Log.e(TAG, "Failed to adjust response data: " + Util.fromUtf8Bytes(response), e);
+      return response;
+    }
+  }
+
+  private static void base64ToBase64Url(StringBuilder base64, int startIndex, int endIndex) {
+    for (int i = startIndex; i < endIndex; i++) {
+      switch (base64.charAt(i)) {
+        case '+':
+          base64.setCharAt(i, '-');
+          break;
+        case '/':
+          base64.setCharAt(i, '_');
+          break;
+        default:
+          break;
+      }
+    }
+  }
+
+  private static String base64UrlToBase64(String base64) {
+    return base64.replace('-', '+').replace('_', '/');
+  }
+
+}
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 688fff48fb1..c391b7035d5 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
@@ -362,6 +362,20 @@ private void postKeyRequest(int type, boolean allowRetry) {
     try {
       KeyRequest request = mediaDrm.getKeyRequest(scope, initData, mimeType, type,
           optionalKeyRequestParameters);
+      if (C.CLEARKEY_UUID.equals(uuid)) {
+        final byte[] data = ClearKeyUtil.adjustRequestData(request.getData());
+        final String defaultUrl = request.getDefaultUrl();
+        request = new KeyRequest() {
+          @Override
+          public byte[] getData() {
+            return data;
+          }
+          @Override
+          public String getDefaultUrl() {
+            return defaultUrl;
+          }
+        };
+      }
       postRequestHandler.obtainMessage(MSG_KEYS, request, allowRetry).sendToTarget();
     } catch (Exception e) {
       onKeysError(e);
@@ -380,8 +394,12 @@ private void onKeyResponse(Object response) {
     }
 
     try {
+      byte[] responseData = (byte[]) response;
+      if (C.CLEARKEY_UUID.equals(uuid)) {
+        responseData = ClearKeyUtil.adjustResponseData(responseData);
+      }
       if (mode == DefaultDrmSessionManager.MODE_RELEASE) {
-        mediaDrm.provideKeyResponse(offlineLicenseKeySetId, (byte[]) response);
+        mediaDrm.provideKeyResponse(offlineLicenseKeySetId, responseData);
         if (eventHandler != null && eventListener != null) {
           eventHandler.post(new Runnable() {
             @Override
@@ -391,7 +409,7 @@ public void run() {
           });
         }
       } else {
-        byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, (byte[]) response);
+        byte[] keySetId = mediaDrm.provideKeyResponse(sessionId, responseData);
         if ((mode == DefaultDrmSessionManager.MODE_DOWNLOAD
             || (mode == DefaultDrmSessionManager.MODE_PLAYBACK && offlineLicenseKeySetId != null))
             && keySetId != null && keySetId.length != 0) {
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 c3ab3462d9b..517ca9247c2 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
@@ -25,6 +25,7 @@
 import android.media.NotProvisionedException;
 import android.media.UnsupportedSchemeException;
 import android.support.annotation.NonNull;
+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;
@@ -74,7 +75,7 @@ public void setOnEventListener(
       final ExoMediaDrm.OnEventListener<? super FrameworkMediaCrypto> listener) {
     mediaDrm.setOnEventListener(listener == null ? null : new MediaDrm.OnEventListener() {
       @Override
-      public void onEvent(@NonNull MediaDrm md, @NonNull byte[] sessionId, int event, int extra,
+      public void onEvent(@NonNull MediaDrm md, @Nullable byte[] sessionId, int event, int extra,
           byte[] data) {
         listener.onEvent(FrameworkMediaDrm.this, sessionId, event, extra, data);
       }
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 24132e400c0..f47caa046a9 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
@@ -246,6 +246,16 @@ public static String normalizeLanguageCode(String language) {
     return language == null ? null : new Locale(language).getLanguage();
   }
 
+  /**
+   * Returns a new {@link String} constructed by decoding UTF-8 encoded bytes.
+   *
+   * @param bytes The UTF-8 encoded bytes to decode.
+   * @return The string.
+   */
+  public static String fromUtf8Bytes(byte[] bytes) {
+    return new String(bytes, Charset.forName(C.UTF8_NAME));
+  }
+
   /**
    * Returns a new byte array containing the code points of a {@link String} encoded using UTF-8.
    *
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
new file mode 100644
index 00000000000..01ab9ea9aa4
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/drm/ClearKeyUtilTest.java
@@ -0,0 +1,64 @@
+/*
+ * 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.drm;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import com.google.android.exoplayer2.C;
+import java.nio.charset.Charset;
+import java.util.Arrays;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.robolectric.RobolectricTestRunner;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link ClearKeyUtil}.
+ */
+// TODO: When API level 27 is supported, add tests that check the adjust methods are no-ops.
+@RunWith(RobolectricTestRunner.class)
+public final class ClearKeyUtilTest {
+
+  @Config(sdk = 26, manifest = Config.NONE)
+  @Test
+  public void testAdjustResponseDataV26() {
+    byte[] data = ("{\"keys\":[{"
+        + "\"k\":\"abc_def-\","
+        + "\"kid\":\"ab_cde-f\"}],"
+        + "\"type\":\"abc_def-"
+        + "\"}").getBytes(Charset.forName(C.UTF8_NAME));
+    // We expect "-" and "_" to be replaced with "+" and "\/" (forward slashes need to be escaped in
+    // JSON respectively, for "k" and "kid" only.
+    byte[] expected = ("{\"keys\":[{"
+        + "\"k\":\"abc\\/def+\","
+        + "\"kid\":\"ab\\/cde+f\"}],"
+        + "\"type\":\"abc_def-"
+        + "\"}").getBytes(Charset.forName(C.UTF8_NAME));
+    assertThat(Arrays.equals(expected, ClearKeyUtil.adjustResponseData(data))).isTrue();
+  }
+
+  @Config(sdk = 26, manifest = Config.NONE)
+  @Test
+  public void testAdjustRequestDataV26() {
+    byte[] data = "{\"kids\":[\"abc+def/\",\"ab+cde/f\"],\"type\":\"abc+def/\"}"
+        .getBytes(Charset.forName(C.UTF8_NAME));
+    // We expect "+" and "/" to be replaced with "-" and "_" respectively, for "kids".
+    byte[] expected = "{\"kids\":[\"abc-def_\",\"ab-cde_f\"],\"type\":\"abc+def/\"}"
+        .getBytes(Charset.forName(C.UTF8_NAME));
+    assertThat(Arrays.equals(expected, ClearKeyUtil.adjustRequestData(data))).isTrue();
+  }
+
+}

From e1b3fed5e9a8743e2510c2f9d96af1cbbdece7c6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 8 Nov 2017 08:34:20 -0800
Subject: [PATCH 394/421] Add default implementations for ExoMediaDrm.*
 interfaces

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175010595
---
 .../exoplayer2/drm/DefaultDrmSession.java     | 15 +--
 .../android/exoplayer2/drm/ExoMediaDrm.java   | 95 +++++++++++++++++--
 .../exoplayer2/drm/FrameworkMediaDrm.java     | 54 ++---------
 3 files changed, 95 insertions(+), 69 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 c391b7035d5..25fdaba5b84 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
@@ -25,6 +25,7 @@
 import android.util.Log;
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.drm.ExoMediaDrm.DefaultKeyRequest;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.KeyRequest;
 import com.google.android.exoplayer2.drm.ExoMediaDrm.ProvisionRequest;
 import java.util.Arrays;
@@ -363,18 +364,8 @@ private void postKeyRequest(int type, boolean allowRetry) {
       KeyRequest request = mediaDrm.getKeyRequest(scope, initData, mimeType, type,
           optionalKeyRequestParameters);
       if (C.CLEARKEY_UUID.equals(uuid)) {
-        final byte[] data = ClearKeyUtil.adjustRequestData(request.getData());
-        final String defaultUrl = request.getDefaultUrl();
-        request = new KeyRequest() {
-          @Override
-          public byte[] getData() {
-            return data;
-          }
-          @Override
-          public String getDefaultUrl() {
-            return defaultUrl;
-          }
-        };
+        request = new DefaultKeyRequest(ClearKeyUtil.adjustRequestData(request.getData()),
+            request.getDefaultUrl());
       }
       postRequestHandler.obtainMessage(MSG_KEYS, request, allowRetry).sendToTarget();
     } catch (Exception e) {
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 e9ee1ce90b9..cecc840511e 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
@@ -82,14 +82,6 @@ void onEvent(ExoMediaDrm<? extends T> mediaDrm, byte[] sessionId, int event, int
         byte[] data);
   }
 
-  /**
-   * @see android.media.MediaDrm.KeyStatus
-   */
-  interface ExoKeyStatus {
-    int getStatusCode();
-    byte[] getKeyId();
-  }
-
   /**
    * @see android.media.MediaDrm.OnKeyStatusChangeListener
    */
@@ -100,11 +92,44 @@ interface OnKeyStatusChangeListener<T extends ExoMediaCrypto> {
      *
      * @param mediaDrm the {@link ExoMediaDrm} object on which the event occurred.
      * @param sessionId the DRM session ID on which the event occurred.
-     * @param exoKeyInfo a list of {@link ExoKeyStatus} that contains key ID and status.
+     * @param exoKeyInfo a list of {@link KeyStatus} that contains key ID and status.
      * @param hasNewUsableKey true if new key becomes usable.
      */
     void onKeyStatusChange(ExoMediaDrm<? extends T> mediaDrm, byte[] sessionId,
-        List<ExoKeyStatus> exoKeyInfo, boolean hasNewUsableKey);
+                           List<KeyStatus> exoKeyInfo, boolean hasNewUsableKey);
+  }
+
+  /**
+   * @see android.media.MediaDrm.KeyStatus
+   */
+  interface KeyStatus {
+    int getStatusCode();
+    byte[] getKeyId();
+  }
+
+  /**
+   * Default implementation of {@link KeyStatus}.
+   */
+  final class DefaultKeyStatus implements KeyStatus {
+
+    private final int statusCode;
+    private final byte[] keyId;
+
+    DefaultKeyStatus(int statusCode, byte[] keyId) {
+      this.statusCode = statusCode;
+      this.keyId = keyId;
+    }
+
+    @Override
+    public int getStatusCode() {
+      return statusCode;
+    }
+
+    @Override
+    public byte[] getKeyId() {
+      return keyId;
+    }
+
   }
 
   /**
@@ -115,6 +140,31 @@ interface KeyRequest {
     String getDefaultUrl();
   }
 
+  /**
+   * Default implementation of {@link KeyRequest}.
+   */
+  final class DefaultKeyRequest implements KeyRequest {
+
+    private final byte[] data;
+    private final String defaultUrl;
+
+    public DefaultKeyRequest(byte[] data, String defaultUrl) {
+      this.data = data;
+      this.defaultUrl = defaultUrl;
+    }
+
+    @Override
+    public byte[] getData() {
+      return data;
+    }
+
+    @Override
+    public String getDefaultUrl() {
+      return defaultUrl;
+    }
+
+  }
+
   /**
    * @see android.media.MediaDrm.ProvisionRequest
    */
@@ -123,6 +173,31 @@ interface ProvisionRequest {
     String getDefaultUrl();
   }
 
+  /**
+   * Default implementation of {@link ProvisionRequest}.
+   */
+  final class DefaultProvisionRequest implements ProvisionRequest {
+
+    private final byte[] data;
+    private final String defaultUrl;
+
+    public DefaultProvisionRequest(byte[] data, String defaultUrl) {
+      this.data = data;
+      this.defaultUrl = defaultUrl;
+    }
+
+    @Override
+    public byte[] getData() {
+      return data;
+    }
+
+    @Override
+    public String getDefaultUrl() {
+      return defaultUrl;
+    }
+
+  }
+
   /**
    * @see MediaDrm#setOnEventListener(MediaDrm.OnEventListener)
    */
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 517ca9247c2..f960cd637f2 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
@@ -20,7 +20,6 @@
 import android.media.MediaCrypto;
 import android.media.MediaCryptoException;
 import android.media.MediaDrm;
-import android.media.MediaDrm.KeyStatus;
 import android.media.MediaDrmException;
 import android.media.NotProvisionedException;
 import android.media.UnsupportedSchemeException;
@@ -93,12 +92,11 @@ public void setOnKeyStatusChangeListener(
         : new MediaDrm.OnKeyStatusChangeListener() {
           @Override
           public void onKeyStatusChange(@NonNull MediaDrm md, @NonNull byte[] sessionId,
-              @NonNull List<KeyStatus> keyInfo, boolean hasNewUsableKey) {
-            List<ExoKeyStatus> exoKeyInfo = new ArrayList<>();
-            for (KeyStatus keyStatus : keyInfo) {
-              exoKeyInfo.add(new FrameworkKeyStatus(keyStatus));
+              @NonNull List<MediaDrm.KeyStatus> keyInfo, boolean hasNewUsableKey) {
+            List<KeyStatus> exoKeyInfo = new ArrayList<>();
+            for (MediaDrm.KeyStatus keyStatus : keyInfo) {
+              exoKeyInfo.add(new DefaultKeyStatus(keyStatus.getStatusCode(), keyStatus.getKeyId()));
             }
-
             listener.onKeyStatusChange(FrameworkMediaDrm.this, sessionId, exoKeyInfo,
                 hasNewUsableKey);
           }
@@ -120,17 +118,7 @@ public KeyRequest getKeyRequest(byte[] scope, byte[] init, String mimeType, int
       HashMap<String, String> optionalParameters) throws NotProvisionedException {
     final MediaDrm.KeyRequest request = mediaDrm.getKeyRequest(scope, init, mimeType, keyType,
         optionalParameters);
-    return new KeyRequest() {
-      @Override
-      public byte[] getData() {
-        return request.getData();
-      }
-
-      @Override
-      public String getDefaultUrl() {
-        return request.getDefaultUrl();
-      }
-    };
+    return new DefaultKeyRequest(request.getData(), request.getDefaultUrl());
   }
 
   @Override
@@ -141,18 +129,8 @@ public byte[] provideKeyResponse(byte[] scope, byte[] response)
 
   @Override
   public ProvisionRequest getProvisionRequest() {
-    final MediaDrm.ProvisionRequest provisionRequest = mediaDrm.getProvisionRequest();
-    return new ProvisionRequest() {
-      @Override
-      public byte[] getData() {
-        return provisionRequest.getData();
-      }
-
-      @Override
-      public String getDefaultUrl() {
-        return provisionRequest.getDefaultUrl();
-      }
-    };
+    final MediaDrm.ProvisionRequest request = mediaDrm.getProvisionRequest();
+    return new DefaultProvisionRequest(request.getData(), request.getDefaultUrl());
   }
 
   @Override
@@ -205,22 +183,4 @@ public FrameworkMediaCrypto createMediaCrypto(byte[] initData) throws MediaCrypt
         forceAllowInsecureDecoderComponents);
   }
 
-  private static final class FrameworkKeyStatus implements ExoKeyStatus {
-    private final MediaDrm.KeyStatus keyStatus;
-
-    FrameworkKeyStatus(MediaDrm.KeyStatus keyStatus) {
-      this.keyStatus = keyStatus;
-    }
-
-    @Override
-    public int getStatusCode() {
-      return keyStatus.getStatusCode();
-    }
-
-    @Override
-    public byte[] getKeyId() {
-      return keyStatus.getKeyId();
-    }
-  }
-
 }

From 86c0198c8103aab59a563fcea36ec63468e3d450 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Wed, 8 Nov 2017 08:45:17 -0800
Subject: [PATCH 395/421] Don't allow cancelation of non-cancelable loads

Issue: #3441

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175011804
---
 .../source/chunk/ChunkSampleStream.java       | 28 ++++++++++++-------
 .../exoplayer2/source/chunk/ChunkSource.java  |  3 +-
 2 files changed, 20 insertions(+), 11 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 b64dec59bfc..8a9be92d750 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,6 +15,8 @@
  */
 package com.google.android.exoplayer2.source.chunk;
 
+import android.util.Log;
+
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Format;
 import com.google.android.exoplayer2.FormatHolder;
@@ -38,6 +40,8 @@
 public class ChunkSampleStream<T extends ChunkSource> implements SampleStream, SequenceableLoader,
     Loader.Callback<Chunk>, Loader.ReleaseCallback {
 
+  private static final String TAG = "ChunkSampleStream";
+
   private final int primaryTrackType;
   private final int[] embeddedTrackTypes;
   private final boolean[] embeddedTracksSelected;
@@ -318,16 +322,20 @@ public int onLoadError(Chunk loadable, long elapsedRealtimeMs, long loadDuration
     boolean cancelable = bytesLoaded == 0 || !isMediaChunk || !haveReadFromLastMediaChunk();
     boolean canceled = false;
     if (chunkSource.onChunkLoadError(loadable, cancelable, error)) {
-      canceled = true;
-      if (isMediaChunk) {
-        BaseMediaChunk removed = mediaChunks.removeLast();
-        Assertions.checkState(removed == loadable);
-        primarySampleQueue.discardUpstreamSamples(removed.getFirstSampleIndex(0));
-        for (int i = 0; i < embeddedSampleQueues.length; i++) {
-          embeddedSampleQueues[i].discardUpstreamSamples(removed.getFirstSampleIndex(i + 1));
-        }
-        if (mediaChunks.isEmpty()) {
-          pendingResetPositionUs = lastSeekPositionUs;
+      if (!cancelable) {
+        Log.w(TAG, "Ignoring attempt to cancel non-cancelable load.");
+      } else {
+        canceled = true;
+        if (isMediaChunk) {
+          BaseMediaChunk removed = mediaChunks.removeLast();
+          Assertions.checkState(removed == loadable);
+          primarySampleQueue.discardUpstreamSamples(removed.getFirstSampleIndex(0));
+          for (int i = 0; i < embeddedSampleQueues.length; i++) {
+            embeddedSampleQueues[i].discardUpstreamSamples(removed.getFirstSampleIndex(i + 1));
+          }
+          if (mediaChunks.isEmpty()) {
+            pendingResetPositionUs = lastSeekPositionUs;
+          }
         }
       }
     }
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
index 6dffc457d6a..b04dc7cbdb4 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/chunk/ChunkSource.java
@@ -85,7 +85,8 @@ void getNextChunk(MediaChunk previous, long playbackPositionUs, long loadPositio
    * @param chunk The chunk whose load encountered the error.
    * @param cancelable Whether the load can be canceled.
    * @param e The error.
-   * @return Whether the load should be canceled.
+   * @return Whether the load should be canceled. Should always be false if {@code cancelable} is
+   *     false.
    */
   boolean onChunkLoadError(Chunk chunk, boolean cancelable, Exception e);
 

From 1331f7adde9b140215ec92b90bea0abcadf94915 Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Thu, 9 Nov 2017 03:14:22 -0800
Subject: [PATCH 396/421] Add custom callbacks to allows seeks after dynamic
 playlist modifications.

These callbacks are executed on the app thread after the corresponding
timeline update was triggered. This ensures that seek operations see the
updated timelines and are therefore valid, even if the seek is performed into a
window which didn't exist before.

GitHub:#3407

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175136187
---
 .../DynamicConcatenatingMediaSourceTest.java  | 226 ++++++++++++++++-
 .../DynamicConcatenatingMediaSource.java      | 228 ++++++++++++++++--
 2 files changed, 428 insertions(+), 26 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index 61eebbc15a5..c0c5252751c 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -15,6 +15,10 @@
  */
 package com.google.android.exoplayer2.source;
 
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import android.os.ConditionVariable;
 import android.os.Handler;
 import android.os.HandlerThread;
@@ -40,6 +44,7 @@
 import java.io.IOException;
 import java.util.Arrays;
 import junit.framework.TestCase;
+import org.mockito.Mockito;
 
 /**
  * Unit tests for {@link DynamicConcatenatingMediaSource}
@@ -50,6 +55,7 @@ public final class DynamicConcatenatingMediaSourceTest extends TestCase {
 
   private Timeline timeline;
   private boolean timelineUpdated;
+  private boolean customRunnableCalled;
 
   public void testPlaylistChangesAfterPreparation() throws InterruptedException {
     timeline = null;
@@ -371,6 +377,180 @@ public void testIllegalArguments() {
     }
   }
 
+  public void testCustomCallbackBeforePreparationAddSingle() {
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    Runnable runnable = Mockito.mock(Runnable.class);
+
+    mediaSource.addMediaSource(createFakeMediaSource(), runnable);
+    verify(runnable).run();
+  }
+
+  public void testCustomCallbackBeforePreparationAddMultiple() {
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    Runnable runnable = Mockito.mock(Runnable.class);
+
+    mediaSource.addMediaSources(Arrays.asList(
+        new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}), runnable);
+    verify(runnable).run();
+  }
+
+  public void testCustomCallbackBeforePreparationAddSingleWithIndex() {
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    Runnable runnable = Mockito.mock(Runnable.class);
+
+    mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(), runnable);
+    verify(runnable).run();
+  }
+
+  public void testCustomCallbackBeforePreparationAddMultipleWithIndex() {
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    Runnable runnable = Mockito.mock(Runnable.class);
+
+    mediaSource.addMediaSources(/* index */ 0, Arrays.asList(
+        new MediaSource[]{createFakeMediaSource(), createFakeMediaSource()}), runnable);
+    verify(runnable).run();
+  }
+
+  public void testCustomCallbackBeforePreparationRemove() throws InterruptedException {
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    Runnable runnable = Mockito.mock(Runnable.class);
+    mediaSource.addMediaSource(createFakeMediaSource());
+
+    mediaSource.removeMediaSource(/* index */ 0, runnable);
+    verify(runnable).run();
+  }
+
+  public void testCustomCallbackBeforePreparationMove() throws InterruptedException {
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    Runnable runnable = Mockito.mock(Runnable.class);
+    mediaSource.addMediaSources(Arrays.asList(
+        new MediaSource[]{createFakeMediaSource(), createFakeMediaSource()}));
+
+    mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0, runnable);
+    verify(runnable).run();
+  }
+
+  public void testCustomCallbackAfterPreparationAddSingle() throws InterruptedException {
+    final DynamicConcatenatingMediaSourceAndHandler sourceHandlerPair =
+        setUpDynamicMediaSourceOnHandlerThread();
+    final Runnable runnable = createCustomRunnable();
+
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.addMediaSource(createFakeMediaSource(), runnable);
+      }
+    });
+    waitForCustomRunnable();
+  }
+
+  public void testCustomCallbackAfterPreparationAddMultiple() throws InterruptedException {
+    final DynamicConcatenatingMediaSourceAndHandler sourceHandlerPair =
+        setUpDynamicMediaSourceOnHandlerThread();
+    final Runnable runnable = createCustomRunnable();
+
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.addMediaSources(Arrays.asList(
+            new MediaSource[] {createFakeMediaSource(), createFakeMediaSource()}), runnable);
+      }
+    });
+    waitForCustomRunnable();
+  }
+
+  public void testCustomCallbackAfterPreparationAddSingleWithIndex() throws InterruptedException {
+    final DynamicConcatenatingMediaSourceAndHandler sourceHandlerPair =
+        setUpDynamicMediaSourceOnHandlerThread();
+    final Runnable runnable = createCustomRunnable();
+
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.addMediaSource(/* index */ 0, createFakeMediaSource(),
+            runnable);
+      }
+    });
+    waitForCustomRunnable();
+  }
+
+  public void testCustomCallbackAfterPreparationAddMultipleWithIndex() throws InterruptedException {
+    final DynamicConcatenatingMediaSourceAndHandler sourceHandlerPair =
+        setUpDynamicMediaSourceOnHandlerThread();
+    final Runnable runnable = createCustomRunnable();
+
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.addMediaSources(/* index */ 0, Arrays.asList(
+            new MediaSource[]{createFakeMediaSource(), createFakeMediaSource()}), runnable);
+      }
+    });
+    waitForCustomRunnable();
+  }
+
+  public void testCustomCallbackAfterPreparationRemove() throws InterruptedException {
+    final DynamicConcatenatingMediaSourceAndHandler sourceHandlerPair =
+        setUpDynamicMediaSourceOnHandlerThread();
+    final Runnable runnable = createCustomRunnable();
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.addMediaSource(createFakeMediaSource());
+      }
+    });
+    waitForTimelineUpdate();
+
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.removeMediaSource(/* index */ 0, runnable);
+      }
+    });
+    waitForCustomRunnable();
+  }
+
+  public void testCustomCallbackAfterPreparationMove() throws InterruptedException {
+    final DynamicConcatenatingMediaSourceAndHandler sourceHandlerPair =
+        setUpDynamicMediaSourceOnHandlerThread();
+    final Runnable runnable = createCustomRunnable();
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.addMediaSources(Arrays.asList(
+            new MediaSource[]{createFakeMediaSource(), createFakeMediaSource()}));
+      }
+    });
+    waitForTimelineUpdate();
+
+    sourceHandlerPair.handler.post(new Runnable() {
+      @Override
+      public void run() {
+        sourceHandlerPair.mediaSource.moveMediaSource(/* fromIndex */ 1, /* toIndex */ 0,
+            runnable);
+      }
+    });
+    waitForCustomRunnable();
+  }
+
+  private DynamicConcatenatingMediaSourceAndHandler setUpDynamicMediaSourceOnHandlerThread()
+      throws InterruptedException {
+    HandlerThread handlerThread = new HandlerThread("TestCustomCallbackExecutionThread");
+    handlerThread.start();
+    Handler.Callback handlerCallback = Mockito.mock(Handler.Callback.class);
+    when(handlerCallback.handleMessage(any(Message.class))).thenReturn(false);
+    Handler handler = new Handler(handlerThread.getLooper(), handlerCallback);
+    final DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    handler.post(new Runnable() {
+      @Override
+      public void run() {
+        prepareAndListenToTimelineUpdates(mediaSource);
+      }
+    });
+    waitForTimelineUpdate();
+    return new DynamicConcatenatingMediaSourceAndHandler(mediaSource, handler);
+  }
+
   private void prepareAndListenToTimelineUpdates(MediaSource mediaSource) {
     mediaSource.prepareSource(new StubExoPlayer(), true, new Listener() {
       @Override
@@ -385,16 +565,41 @@ public void onSourceInfoRefreshed(MediaSource source, Timeline newTimeline, Obje
   }
 
   private synchronized void waitForTimelineUpdate() throws InterruptedException {
-    long timeoutMs = System.currentTimeMillis() + TIMEOUT_MS;
+    long deadlineMs = System.currentTimeMillis() + TIMEOUT_MS;
     while (!timelineUpdated) {
       wait(TIMEOUT_MS);
-      if (System.currentTimeMillis() >= timeoutMs) {
+      if (System.currentTimeMillis() >= deadlineMs) {
         fail("No timeline update occurred within timeout.");
       }
     }
     timelineUpdated = false;
   }
 
+  private Runnable createCustomRunnable() {
+    return new Runnable() {
+      @Override
+      public void run() {
+        synchronized (DynamicConcatenatingMediaSourceTest.this) {
+          assertTrue(timelineUpdated);
+          timelineUpdated = false;
+          customRunnableCalled = true;
+          DynamicConcatenatingMediaSourceTest.this.notify();
+        }
+      }
+    };
+  }
+
+  private synchronized void waitForCustomRunnable() throws InterruptedException {
+    long deadlineMs = System.currentTimeMillis() + TIMEOUT_MS;
+    while (!customRunnableCalled) {
+      wait(TIMEOUT_MS);
+      if (System.currentTimeMillis() >= deadlineMs) {
+        fail("No custom runnable call occurred within timeout.");
+      }
+    }
+    customRunnableCalled = false;
+  }
+
   private static FakeMediaSource[] createMediaSources(int count) {
     FakeMediaSource[] sources = new FakeMediaSource[count];
     for (int i = 0; i < count; i++) {
@@ -403,6 +608,10 @@ private static FakeMediaSource[] createMediaSources(int count) {
     return sources;
   }
 
+  private static FakeMediaSource createFakeMediaSource() {
+    return new FakeMediaSource(createFakeTimeline(/* index */ 0), null);
+  }
+
   private static FakeTimeline createFakeTimeline(int index) {
     return new FakeTimeline(new TimelineWindowDefinition(index + 1, (index + 1) * 111));
   }
@@ -429,6 +638,19 @@ public void onContinueLoadingRequested(MediaPeriod source) {}
     }
   }
 
+  private static class DynamicConcatenatingMediaSourceAndHandler {
+
+    public final DynamicConcatenatingMediaSource mediaSource;
+    public final Handler handler;
+
+    public DynamicConcatenatingMediaSourceAndHandler(DynamicConcatenatingMediaSource mediaSource,
+        Handler handler) {
+      this.mediaSource = mediaSource;
+      this.handler = handler;
+    }
+
+  }
+
   private static class LazyMediaSource implements MediaSource {
 
     private Listener listener;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 92a117ce4e3..6bfa4047a5a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -15,8 +15,10 @@
  */
 package com.google.android.exoplayer2.source;
 
+import android.os.Handler;
+import android.os.Looper;
 import android.support.annotation.NonNull;
-import android.util.Pair;
+import android.support.annotation.Nullable;
 import android.util.SparseIntArray;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.ExoPlaybackException;
@@ -47,6 +49,7 @@ public final class DynamicConcatenatingMediaSource implements MediaSource, ExoPl
   private static final int MSG_ADD_MULTIPLE = 1;
   private static final int MSG_REMOVE = 2;
   private static final int MSG_MOVE = 3;
+  private static final int MSG_ON_COMPLETION = 4;
 
   // Accessed on the app thread.
   private final List<MediaSource> mediaSourcesPublic;
@@ -95,7 +98,22 @@ public DynamicConcatenatingMediaSource(ShuffleOrder shuffleOrder) {
    * @param mediaSource The {@link MediaSource} to be added to the list.
    */
   public synchronized void addMediaSource(MediaSource mediaSource) {
-    addMediaSource(mediaSourcesPublic.size(), mediaSource);
+    addMediaSource(mediaSourcesPublic.size(), mediaSource, null);
+  }
+
+  /**
+   * Appends a {@link MediaSource} to the playlist and executes a custom action on completion.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
+   *
+   * @param mediaSource The {@link MediaSource} to be added to the list.
+   * @param actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   *     source has been added to the playlist.
+   */
+  public synchronized void addMediaSource(MediaSource mediaSource,
+      @Nullable Runnable actionOnCompletion) {
+    addMediaSource(mediaSourcesPublic.size(), mediaSource, actionOnCompletion);
   }
 
   /**
@@ -109,11 +127,31 @@ public synchronized void addMediaSource(MediaSource mediaSource) {
    * @param mediaSource The {@link MediaSource} to be added to the list.
    */
   public synchronized void addMediaSource(int index, MediaSource mediaSource) {
+    addMediaSource(index, mediaSource, null);
+  }
+
+  /**
+   * Adds a {@link MediaSource} to the playlist and executes a custom action on completion.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
+   *
+   * @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 actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   *     source has been added to the playlist.
+   */
+  public synchronized void addMediaSource(int index, MediaSource mediaSource,
+      @Nullable Runnable actionOnCompletion) {
     Assertions.checkNotNull(mediaSource);
     Assertions.checkArgument(!mediaSourcesPublic.contains(mediaSource));
     mediaSourcesPublic.add(index, mediaSource);
     if (player != null) {
-      player.sendMessages(new ExoPlayerMessage(this, MSG_ADD, Pair.create(index, mediaSource)));
+      player.sendMessages(new ExoPlayerMessage(this, MSG_ADD,
+          new MessageData<>(index, mediaSource, actionOnCompletion)));
+    } else if (actionOnCompletion != null) {
+      actionOnCompletion.run();
     }
   }
 
@@ -127,7 +165,24 @@ public synchronized void addMediaSource(int index, MediaSource mediaSource) {
    *     sources are added in the order in which they appear in this collection.
    */
   public synchronized void addMediaSources(Collection<MediaSource> mediaSources) {
-    addMediaSources(mediaSourcesPublic.size(), mediaSources);
+    addMediaSources(mediaSourcesPublic.size(), mediaSources, null);
+  }
+
+  /**
+   * Appends multiple {@link MediaSource}s to the playlist and executes a custom action on
+   * completion.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
+   *
+   * @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 actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   *     sources have been added to the playlist.
+   */
+  public synchronized void addMediaSources(Collection<MediaSource> mediaSources,
+      @Nullable Runnable actionOnCompletion) {
+    addMediaSources(mediaSourcesPublic.size(), mediaSources, actionOnCompletion);
   }
 
   /**
@@ -142,6 +197,24 @@ public synchronized void addMediaSources(Collection<MediaSource> mediaSources) {
    *     sources are added in the order in which they appear in this collection.
    */
   public synchronized void addMediaSources(int index, Collection<MediaSource> mediaSources) {
+    addMediaSources(index, mediaSources, null);
+  }
+
+  /**
+   * Adds multiple {@link MediaSource}s to the playlist and executes a custom action on completion.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used. If you want to add the same
+   * piece of media multiple times, use a new instance each time.
+   *
+   * @param index The index at which the new {@link MediaSource}s will be inserted. This index must
+   *     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 actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   *     sources have been added to the playlist.
+   */
+  public synchronized void addMediaSources(int index, Collection<MediaSource> mediaSources,
+      @Nullable Runnable actionOnCompletion) {
     for (MediaSource mediaSource : mediaSources) {
       Assertions.checkNotNull(mediaSource);
       Assertions.checkArgument(!mediaSourcesPublic.contains(mediaSource));
@@ -149,7 +222,9 @@ public synchronized void addMediaSources(int index, Collection<MediaSource> medi
     mediaSourcesPublic.addAll(index, mediaSources);
     if (player != null && !mediaSources.isEmpty()) {
       player.sendMessages(new ExoPlayerMessage(this, MSG_ADD_MULTIPLE,
-          Pair.create(index, mediaSources)));
+          new MessageData<>(index, mediaSources, actionOnCompletion)));
+    } else if (actionOnCompletion != null){
+      actionOnCompletion.run();
     }
   }
 
@@ -164,9 +239,28 @@ public synchronized void addMediaSources(int index, Collection<MediaSource> medi
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
    */
   public synchronized void removeMediaSource(int index) {
+    removeMediaSource(index, null);
+  }
+
+  /**
+   * Removes a {@link MediaSource} from the playlist and executes a custom action on completion.
+   * <p>
+   * Note: {@link MediaSource} instances are not designed to be re-used, and so the instance being
+   * removed should not be re-added. If you want to move the instance use
+   * {@link #moveMediaSource(int, int)} 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 actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   *     source has been removed from the playlist.
+   */
+  public synchronized void removeMediaSource(int index, @Nullable Runnable actionOnCompletion) {
     mediaSourcesPublic.remove(index);
     if (player != null) {
-      player.sendMessages(new ExoPlayerMessage(this, MSG_REMOVE, index));
+      player.sendMessages(new ExoPlayerMessage(this, MSG_REMOVE,
+          new MessageData<>(index, null, actionOnCompletion)));
+    } else if (actionOnCompletion != null) {
+      actionOnCompletion.run();
     }
   }
 
@@ -179,13 +273,31 @@ public synchronized void removeMediaSource(int index) {
    *     range of 0 &lt;= index &lt; {@link #getSize()}.
    */
   public synchronized void moveMediaSource(int currentIndex, int newIndex) {
+    moveMediaSource(currentIndex, newIndex, null);
+  }
+
+  /**
+   * Moves an existing {@link MediaSource} within the playlist and executes a custom action on
+   * completion.
+   *
+   * @param currentIndex The current index of the media source in the playlist. This index must be
+   *     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 actionOnCompletion A {@link Runnable} which is executed immediately after the media
+   *     source has been moved.
+   */
+  public synchronized void moveMediaSource(int currentIndex, int newIndex,
+      @Nullable Runnable actionOnCompletion) {
     if (currentIndex == newIndex) {
       return;
     }
     mediaSourcesPublic.add(newIndex, mediaSourcesPublic.remove(currentIndex));
     if (player != null) {
       player.sendMessages(new ExoPlayerMessage(this, MSG_MOVE,
-          Pair.create(currentIndex, newIndex)));
+          new MessageData<>(currentIndex, newIndex, actionOnCompletion)));
+    } else if (actionOnCompletion != null) {
+      actionOnCompletion.run();
     }
   }
 
@@ -215,7 +327,7 @@ public synchronized void prepareSource(ExoPlayer player, boolean isTopLevelSourc
     shuffleOrder = shuffleOrder.cloneAndInsert(0, mediaSourcesPublic.size());
     addMediaSourcesInternal(0, mediaSourcesPublic);
     preventListenerNotification = false;
-    maybeNotifyListener();
+    maybeNotifyListener(null);
   }
 
   @Override
@@ -263,31 +375,42 @@ public void releaseSource() {
   @Override
   @SuppressWarnings("unchecked")
   public void handleMessage(int messageType, Object message) throws ExoPlaybackException {
+    if (messageType == MSG_ON_COMPLETION) {
+      ((EventDispatcher) message).dispatchEvent();
+      return;
+    }
     preventListenerNotification = true;
+    EventDispatcher actionOnCompletion;
     switch (messageType) {
       case MSG_ADD: {
-        Pair<Integer, MediaSource> messageData = (Pair<Integer, MediaSource>) message;
-        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.first, 1);
-        addMediaSourceInternal(messageData.first, messageData.second);
+        MessageData<MediaSource> messageData = (MessageData<MediaSource>) message;
+        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.index, 1);
+        addMediaSourceInternal(messageData.index, messageData.customData);
+        actionOnCompletion = messageData.actionOnCompletion;
         break;
       }
       case MSG_ADD_MULTIPLE: {
-        Pair<Integer, Collection<MediaSource>> messageData =
-            (Pair<Integer, Collection<MediaSource>>) message;
-        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.first, messageData.second.size());
-        addMediaSourcesInternal(messageData.first, messageData.second);
+        MessageData<Collection<MediaSource>> messageData =
+            (MessageData<Collection<MediaSource>>) message;
+        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.index,
+            messageData.customData.size());
+        addMediaSourcesInternal(messageData.index, messageData.customData);
+        actionOnCompletion = messageData.actionOnCompletion;
         break;
       }
       case MSG_REMOVE: {
-        shuffleOrder = shuffleOrder.cloneAndRemove((Integer) message);
-        removeMediaSourceInternal((Integer) message);
+        MessageData<Void> messageData = (MessageData<Void>) message;
+        shuffleOrder = shuffleOrder.cloneAndRemove(messageData.index);
+        removeMediaSourceInternal(messageData.index);
+        actionOnCompletion = messageData.actionOnCompletion;
         break;
       }
       case MSG_MOVE: {
-        Pair<Integer, Integer> messageData = (Pair<Integer, Integer>) message;
-        shuffleOrder = shuffleOrder.cloneAndRemove(messageData.first);
-        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.second, 1);
-        moveMediaSourceInternal(messageData.first, messageData.second);
+        MessageData<Integer> messageData = (MessageData<Integer>) message;
+        shuffleOrder = shuffleOrder.cloneAndRemove(messageData.index);
+        shuffleOrder = shuffleOrder.cloneAndInsert(messageData.customData, 1);
+        moveMediaSourceInternal(messageData.index, messageData.customData);
+        actionOnCompletion = messageData.actionOnCompletion;
         break;
       }
       default: {
@@ -295,14 +418,18 @@ public void handleMessage(int messageType, Object message) throws ExoPlaybackExc
       }
     }
     preventListenerNotification = false;
-    maybeNotifyListener();
+    maybeNotifyListener(actionOnCompletion);
   }
 
-  private void maybeNotifyListener() {
+  private void maybeNotifyListener(@Nullable EventDispatcher actionOnCompletion) {
     if (!preventListenerNotification) {
       listener.onSourceInfoRefreshed(this,
           new ConcatenatedTimeline(mediaSourceHolders, windowCount, periodCount, shuffleOrder),
           null);
+      if (actionOnCompletion != null) {
+        player.sendMessages(
+            new ExoPlayerMessage(this, MSG_ON_COMPLETION, actionOnCompletion));
+      }
     }
   }
 
@@ -359,7 +486,7 @@ private void updateMediaSourceInternal(MediaSourceHolder mediaSourceHolder, Time
       }
     }
     mediaSourceHolder.isPrepared = true;
-    maybeNotifyListener();
+    maybeNotifyListener(null);
   }
 
   private void removeMediaSourceInternal(int index) {
@@ -407,6 +534,9 @@ private int findMediaSourceHolderByPeriodIndex(int periodIndex) {
     return index;
   }
 
+  /**
+   * Data class to hold playlist media sources together with meta data needed to process them.
+   */
   private static final class MediaSourceHolder implements Comparable<MediaSourceHolder> {
 
     public final MediaSource mediaSource;
@@ -432,6 +562,47 @@ public int compareTo(@NonNull MediaSourceHolder other) {
     }
   }
 
+  /**
+   * Can be used to dispatch a runnable on the thread the object was created on.
+   */
+  private static final class EventDispatcher {
+
+    public final Handler eventHandler;
+    public final Runnable runnable;
+
+    public EventDispatcher(Runnable runnable) {
+      this.runnable = runnable;
+      this.eventHandler = new Handler(Looper.myLooper() != null ? Looper.myLooper()
+          : Looper.getMainLooper());
+    }
+
+    public void dispatchEvent() {
+      eventHandler.post(runnable);
+    }
+
+  }
+
+  /**
+   * Message used to post actions from app thread to playback thread.
+   */
+  private static final class MessageData<CustomType> {
+
+    public final int index;
+    public final CustomType customData;
+    public final @Nullable EventDispatcher actionOnCompletion;
+
+    public MessageData(int index, CustomType customData, @Nullable Runnable actionOnCompletion) {
+      this.index = index;
+      this.actionOnCompletion = actionOnCompletion != null
+          ? new EventDispatcher(actionOnCompletion) : null;
+      this.customData = customData;
+    }
+
+  }
+
+  /**
+   * Timeline exposing concatenated timelines of playlist media sources.
+   */
   private static final class ConcatenatedTimeline extends AbstractConcatenatedTimeline {
 
     private final int windowCount;
@@ -514,6 +685,10 @@ public int getPeriodCount() {
 
   }
 
+  /**
+   * 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.
+   */
   private static final class DeferredTimeline extends Timeline {
 
     private static final Object DUMMY_ID = new Object();
@@ -582,6 +757,11 @@ public int getIndexOfPeriod(Object uid) {
 
   }
 
+  /**
+   * Media period used for periods created from unprepared media sources exposed through
+   * {@link DeferredTimeline}. Period preparation is postponed until the actual media source becomes
+   * available.
+   */
   private static final class DeferredMediaPeriod implements MediaPeriod, MediaPeriod.Callback {
 
     public final MediaSource mediaSource;

From fbfbe7d6c9313b7a9b8fc26e8483989351336320 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Thu, 9 Nov 2017 07:14:21 -0800
Subject: [PATCH 397/421] Re-enable index file store at the end of the
 SimpleCache.initialize()

In the case converting cache files from an earlier version of
SimpleCache, there is no previous version of the index file. If the app
doesn't call any SimpleCache methods which would make the index file
stored before it exists whole data gets lost.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175153650
---
 .../android/exoplayer2/upstream/cache/SimpleCache.java   | 9 ++++++++-
 1 file changed, 8 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 9739f219230..599474d6c3d 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,6 +16,7 @@
 package com.google.android.exoplayer2.upstream.cache;
 
 import android.os.ConditionVariable;
+import android.util.Log;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.util.Assertions;
 import java.io.File;
@@ -31,6 +32,8 @@
  */
 public final class SimpleCache implements Cache {
 
+  private static final String TAG = "SimpleCache";
+
   private final File cacheDir;
   private final CacheEvictor evictor;
   private final HashMap<String, CacheSpan> lockedSpans;
@@ -288,7 +291,11 @@ private void initialize() {
     }
 
     index.removeEmpty();
-    // Don't call index.store() here so initialization doesn't fail because of write issues.
+    try {
+      index.store();
+    } catch (CacheException e) {
+      Log.e(TAG, "Storing index file failed", e);
+    }
   }
 
   /**

From 6e15d5cab7f3de87ca0ef73b5a9974badcdb1711 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 13 Nov 2017 09:31:52 -0800
Subject: [PATCH 398/421] Update moe equivalence

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175542973
---
 extensions/tv/README.md    | 41 --------------------------------------
 extensions/tv/build.gradle | 39 ------------------------------------
 2 files changed, 80 deletions(-)
 delete mode 100644 extensions/tv/README.md
 delete mode 100644 extensions/tv/build.gradle

diff --git a/extensions/tv/README.md b/extensions/tv/README.md
deleted file mode 100644
index 0deb33794ff..00000000000
--- a/extensions/tv/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
-# ExoPlayer TV tuner extension #
-
-Provides components for broadcast TV playback with ExoPlayer.
-
-## Links ##
-
-* [Javadoc][]: Classes matching `com.google.android.exoplayer2.ext.tv.*`
-  belong to this extension.
-
-[Javadoc]: https://google.github.io/ExoPlayer/doc/reference/index.html
-
-## Build Instructions ##
-
-* Checkout ExoPlayer:
-
-```
-git clone https://github.com/google/ExoPlayer.git
-```
-
-* Set the following environment variables:
-
-```
-cd "<path to exoplayer checkout>"
-EXOPLAYER_ROOT="$(pwd)"
-TV_MODULE_PATH="${EXOPLAYER_ROOT}/extensions/tv/src/main"
-```
-
-* Download the [Android NDK][] and set its location in an environment variable:
-
-[Android NDK]: https://developer.android.com/tools/sdk/ndk/index.html
-
-```
-NDK_PATH="<path to Android NDK>"
-```
-
-* Build the JNI native libraries from the command line:
-
-```
-cd "${TV_MODULE_PATH}"/jni && \
-${NDK_PATH}/ndk-build APP_ABI=all -j<N>
-```
diff --git a/extensions/tv/build.gradle b/extensions/tv/build.gradle
deleted file mode 100644
index ee549266509..00000000000
--- a/extensions/tv/build.gradle
+++ /dev/null
@@ -1,39 +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.
-apply from: '../../constants.gradle'
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion project.ext.targetSdkVersion
-    }
-
-    sourceSets.main {
-        jniLibs.srcDir 'src/main/libs'
-        jni.srcDirs = [] // Disable the automatic ndk-build call by Android Studio.
-    }
-}
-
-dependencies {
-    compile project(modulePrefix + 'library-core')
-}
-
-ext {
-    javadocTitle = 'TV tuner extension'
-}
-apply from: '../../javadoc_library.gradle'

From 812ecc3c2dc0d451571c91bc589cca2b4b5b25c6 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 13 Nov 2017 09:35:49 -0800
Subject: [PATCH 399/421] Drop the 'r' from release version.

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

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 9bc7005ffc3..6e6ed280778 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -1,7 +1,8 @@
 # Release notes #
 
-### r2.6.0 ###
+### 2.6.0 ###
 
+* Removed "r" prefix from versions. This release is "2.6.0", not "r2.6.0".
 * New `Player.DefaultEventListener` abstract class can be extended to avoid
   having to implement all methods defined by `Player.EventListener`.
 * Added a reason to `EventListener.onPositionDiscontinuity`
diff --git a/constants.gradle b/constants.gradle
index 644d47b8aa8..2a7754d65cb 100644
--- a/constants.gradle
+++ b/constants.gradle
@@ -28,7 +28,7 @@ project.ext {
     junitVersion = '4.12'
     truthVersion = '0.35'
     robolectricVersion = '3.4.2'
-    releaseVersion = 'r2.6.0'
+    releaseVersion = '2.6.0'
     modulePrefix = ':'
     if (gradle.ext.has('exoplayerModulePrefix')) {
         modulePrefix += gradle.ext.exoplayerModulePrefix

From 4ac8680b947f6a2d826d916bc49d4a808ce0ea0f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 13 Nov 2017 10:01:30 -0800
Subject: [PATCH 400/421] Update 2.6.0 release notes

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

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 6e6ed280778..d6b20be4e16 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -22,6 +22,9 @@
   to key-frames. This is particularly relevant for variable speed playbacks.
 * Allow `SingleSampleMediaSource` to suppress load errors
   ([#3140](https://github.com/google/ExoPlayer/issues/3140)).
+* `DynamicConcatenatingMediaSource`: Allow specifying a callback to be invoked
+  after a dynamic playlist modification has been applied
+  ([#3407](https://github.com/google/ExoPlayer/issues/3407)).
 * Audio: New `AudioSink` interface allows customization of audio output path.
 * Offline: Added `Downloader` implementations for DASH, HLS, SmoothStreaming
   and progressive streams.

From 2c8c14d647025817db2a70c3b08763f348907dfd Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Wed, 8 Nov 2017 11:01:47 +0900
Subject: [PATCH 401/421] add bravia workaround to skip using setOutputSurface
 in MediaCodec

---
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java      | 3 ++-
 1 file changed, 2 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 25e507d9848..ac196da977f 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
@@ -1075,7 +1075,8 @@ private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
     // https://github.com/google/ExoPlayer/issues/3355.
     return (("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
         && "OMX.qcom.video.decoder.avc".equals(name))
-        || ("tcl_eu".equals(Util.DEVICE) && "OMX.MTK.VIDEO.DECODER.AVC".equals(name));
+        || (("tcl_eu".equals(Util.DEVICE) || Util.MODEL.startsWith("BRAVIA"))
+        && "OMX.MTK.VIDEO.DECODER.AVC".equals(name));
   }
 
   /**

From 2c495502e020041cb999c41e92e375d2a2be808d Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Wed, 8 Nov 2017 13:41:04 +0900
Subject: [PATCH 402/421] add issue link

---
 .../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 ac196da977f..2d74dfba9e3 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
@@ -1071,8 +1071,9 @@ private static boolean deviceNeedsAutoFrcWorkaround() {
    * If true is returned then we fall back to releasing and re-instantiating the codec instead.
    */
   private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
-    // Work around https://github.com/google/ExoPlayer/issues/3236 and
-    // https://github.com/google/ExoPlayer/issues/3355.
+    // Work around https://github.com/google/ExoPlayer/issues/3236,
+    // https://github.com/google/ExoPlayer/issues/3355 and
+    // https://github.com/google/ExoPlayer/issues/3439.
     return (("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
         && "OMX.qcom.video.decoder.avc".equals(name))
         || (("tcl_eu".equals(Util.DEVICE) || Util.MODEL.startsWith("BRAVIA"))

From a573099f93a4a77c7c08f4cb2ee2345446e59b47 Mon Sep 17 00:00:00 2001
From: yqritc <yqritc@gmail.com>
Date: Thu, 9 Nov 2017 10:56:47 +0900
Subject: [PATCH 403/421] update bravia workaround more precisely

---
 .../android/exoplayer2/video/MediaCodecVideoRenderer.java      | 3 ++-
 1 file changed, 2 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 2d74dfba9e3..41e3c970c4f 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
@@ -1076,7 +1076,8 @@ private static boolean codecNeedsSetOutputSurfaceWorkaround(String name) {
     // https://github.com/google/ExoPlayer/issues/3439.
     return (("deb".equals(Util.DEVICE) || "flo".equals(Util.DEVICE))
         && "OMX.qcom.video.decoder.avc".equals(name))
-        || (("tcl_eu".equals(Util.DEVICE) || Util.MODEL.startsWith("BRAVIA"))
+        || (("tcl_eu".equals(Util.DEVICE) || "SVP-DTV15".equals(Util.DEVICE)
+        || "BRAVIA_ATV2".equals(Util.DEVICE))
         && "OMX.MTK.VIDEO.DECODER.AVC".equals(name));
   }
 

From 427fe668552c2659d94c2e99a766dd7d7349090b Mon Sep 17 00:00:00 2001
From: nvalletta <nora.valletta@gmail.com>
Date: Sun, 12 Nov 2017 14:23:22 -0700
Subject: [PATCH 404/421] Add an easy way to set the shutter view background
 color

---
 .../exoplayer2/ui/SimpleExoPlayerView.java    | 22 +++++++++++++++++++
 library/ui/src/main/res/values/attrs.xml      |  1 +
 2 files changed, 23 insertions(+)

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 fc410317560..86fe7a3f7f4 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
@@ -83,6 +83,12 @@
  *         <li>Default: {@code true}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter} view.
+ *       <ul>
+ *         <li>Corresponding method: {@link #setShutterBackgroundColor(int)}</li>
+ *         <li>Default: {@code 0}</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code hide_on_touch}</b> - Whether the playback controls are hidden by touch events.
  *       <ul>
  *         <li>Corresponding method: {@link #setControllerHideOnTouch(boolean)}</li>
@@ -249,6 +255,7 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
       return;
     }
 
+    int shutterColor = 0;
     int playerLayoutId = R.layout.exo_simple_player_view;
     boolean useArtwork = true;
     int defaultArtworkId = 0;
@@ -262,6 +269,7 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs,
           R.styleable.SimpleExoPlayerView, 0, 0);
       try {
+        shutterColor = a.getColor(R.styleable.SimpleExoPlayerView_shutter_background_color, shutterColor);
         playerLayoutId = a.getResourceId(R.styleable.SimpleExoPlayerView_player_layout_id,
             playerLayoutId);
         useArtwork = a.getBoolean(R.styleable.SimpleExoPlayerView_use_artwork, useArtwork);
@@ -293,6 +301,9 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
 
     // Shutter view.
     shutterView = findViewById(R.id.exo_shutter);
+    if (shutterView != null) {
+      shutterView.setBackgroundColor(shutterColor);
+    }
 
     // Create a surface view and insert it into the content frame, if there is one.
     if (contentFrame != null && surfaceType != SURFACE_TYPE_NONE) {
@@ -513,6 +524,17 @@ public void setUseController(boolean useController) {
     }
   }
 
+  /**
+   * Sets the background color of the {@code exo_shutter} view.
+   *
+   * @param color A resolved color (not a resource ID) for the background of the shutter view.
+   */
+  public void setShutterBackgroundColor(int color) {
+    if (shutterView != null) {
+      shutterView.setBackgroundColor(color);
+    }
+  }
+
   @Override
   public boolean dispatchKeyEvent(KeyEvent event) {
     if (player != null && player.isPlayingAd()) {
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index d02d54ef237..eb9edaccdcc 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -43,6 +43,7 @@
 
   <declare-styleable name="SimpleExoPlayerView">
     <attr name="use_artwork" format="boolean"/>
+    <attr name="shutter_background_color" format="color" />
     <attr name="default_artwork" format="reference"/>
     <attr name="use_controller" format="boolean"/>
     <attr name="hide_on_touch" format="boolean"/>

From 444358521c9532f5e98f492f3cd5200d4bffd920 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Mon, 13 Nov 2017 17:28:25 +0000
Subject: [PATCH 405/421] Only set shutter color if attr is declared

---
 .../exoplayer2/ui/SimpleExoPlayerView.java    | 22 +++++++++++--------
 library/ui/src/main/res/values/attrs.xml      |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

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 86fe7a3f7f4..b09e80c5917 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
@@ -83,12 +83,6 @@
  *         <li>Default: {@code true}</li>
  *       </ul>
  *   </li>
- *   <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter} view.
- *       <ul>
- *         <li>Corresponding method: {@link #setShutterBackgroundColor(int)}</li>
- *         <li>Default: {@code 0}</li>
- *       </ul>
- *   </li>
  *   <li><b>{@code hide_on_touch}</b> - Whether the playback controls are hidden by touch events.
  *       <ul>
  *         <li>Corresponding method: {@link #setControllerHideOnTouch(boolean)}</li>
@@ -119,6 +113,13 @@
  *         <li>Default: {@code surface_view}</li>
  *       </ul>
  *   </li>
+ *   <li><b>{@code shutter_background_color}</b> - The background color of the {@code exo_shutter}
+ *       view.
+ *       <ul>
+ *         <li>Corresponding method: {@link #setShutterBackgroundColor(int)}</li>
+ *         <li>Default: {@code unset}</li>
+ *       </ul>
+ *   </li>
  *   <li><b>{@code player_layout_id}</b> - Specifies the id of the layout to be inflated. See below
  *       for more details.
  *       <ul>
@@ -255,6 +256,7 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
       return;
     }
 
+    boolean shutterColorSet = false;
     int shutterColor = 0;
     int playerLayoutId = R.layout.exo_simple_player_view;
     boolean useArtwork = true;
@@ -269,7 +271,9 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
       TypedArray a = context.getTheme().obtainStyledAttributes(attrs,
           R.styleable.SimpleExoPlayerView, 0, 0);
       try {
-        shutterColor = a.getColor(R.styleable.SimpleExoPlayerView_shutter_background_color, shutterColor);
+        shutterColorSet = a.hasValue(R.styleable.SimpleExoPlayerView_shutter_background_color);
+        shutterColor = a.getColor(R.styleable.SimpleExoPlayerView_shutter_background_color,
+              shutterColor);
         playerLayoutId = a.getResourceId(R.styleable.SimpleExoPlayerView_player_layout_id,
             playerLayoutId);
         useArtwork = a.getBoolean(R.styleable.SimpleExoPlayerView_use_artwork, useArtwork);
@@ -301,7 +305,7 @@ public SimpleExoPlayerView(Context context, AttributeSet attrs, int defStyleAttr
 
     // Shutter view.
     shutterView = findViewById(R.id.exo_shutter);
-    if (shutterView != null) {
+    if (shutterView != null && shutterColorSet) {
       shutterView.setBackgroundColor(shutterColor);
     }
 
@@ -527,7 +531,7 @@ public void setUseController(boolean useController) {
   /**
    * Sets the background color of the {@code exo_shutter} view.
    *
-   * @param color A resolved color (not a resource ID) for the background of the shutter view.
+   * @param color The background color.
    */
   public void setShutterBackgroundColor(int color) {
     if (shutterView != null) {
diff --git a/library/ui/src/main/res/values/attrs.xml b/library/ui/src/main/res/values/attrs.xml
index eb9edaccdcc..525f95768c5 100644
--- a/library/ui/src/main/res/values/attrs.xml
+++ b/library/ui/src/main/res/values/attrs.xml
@@ -43,7 +43,7 @@
 
   <declare-styleable name="SimpleExoPlayerView">
     <attr name="use_artwork" format="boolean"/>
-    <attr name="shutter_background_color" format="color" />
+    <attr name="shutter_background_color" format="color"/>
     <attr name="default_artwork" format="reference"/>
     <attr name="use_controller" format="boolean"/>
     <attr name="hide_on_touch" format="boolean"/>

From 47a9609d3f449a94d761492600bd575de217ebb3 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 17 Nov 2017 19:26:55 +0000
Subject: [PATCH 406/421] Remove cast extension from 2.6.0 release

---
 core_settings.gradle                          |   2 -
 demos/cast/README.md                          |   4 -
 demos/cast/build.gradle                       |  51 --
 demos/cast/src/main/AndroidManifest.xml       |  42 -
 .../android/exoplayer2/castdemo/DemoUtil.java |  92 --
 .../exoplayer2/castdemo/MainActivity.java     | 122 ---
 .../exoplayer2/castdemo/PlayerManager.java    | 208 -----
 .../src/main/res/layout/main_activity.xml     |  42 -
 demos/cast/src/main/res/menu/menu.xml         |  25 -
 .../src/main/res/mipmap-hdpi/ic_launcher.png  | Bin 4315 -> 0 bytes
 .../src/main/res/mipmap-mdpi/ic_launcher.png  | Bin 2734 -> 0 bytes
 .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 6159 -> 0 bytes
 .../main/res/mipmap-xxhdpi/ic_launcher.png    | Bin 10578 -> 0 bytes
 .../main/res/mipmap-xxxhdpi/ic_launcher.png   | Bin 11743 -> 0 bytes
 demos/cast/src/main/res/values/strings.xml    |  25 -
 extensions/cast/README.md                     |  33 -
 extensions/cast/build.gradle                  |  45 -
 extensions/cast/src/main/AndroidManifest.xml  |  16 -
 .../exoplayer2/ext/cast/CastPlayer.java       | 853 ------------------
 .../exoplayer2/ext/cast/CastTimeline.java     | 114 ---
 .../exoplayer2/ext/cast/CastUtils.java        |  94 --
 .../ext/cast/DefaultCastOptionsProvider.java  |  42 -
 settings.gradle                               |   2 -
 23 files changed, 1812 deletions(-)
 delete mode 100644 demos/cast/README.md
 delete mode 100644 demos/cast/build.gradle
 delete mode 100644 demos/cast/src/main/AndroidManifest.xml
 delete mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
 delete mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
 delete mode 100644 demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
 delete mode 100644 demos/cast/src/main/res/layout/main_activity.xml
 delete mode 100644 demos/cast/src/main/res/menu/menu.xml
 delete mode 100644 demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png
 delete mode 100644 demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png
 delete mode 100644 demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png
 delete mode 100644 demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png
 delete mode 100644 demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png
 delete mode 100644 demos/cast/src/main/res/values/strings.xml
 delete mode 100644 extensions/cast/README.md
 delete mode 100644 extensions/cast/build.gradle
 delete mode 100644 extensions/cast/src/main/AndroidManifest.xml
 delete mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
 delete mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
 delete mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
 delete mode 100644 extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java

diff --git a/core_settings.gradle b/core_settings.gradle
index 20a7c87bde2..7a8320b1a12 100644
--- a/core_settings.gradle
+++ b/core_settings.gradle
@@ -28,7 +28,6 @@ include modulePrefix + 'extension-ffmpeg'
 include modulePrefix + 'extension-flac'
 include modulePrefix + 'extension-gvr'
 include modulePrefix + 'extension-ima'
-include modulePrefix + 'extension-cast'
 include modulePrefix + 'extension-mediasession'
 include modulePrefix + 'extension-okhttp'
 include modulePrefix + 'extension-opus'
@@ -47,7 +46,6 @@ project(modulePrefix + 'extension-ffmpeg').projectDir = new File(rootDir, 'exten
 project(modulePrefix + 'extension-flac').projectDir = new File(rootDir, 'extensions/flac')
 project(modulePrefix + 'extension-gvr').projectDir = new File(rootDir, 'extensions/gvr')
 project(modulePrefix + 'extension-ima').projectDir = new File(rootDir, 'extensions/ima')
-project(modulePrefix + 'extension-cast').projectDir = new File(rootDir, 'extensions/cast')
 project(modulePrefix + 'extension-mediasession').projectDir = new File(rootDir, 'extensions/mediasession')
 project(modulePrefix + 'extension-okhttp').projectDir = new File(rootDir, 'extensions/okhttp')
 project(modulePrefix + 'extension-opus').projectDir = new File(rootDir, 'extensions/opus')
diff --git a/demos/cast/README.md b/demos/cast/README.md
deleted file mode 100644
index 2c68a5277a5..00000000000
--- a/demos/cast/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# Cast demo application #
-
-This folder contains a demo application that showcases ExoPlayer integration
-with Google Cast.
diff --git a/demos/cast/build.gradle b/demos/cast/build.gradle
deleted file mode 100644
index a9fa27ad586..00000000000
--- a/demos/cast/build.gradle
+++ /dev/null
@@ -1,51 +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.
-apply from: '../../constants.gradle'
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion 16
-        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 {
-    compile project(modulePrefix + 'library-core')
-    compile project(modulePrefix + 'library-dash')
-    compile project(modulePrefix + 'library-hls')
-    compile project(modulePrefix + 'library-smoothstreaming')
-    compile project(modulePrefix + 'library-ui')
-    compile project(modulePrefix + 'extension-cast')
-}
diff --git a/demos/cast/src/main/AndroidManifest.xml b/demos/cast/src/main/AndroidManifest.xml
deleted file mode 100644
index 11f8e39b538..00000000000
--- a/demos/cast/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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"
-    package="com.google.android.exoplayer2.castdemo"
-    android:versionCode="2600"
-    android:versionName="2.6.0">
-
-  <uses-permission android:name="android.permission.INTERNET"/>
-  <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="26"/>
-
-  <application android:label="@string/application_name" android:icon="@mipmap/ic_launcher"
-      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" />
-
-    <activity android:name="com.google.android.exoplayer2.castdemo.MainActivity"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout|smallestScreenSize|uiMode"
-        android:launchMode="singleTop" 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"/>
-      </intent-filter>
-    </activity>
-
-  </application>
-
-</manifest>
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
deleted file mode 100644
index d36f8c319e4..00000000000
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/DemoUtil.java
+++ /dev/null
@@ -1,92 +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 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;
-
-/**
- * Utility methods and constants for the Cast demo application.
- */
-/* package */ final class DemoUtil {
-
-  public static final String MIME_TYPE_DASH = "application/dash+xml";
-  public static final String MIME_TYPE_HLS = "application/vnd.apple.mpegurl";
-  public static final String MIME_TYPE_SS = "application/vnd.ms-sstr+xml";
-  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;
-    }
-
-  }
-
-  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));
-
-
-    SAMPLES = Collections.unmodifiableList(samples);
-
-  }
-
-  private DemoUtil() {}
-
-}
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
deleted file mode 100644
index 094e9f9e6e4..00000000000
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/MainActivity.java
+++ /dev/null
@@ -1,122 +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.graphics.Color;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.v7.app.AppCompatActivity;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
-import android.widget.ListView;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.ext.cast.CastPlayer;
-import com.google.android.exoplayer2.ui.PlaybackControlView;
-import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
-import com.google.android.gms.cast.framework.CastButtonFactory;
-
-/**
- * An activity that plays video using {@link SimpleExoPlayer} and {@link CastPlayer}.
- */
-public class MainActivity extends AppCompatActivity {
-
-  private SimpleExoPlayerView simpleExoPlayerView;
-  private PlaybackControlView castControlView;
-  private PlayerManager playerManager;
-
-  // Activity lifecycle methods.
-
-  @Override
-  public void onCreate(Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
-
-    setContentView(R.layout.main_activity);
-
-    simpleExoPlayerView = findViewById(R.id.player_view);
-    simpleExoPlayerView.requestFocus();
-
-    castControlView = findViewById(R.id.cast_control_view);
-
-    ListView sampleList = findViewById(R.id.sample_list);
-    sampleList.setAdapter(new SampleListAdapter());
-    sampleList.setOnItemClickListener(new SampleClickListener());
-  }
-
-  @Override
-  public boolean onCreateOptionsMenu(Menu menu) {
-    super.onCreateOptionsMenu(menu);
-    getMenuInflater().inflate(R.menu.menu, menu);
-    CastButtonFactory.setUpMediaRouteButton(getApplicationContext(), menu,
-        R.id.media_route_menu_item);
-    return true;
-  }
-
-  @Override
-  public void onResume() {
-    super.onResume();
-    playerManager = new PlayerManager(simpleExoPlayerView, castControlView, this);
-  }
-
-  @Override
-  public void onPause() {
-    super.onPause();
-    playerManager.release();
-    playerManager = null;
-  }
-
-  // Activity input.
-
-  @Override
-  public boolean dispatchKeyEvent(KeyEvent event) {
-    // If the event was not handled then see if the player view can handle it.
-    return super.dispatchKeyEvent(event) || playerManager.dispatchKeyEvent(event);
-  }
-
-  // User controls.
-
-  private final class SampleListAdapter extends ArrayAdapter<DemoUtil.Sample> {
-
-    public SampleListAdapter() {
-      super(getApplicationContext(), android.R.layout.simple_list_item_1, DemoUtil.SAMPLES);
-    }
-
-    @Override
-    @NonNull
-    public View getView(int position, View convertView, @NonNull ViewGroup parent) {
-      View view = super.getView(position, convertView, parent);
-      view.setBackgroundColor(Color.WHITE);
-      return view;
-    }
-
-  }
-
-  private class SampleClickListener implements AdapterView.OnItemClickListener {
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-      if (parent.getSelectedItemPosition() != position) {
-        DemoUtil.Sample currentSample = DemoUtil.SAMPLES.get(position);
-        playerManager.setCurrentSample(currentSample, 0, true);
-      }
-    }
-
-  }
-
-}
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 77dc018a73a..00000000000
--- a/demos/cast/src/main/java/com/google/android/exoplayer2/castdemo/PlayerManager.java
+++ /dev/null
@@ -1,208 +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.view.KeyEvent;
-import android.view.View;
-import com.google.android.exoplayer2.DefaultRenderersFactory;
-import com.google.android.exoplayer2.ExoPlayerFactory;
-import com.google.android.exoplayer2.RenderersFactory;
-import com.google.android.exoplayer2.SimpleExoPlayer;
-import com.google.android.exoplayer2.ext.cast.CastPlayer;
-import com.google.android.exoplayer2.extractor.DefaultExtractorsFactory;
-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.dash.DefaultDashChunkSource;
-import com.google.android.exoplayer2.source.hls.HlsMediaSource;
-import com.google.android.exoplayer2.source.smoothstreaming.DefaultSsChunkSource;
-import com.google.android.exoplayer2.source.smoothstreaming.SsMediaSource;
-import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.ui.PlaybackControlView;
-import com.google.android.exoplayer2.ui.SimpleExoPlayerView;
-import com.google.android.exoplayer2.upstream.DefaultBandwidthMeter;
-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;
-
-/**
- * Manages players for the ExoPlayer/Cast integration app.
- */
-/* package */ final class PlayerManager implements CastPlayer.SessionAvailabilityListener {
-
-  private static final int PLAYBACK_REMOTE = 1;
-  private static final int PLAYBACK_LOCAL = 2;
-
-  private static final String USER_AGENT = "ExoCastDemoPlayer";
-  private static final DefaultBandwidthMeter BANDWIDTH_METER = new DefaultBandwidthMeter();
-  private static final DefaultHttpDataSourceFactory DATA_SOURCE_FACTORY =
-      new DefaultHttpDataSourceFactory(USER_AGENT, BANDWIDTH_METER);
-
-  private final SimpleExoPlayerView exoPlayerView;
-  private final PlaybackControlView castControlView;
-  private final SimpleExoPlayer exoPlayer;
-  private final CastPlayer castPlayer;
-
-  private int playbackLocation;
-  private DemoUtil.Sample currentSample;
-
-  /**
-   * @param exoPlayerView The {@link SimpleExoPlayerView} for local playback.
-   * @param castControlView The {@link PlaybackControlView} to control remote playback.
-   * @param context A {@link Context}.
-   */
-  public PlayerManager(SimpleExoPlayerView exoPlayerView, PlaybackControlView castControlView,
-      Context context) {
-    this.exoPlayerView = exoPlayerView;
-    this.castControlView = castControlView;
-
-    DefaultTrackSelector trackSelector = new DefaultTrackSelector(BANDWIDTH_METER);
-    RenderersFactory renderersFactory = new DefaultRenderersFactory(context, null);
-    exoPlayer = ExoPlayerFactory.newSimpleInstance(renderersFactory, trackSelector);
-    exoPlayerView.setPlayer(exoPlayer);
-
-    castPlayer = new CastPlayer(CastContext.getSharedInstance(context));
-    castPlayer.setSessionAvailabilityListener(this);
-    castControlView.setPlayer(castPlayer);
-
-    setPlaybackLocation(castPlayer.isCastSessionAvailable() ? PLAYBACK_REMOTE : PLAYBACK_LOCAL);
-  }
-
-  /**
-   * Starts playback of the given sample at the given position.
-   *
-   * @param currentSample The {@link DemoUtil} to play.
-   * @param positionMs The position at which playback should start.
-   * @param playWhenReady Whether the player should proceed when ready to do so.
-   */
-  public void setCurrentSample(DemoUtil.Sample currentSample, long positionMs,
-      boolean playWhenReady) {
-    this.currentSample = currentSample;
-    if (playbackLocation == PLAYBACK_REMOTE) {
-      castPlayer.loadItem(buildMediaQueueItem(currentSample), positionMs);
-      castPlayer.setPlayWhenReady(playWhenReady);
-    } else /* playbackLocation == PLAYBACK_LOCAL */ {
-      exoPlayer.prepare(buildMediaSource(currentSample), true, true);
-      exoPlayer.setPlayWhenReady(playWhenReady);
-      exoPlayer.seekTo(positionMs);
-    }
-  }
-
-  /**
-   * Dispatches a given {@link KeyEvent} to whichever view corresponds according to the current
-   * playback location.
-   *
-   * @param event The {@link KeyEvent}.
-   * @return Whether the event was handled by the target view.
-   */
-  public boolean dispatchKeyEvent(KeyEvent event) {
-    if (playbackLocation == PLAYBACK_REMOTE) {
-      return castControlView.dispatchKeyEvent(event);
-    } else /* playbackLocation == PLAYBACK_REMOTE */ {
-      return exoPlayerView.dispatchKeyEvent(event);
-    }
-  }
-
-  /**
-   * Releases the manager and the players that it holds.
-   */
-  public void release() {
-    castPlayer.setSessionAvailabilityListener(null);
-    castPlayer.release();
-    exoPlayerView.setPlayer(null);
-    exoPlayer.release();
-  }
-
-  // CastPlayer.SessionAvailabilityListener implementation.
-
-  @Override
-  public void onCastSessionAvailable() {
-    setPlaybackLocation(PLAYBACK_REMOTE);
-  }
-
-  @Override
-  public void onCastSessionUnavailable() {
-    setPlaybackLocation(PLAYBACK_LOCAL);
-  }
-
-  // Internal methods.
-
-  private static MediaQueueItem buildMediaQueueItem(DemoUtil.Sample sample) {
-    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();
-    return new MediaQueueItem.Builder(mediaInfo).build();
-  }
-
-  private static MediaSource buildMediaSource(DemoUtil.Sample sample) {
-    Uri uri = Uri.parse(sample.uri);
-    switch (sample.mimeType) {
-      case DemoUtil.MIME_TYPE_SS:
-        return new SsMediaSource(uri, DATA_SOURCE_FACTORY,
-            new DefaultSsChunkSource.Factory(DATA_SOURCE_FACTORY), null, null);
-      case DemoUtil.MIME_TYPE_DASH:
-        return new DashMediaSource(uri, DATA_SOURCE_FACTORY,
-            new DefaultDashChunkSource.Factory(DATA_SOURCE_FACTORY), null, null);
-      case DemoUtil.MIME_TYPE_HLS:
-        return new HlsMediaSource(uri, DATA_SOURCE_FACTORY, null, null);
-      case DemoUtil.MIME_TYPE_VIDEO_MP4:
-        return new ExtractorMediaSource(uri, DATA_SOURCE_FACTORY, new DefaultExtractorsFactory(),
-            null, null);
-      default: {
-        throw new IllegalStateException("Unsupported type: " + sample.mimeType);
-      }
-    }
-  }
-
-  private void setPlaybackLocation(int playbackLocation) {
-    if (this.playbackLocation == playbackLocation) {
-      return;
-    }
-
-    // View management.
-    if (playbackLocation == PLAYBACK_LOCAL) {
-      exoPlayerView.setVisibility(View.VISIBLE);
-      castControlView.hide();
-    } else {
-      exoPlayerView.setVisibility(View.GONE);
-      castControlView.show();
-    }
-
-    long playbackPositionMs;
-    boolean playWhenReady;
-    if (this.playbackLocation == PLAYBACK_LOCAL) {
-      playbackPositionMs = exoPlayer.getCurrentPosition();
-      playWhenReady = exoPlayer.getPlayWhenReady();
-      exoPlayer.stop();
-    } else /* this.playbackLocation == PLAYBACK_REMOTE */ {
-      playbackPositionMs = castPlayer.getCurrentPosition();
-      playWhenReady = castPlayer.getPlayWhenReady();
-      castPlayer.stop();
-    }
-
-    this.playbackLocation = playbackLocation;
-    if (currentSample != null) {
-      setCurrentSample(currentSample, playbackPositionMs, playWhenReady);
-    }
-  }
-
-}
diff --git a/demos/cast/src/main/res/layout/main_activity.xml b/demos/cast/src/main/res/layout/main_activity.xml
deleted file mode 100644
index 5d94931b64c..00000000000
--- a/demos/cast/src/main/res/layout/main_activity.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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.
--->
-<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"
-    android:keepScreenOn="true">
-  <com.google.android.exoplayer2.ui.SimpleExoPlayerView android:id="@+id/player_view"
-      android:layout_width="match_parent"
-      app:repeat_toggle_modes="all|one"
-      android:layout_height="0dp"
-      android:layout_weight="12" />
-  <ListView
-      android:id="@+id/sample_list"
-      android:choiceMode="singleChoice"
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="12" />
-  <com.google.android.exoplayer2.ui.PlaybackControlView
-      android:id="@+id/cast_control_view"
-      android:layout_width="match_parent"
-      android:layout_height="0dp"
-      android:layout_weight="2"
-      android:visibility="gone"
-      app:repeat_toggle_modes="all|one"
-      app:show_timeout="-1"/>
-</LinearLayout>
diff --git a/demos/cast/src/main/res/menu/menu.xml b/demos/cast/src/main/res/menu/menu.xml
deleted file mode 100644
index 075ad34ec42..00000000000
--- a/demos/cast/src/main/res/menu/menu.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <item
-      android:id="@+id/media_route_menu_item"
-      android:title="@string/media_route_menu_title"
-      app:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
-      app:showAsAction="always" />
-
-</menu>
diff --git a/demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 52e8dc93d9895cf4e991eb391eb3f608d89b4743..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4315
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
JPDHLkV1g_qPgei{

diff --git a/demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index b55576eff33fc89f4297a425580fd78e2db6f886..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2734
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

diff --git a/demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index ca84d6a60e76c7095cebbff5d99732d82f43c55b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6159
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

diff --git a/demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 27ab9b1054ea5ae051c443ddf9110d9754c5b39f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10578
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

diff --git a/demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/demos/cast/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index d1eb9b78cf195a355c8354f38c22999778ceb52a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11743
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

diff --git a/demos/cast/src/main/res/values/strings.xml b/demos/cast/src/main/res/values/strings.xml
deleted file mode 100644
index 766e8972d92..00000000000
--- a/demos/cast/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?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.
--->
-
-<resources>
-
-  <string name="application_name">Exo Cast Demo</string>
-
-  <string name="media_route_menu_title">Cast</string>
-
-  <string name="error_unsupported_drm">DRM scheme not supported by this device.</string>
-
-</resources>
diff --git a/extensions/cast/README.md b/extensions/cast/README.md
deleted file mode 100644
index 73f7041729c..00000000000
--- a/extensions/cast/README.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# ExoPlayer Cast extension #
-
-## Description ##
-
-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
-
-## Getting the extension ##
-
-The easiest way to use the extension is to add it as a gradle dependency:
-
-```gradle
-compile 'com.google.android.exoplayer:extension-cast:rX.X.X'
-```
-
-where `rX.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 ##
-
-Create a `CastPlayer` and use it to integrate Cast into your app using
-ExoPlayer's common Player interface. You can try the Cast Extension to see how a
-[PlaybackControlView][] can be used to control playback in a remote receiver app.
-
-[PlaybackControlView]: https://google.github.io/ExoPlayer/doc/reference/com/google/android/exoplayer2/ui/PlaybackControlView.html
diff --git a/extensions/cast/build.gradle b/extensions/cast/build.gradle
deleted file mode 100644
index 7d252332c98..00000000000
--- a/extensions/cast/build.gradle
+++ /dev/null
@@ -1,45 +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.
-apply from: '../../constants.gradle'
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion project.ext.targetSdkVersion
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-    }
-}
-
-dependencies {
-    compile 'com.android.support:appcompat-v7:' + supportLibraryVersion
-    compile 'com.android.support:mediarouter-v7:' + supportLibraryVersion
-    compile 'com.google.android.gms:play-services-cast-framework:' + playServicesLibraryVersion
-    compile project(modulePrefix + 'library-core')
-    compile project(modulePrefix + 'library-ui')
-}
-
-ext {
-    javadocTitle = 'Cast extension'
-}
-apply from: '../../javadoc_library.gradle'
-
-ext {
-    releaseArtifact = 'extension-cast'
-    releaseDescription = 'Cast extension for ExoPlayer.'
-}
-apply from: '../../publish.gradle'
diff --git a/extensions/cast/src/main/AndroidManifest.xml b/extensions/cast/src/main/AndroidManifest.xml
deleted file mode 100644
index c12fc1289fd..00000000000
--- a/extensions/cast/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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 package="com.google.android.exoplayer2.ext.cast"/>
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
deleted file mode 100644
index ffb06ed2326..00000000000
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastPlayer.java
+++ /dev/null
@@ -1,853 +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.cast;
-
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.util.Log;
-import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.PlaybackParameters;
-import com.google.android.exoplayer2.Player;
-import com.google.android.exoplayer2.Timeline;
-import com.google.android.exoplayer2.source.TrackGroup;
-import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.FixedTrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
-import com.google.android.exoplayer2.util.Assertions;
-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;
-import com.google.android.gms.cast.MediaStatus;
-import com.google.android.gms.cast.MediaTrack;
-import com.google.android.gms.cast.framework.CastContext;
-import com.google.android.gms.cast.framework.CastSession;
-import com.google.android.gms.cast.framework.SessionManager;
-import com.google.android.gms.cast.framework.SessionManagerListener;
-import com.google.android.gms.cast.framework.media.RemoteMediaClient;
-import com.google.android.gms.cast.framework.media.RemoteMediaClient.MediaChannelResult;
-import com.google.android.gms.common.api.PendingResult;
-import com.google.android.gms.common.api.ResultCallback;
-import java.util.List;
-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>
- *
- * <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>
- *
- * <p>Methods should be called on the application's main thread.</p>
- */
-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;
-  private static final int RENDERER_INDEX_VIDEO = 0;
-  private static final int RENDERER_INDEX_AUDIO = 1;
-  private static final int RENDERER_INDEX_TEXT = 2;
-  private static final long PROGRESS_REPORT_PERIOD_MS = 1000;
-  private static final TrackGroupArray EMPTY_TRACK_GROUP_ARRAY = new TrackGroupArray();
-  private static final TrackSelectionArray EMPTY_TRACK_SELECTION_ARRAY =
-      new TrackSelectionArray(null, null, null);
-  private static final long[] EMPTY_TRACK_ID_ARRAY = new long[0];
-
-  private final CastContext castContext;
-  private final Timeline.Window window;
-  private final Timeline.Period period;
-
-  private RemoteMediaClient remoteMediaClient;
-
-  // Result callbacks.
-  private final StatusListener statusListener;
-  private final SeekResultCallback seekResultCallback;
-
-  // Listeners.
-  private final CopyOnWriteArraySet<EventListener> listeners;
-  private SessionAvailabilityListener sessionAvailabilityListener;
-
-  // Internal state.
-  private CastTimeline currentTimeline;
-  private TrackGroupArray currentTrackGroups;
-  private TrackSelectionArray currentTrackSelection;
-  private int playbackState;
-  private int repeatMode;
-  private int currentWindowIndex;
-  private boolean playWhenReady;
-  private long lastReportedPositionMs;
-  private int pendingSeekCount;
-  private int pendingSeekWindowIndex;
-  private long pendingSeekPositionMs;
-
-  /**
-   * @param castContext The context from which the cast session is obtained.
-   */
-  public CastPlayer(CastContext castContext) {
-    this.castContext = castContext;
-    window = new Timeline.Window();
-    period = new Timeline.Period();
-    statusListener = new StatusListener();
-    seekResultCallback = new SeekResultCallback();
-    listeners = new CopyOnWriteArraySet<>();
-
-    SessionManager sessionManager = castContext.getSessionManager();
-    sessionManager.addSessionManagerListener(statusListener, CastSession.class);
-    CastSession session = sessionManager.getCurrentCastSession();
-    remoteMediaClient = session != null ? session.getRemoteMediaClient() : null;
-
-    playbackState = STATE_IDLE;
-    repeatMode = REPEAT_MODE_OFF;
-    currentTimeline = CastTimeline.EMPTY_CAST_TIMELINE;
-    currentTrackGroups = EMPTY_TRACK_GROUP_ARRAY;
-    currentTrackSelection = EMPTY_TRACK_SELECTION_ARRAY;
-    pendingSeekWindowIndex = C.INDEX_UNSET;
-    pendingSeekPositionMs = C.TIME_UNSET;
-    updateInternalState();
-  }
-
-  // Media Queue manipulation methods.
-
-  /**
-   * Loads a single item media queue. If no session is available, does nothing.
-   *
-   * @param item The item to load.
-   * @param positionMs The position at which the playback should start in milliseconds relative to
-   *     the start of the item at {@code startIndex}.
-   * @return The Cast {@code PendingResult}, or null if no session is available.
-   */
-  public PendingResult<MediaChannelResult> loadItem(MediaQueueItem item, long positionMs) {
-    return loadItems(new MediaQueueItem[] {item}, 0, positionMs, REPEAT_MODE_OFF);
-  }
-
-  /**
-   * Loads a media queue. If no session is available, does nothing.
-   *
-   * @param items The items to load.
-   * @param startIndex The index of the item at which playback should start.
-   * @param positionMs The position at which the playback should start in milliseconds relative to
-   *     the start of the item at {@code startIndex}.
-   * @param repeatMode The repeat mode for the created media queue.
-   * @return The Cast {@code PendingResult}, or null if no session is available.
-   */
-  public PendingResult<MediaChannelResult> loadItems(MediaQueueItem[] items, int startIndex,
-      long positionMs, @RepeatMode int repeatMode) {
-    if (remoteMediaClient != null) {
-      return remoteMediaClient.queueLoad(items, startIndex, getCastRepeatMode(repeatMode),
-          positionMs, null);
-    }
-    return null;
-  }
-
-  /**
-   * Appends a sequence of items to the media queue. If no media queue exists, does nothing.
-   *
-   * @param items The items to append.
-   * @return The Cast {@code PendingResult}, or null if no media queue exists.
-   */
-  public PendingResult<MediaChannelResult> addItems(MediaQueueItem... items) {
-    return addItems(MediaQueueItem.INVALID_ITEM_ID, items);
-  }
-
-  /**
-   * Inserts a sequence of items into the media queue. If no media queue or period with id
-   * {@code periodId} exist, does nothing.
-   *
-   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
-   *     that will follow immediately after the inserted items.
-   * @param items The items to insert.
-   * @return The Cast {@code PendingResult}, or null if no media queue or no period with id
-   *     {@code periodId} exist.
-   */
-  public PendingResult<MediaChannelResult> addItems(int periodId, MediaQueueItem... items) {
-    if (getMediaStatus() != null && (periodId == MediaQueueItem.INVALID_ITEM_ID
-        || currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET)) {
-      return remoteMediaClient.queueInsertItems(items, periodId, null);
-    }
-    return null;
-  }
-
-  /**
-   * Removes an item from the media queue. If no media queue or period with id {@code periodId}
-   * exist, does nothing.
-   *
-   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
-   *     to remove.
-   * @return The Cast {@code PendingResult}, or null if no media queue or no period with id
-   *     {@code periodId} exist.
-   */
-  public PendingResult<MediaChannelResult> removeItem(int periodId) {
-    if (getMediaStatus() != null && currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET) {
-      return remoteMediaClient.queueRemoveItem(periodId, null);
-    }
-    return null;
-  }
-
-  /**
-   * Moves an existing item within the media queue. If no media queue or period with id
-   * {@code periodId} exist, does nothing.
-   *
-   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
-   *     to move.
-   * @param newIndex The target index of the item in the media queue. Must be in the range
-   *     0 &lt;= index &lt; {@link Timeline#getPeriodCount()}, as provided by
-   *     {@link #getCurrentTimeline()}.
-   * @return The Cast {@code PendingResult}, or null if no media queue or no period with id
-   *     {@code periodId} exist.
-   */
-  public PendingResult<MediaChannelResult> moveItem(int periodId, int newIndex) {
-    Assertions.checkArgument(newIndex >= 0 && newIndex < currentTimeline.getPeriodCount());
-    if (getMediaStatus() != null && currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET) {
-      return remoteMediaClient.queueMoveItemToNewIndex(periodId, newIndex, null);
-    }
-    return null;
-  }
-
-  /**
-   * Returns the item that corresponds to the period with the given id, or null if no media queue or
-   * period with id {@code periodId} exist.
-   *
-   * @param periodId The id of the period ({@see #getCurrentTimeline}) that corresponds to the item
-   *     to get.
-   * @return The item that corresponds to the period with the given id, or null if no media queue or
-   *     period with id {@code periodId} exist.
-   */
-  public MediaQueueItem getItem(int periodId) {
-    MediaStatus mediaStatus = getMediaStatus();
-    return mediaStatus != null && currentTimeline.getIndexOfPeriod(periodId) != C.INDEX_UNSET
-        ? mediaStatus.getItemById(periodId) : null;
-  }
-
-  // CastSession methods.
-
-  /**
-   * Returns whether a cast session is available.
-   */
-  public boolean isCastSessionAvailable() {
-    return remoteMediaClient != null;
-  }
-
-  /**
-   * Sets a listener for updates on the cast session availability.
-   *
-   * @param listener The {@link SessionAvailabilityListener}.
-   */
-  public void setSessionAvailabilityListener(SessionAvailabilityListener listener) {
-    sessionAvailabilityListener = listener;
-  }
-
-  // Player implementation.
-
-  @Override
-  public void addListener(EventListener listener) {
-    listeners.add(listener);
-  }
-
-  @Override
-  public void removeListener(EventListener listener) {
-    listeners.remove(listener);
-  }
-
-  @Override
-  public int getPlaybackState() {
-    return playbackState;
-  }
-
-  @Override
-  public void setPlayWhenReady(boolean playWhenReady) {
-    if (remoteMediaClient == null) {
-      return;
-    }
-    if (playWhenReady) {
-      remoteMediaClient.play();
-    } else {
-      remoteMediaClient.pause();
-    }
-  }
-
-  @Override
-  public boolean getPlayWhenReady() {
-    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();
-    if (mediaStatus != null) {
-      if (getCurrentWindowIndex() != windowIndex) {
-        remoteMediaClient.queueJumpToItem((int) currentTimeline.getPeriod(windowIndex, period).uid,
-            positionMs, null).setResultCallback(seekResultCallback);
-      } else {
-        remoteMediaClient.seek(positionMs).setResultCallback(seekResultCallback);
-      }
-      pendingSeekCount++;
-      pendingSeekWindowIndex = windowIndex;
-      pendingSeekPositionMs = positionMs;
-      for (EventListener listener : listeners) {
-        listener.onPositionDiscontinuity(Player.DISCONTINUITY_REASON_SEEK);
-      }
-    } else if (pendingSeekCount == 0) {
-      for (EventListener listener : listeners) {
-        listener.onSeekProcessed();
-      }
-    }
-  }
-
-  @Override
-  public void setPlaybackParameters(@Nullable PlaybackParameters playbackParameters) {
-    // Unsupported by the RemoteMediaClient API. Do nothing.
-  }
-
-  @Override
-  public PlaybackParameters getPlaybackParameters() {
-    return PlaybackParameters.DEFAULT;
-  }
-
-  @Override
-  public void stop() {
-    if (remoteMediaClient != null) {
-      remoteMediaClient.stop();
-    }
-  }
-
-  @Override
-  public void release() {
-    castContext.getSessionManager().removeSessionManagerListener(statusListener, CastSession.class);
-  }
-
-  @Override
-  public int getRendererCount() {
-    // We assume there are three renderers: video, audio, and text.
-    return RENDERER_COUNT;
-  }
-
-  @Override
-  public int getRendererType(int index) {
-    switch (index) {
-      case RENDERER_INDEX_VIDEO:
-        return C.TRACK_TYPE_VIDEO;
-      case RENDERER_INDEX_AUDIO:
-        return C.TRACK_TYPE_AUDIO;
-      case RENDERER_INDEX_TEXT:
-        return C.TRACK_TYPE_TEXT;
-      default:
-        throw new IndexOutOfBoundsException();
-    }
-  }
-
-  @Override
-  public void setRepeatMode(@RepeatMode int repeatMode) {
-    if (remoteMediaClient != null) {
-      remoteMediaClient.queueSetRepeatMode(getCastRepeatMode(repeatMode), null);
-    }
-  }
-
-  @Override
-  @RepeatMode public int getRepeatMode() {
-    return repeatMode;
-  }
-
-  @Override
-  public void setShuffleModeEnabled(boolean shuffleModeEnabled) {
-    // TODO: Support shuffle mode.
-  }
-
-  @Override
-  public boolean getShuffleModeEnabled() {
-    // TODO: Support shuffle mode.
-    return false;
-  }
-
-  @Override
-  public TrackSelectionArray getCurrentTrackSelections() {
-    return currentTrackSelection;
-  }
-
-  @Override
-  public TrackGroupArray getCurrentTrackGroups() {
-    return currentTrackGroups;
-  }
-
-  @Override
-  public Timeline getCurrentTimeline() {
-    return currentTimeline;
-  }
-
-  @Override
-  @Nullable public Object getCurrentManifest() {
-    return null;
-  }
-
-  @Override
-  public int getCurrentPeriodIndex() {
-    return getCurrentWindowIndex();
-  }
-
-  @Override
-  public int getCurrentWindowIndex() {
-    return pendingSeekWindowIndex != C.INDEX_UNSET ? pendingSeekWindowIndex : currentWindowIndex;
-  }
-
-  @Override
-  public int getNextWindowIndex() {
-    return C.INDEX_UNSET;
-  }
-
-  @Override
-  public int getPreviousWindowIndex() {
-    return C.INDEX_UNSET;
-  }
-
-  @Override
-  public long getDuration() {
-    return currentTimeline.isEmpty() ? C.TIME_UNSET
-        : currentTimeline.getWindow(getCurrentWindowIndex(), window).getDurationMs();
-  }
-
-  @Override
-  public long getCurrentPosition() {
-    return pendingSeekPositionMs != C.TIME_UNSET ? pendingSeekPositionMs
-        : remoteMediaClient != null ? remoteMediaClient.getApproximateStreamPosition()
-        : lastReportedPositionMs;
-  }
-
-  @Override
-  public long getBufferedPosition() {
-    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 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;
-  }
-
-  @Override
-  public int getCurrentAdGroupIndex() {
-    return C.INDEX_UNSET;
-  }
-
-  @Override
-  public int getCurrentAdIndexInAdGroup() {
-    return C.INDEX_UNSET;
-  }
-
-  @Override
-  public boolean isLoading() {
-    return false;
-  }
-
-  @Override
-  public long getContentPosition() {
-    return getCurrentPosition();
-  }
-
-  // Internal methods.
-
-  public void updateInternalState() {
-    if (remoteMediaClient == null) {
-      // There is no session. We leave the state of the player as it is now.
-      return;
-    }
-
-    int playbackState = fetchPlaybackState(remoteMediaClient);
-    boolean playWhenReady = !remoteMediaClient.isPaused();
-    if (this.playbackState != playbackState
-        || this.playWhenReady != playWhenReady) {
-      this.playbackState = playbackState;
-      this.playWhenReady = playWhenReady;
-      for (EventListener listener : listeners) {
-        listener.onPlayerStateChanged(this.playWhenReady, this.playbackState);
-      }
-    }
-    @RepeatMode int repeatMode = fetchRepeatMode(remoteMediaClient);
-    if (this.repeatMode != repeatMode) {
-      this.repeatMode = repeatMode;
-      for (EventListener listener : listeners) {
-        listener.onRepeatModeChanged(repeatMode);
-      }
-    }
-    int currentWindowIndex = fetchCurrentWindowIndex(getMediaStatus());
-    if (this.currentWindowIndex != currentWindowIndex && pendingSeekCount == 0) {
-      this.currentWindowIndex = currentWindowIndex;
-      for (EventListener listener : listeners) {
-        listener.onPositionDiscontinuity(DISCONTINUITY_REASON_PERIOD_TRANSITION);
-      }
-    }
-    if (updateTracksAndSelections()) {
-      for (EventListener listener : listeners) {
-        listener.onTracksChanged(currentTrackGroups, currentTrackSelection);
-      }
-    }
-    maybeUpdateTimelineAndNotify();
-  }
-
-  private void maybeUpdateTimelineAndNotify() {
-    if (updateTimeline()) {
-      for (EventListener listener : listeners) {
-        listener.onTimelineChanged(currentTimeline, null);
-      }
-    }
-  }
-
-  /**
-   * Updates the current timeline and returns whether it has changed.
-   */
-  private boolean updateTimeline() {
-    MediaStatus mediaStatus = getMediaStatus();
-    if (mediaStatus == null) {
-      boolean hasChanged = currentTimeline != CastTimeline.EMPTY_CAST_TIMELINE;
-      currentTimeline = CastTimeline.EMPTY_CAST_TIMELINE;
-      return hasChanged;
-    }
-
-    List<MediaQueueItem> items = mediaStatus.getQueueItems();
-    if (!currentTimeline.represents(items)) {
-      currentTimeline = !items.isEmpty() ? new CastTimeline(mediaStatus.getQueueItems())
-          : CastTimeline.EMPTY_CAST_TIMELINE;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Updates the internal tracks and selection and returns whether they have changed.
-   */
-  private boolean updateTracksAndSelections() {
-    if (remoteMediaClient == null) {
-      // There is no session. We leave the state of the player as it is now.
-      return false;
-    }
-
-    MediaStatus mediaStatus = getMediaStatus();
-    MediaInfo mediaInfo = mediaStatus != null ? mediaStatus.getMediaInfo() : null;
-    List<MediaTrack> castMediaTracks = mediaInfo != null ? mediaInfo.getMediaTracks() : null;
-    if (castMediaTracks == null || castMediaTracks.isEmpty()) {
-      boolean hasChanged = currentTrackGroups != EMPTY_TRACK_GROUP_ARRAY;
-      currentTrackGroups = EMPTY_TRACK_GROUP_ARRAY;
-      currentTrackSelection = EMPTY_TRACK_SELECTION_ARRAY;
-      return hasChanged;
-    }
-    long[] activeTrackIds = mediaStatus.getActiveTrackIds();
-    if (activeTrackIds == null) {
-      activeTrackIds = EMPTY_TRACK_ID_ARRAY;
-    }
-
-    TrackGroup[] trackGroups = new TrackGroup[castMediaTracks.size()];
-    TrackSelection[] trackSelections = new TrackSelection[RENDERER_COUNT];
-    for (int i = 0; i < castMediaTracks.size(); i++) {
-      MediaTrack mediaTrack = castMediaTracks.get(i);
-      trackGroups[i] = new TrackGroup(CastUtils.mediaTrackToFormat(mediaTrack));
-
-      long id = mediaTrack.getId();
-      int trackType = MimeTypes.getTrackType(mediaTrack.getContentType());
-      int rendererIndex = getRendererIndexForTrackType(trackType);
-      if (isTrackActive(id, activeTrackIds) && rendererIndex != C.INDEX_UNSET
-          && trackSelections[rendererIndex] == null) {
-        trackSelections[rendererIndex] = new FixedTrackSelection(trackGroups[i], 0);
-      }
-    }
-    TrackGroupArray newTrackGroups = new TrackGroupArray(trackGroups);
-    TrackSelectionArray newTrackSelections = new TrackSelectionArray(trackSelections);
-
-    if (!newTrackGroups.equals(currentTrackGroups)
-        || !newTrackSelections.equals(currentTrackSelection)) {
-      currentTrackSelection = new TrackSelectionArray(trackSelections);
-      currentTrackGroups = new TrackGroupArray(trackGroups);
-      return true;
-    }
-    return false;
-  }
-
-  private void setRemoteMediaClient(@Nullable RemoteMediaClient remoteMediaClient) {
-    if (this.remoteMediaClient == remoteMediaClient) {
-      // Do nothing.
-      return;
-    }
-    if (this.remoteMediaClient != null) {
-      this.remoteMediaClient.removeListener(statusListener);
-      this.remoteMediaClient.removeProgressListener(statusListener);
-    }
-    this.remoteMediaClient = remoteMediaClient;
-    if (remoteMediaClient != null) {
-      if (sessionAvailabilityListener != null) {
-        sessionAvailabilityListener.onCastSessionAvailable();
-      }
-      remoteMediaClient.addListener(statusListener);
-      remoteMediaClient.addProgressListener(statusListener, PROGRESS_REPORT_PERIOD_MS);
-      updateInternalState();
-    } else {
-      if (sessionAvailabilityListener != null) {
-        sessionAvailabilityListener.onCastSessionUnavailable();
-      }
-    }
-  }
-
-  private @Nullable MediaStatus getMediaStatus() {
-    return remoteMediaClient != null ? remoteMediaClient.getMediaStatus() : null;
-  }
-
-  /**
-   * Retrieves the playback state from {@code remoteMediaClient} and maps it into a {@link Player}
-   * state
-   */
-  private static int fetchPlaybackState(RemoteMediaClient remoteMediaClient) {
-    int receiverAppStatus = remoteMediaClient.getPlayerState();
-    switch (receiverAppStatus) {
-      case MediaStatus.PLAYER_STATE_BUFFERING:
-        return STATE_BUFFERING;
-      case MediaStatus.PLAYER_STATE_PLAYING:
-      case MediaStatus.PLAYER_STATE_PAUSED:
-        return STATE_READY;
-      case MediaStatus.PLAYER_STATE_IDLE:
-      case MediaStatus.PLAYER_STATE_UNKNOWN:
-      default:
-        return STATE_IDLE;
-    }
-  }
-
-  /**
-   * Retrieves the repeat mode from {@code remoteMediaClient} and maps it into a
-   * {@link Player.RepeatMode}.
-   */
-  @RepeatMode
-  private static int fetchRepeatMode(RemoteMediaClient remoteMediaClient) {
-    MediaStatus mediaStatus = remoteMediaClient.getMediaStatus();
-    if (mediaStatus == null) {
-      // No media session active, yet.
-      return REPEAT_MODE_OFF;
-    }
-    int castRepeatMode = mediaStatus.getQueueRepeatMode();
-    switch (castRepeatMode) {
-      case MediaStatus.REPEAT_MODE_REPEAT_SINGLE:
-        return REPEAT_MODE_ONE;
-      case MediaStatus.REPEAT_MODE_REPEAT_ALL:
-      case MediaStatus.REPEAT_MODE_REPEAT_ALL_AND_SHUFFLE:
-        return REPEAT_MODE_ALL;
-      case MediaStatus.REPEAT_MODE_REPEAT_OFF:
-        return REPEAT_MODE_OFF;
-      default:
-        throw new IllegalStateException();
-    }
-  }
-
-  /**
-   * Retrieves the current item index from {@code mediaStatus} and maps it into a window index. If
-   * there is no media session, returns 0.
-   */
-  private static int fetchCurrentWindowIndex(@Nullable MediaStatus mediaStatus) {
-    Integer currentItemId = mediaStatus != null
-        ? mediaStatus.getIndexById(mediaStatus.getCurrentItemId()) : null;
-    return currentItemId != null ? currentItemId : 0;
-  }
-
-  private static boolean isTrackActive(long id, long[] activeTrackIds) {
-    for (long activeTrackId : activeTrackIds) {
-      if (activeTrackId == id) {
-        return true;
-      }
-    }
-    return false;
-  }
-
-  private static int getRendererIndexForTrackType(int trackType) {
-    return trackType == C.TRACK_TYPE_VIDEO ? RENDERER_INDEX_VIDEO
-        : trackType == C.TRACK_TYPE_AUDIO ? RENDERER_INDEX_AUDIO
-        : trackType == C.TRACK_TYPE_TEXT ? RENDERER_INDEX_TEXT
-        : C.INDEX_UNSET;
-  }
-
-  private static int getCastRepeatMode(@RepeatMode int repeatMode) {
-    switch (repeatMode) {
-      case REPEAT_MODE_ONE:
-        return MediaStatus.REPEAT_MODE_REPEAT_SINGLE;
-      case REPEAT_MODE_ALL:
-        return MediaStatus.REPEAT_MODE_REPEAT_ALL;
-      case REPEAT_MODE_OFF:
-        return MediaStatus.REPEAT_MODE_REPEAT_OFF;
-      default:
-        throw new IllegalArgumentException();
-    }
-  }
-
-  private final class StatusListener implements RemoteMediaClient.Listener,
-      SessionManagerListener<CastSession>, RemoteMediaClient.ProgressListener {
-
-    // RemoteMediaClient.ProgressListener implementation.
-
-    @Override
-    public void onProgressUpdated(long progressMs, long unusedDurationMs) {
-      lastReportedPositionMs = progressMs;
-    }
-
-    // RemoteMediaClient.Listener implementation.
-
-    @Override
-    public void onStatusUpdated() {
-      updateInternalState();
-    }
-
-    @Override
-    public void onMetadataUpdated() {}
-
-    @Override
-    public void onQueueStatusUpdated() {
-      maybeUpdateTimelineAndNotify();
-    }
-
-    @Override
-    public void onPreloadStatusUpdated() {}
-
-    @Override
-    public void onSendingRemoteMediaRequest() {}
-
-    @Override
-    public void onAdBreakStatusUpdated() {}
-
-
-    // SessionManagerListener implementation.
-
-    @Override
-    public void onSessionStarted(CastSession castSession, String s) {
-      setRemoteMediaClient(castSession.getRemoteMediaClient());
-    }
-
-    @Override
-    public void onSessionResumed(CastSession castSession, boolean b) {
-      setRemoteMediaClient(castSession.getRemoteMediaClient());
-    }
-
-    @Override
-    public void onSessionEnded(CastSession castSession, int i) {
-      setRemoteMediaClient(null);
-    }
-
-    @Override
-    public void onSessionSuspended(CastSession castSession, int i) {
-      setRemoteMediaClient(null);
-    }
-
-    @Override
-    public void onSessionResumeFailed(CastSession castSession, int statusCode) {
-      Log.e(TAG, "Session resume failed. Error code " + statusCode + ": "
-          + CastUtils.getLogString(statusCode));
-    }
-
-    @Override
-    public void onSessionStarting(CastSession castSession) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onSessionStartFailed(CastSession castSession, int statusCode) {
-      Log.e(TAG, "Session start failed. Error code " + statusCode + ": "
-          + CastUtils.getLogString(statusCode));
-    }
-
-    @Override
-    public void onSessionEnding(CastSession castSession) {
-      // Do nothing.
-    }
-
-    @Override
-    public void onSessionResuming(CastSession castSession, String s) {
-      // Do nothing.
-    }
-
-  }
-
-  // Result callbacks hooks.
-
-  private final class SeekResultCallback implements ResultCallback<MediaChannelResult> {
-
-    @Override
-    public void onResult(@NonNull MediaChannelResult result) {
-      int statusCode = result.getStatus().getStatusCode();
-      if (statusCode != CastStatusCodes.SUCCESS && statusCode != CastStatusCodes.REPLACED) {
-        Log.e(TAG, "Seek failed. Error code " + statusCode + ": "
-            + CastUtils.getLogString(statusCode));
-      }
-      if (--pendingSeekCount == 0) {
-        pendingSeekWindowIndex = C.INDEX_UNSET;
-        pendingSeekPositionMs = C.TIME_UNSET;
-        for (EventListener listener : listeners) {
-          listener.onSeekProcessed();
-        }
-      }
-    }
-  }
-
-}
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
deleted file mode 100644
index 39b57148b2e..00000000000
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastTimeline.java
+++ /dev/null
@@ -1,114 +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.cast;
-
-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.Collections;
-import java.util.List;
-
-/**
- * A {@link Timeline} for Cast media queues.
- */
-/* package */ final class CastTimeline extends Timeline {
-
-  public static final CastTimeline EMPTY_CAST_TIMELINE =
-      new CastTimeline(Collections.<MediaQueueItem>emptyList());
-
-  private final SparseIntArray idsToIndex;
-  private final int[] ids;
-  private final long[] durationsUs;
-  private final long[] defaultPositionsUs;
-
-  public CastTimeline(List<MediaQueueItem> items) {
-    int itemCount = items.size();
-    int index = 0;
-    idsToIndex = new SparseIntArray(itemCount);
-    ids = new int[itemCount];
-    durationsUs = new long[itemCount];
-    defaultPositionsUs = new long[itemCount];
-    for (MediaQueueItem item : items) {
-      int itemId = item.getItemId();
-      ids[index] = itemId;
-      idsToIndex.put(itemId, index);
-      durationsUs[index] = getStreamDurationUs(item.getMedia());
-      defaultPositionsUs[index] = (long) (item.getStartTime() * C.MICROS_PER_SECOND);
-      index++;
-    }
-  }
-
-  @Override
-  public int getWindowCount() {
-    return ids.length;
-  }
-
-  @Override
-  public Window getWindow(int windowIndex, Window window, boolean setIds,
-      long defaultPositionProjectionUs) {
-    long durationUs = durationsUs[windowIndex];
-    boolean isDynamic = durationUs == C.TIME_UNSET;
-    return window.set(ids[windowIndex], C.TIME_UNSET, C.TIME_UNSET, !isDynamic, isDynamic,
-        defaultPositionsUs[windowIndex], durationUs, windowIndex, windowIndex, 0);
-  }
-
-  @Override
-  public int getPeriodCount() {
-    return ids.length;
-  }
-
-  @Override
-  public Period getPeriod(int periodIndex, Period period, boolean setIds) {
-    int id = ids[periodIndex];
-    return period.set(id, id, periodIndex, durationsUs[periodIndex], 0);
-  }
-
-  @Override
-  public int getIndexOfPeriod(Object uid) {
-    return uid instanceof Integer ? idsToIndex.get((int) uid, C.INDEX_UNSET) : C.INDEX_UNSET;
-  }
-
-  /**
-   * Returns whether the timeline represents a given {@code MediaQueueItem} list.
-   *
-   * @param items The {@code MediaQueueItem} list.
-   * @return Whether the timeline represents {@code items}.
-   */
-  /* package */ boolean represents(List<MediaQueueItem> items) {
-    if (ids.length != items.size()) {
-      return false;
-    }
-    int index = 0;
-    for (MediaQueueItem item : items) {
-      if (ids[index] != item.getItemId()
-          || durationsUs[index] != getStreamDurationUs(item.getMedia())
-          || defaultPositionsUs[index] != (long) (item.getStartTime() * C.MICROS_PER_SECOND)) {
-        return false;
-      }
-      index++;
-    }
-    return true;
-  }
-
-  private static long getStreamDurationUs(MediaInfo mediaInfo) {
-    long durationMs = mediaInfo != null ? mediaInfo.getStreamDuration()
-        : MediaInfo.UNKNOWN_DURATION;
-    return durationMs != MediaInfo.UNKNOWN_DURATION ? C.msToUs(durationMs) : C.TIME_UNSET;
-  }
-
-}
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
deleted file mode 100644
index de604374442..00000000000
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/CastUtils.java
+++ /dev/null
@@ -1,94 +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.cast;
-
-import com.google.android.exoplayer2.Format;
-import com.google.android.gms.cast.CastStatusCodes;
-import com.google.android.gms.cast.MediaTrack;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Utility methods for ExoPlayer/Cast integration.
- */
-/* package */ final class CastUtils {
-
-  private static final Map<Integer, String> CAST_STATUS_CODE_TO_STRING;
-
-  /**
-   * Returns a descriptive log string for the given {@code statusCode}, or "Unknown." if not one of
-   * {@link CastStatusCodes}.
-   *
-   * @param statusCode A Cast API status code.
-   * @return A descriptive log string for the given {@code statusCode}, or "Unknown." if not one of
-   *     {@link CastStatusCodes}.
-   */
-  public static String getLogString(int statusCode) {
-    String description = CAST_STATUS_CODE_TO_STRING.get(statusCode);
-    return description != null ? description : "Unknown.";
-  }
-
-  /**
-   * Creates a {@link Format} instance containing all information contained in the given
-   * {@link MediaTrack} object.
-   *
-   * @param mediaTrack The {@link MediaTrack}.
-   * @return The equivalent {@link Format}.
-   */
-  public static Format mediaTrackToFormat(MediaTrack mediaTrack) {
-    return Format.createContainerFormat(mediaTrack.getContentId(), mediaTrack.getContentType(),
-        null, null, Format.NO_VALUE, 0, mediaTrack.getLanguage());
-  }
-
-  static {
-    HashMap<Integer, String> statusCodeToString = new HashMap<>();
-    statusCodeToString.put(CastStatusCodes.APPLICATION_NOT_FOUND,
-        "A requested application could not be found.");
-    statusCodeToString.put(CastStatusCodes.APPLICATION_NOT_RUNNING,
-        "A requested application is not currently running.");
-    statusCodeToString.put(CastStatusCodes.AUTHENTICATION_FAILED, "Authentication failure.");
-    statusCodeToString.put(CastStatusCodes.CANCELED, "An in-progress request has been "
-        + "canceled, most likely because another action has preempted it.");
-    statusCodeToString.put(CastStatusCodes.ERROR_SERVICE_CREATION_FAILED,
-        "The Cast Remote Display service could not be created.");
-    statusCodeToString.put(CastStatusCodes.ERROR_SERVICE_DISCONNECTED,
-        "The Cast Remote Display service was disconnected.");
-    statusCodeToString.put(CastStatusCodes.FAILED, "The in-progress request failed.");
-    statusCodeToString.put(CastStatusCodes.INTERNAL_ERROR, "An internal error has occurred.");
-    statusCodeToString.put(CastStatusCodes.INTERRUPTED,
-        "A blocking call was interrupted while waiting and did not run to completion.");
-    statusCodeToString.put(CastStatusCodes.INVALID_REQUEST, "An invalid request was made.");
-    statusCodeToString.put(CastStatusCodes.MESSAGE_SEND_BUFFER_TOO_FULL, "A message could "
-        + "not be sent because there is not enough room in the send buffer at this time.");
-    statusCodeToString.put(CastStatusCodes.MESSAGE_TOO_LARGE,
-        "A message could not be sent because it is too large.");
-    statusCodeToString.put(CastStatusCodes.NETWORK_ERROR, "Network I/O error.");
-    statusCodeToString.put(CastStatusCodes.NOT_ALLOWED,
-        "The request was disallowed and could not be completed.");
-    statusCodeToString.put(CastStatusCodes.REPLACED,
-        "The request's progress is no longer being tracked because another request of the same type"
-            + " has been made before the first request completed.");
-    statusCodeToString.put(CastStatusCodes.SUCCESS, "Success.");
-    statusCodeToString.put(CastStatusCodes.TIMEOUT, "An operation has timed out.");
-    statusCodeToString.put(CastStatusCodes.UNKNOWN_ERROR,
-        "An unknown, unexpected error has occurred.");
-    CAST_STATUS_CODE_TO_STRING = Collections.unmodifiableMap(statusCodeToString);
-  }
-
-  private CastUtils() {}
-
-}
diff --git a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java b/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
deleted file mode 100644
index 06f0bec971a..00000000000
--- a/extensions/cast/src/main/java/com/google/android/exoplayer2/ext/cast/DefaultCastOptionsProvider.java
+++ /dev/null
@@ -1,42 +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.cast;
-
-import android.content.Context;
-import com.google.android.gms.cast.CastMediaControlIntent;
-import com.google.android.gms.cast.framework.CastOptions;
-import com.google.android.gms.cast.framework.OptionsProvider;
-import com.google.android.gms.cast.framework.SessionProvider;
-import java.util.List;
-
-/**
- * A convenience {@link OptionsProvider} to target the default cast receiver app.
- */
-public final class DefaultCastOptionsProvider implements OptionsProvider {
-
-  @Override
-  public CastOptions getCastOptions(Context context) {
-    return new CastOptions.Builder()
-        .setReceiverApplicationId(CastMediaControlIntent.DEFAULT_MEDIA_RECEIVER_APPLICATION_ID)
-        .setStopReceiverApplicationWhenEndingSession(true).build();
-  }
-
-  @Override
-  public List<SessionProvider> getAdditionalSessionProviders(Context context) {
-    return null;
-  }
-
-}
diff --git a/settings.gradle b/settings.gradle
index d4530d67b74..0a404aad730 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -19,11 +19,9 @@ if (gradle.ext.has('exoplayerModulePrefix')) {
 }
 
 include modulePrefix + 'demo'
-include modulePrefix + 'demo-cast'
 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-ima').projectDir = new File(rootDir, 'demos/ima')
 project(modulePrefix + 'playbacktests').projectDir = new File(rootDir, 'playbacktests')
 

From a361f9043c9c758da6089871e67a007817765b8f Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 13 Nov 2017 09:31:52 -0800
Subject: [PATCH 407/421] Remove stray TV directory from 2.6.0 release

---
 demos/tv/README.md    |  4 ----
 demos/tv/build.gradle | 49 -------------------------------------------
 2 files changed, 53 deletions(-)
 delete mode 100644 demos/tv/README.md
 delete mode 100644 demos/tv/build.gradle

diff --git a/demos/tv/README.md b/demos/tv/README.md
deleted file mode 100644
index 8a1ab807a05..00000000000
--- a/demos/tv/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# TV tuner demo application #
-
-This folder contains a demo application that uses ExoPlayer to play broadcast
-TV from USB tuners.
diff --git a/demos/tv/build.gradle b/demos/tv/build.gradle
deleted file mode 100644
index 9e87d5e06b9..00000000000
--- a/demos/tv/build.gradle
+++ /dev/null
@@ -1,49 +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.
-apply from: '../../constants.gradle'
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion project.ext.compileSdkVersion
-    buildToolsVersion project.ext.buildToolsVersion
-
-    defaultConfig {
-        minSdkVersion 21
-        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 {
-    compile project(modulePrefix + 'library-core')
-    compile project(modulePrefix + 'library-ui')
-    compile project(modulePrefix + 'internal-extension-tv')
-    compile project(modulePrefix + 'extension-ffmpeg')
-}

From be0648541fe4d7cd2c8b44d57822a379c381a7db Mon Sep 17 00:00:00 2001
From: tonihei <tonihei@google.com>
Date: Tue, 14 Nov 2017 03:01:58 -0800
Subject: [PATCH 408/421] Forward ad group and ad index when creating period
 from concatanted media sources.

Also added tests which verify the intended behaviour.

GitHub:#3452

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=175656478
---
 .../source/ConcatenatingMediaSourceTest.java  | 26 ++++++++
 .../DynamicConcatenatingMediaSourceTest.java  | 63 +++++++++++--------
 .../source/ConcatenatingMediaSource.java      |  4 +-
 .../DynamicConcatenatingMediaSource.java      |  3 +-
 .../exoplayer2/source/LoopingMediaSource.java |  3 +-
 .../exoplayer2/testutil/FakeMediaSource.java  | 21 +++++--
 .../exoplayer2/testutil/FakeTimeline.java     | 35 ++++++++++-
 .../exoplayer2/testutil/TimelineAsserts.java  | 61 +++++++++++++++++-
 8 files changed, 180 insertions(+), 36 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
index 53111e83ace..6f6556225e2 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ConcatenatingMediaSourceTest.java
@@ -18,6 +18,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.testutil.FakeMediaSource;
 import com.google.android.exoplayer2.testutil.FakeShuffleOrder;
 import com.google.android.exoplayer2.testutil.FakeTimeline;
@@ -196,6 +197,31 @@ Timeline.EMPTY, createFakeTimeline(2, 222), Timeline.EMPTY, createFakeTimeline(3
     }
   }
 
+  public void testPeriodCreationWithAds() throws InterruptedException {
+    // Create media source with ad child source.
+    Timeline timelineContentOnly = new FakeTimeline(
+        new TimelineWindowDefinition(2, 111, true, false, 10 * C.MICROS_PER_SECOND));
+    Timeline timelineWithAds = new FakeTimeline(
+        new TimelineWindowDefinition(2, 222, true, false, 10 * C.MICROS_PER_SECOND, 1, 1));
+    FakeMediaSource mediaSourceContentOnly = new FakeMediaSource(timelineContentOnly, null);
+    FakeMediaSource mediaSourceWithAds = new FakeMediaSource(timelineWithAds, null);
+    ConcatenatingMediaSource mediaSource = new ConcatenatingMediaSource(mediaSourceContentOnly,
+        mediaSourceWithAds);
+
+    // Prepare and assert timeline contains ad groups.
+    Timeline timeline = TestUtil.extractTimelineFromMediaSource(mediaSource);
+    TimelineAsserts.assertAdGroupCounts(timeline, 0, 0, 1, 1);
+
+    // Create all periods and assert period creation of child media sources has been called.
+    TimelineAsserts.assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline, 10_000);
+    mediaSourceContentOnly.assertMediaPeriodCreated(new MediaPeriodId(0));
+    mediaSourceContentOnly.assertMediaPeriodCreated(new MediaPeriodId(1));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(0));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(1));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(0, 0, 0));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(1, 0, 0));
+  }
+
   /**
    * Wraps the specified timelines in a {@link ConcatenatingMediaSource} and returns
    * the concatenated timeline.
diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
index c0c5252751c..e506d0a4b3f 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSourceTest.java
@@ -154,7 +154,8 @@ public void testPlaylistChangesAfterPreparation() throws InterruptedException {
     assertEquals(0, timeline.getLastWindowIndex(true));
 
     // Assert all periods can be prepared.
-    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
+    TimelineAsserts.assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline,
+        TIMEOUT_MS);
 
     // Remove at front of queue.
     mediaSource.removeMediaSource(0);
@@ -205,7 +206,8 @@ public void testPlaylistChangesBeforePreparation() throws InterruptedException {
     TimelineAsserts.assertPreviousWindowIndices(timeline, Player.REPEAT_MODE_OFF, true,
         1, 2, C.INDEX_UNSET);
 
-    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
+    TimelineAsserts.assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline,
+        TIMEOUT_MS);
     mediaSource.releaseSource();
     for (int i = 1; i < 4; i++) {
       childSources[i].assertReleased();
@@ -239,7 +241,8 @@ public void testPlaylistWithLazyMediaSource() throws InterruptedException {
     TimelineAsserts.assertPeriodCounts(timeline, 1, 9);
     TimelineAsserts.assertWindowIds(timeline, 111, 999);
     TimelineAsserts.assertWindowIsDynamic(timeline, false, false);
-    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
+    TimelineAsserts.assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline,
+        TIMEOUT_MS);
 
     //Add lazy sources after preparation (and also try to prepare media period from lazy source).
     mediaSource.addMediaSource(1, lazySources[2]);
@@ -335,7 +338,8 @@ public void testEmptyTimelineMediaSource() throws InterruptedException {
     assertEquals(2, timeline.getLastWindowIndex(false));
     assertEquals(2, timeline.getFirstWindowIndex(true));
     assertEquals(0, timeline.getLastWindowIndex(true));
-    assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline.getPeriodCount());
+    TimelineAsserts.assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline,
+        TIMEOUT_MS);
   }
 
   public void testIllegalArguments() {
@@ -533,6 +537,35 @@ public void run() {
     waitForCustomRunnable();
   }
 
+  public void testPeriodCreationWithAds() throws InterruptedException {
+    // Create dynamic media source with ad child source.
+    Timeline timelineContentOnly = new FakeTimeline(
+        new TimelineWindowDefinition(2, 111, true, false, 10 * C.MICROS_PER_SECOND));
+    Timeline timelineWithAds = new FakeTimeline(
+        new TimelineWindowDefinition(2, 222, true, false, 10 * C.MICROS_PER_SECOND, 1, 1));
+    FakeMediaSource mediaSourceContentOnly = new FakeMediaSource(timelineContentOnly, null);
+    FakeMediaSource mediaSourceWithAds = new FakeMediaSource(timelineWithAds, null);
+    DynamicConcatenatingMediaSource mediaSource = new DynamicConcatenatingMediaSource();
+    mediaSource.addMediaSource(mediaSourceContentOnly);
+    mediaSource.addMediaSource(mediaSourceWithAds);
+    assertNull(timeline);
+
+    // Prepare and assert timeline contains ad groups.
+    prepareAndListenToTimelineUpdates(mediaSource);
+    waitForTimelineUpdate();
+    TimelineAsserts.assertAdGroupCounts(timeline, 0, 0, 1, 1);
+
+    // Create all periods and assert period creation of child media sources has been called.
+    TimelineAsserts.assertAllPeriodsCanBeCreatedPreparedAndReleased(mediaSource, timeline,
+        TIMEOUT_MS);
+    mediaSourceContentOnly.assertMediaPeriodCreated(new MediaPeriodId(0));
+    mediaSourceContentOnly.assertMediaPeriodCreated(new MediaPeriodId(1));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(0));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(1));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(0, 0, 0));
+    mediaSourceWithAds.assertMediaPeriodCreated(new MediaPeriodId(1, 0, 0));
+  }
+
   private DynamicConcatenatingMediaSourceAndHandler setUpDynamicMediaSourceOnHandlerThread()
       throws InterruptedException {
     HandlerThread handlerThread = new HandlerThread("TestCustomCallbackExecutionThread");
@@ -616,28 +649,6 @@ private static FakeTimeline createFakeTimeline(int index) {
     return new FakeTimeline(new TimelineWindowDefinition(index + 1, (index + 1) * 111));
   }
 
-  private static void assertAllPeriodsCanBeCreatedPreparedAndReleased(MediaSource mediaSource,
-      int periodCount) {
-    for (int i = 0; i < periodCount; i++) {
-      MediaPeriod mediaPeriod = mediaSource.createPeriod(new MediaPeriodId(i), null);
-      assertNotNull(mediaPeriod);
-      final ConditionVariable mediaPeriodPrepared = new ConditionVariable();
-      mediaPeriod.prepare(new Callback() {
-        @Override
-        public void onPrepared(MediaPeriod mediaPeriod) {
-          mediaPeriodPrepared.open();
-        }
-        @Override
-        public void onContinueLoadingRequested(MediaPeriod source) {}
-      }, 0);
-      assertTrue(mediaPeriodPrepared.block(TIMEOUT_MS));
-      MediaPeriod secondMediaPeriod = mediaSource.createPeriod(new MediaPeriodId(i), null);
-      assertNotNull(secondMediaPeriod);
-      mediaSource.releasePeriod(secondMediaPeriod);
-      mediaSource.releasePeriod(mediaPeriod);
-    }
-  }
-
   private static class DynamicConcatenatingMediaSourceAndHandler {
 
     public final DynamicConcatenatingMediaSource mediaSource;
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 fe8f23c4c03..058471f31fb 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
@@ -120,8 +120,8 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
   @Override
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     int sourceIndex = timeline.getChildIndexByPeriodIndex(id.periodIndex);
-    MediaPeriodId periodIdInSource =
-        new MediaPeriodId(id.periodIndex - timeline.getFirstPeriodIndexByChildIndex(sourceIndex));
+    MediaPeriodId periodIdInSource = id.copyWithPeriodIndex(
+        id.periodIndex - timeline.getFirstPeriodIndexByChildIndex(sourceIndex));
     MediaPeriod mediaPeriod = mediaSources[sourceIndex].createPeriod(periodIdInSource, allocator);
     sourceIndexByMediaPeriod.put(mediaPeriod, sourceIndex);
     return mediaPeriod;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
index 6bfa4047a5a..e80abad3ef9 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/source/DynamicConcatenatingMediaSource.java
@@ -341,7 +341,8 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     int mediaSourceHolderIndex = findMediaSourceHolderByPeriodIndex(id.periodIndex);
     MediaSourceHolder holder = mediaSourceHolders.get(mediaSourceHolderIndex);
-    MediaPeriodId idInSource = new MediaPeriodId(id.periodIndex - holder.firstPeriodIndexInChild);
+    MediaPeriodId idInSource = id.copyWithPeriodIndex(
+        id.periodIndex - holder.firstPeriodIndexInChild);
     MediaPeriod mediaPeriod;
     if (!holder.isPrepared) {
       mediaPeriod = new DeferredMediaPeriod(holder.mediaSource, idInSource, allocator);
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 583c1ed68c0..984820cc6a2 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
@@ -80,7 +80,8 @@ public void maybeThrowSourceInfoRefreshError() throws IOException {
   @Override
   public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     return loopCount != Integer.MAX_VALUE
-        ? childSource.createPeriod(new MediaPeriodId(id.periodIndex % childPeriodCount), allocator)
+        ? childSource.createPeriod(id.copyWithPeriodIndex(id.periodIndex % childPeriodCount),
+            allocator)
         : childSource.createPeriod(id, allocator);
   }
 
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 cef48285ca9..1f2524110a9 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
@@ -38,6 +38,7 @@ public class FakeMediaSource implements MediaSource {
   private final Object manifest;
   private final TrackGroupArray trackGroupArray;
   private final ArrayList<FakeMediaPeriod> activeMediaPeriods;
+  private final ArrayList<MediaPeriodId> createdMediaPeriods;
 
   private boolean preparedSource;
   private boolean releasedSource;
@@ -58,13 +59,10 @@ public FakeMediaSource(Timeline timeline, Object manifest, TrackGroupArray track
     this.timeline = timeline;
     this.manifest = manifest;
     this.activeMediaPeriods = new ArrayList<>();
+    this.createdMediaPeriods = new ArrayList<>();
     this.trackGroupArray = trackGroupArray;
   }
 
-  public void assertReleased() {
-    Assert.assertTrue(releasedSource);
-  }
-
   @Override
   public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
     Assert.assertFalse(preparedSource);
@@ -84,6 +82,7 @@ public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) {
     Assert.assertFalse(releasedSource);
     FakeMediaPeriod mediaPeriod = createFakeMediaPeriod(id, trackGroupArray, allocator);
     activeMediaPeriods.add(mediaPeriod);
+    createdMediaPeriods.add(id);
     return mediaPeriod;
   }
 
@@ -104,6 +103,20 @@ public void releaseSource() {
     releasedSource = true;
   }
 
+  /**
+   * Assert that the source and all periods have been released.
+   */
+  public void assertReleased() {
+    Assert.assertTrue(releasedSource);
+  }
+
+  /**
+   * Assert that a media period for the given id has been created.
+   */
+  public void assertMediaPeriodCreated(MediaPeriodId mediaPeriodId) {
+    Assert.assertTrue(createdMediaPeriods.contains(mediaPeriodId));
+  }
+
   protected FakeMediaPeriod createFakeMediaPeriod(MediaPeriodId id, TrackGroupArray trackGroupArray,
       Allocator allocator) {
     return new FakeMediaPeriod(trackGroupArray);
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
index 040782264b4..2937ee27708 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeTimeline.java
@@ -18,6 +18,7 @@
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.util.Util;
+import java.util.Arrays;
 
 /**
  * Fake {@link Timeline} which can be setup to return custom {@link TimelineWindowDefinition}s.
@@ -36,6 +37,8 @@ public static final class TimelineWindowDefinition {
     public final boolean isSeekable;
     public final boolean isDynamic;
     public final long durationUs;
+    public final int adGroupsPerPeriodCount;
+    public final int adsPerAdGroupCount;
 
     public TimelineWindowDefinition(int periodCount, Object id) {
       this(periodCount, id, true, false, WINDOW_DURATION_US);
@@ -47,15 +50,24 @@ public TimelineWindowDefinition(boolean isSeekable, boolean isDynamic, long dura
 
     public TimelineWindowDefinition(int periodCount, Object id, boolean isSeekable,
         boolean isDynamic, long durationUs) {
+      this(periodCount, id, isSeekable, isDynamic, durationUs, 0, 0);
+    }
+
+    public TimelineWindowDefinition(int periodCount, Object id, boolean isSeekable,
+        boolean isDynamic, long durationUs, int adGroupsCountPerPeriod, int adsPerAdGroupCount) {
       this.periodCount = periodCount;
       this.id = id;
       this.isSeekable = isSeekable;
       this.isDynamic = isDynamic;
       this.durationUs = durationUs;
+      this.adGroupsPerPeriodCount = adGroupsCountPerPeriod;
+      this.adsPerAdGroupCount = adsPerAdGroupCount;
     }
 
   }
 
+  private static final long AD_DURATION_US = 10 * C.MICROS_PER_SECOND;
+
   private final TimelineWindowDefinition[] windowDefinitions;
   private final int[] periodOffsets;
 
@@ -96,7 +108,28 @@ public Period getPeriod(int periodIndex, Period period, boolean setIds) {
     Object id = setIds ? windowPeriodIndex : null;
     Object uid = setIds ? periodIndex : null;
     long periodDurationUs = windowDefinition.durationUs / windowDefinition.periodCount;
-    return period.set(id, uid, windowIndex, periodDurationUs, periodDurationUs * windowPeriodIndex);
+    long positionInWindowUs = periodDurationUs * windowPeriodIndex;
+    if (windowDefinition.adGroupsPerPeriodCount == 0) {
+      return period.set(id, uid, windowIndex, periodDurationUs, positionInWindowUs);
+    } else {
+      int adGroups = windowDefinition.adGroupsPerPeriodCount;
+      long[] adGroupTimesUs = new long[adGroups];
+      int[] adCounts = new int[adGroups];
+      int[] adLoadedAndPlayedCounts = new int[adGroups];
+      long[][] adDurationsUs = new long[adGroups][];
+      long adResumePositionUs = 0;
+      long adGroupOffset = adGroups > 1 ? periodDurationUs / (adGroups - 1) : 0;
+      for (int i = 0; i < adGroups; i++) {
+        adGroupTimesUs[i] = i * adGroupOffset;
+        adCounts[i] = windowDefinition.adsPerAdGroupCount;
+        adLoadedAndPlayedCounts[i] = 0;
+        adDurationsUs[i] = new long[adCounts[i]];
+        Arrays.fill(adDurationsUs[i], AD_DURATION_US);
+      }
+      return period.set(id, uid, windowIndex, periodDurationUs, positionInWindowUs, adGroupTimesUs,
+          adCounts, adLoadedAndPlayedCounts, adLoadedAndPlayedCounts, adDurationsUs,
+          adResumePositionUs);
+    }
   }
 
   @Override
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
index c61aac708cf..b1df8f62e15 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/TimelineAsserts.java
@@ -16,12 +16,19 @@
 package com.google.android.exoplayer2.testutil;
 
 import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertTrue;
 
+import android.os.ConditionVariable;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.Player;
 import com.google.android.exoplayer2.Timeline;
 import com.google.android.exoplayer2.Timeline.Period;
 import com.google.android.exoplayer2.Timeline.Window;
+import com.google.android.exoplayer2.source.MediaPeriod;
+import com.google.android.exoplayer2.source.MediaPeriod.Callback;
+import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSource.MediaPeriodId;
 
 /**
  * Unit test for {@link Timeline}.
@@ -60,7 +67,7 @@ public static void assertWindowIds(Timeline timeline, Object... expectedWindowId
   }
 
   /**
-   * Asserts that window properties {@link Window}.isDynamic are set correctly..
+   * Asserts that window properties {@link Window}.isDynamic are set correctly.
    */
   public static void assertWindowIsDynamic(Timeline timeline, boolean... windowIsDynamic) {
     Window window = new Window();
@@ -139,5 +146,57 @@ public static void assertPeriodCounts(Timeline timeline, int... expectedPeriodCo
     }
   }
 
+  /**
+   * Asserts that periods' {@link Period#getAdGroupCount()} are set correctly.
+   */
+  public static void assertAdGroupCounts(Timeline timeline, int... expectedAdGroupCounts) {
+    Period period = new Period();
+    for (int i = 0; i < timeline.getPeriodCount(); i++) {
+      timeline.getPeriod(i, period);
+      assertEquals(expectedAdGroupCounts[i], period.getAdGroupCount());
+    }
+  }
+
+  /**
+   * Asserts that all period (including ad periods) can be created from the source, prepared, and
+   * released without exception and within timeout.
+   */
+  public static void assertAllPeriodsCanBeCreatedPreparedAndReleased(MediaSource mediaSource,
+      Timeline timeline, long timeoutMs) {
+    Period period = new Period();
+    for (int i = 0; i < timeline.getPeriodCount(); i++) {
+      assertPeriodCanBeCreatedPreparedAndReleased(mediaSource, new MediaPeriodId(i), timeoutMs);
+      timeline.getPeriod(i, period);
+      for (int adGroupIndex = 0; adGroupIndex < period.getAdGroupCount(); adGroupIndex++) {
+        for (int adIndex = 0; adIndex < period.getAdCountInAdGroup(adGroupIndex); adIndex++) {
+          assertPeriodCanBeCreatedPreparedAndReleased(mediaSource,
+              new MediaPeriodId(i, adGroupIndex, adIndex), timeoutMs);
+        }
+      }
+    }
+  }
+
+  private static void assertPeriodCanBeCreatedPreparedAndReleased(MediaSource mediaSource,
+      MediaPeriodId mediaPeriodId, long timeoutMs) {
+    MediaPeriod mediaPeriod = mediaSource.createPeriod(mediaPeriodId, null);
+    assertNotNull(mediaPeriod);
+    final ConditionVariable mediaPeriodPrepared = new ConditionVariable();
+    mediaPeriod.prepare(new Callback() {
+      @Override
+      public void onPrepared(MediaPeriod mediaPeriod) {
+        mediaPeriodPrepared.open();
+      }
+      @Override
+      public void onContinueLoadingRequested(MediaPeriod source) {}
+    }, /* positionUs= */ 0);
+    assertTrue(mediaPeriodPrepared.block(timeoutMs));
+    // MediaSource is supposed to support multiple calls to createPeriod with the same id without an
+    // intervening call to releasePeriod.
+    MediaPeriod secondMediaPeriod = mediaSource.createPeriod(mediaPeriodId, null);
+    assertNotNull(secondMediaPeriod);
+    mediaSource.releasePeriod(secondMediaPeriod);
+    mediaSource.releasePeriod(mediaPeriod);
+  }
+
 }
 

From 0a8d2423851a8b96f6d4c19005b01aec21d5bd2b Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Fri, 17 Nov 2017 19:34:27 +0000
Subject: [PATCH 409/421] Amend release notes for 2.6.0 release

---
 RELEASENOTES.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index d6b20be4e16..b645cc81a0d 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -60,7 +60,6 @@
     ([#3406](https://github.com/google/ExoPlayer/issues/3406)).
 * New Leanback extension: Simplifies binding Exoplayer to Leanback UI
   components.
-* New Cast extension: Simplifies toggling between local and Cast playbacks.
 * Unit tests moved to Robolectric.
 * Misc bugfixes.
 

From 8940e7b32a188be36f68e244dddbe66456884e66 Mon Sep 17 00:00:00 2001
From: eguven <eguven@google.com>
Date: Fri, 17 Nov 2017 06:33:32 -0800
Subject: [PATCH 410/421] Replace hard coded UUID in OfflineLicenseHelper with
 a parameter

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176102179
---
 .../exoplayer2/drm/OfflineLicenseHelperTest.java  |  5 ++---
 .../exoplayer2/drm/OfflineLicenseHelper.java      | 15 +++++++--------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
index 35bfbe613ac..22ae57932bb 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/drm/OfflineLicenseHelperTest.java
@@ -23,7 +23,6 @@
 import android.util.Pair;
 import com.google.android.exoplayer2.C;
 import com.google.android.exoplayer2.drm.DrmInitData.SchemeData;
-import com.google.android.exoplayer2.upstream.HttpDataSource;
 import java.util.HashMap;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
@@ -34,7 +33,6 @@
 public class OfflineLicenseHelperTest extends InstrumentationTestCase {
 
   private OfflineLicenseHelper<?> offlineLicenseHelper;
-  @Mock private HttpDataSource httpDataSource;
   @Mock private MediaDrmCallback mediaDrmCallback;
   @Mock private ExoMediaDrm<ExoMediaCrypto> mediaDrm;
 
@@ -42,7 +40,8 @@ public class OfflineLicenseHelperTest extends InstrumentationTestCase {
   protected void setUp() throws Exception {
     setUpMockito(this);
     when(mediaDrm.openSession()).thenReturn(new byte[] {1, 2, 3});
-    offlineLicenseHelper = new OfflineLicenseHelper<>(mediaDrm, mediaDrmCallback, null);
+    offlineLicenseHelper = new OfflineLicenseHelper<>(C.WIDEVINE_UUID, mediaDrm, mediaDrmCallback,
+        null);
   }
 
   @Override
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 cafe41ed093..481bea66c37 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
@@ -27,8 +27,8 @@
 import com.google.android.exoplayer2.upstream.HttpDataSource;
 import com.google.android.exoplayer2.upstream.HttpDataSource.Factory;
 import com.google.android.exoplayer2.util.Assertions;
-import java.io.IOException;
 import java.util.HashMap;
+import java.util.UUID;
 
 /**
  * Helper class to download, renew and release offline licenses.
@@ -96,7 +96,8 @@ public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
       String defaultLicenseUrl, boolean forceDefaultLicenseUrl, Factory httpDataSourceFactory,
       HashMap<String, String> optionalKeyRequestParameters)
       throws UnsupportedDrmException {
-    return new OfflineLicenseHelper<>(FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID),
+    return new OfflineLicenseHelper<>(C.WIDEVINE_UUID,
+        FrameworkMediaDrm.newInstance(C.WIDEVINE_UUID),
         new HttpMediaDrmCallback(defaultLicenseUrl, forceDefaultLicenseUrl, httpDataSourceFactory),
         optionalKeyRequestParameters);
   }
@@ -104,6 +105,7 @@ public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
   /**
    * Constructs an instance. Call {@link #release()} when the instance is no longer required.
    *
+   * @param uuid The UUID of the drm scheme.
    * @param mediaDrm An underlying {@link ExoMediaDrm} for use by the manager.
    * @param callback Performs key and provisioning requests.
    * @param optionalKeyRequestParameters An optional map of parameters to pass as the last argument
@@ -111,7 +113,7 @@ public static OfflineLicenseHelper<FrameworkMediaCrypto> newWidevineInstance(
    * @see DefaultDrmSessionManager#DefaultDrmSessionManager(java.util.UUID, ExoMediaDrm,
    *     MediaDrmCallback, HashMap, Handler, EventListener)
    */
-  public OfflineLicenseHelper(ExoMediaDrm<T> mediaDrm, MediaDrmCallback callback,
+  public OfflineLicenseHelper(UUID uuid, ExoMediaDrm<T> mediaDrm, MediaDrmCallback callback,
       HashMap<String, String> optionalKeyRequestParameters) {
     handlerThread = new HandlerThread("OfflineLicenseHelper");
     handlerThread.start();
@@ -137,7 +139,7 @@ public void onDrmKeysRemoved() {
         conditionVariable.open();
       }
     };
-    drmSessionManager = new DefaultDrmSessionManager<>(C.WIDEVINE_UUID, mediaDrm, callback,
+    drmSessionManager = new DefaultDrmSessionManager<>(uuid, mediaDrm, callback,
         optionalKeyRequestParameters, new Handler(handlerThread.getLooper()), eventListener);
   }
 
@@ -174,12 +176,9 @@ public synchronized void setPropertyString(String key, String value) {
    *
    * @param drmInitData The {@link DrmInitData} for the content whose license is to be downloaded.
    * @return The key set id for the downloaded license.
-   * @throws IOException If an error occurs reading data from the stream.
-   * @throws InterruptedException If the thread has been interrupted.
    * @throws DrmSessionException Thrown when a DRM session error occurs.
    */
-  public synchronized byte[] downloadLicense(DrmInitData drmInitData) throws IOException,
-      InterruptedException, DrmSessionException {
+  public synchronized byte[] downloadLicense(DrmInitData drmInitData) throws DrmSessionException {
     Assertions.checkArgument(drmInitData != null);
     return blockingKeyRequest(DefaultDrmSessionManager.MODE_DOWNLOAD, null, drmInitData);
   }

From e469269f3c45e6c11737512447ccea6d95f505be Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 20 Nov 2017 03:36:50 -0800
Subject: [PATCH 411/421] Fix some lint issues.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176337058
---
 extensions/ima/build.gradle                   |  9 +++----
 .../exoplayer2/offline/SegmentDownloader.java |  2 +-
 .../google/android/exoplayer2/util/Util.java  |  3 +++
 .../dash/manifest/DashManifestParser.java     |  2 +-
 .../source/dash/offline/DashDownloader.java   |  4 ++--
 .../smoothstreaming/offline/SsDownloader.java |  4 ++--
 library/ui/src/main/res/values-v11/styles.xml | 24 -------------------
 library/ui/src/main/res/values/styles.xml     |  2 +-
 .../testutil/FakeSimpleExoPlayer.java         |  8 ++++++-
 9 files changed, 22 insertions(+), 36 deletions(-)
 delete mode 100644 library/ui/src/main/res/values-v11/styles.xml

diff --git a/extensions/ima/build.gradle b/extensions/ima/build.gradle
index 90c0a911d9d..5038aaf5b9a 100644
--- a/extensions/ima/build.gradle
+++ b/extensions/ima/build.gradle
@@ -28,10 +28,11 @@ android {
 dependencies {
     compile project(modulePrefix + 'library-core')
     // This dependency is necessary to force the supportLibraryVersion of
-    // com.android.support:support-v4 to be used. Else an older version (25.2.0) is included via:
-    // com.google.android.gms:play-services-ads:11.2.0
-    // |-- com.google.android.gms:play-services-ads-lite:11.2.0
-    //   |-- com.google.android.gms:play-services-basement:11.2.0
+    // com.android.support:support-v4 to be used. Else an older version (25.2.0)
+    // is included via:
+    // com.google.android.gms:play-services-ads:11.4.2
+    // |-- com.google.android.gms:play-services-ads-lite:11.4.2
+    //   |-- com.google.android.gms:play-services-basement:11.4.2
     //     |-- com.android.support:support-v4:25.2.0
     compile 'com.android.support:support-v4:' + supportLibraryVersion
     compile 'com.google.ads.interactivemedia.v3:interactivemedia:3.7.4'
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 d81df90b813..3cb5db30ec3 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
@@ -265,7 +265,7 @@ protected abstract List<Segment> getSegments(DataSource dataSource, M manifest,
   /**
    * Returns a list of all segments.
    *
-   * @see #getSegments(DataSource, M, Object[], boolean)}.
+   * @see #getSegments(DataSource, M, Object[], boolean)
    */
   protected abstract List<Segment> getAllSegments(DataSource dataSource, M manifest,
       boolean allowPartialIndex) throws InterruptedException, IOException;
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 f47caa046a9..a79ed387559 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
@@ -32,6 +32,7 @@
 import android.view.WindowManager;
 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.upstream.DataSource;
 import java.io.ByteArrayOutputStream;
@@ -801,6 +802,8 @@ public static int getPcmFrameSize(@C.PcmEncoding int pcmEncoding, int channelCou
         return channelCount * 3;
       case C.ENCODING_PCM_32BIT:
         return channelCount * 4;
+      case C.ENCODING_INVALID:
+      case Format.NO_VALUE:
       default:
         throw new IllegalArgumentException();
     }
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 72df69f7e9d..7ffb4297841 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
@@ -352,7 +352,7 @@ protected Pair<String, SchemeData> parseContentProtection(XmlPullParser xpp)
 
     String schemeIdUri = xpp.getAttributeValue(null, "schemeIdUri");
     if (schemeIdUri != null) {
-      switch (schemeIdUri.toLowerCase()) {
+      switch (Util.toLowerInvariant(schemeIdUri)) {
         case "urn:mpeg:dash:mp4protection:2011":
           schemeType = xpp.getAttributeValue(null, "value");
           String defaultKid = xpp.getAttributeValue(null, "cenc:default_KID");
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 558adca7bde..4c07e4874e0 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
@@ -39,8 +39,8 @@
 /**
  * Helper class to download DASH streams.
  *
- * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link
- * #getDownloadedBytes()}, this class isn't thread safe.
+ * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and
+ * {@link #getDownloadedBytes()}, this class isn't thread safe.
  *
  * <p>Example usage:
  *
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 21cacdc6f3e..5e9ae9a1643 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
@@ -33,8 +33,8 @@
 /**
  * Helper class to download SmoothStreaming streams.
  *
- * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and {@link
- * #getDownloadedBytes()}, this class isn't thread safe.
+ * <p>Except {@link #getTotalSegments()}, {@link #getDownloadedSegments()} and
+ * {@link #getDownloadedBytes()}, this class isn't thread safe.
  *
  * <p>Example usage:
  *
diff --git a/library/ui/src/main/res/values-v11/styles.xml b/library/ui/src/main/res/values-v11/styles.xml
deleted file mode 100644
index 6f774402873..00000000000
--- a/library/ui/src/main/res/values-v11/styles.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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.
--->
-<resources>
-
-  <style name="ExoMediaButton">
-    <item name="android:background">?android:attr/selectableItemBackground</item>
-    <item name="android:layout_width">@dimen/exo_media_button_width</item>
-    <item name="android:layout_height">@dimen/exo_media_button_height</item>
-  </style>
-
-</resources>
diff --git a/library/ui/src/main/res/values/styles.xml b/library/ui/src/main/res/values/styles.xml
index 4ef8971ccdd..b57cbeaddfb 100644
--- a/library/ui/src/main/res/values/styles.xml
+++ b/library/ui/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
 <resources>
 
   <style name="ExoMediaButton">
-    <item name="android:background">@null</item>
+    <item name="android:background">?android:attr/selectableItemBackground</item>
     <item name="android:layout_width">@dimen/exo_media_button_width</item>
     <item name="android:layout_height">@dimen/exo_media_button_height</item>
   </style>
diff --git a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
index 01f984b2122..4d53a6c89de 100644
--- a/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
+++ b/testutils/src/main/java/com/google/android/exoplayer2/testutil/FakeSimpleExoPlayer.java
@@ -215,7 +215,13 @@ public void run () {
     @SuppressWarnings("ThreadJoinLoop")
     public void release() {
       stop();
-      playbackThread.quitSafely();
+      playbackHandler.post(new Runnable() {
+        @Override
+        public void run () {
+          playbackHandler.removeCallbacksAndMessages(null);
+          playbackThread.quit();
+        }
+      });
       while (playbackThread.isAlive()) {
         try {
           playbackThread.join();

From 494237548ada77c3dc56e98fc25dd2c479c7f7d5 Mon Sep 17 00:00:00 2001
From: Ian Bird <IanDBird@Gmail.com>
Date: Tue, 21 Nov 2017 10:59:04 +0000
Subject: [PATCH 412/421] Fix initializationData check for SSA subtitles

---
 .../java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
index d2f5a67c279..12aa1e97d5a 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
@@ -59,7 +59,7 @@ public SsaDecoder() {
    */
   public SsaDecoder(List<byte[]> initializationData) {
     super("SsaDecoder");
-    if (initializationData != null) {
+    if (initializationData != null && initializationData.size() > 0) {
       haveInitializationData = true;
       String formatLine = new String(initializationData.get(0));
       Assertions.checkArgument(formatLine.startsWith(FORMAT_LINE_PREFIX));

From 1439b4a3ef5a31f15553db30071177c115ea12f5 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Tue, 21 Nov 2017 13:42:12 +0000
Subject: [PATCH 413/421] Mini cleanup

---
 .../google/android/exoplayer2/text/ssa/SsaDecoder.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
index 12aa1e97d5a..eec4a1269c0 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
@@ -53,13 +53,14 @@ public SsaDecoder() {
   }
 
   /**
-   * @param initializationData Optional initialization data for the decoder. If not null, the
-   *     initialization data must consist of two byte arrays. The first must contain an SSA format
-   *     line. The second must contain an SSA header that will be assumed common to all samples.
+   * @param initializationData Optional initialization data for the decoder. If not null or empty,
+   *     the initialization data must consist of two byte arrays. The first must contain an SSA
+   *     format line. The second must contain an SSA header that will be assumed common to all
+   *     samples.
    */
   public SsaDecoder(List<byte[]> initializationData) {
     super("SsaDecoder");
-    if (initializationData != null && initializationData.size() > 0) {
+    if (initializationData != null && !initializationData.isEmpty()) {
       haveInitializationData = true;
       String formatLine = new String(initializationData.get(0));
       Assertions.checkArgument(formatLine.startsWith(FORMAT_LINE_PREFIX));

From 60555e2c4b6d74f1276ae30b6524174ac8ee2365 Mon Sep 17 00:00:00 2001
From: andrewlewis <andrewlewis@google.com>
Date: Mon, 20 Nov 2017 08:42:34 -0800
Subject: [PATCH 414/421] Improve robustness of ImaAdsLoader

Remove an assertion that there was a call to pause content between two
content -> ad transitions.

Also, only use the player position for resuming an ad on reattaching if the
player is currently playing an ad, in case IMA pauses content before the player
actually transitions to an ad.

Issue: #3430

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176365842
---
 RELEASENOTES.md                                                | 3 +++
 .../com/google/android/exoplayer2/ext/ima/ImaAdsLoader.java    | 3 +--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index b645cc81a0d..13218f073f4 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -53,6 +53,9 @@
     ([#3303](https://github.com/google/ExoPlayer/issues/3303)).
   * Ignore seeks if an ad is playing
     ([#3309](https://github.com/google/ExoPlayer/issues/3309)).
+  * Improve robustness of `ImaAdsLoader` in case content is not paused between
+    content to ad transitions
+    ([#3430](https://github.com/google/ExoPlayer/issues/3430)).
 * UI:
   * Allow specifying a `Drawable` for the `TimeBar` scrubber
     ([#3337](https://github.com/google/ExoPlayer/issues/3337)).
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 0b11a97f844..5b61db0264a 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
@@ -260,7 +260,7 @@ public void attachPlayer(ExoPlayer player, EventListener eventListener, ViewGrou
   @Override
   public void detachPlayer() {
     if (adsManager != null && imaPausedContent) {
-      adPlaybackState.setAdResumePositionUs(C.msToUs(player.getCurrentPosition()));
+      adPlaybackState.setAdResumePositionUs(playingAd ? C.msToUs(player.getCurrentPosition()) : 0);
       adsManager.pause();
     }
     lastAdProgress = getAdProgress();
@@ -628,7 +628,6 @@ private void updateImaStateForPlayerState() {
       if (!wasPlayingAd && playingAd) {
         int adGroupIndex = player.getCurrentAdGroupIndex();
         // IMA hasn't sent CONTENT_PAUSE_REQUESTED yet, so fake the content position.
-        Assertions.checkState(fakeContentProgressElapsedRealtimeMs == C.TIME_UNSET);
         fakeContentProgressElapsedRealtimeMs = SystemClock.elapsedRealtime();
         fakeContentProgressOffsetMs = C.usToMs(adPlaybackState.adGroupTimesUs[adGroupIndex]);
         if (fakeContentProgressOffsetMs == C.TIME_END_OF_SOURCE) {

From d51944f4b3fe9586c542e4aec4d3d5c7d81d83a2 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 21 Nov 2017 03:44:06 -0800
Subject: [PATCH 415/421] Remove unnecessary dependency

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

diff --git a/extensions/mediasession/build.gradle b/extensions/mediasession/build.gradle
index 85a8ac46e20..651bd952f88 100644
--- a/extensions/mediasession/build.gradle
+++ b/extensions/mediasession/build.gradle
@@ -27,7 +27,6 @@ android {
 dependencies {
     compile project(modulePrefix + 'library-core')
     compile 'com.android.support:support-media-compat:' + supportLibraryVersion
-    compile 'com.android.support:appcompat-v7:' + supportLibraryVersion
 }
 
 ext {

From b688a562508e74721841aaaa770e9dc47bd378dd Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Tue, 21 Nov 2017 04:46:52 -0800
Subject: [PATCH 416/421] Make ExtractorMediaSource timeline dynamic until
 duration is set

We (eventually - albeit possibly infinitely far in the future)
expect a timeline update with a window of known duration. This
also stops live radio stream playbacks transitioning to ended
state when their tracks are disabled.

As part of this fix, I found an issue where getPeriodPosition
could return null even when defaultPositionProjectionUs is 0,
which is not as documented.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176492024
---
 .../source/ClippingMediaSourceTest.java       | 10 +--
 .../source/ExtractorMediaSource.java          |  7 +-
 .../source/SinglePeriodTimeline.java          | 23 +++---
 .../source/SingleSampleMediaSource.java       |  2 +-
 .../source/SinglePeriodTimelineTest.java      | 77 +++++++++++++++++++
 5 files changed, 102 insertions(+), 17 deletions(-)
 create mode 100644 library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
index 5e615dbc7f5..0fefff86a2c 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
@@ -45,7 +45,7 @@ protected void setUp() throws Exception {
   }
 
   public void testNoClipping() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, 0, TEST_PERIOD_DURATION_US);
 
@@ -56,7 +56,7 @@ public void testNoClipping() {
   }
 
   public void testClippingUnseekableWindowThrows() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), false);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), false, false);
 
     // If the unseekable window isn't clipped, clipping succeeds.
     getClippedTimeline(timeline, 0, TEST_PERIOD_DURATION_US);
@@ -70,7 +70,7 @@ public void testClippingUnseekableWindowThrows() {
   }
 
   public void testClippingStart() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, TEST_CLIP_AMOUNT_US,
         TEST_PERIOD_DURATION_US);
@@ -81,7 +81,7 @@ public void testClippingStart() {
   }
 
   public void testClippingEnd() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, 0,
         TEST_PERIOD_DURATION_US - TEST_CLIP_AMOUNT_US);
@@ -92,7 +92,7 @@ public void testClippingEnd() {
   }
 
   public void testClippingStartAndEnd() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, TEST_CLIP_AMOUNT_US,
         TEST_PERIOD_DURATION_US - TEST_CLIP_AMOUNT_US * 2);
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 1b3f6cb95c0..17f2fc2dad1 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
@@ -204,8 +204,11 @@ public void onSourceInfoRefreshed(long durationUs, boolean isSeekable) {
   private void notifySourceInfoRefreshed(long durationUs, boolean isSeekable) {
     timelineDurationUs = durationUs;
     timelineIsSeekable = isSeekable;
-    sourceListener.onSourceInfoRefreshed(
-        this, new SinglePeriodTimeline(timelineDurationUs, timelineIsSeekable), null);
+    // If the duration is currently unset, we expect to be able to update the window when its
+    // duration eventually becomes known.
+    boolean isDynamic = timelineDurationUs == C.TIME_UNSET;
+    sourceListener.onSourceInfoRefreshed(this,
+        new SinglePeriodTimeline(timelineDurationUs, timelineIsSeekable, isDynamic), null);
   }
 
 }
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 6f354384449..9cce67f68c6 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
@@ -36,14 +36,14 @@ public final class SinglePeriodTimeline extends Timeline {
   private final boolean isDynamic;
 
   /**
-   * Creates a timeline of one period of known duration, and a static window starting at zero and
-   * extending to that duration.
+   * Creates a timeline containing a single period and a window that spans it.
    *
    * @param durationUs The duration of the period, in microseconds.
    * @param isSeekable Whether seeking is supported within the period.
+   * @param isDynamic Whether the window may change when the timeline is updated.
    */
-  public SinglePeriodTimeline(long durationUs, boolean isSeekable) {
-    this(durationUs, durationUs, 0, 0, isSeekable, false);
+  public SinglePeriodTimeline(long durationUs, boolean isSeekable, boolean isDynamic) {
+    this(durationUs, durationUs, 0, 0, isSeekable, isDynamic);
   }
 
   /**
@@ -63,7 +63,7 @@ public SinglePeriodTimeline(long periodDurationUs, long windowDurationUs,
       long windowPositionInPeriodUs, long windowDefaultStartPositionUs, boolean isSeekable,
       boolean isDynamic) {
     this(C.TIME_UNSET, C.TIME_UNSET, periodDurationUs, windowDurationUs, windowPositionInPeriodUs,
-    windowDefaultStartPositionUs, isSeekable, isDynamic);
+        windowDefaultStartPositionUs, isSeekable, isDynamic);
   }
 
   /**
@@ -106,11 +106,16 @@ public Window getWindow(int windowIndex, Window window, boolean setIds,
     Assertions.checkIndex(windowIndex, 0, 1);
     Object id = setIds ? ID : null;
     long windowDefaultStartPositionUs = this.windowDefaultStartPositionUs;
-    if (isDynamic) {
-      windowDefaultStartPositionUs += defaultPositionProjectionUs;
-      if (windowDefaultStartPositionUs > windowDurationUs) {
-        // The projection takes us beyond the end of the live window.
+    if (isDynamic && defaultPositionProjectionUs != 0) {
+      if (windowDurationUs == C.TIME_UNSET) {
+        // Don't allow projection into a window that has an unknown duration.
         windowDefaultStartPositionUs = C.TIME_UNSET;
+      } else {
+        windowDefaultStartPositionUs += defaultPositionProjectionUs;
+        if (windowDefaultStartPositionUs > windowDurationUs) {
+          // The projection takes us beyond the end of the window.
+          windowDefaultStartPositionUs = C.TIME_UNSET;
+        }
       }
     }
     return window.set(id, presentationStartTimeMs, windowStartTimeMs, isSeekable, isDynamic,
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 dd901958fd7..ede2c7ccf9c 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
@@ -110,7 +110,7 @@ public SingleSampleMediaSource(Uri uri, DataSource.Factory dataSourceFactory, Fo
     this.eventListener = eventListener;
     this.eventSourceId = eventSourceId;
     this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
-    timeline = new SinglePeriodTimeline(durationUs, true);
+    timeline = new SinglePeriodTimeline(durationUs, true, false);
   }
 
   // MediaSource implementation.
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
new file mode 100644
index 00000000000..94ca8b03f0d
--- /dev/null
+++ b/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
@@ -0,0 +1,77 @@
+/*
+ * 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;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import android.util.Pair;
+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;
+import org.robolectric.annotation.Config;
+
+/**
+ * Unit test for {@link SinglePeriodTimeline}.
+ */
+@RunWith(RobolectricTestRunner.class)
+@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
+public final class SinglePeriodTimelineTest {
+
+  private Window window;
+  private Period period;
+
+  @Before
+  public void setUp() throws Exception {
+    window = new Window();
+    period = new Period();
+  }
+
+  @Test
+  public void testGetPeriodPositionDynamicWindowUnknownDuration() {
+    SinglePeriodTimeline timeline = new SinglePeriodTimeline(C.TIME_UNSET, false, true);
+    // Should return null with any positive position projection.
+    Pair<Integer, Long> position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, 1);
+    assertThat(position).isNull();
+    // Should return (0, 0) without a position projection.
+    position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, 0);
+    assertThat(position.first).isEqualTo(0);
+    assertThat(position.second).isEqualTo(0);
+  }
+
+  @Test
+  public void testGetPeriodPositionDynamicWindowKnownDuration() {
+    long windowDurationUs = 1000;
+    SinglePeriodTimeline timeline = new SinglePeriodTimeline(windowDurationUs, windowDurationUs, 0,
+        0, false, true);
+    // Should return null with a positive position projection beyond window duration.
+    Pair<Integer, Long> position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET,
+        windowDurationUs + 1);
+    assertThat(position).isNull();
+    // Should return (0, duration) with a projection equal to window duration.
+    position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, windowDurationUs);
+    assertThat(position.first).isEqualTo(0);
+    assertThat(position.second).isEqualTo(windowDurationUs);
+    // Should return (0, 0) without a position projection.
+    position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, 0);
+    assertThat(position.first).isEqualTo(0);
+    assertThat(position.second).isEqualTo(0);
+  }
+
+}

From fa3052d36b78455c80ce7b23e6526edc092b0561 Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 20 Nov 2017 08:56:23 -0800
Subject: [PATCH 417/421] Report additional position discontinuities

- Properly report internal discontinuities
- Add DISCONTINUITY_REASON_SEEK_ADJUSTMENT to distinguish
  seek adjustments from other internal discontinuity events

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176367365
---
 RELEASENOTES.md                                   |  4 ++++
 .../android/exoplayer2/demo/EventLogger.java      |  2 ++
 .../google/android/exoplayer2/ExoPlayerImpl.java  | 15 ++++++++-------
 .../android/exoplayer2/ExoPlayerImplInternal.java | 12 ++++++++++--
 .../com/google/android/exoplayer2/Player.java     |  9 +++++++--
 5 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
index 13218f073f4..579c2a92ac0 100644
--- a/RELEASENOTES.md
+++ b/RELEASENOTES.md
@@ -11,6 +11,10 @@
 * SimpleExoPlayer: Support for multiple video, text and metadata outputs.
 * Support for `Renderer`s that don't consume any media
   ([#3212](https://github.com/google/ExoPlayer/issues/3212)).
+* Fix reporting of internal position discontinuities via
+  `Player.onPositionDiscontinuity`. `DISCONTINUITY_REASON_SEEK_ADJUSTMENT` is
+  added to disambiguate position adjustments during seeks from other types of
+  internal position discontinuity.
 * Fix potential `IndexOutOfBoundsException` when calling `ExoPlayer.getDuration`
   ([#3362](https://github.com/google/ExoPlayer/issues/3362)).
 * Fix playbacks involving looping, concatenation and ads getting stuck when
diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
index 68f7ddfd213..27a5c68e28b 100644
--- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
+++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/EventLogger.java
@@ -496,6 +496,8 @@ private static String getDiscontinuityReasonString(@Player.DiscontinuityReason i
         return "PERIOD_TRANSITION";
       case Player.DISCONTINUITY_REASON_SEEK:
         return "SEEK";
+      case Player.DISCONTINUITY_REASON_SEEK_ADJUSTMENT:
+        return "SEEK_ADJUSTMENT";
       case Player.DISCONTINUITY_REASON_INTERNAL:
         return "INTERNAL";
       default:
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 8ee8af59804..349751eb591 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
@@ -473,7 +473,8 @@ public Object getCurrentManifest() {
       case ExoPlayerImplInternal.MSG_SOURCE_INFO_REFRESHED: {
         int prepareAcks = msg.arg1;
         int seekAcks = msg.arg2;
-        handlePlaybackInfo((PlaybackInfo) msg.obj, prepareAcks, seekAcks, false);
+        handlePlaybackInfo((PlaybackInfo) msg.obj, prepareAcks, seekAcks, false,
+            /* ignored */ DISCONTINUITY_REASON_INTERNAL);
         break;
       }
       case ExoPlayerImplInternal.MSG_TRACKS_CHANGED: {
@@ -491,11 +492,13 @@ public Object getCurrentManifest() {
       }
       case ExoPlayerImplInternal.MSG_SEEK_ACK: {
         boolean seekPositionAdjusted = msg.arg1 != 0;
-        handlePlaybackInfo((PlaybackInfo) msg.obj, 0, 1, seekPositionAdjusted);
+        handlePlaybackInfo((PlaybackInfo) msg.obj, 0, 1, seekPositionAdjusted,
+            DISCONTINUITY_REASON_SEEK_ADJUSTMENT);
         break;
       }
       case ExoPlayerImplInternal.MSG_POSITION_DISCONTINUITY: {
-        handlePlaybackInfo((PlaybackInfo) msg.obj, 0, 0, true);
+        @DiscontinuityReason int discontinuityReason = msg.arg1;
+        handlePlaybackInfo((PlaybackInfo) msg.obj, 0, 0, true, discontinuityReason);
         break;
       }
       case ExoPlayerImplInternal.MSG_PLAYBACK_PARAMETERS_CHANGED: {
@@ -521,7 +524,7 @@ public Object getCurrentManifest() {
   }
 
   private void handlePlaybackInfo(PlaybackInfo playbackInfo, int prepareAcks, int seekAcks,
-      boolean positionDiscontinuity) {
+      boolean positionDiscontinuity, @DiscontinuityReason int positionDiscontinuityReason) {
     Assertions.checkNotNull(playbackInfo.timeline);
     pendingPrepareAcks -= prepareAcks;
     pendingSeekAcks -= seekAcks;
@@ -542,9 +545,7 @@ private void handlePlaybackInfo(PlaybackInfo playbackInfo, int prepareAcks, int
       }
       if (positionDiscontinuity) {
         for (Player.EventListener listener : listeners) {
-          listener.onPositionDiscontinuity(
-              seekAcks > 0 ? DISCONTINUITY_REASON_INTERNAL : DISCONTINUITY_REASON_PERIOD_TRANSITION
-          );
+          listener.onPositionDiscontinuity(positionDiscontinuityReason);
         }
       }
     }
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 f00a5ce02d4..56e16343ed4 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
@@ -503,6 +503,10 @@ private void updatePlaybackPositions() throws ExoPlaybackException {
     long periodPositionUs = playingPeriodHolder.mediaPeriod.readDiscontinuity();
     if (periodPositionUs != C.TIME_UNSET) {
       resetRendererPosition(periodPositionUs);
+      playbackInfo = playbackInfo.fromNewPosition(playbackInfo.periodId, periodPositionUs,
+          playbackInfo.contentPositionUs);
+      eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, Player.DISCONTINUITY_REASON_INTERNAL,
+          0, playbackInfo).sendToTarget();
     } else {
       // Use the standalone clock if there's no renderer clock, or if the providing renderer has
       // ended or needs the next sample stream to reenter the ready state. The latter case uses the
@@ -893,7 +897,10 @@ private void reselectTracksInternal() throws ExoPlaybackException {
       long periodPositionUs = playingPeriodHolder.updatePeriodTrackSelection(
           playbackInfo.positionUs, recreateStreams, streamResetFlags);
       if (periodPositionUs != playbackInfo.positionUs) {
-        playbackInfo.positionUs = periodPositionUs;
+        playbackInfo = playbackInfo.fromNewPosition(playbackInfo.periodId, periodPositionUs,
+            playbackInfo.contentPositionUs);
+        eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, Player.DISCONTINUITY_REASON_INTERNAL,
+            0, playbackInfo).sendToTarget();
         resetRendererPosition(periodPositionUs);
       }
 
@@ -1280,7 +1287,8 @@ private void updatePeriods() throws ExoPlaybackException, IOException {
       playbackInfo = playbackInfo.fromNewPosition(playingPeriodHolder.info.id,
           playingPeriodHolder.info.startPositionUs, playingPeriodHolder.info.contentPositionUs);
       updatePlaybackPositions();
-      eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, playbackInfo).sendToTarget();
+      eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY,
+          Player.DISCONTINUITY_REASON_PERIOD_TRANSITION, 0, playbackInfo).sendToTarget();
     }
 
     if (readingPeriodHolder.info.isFinal) {
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 af653ec2bd1..dc703f924ac 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
@@ -243,7 +243,7 @@ public void onSeekProcessed() {
    */
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({DISCONTINUITY_REASON_PERIOD_TRANSITION, DISCONTINUITY_REASON_SEEK,
-      DISCONTINUITY_REASON_INTERNAL})
+      DISCONTINUITY_REASON_SEEK_ADJUSTMENT, DISCONTINUITY_REASON_INTERNAL})
   public @interface DiscontinuityReason {}
   /**
    * Automatic playback transition from one period in the timeline to the next. The period index may
@@ -254,10 +254,15 @@ public void onSeekProcessed() {
    * Seek within the current period or to another period.
    */
   int DISCONTINUITY_REASON_SEEK = 1;
+  /**
+   * Seek adjustment due to being unable to seek to the requested position or because the seek was
+   * permitted to be inexact.
+   */
+  int DISCONTINUITY_REASON_SEEK_ADJUSTMENT = 2;
   /**
    * Discontinuity introduced internally by the source.
    */
-  int DISCONTINUITY_REASON_INTERNAL = 2;
+  int DISCONTINUITY_REASON_INTERNAL = 3;
 
   /**
    * Register a listener to receive events from the player. The listener's methods will be called on

From 74569bba450cc91b21771361f5e323b12ed1227b Mon Sep 17 00:00:00 2001
From: olly <olly@google.com>
Date: Mon, 20 Nov 2017 09:35:01 -0800
Subject: [PATCH 418/421] Don't do work after track selection when in ended
 state

This causes the player to report that it's started loading
when in the ended state.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=176371892
---
 .../android/exoplayer2/ExoPlayerImplInternal.java      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 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 56e16343ed4..998779858b5 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
@@ -896,7 +896,7 @@ private void reselectTracksInternal() throws ExoPlaybackException {
       boolean[] streamResetFlags = new boolean[renderers.length];
       long periodPositionUs = playingPeriodHolder.updatePeriodTrackSelection(
           playbackInfo.positionUs, recreateStreams, streamResetFlags);
-      if (periodPositionUs != playbackInfo.positionUs) {
+      if (state != Player.STATE_ENDED && periodPositionUs != playbackInfo.positionUs) {
         playbackInfo = playbackInfo.fromNewPosition(playbackInfo.periodId, periodPositionUs,
             playbackInfo.contentPositionUs);
         eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, Player.DISCONTINUITY_REASON_INTERNAL,
@@ -941,9 +941,11 @@ private void reselectTracksInternal() throws ExoPlaybackException {
         loadingPeriodHolder.updatePeriodTrackSelection(loadingPeriodPositionUs, false);
       }
     }
-    maybeContinueLoading();
-    updatePlaybackPositions();
-    handler.sendEmptyMessage(MSG_DO_SOME_WORK);
+    if (state != Player.STATE_ENDED) {
+      maybeContinueLoading();
+      updatePlaybackPositions();
+      handler.sendEmptyMessage(MSG_DO_SOME_WORK);
+    }
   }
 
   private boolean isTimelineReady(long playingPeriodDurationUs) {

From 56c1c3f6a724b62ccb624148e2c892a4ef9519bf Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 22 Nov 2017 17:59:36 +0000
Subject: [PATCH 419/421] Revert "Make ExtractorMediaSource timeline dynamic
 until duration is set"

This reverts commit b688a562508e74721841aaaa770e9dc47bd378dd.
---
 .../source/ClippingMediaSourceTest.java       | 10 +--
 .../source/ExtractorMediaSource.java          |  7 +-
 .../source/SinglePeriodTimeline.java          | 23 +++---
 .../source/SingleSampleMediaSource.java       |  2 +-
 .../source/SinglePeriodTimelineTest.java      | 77 -------------------
 5 files changed, 17 insertions(+), 102 deletions(-)
 delete mode 100644 library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java

diff --git a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
index 0fefff86a2c..5e615dbc7f5 100644
--- a/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
+++ b/library/core/src/androidTest/java/com/google/android/exoplayer2/source/ClippingMediaSourceTest.java
@@ -45,7 +45,7 @@ protected void setUp() throws Exception {
   }
 
   public void testNoClipping() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, 0, TEST_PERIOD_DURATION_US);
 
@@ -56,7 +56,7 @@ public void testNoClipping() {
   }
 
   public void testClippingUnseekableWindowThrows() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), false, false);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), false);
 
     // If the unseekable window isn't clipped, clipping succeeds.
     getClippedTimeline(timeline, 0, TEST_PERIOD_DURATION_US);
@@ -70,7 +70,7 @@ public void testClippingUnseekableWindowThrows() {
   }
 
   public void testClippingStart() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, TEST_CLIP_AMOUNT_US,
         TEST_PERIOD_DURATION_US);
@@ -81,7 +81,7 @@ public void testClippingStart() {
   }
 
   public void testClippingEnd() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, 0,
         TEST_PERIOD_DURATION_US - TEST_CLIP_AMOUNT_US);
@@ -92,7 +92,7 @@ public void testClippingEnd() {
   }
 
   public void testClippingStartAndEnd() {
-    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true, false);
+    Timeline timeline = new SinglePeriodTimeline(C.msToUs(TEST_PERIOD_DURATION_US), true);
 
     Timeline clippedTimeline = getClippedTimeline(timeline, TEST_CLIP_AMOUNT_US,
         TEST_PERIOD_DURATION_US - TEST_CLIP_AMOUNT_US * 2);
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 17f2fc2dad1..1b3f6cb95c0 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
@@ -204,11 +204,8 @@ public void onSourceInfoRefreshed(long durationUs, boolean isSeekable) {
   private void notifySourceInfoRefreshed(long durationUs, boolean isSeekable) {
     timelineDurationUs = durationUs;
     timelineIsSeekable = isSeekable;
-    // If the duration is currently unset, we expect to be able to update the window when its
-    // duration eventually becomes known.
-    boolean isDynamic = timelineDurationUs == C.TIME_UNSET;
-    sourceListener.onSourceInfoRefreshed(this,
-        new SinglePeriodTimeline(timelineDurationUs, timelineIsSeekable, isDynamic), null);
+    sourceListener.onSourceInfoRefreshed(
+        this, new SinglePeriodTimeline(timelineDurationUs, timelineIsSeekable), null);
   }
 
 }
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 9cce67f68c6..6f354384449 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
@@ -36,14 +36,14 @@ public final class SinglePeriodTimeline extends Timeline {
   private final boolean isDynamic;
 
   /**
-   * Creates a timeline containing a single period and a window that spans it.
+   * Creates a timeline of one period of known duration, and a static window starting at zero and
+   * extending to that duration.
    *
    * @param durationUs The duration of the period, in microseconds.
    * @param isSeekable Whether seeking is supported within the period.
-   * @param isDynamic Whether the window may change when the timeline is updated.
    */
-  public SinglePeriodTimeline(long durationUs, boolean isSeekable, boolean isDynamic) {
-    this(durationUs, durationUs, 0, 0, isSeekable, isDynamic);
+  public SinglePeriodTimeline(long durationUs, boolean isSeekable) {
+    this(durationUs, durationUs, 0, 0, isSeekable, false);
   }
 
   /**
@@ -63,7 +63,7 @@ public SinglePeriodTimeline(long periodDurationUs, long windowDurationUs,
       long windowPositionInPeriodUs, long windowDefaultStartPositionUs, boolean isSeekable,
       boolean isDynamic) {
     this(C.TIME_UNSET, C.TIME_UNSET, periodDurationUs, windowDurationUs, windowPositionInPeriodUs,
-        windowDefaultStartPositionUs, isSeekable, isDynamic);
+    windowDefaultStartPositionUs, isSeekable, isDynamic);
   }
 
   /**
@@ -106,16 +106,11 @@ public Window getWindow(int windowIndex, Window window, boolean setIds,
     Assertions.checkIndex(windowIndex, 0, 1);
     Object id = setIds ? ID : null;
     long windowDefaultStartPositionUs = this.windowDefaultStartPositionUs;
-    if (isDynamic && defaultPositionProjectionUs != 0) {
-      if (windowDurationUs == C.TIME_UNSET) {
-        // Don't allow projection into a window that has an unknown duration.
+    if (isDynamic) {
+      windowDefaultStartPositionUs += defaultPositionProjectionUs;
+      if (windowDefaultStartPositionUs > windowDurationUs) {
+        // The projection takes us beyond the end of the live window.
         windowDefaultStartPositionUs = C.TIME_UNSET;
-      } else {
-        windowDefaultStartPositionUs += defaultPositionProjectionUs;
-        if (windowDefaultStartPositionUs > windowDurationUs) {
-          // The projection takes us beyond the end of the window.
-          windowDefaultStartPositionUs = C.TIME_UNSET;
-        }
       }
     }
     return window.set(id, presentationStartTimeMs, windowStartTimeMs, isSeekable, isDynamic,
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 ede2c7ccf9c..dd901958fd7 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
@@ -110,7 +110,7 @@ public SingleSampleMediaSource(Uri uri, DataSource.Factory dataSourceFactory, Fo
     this.eventListener = eventListener;
     this.eventSourceId = eventSourceId;
     this.treatLoadErrorsAsEndOfStream = treatLoadErrorsAsEndOfStream;
-    timeline = new SinglePeriodTimeline(durationUs, true, false);
+    timeline = new SinglePeriodTimeline(durationUs, true);
   }
 
   // MediaSource implementation.
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
deleted file mode 100644
index 94ca8b03f0d..00000000000
--- a/library/core/src/test/java/com/google/android/exoplayer2/source/SinglePeriodTimelineTest.java
+++ /dev/null
@@ -1,77 +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;
-
-import static com.google.common.truth.Truth.assertThat;
-
-import android.util.Pair;
-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;
-import org.robolectric.annotation.Config;
-
-/**
- * Unit test for {@link SinglePeriodTimeline}.
- */
-@RunWith(RobolectricTestRunner.class)
-@Config(sdk = Config.TARGET_SDK, manifest = Config.NONE)
-public final class SinglePeriodTimelineTest {
-
-  private Window window;
-  private Period period;
-
-  @Before
-  public void setUp() throws Exception {
-    window = new Window();
-    period = new Period();
-  }
-
-  @Test
-  public void testGetPeriodPositionDynamicWindowUnknownDuration() {
-    SinglePeriodTimeline timeline = new SinglePeriodTimeline(C.TIME_UNSET, false, true);
-    // Should return null with any positive position projection.
-    Pair<Integer, Long> position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, 1);
-    assertThat(position).isNull();
-    // Should return (0, 0) without a position projection.
-    position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, 0);
-    assertThat(position.first).isEqualTo(0);
-    assertThat(position.second).isEqualTo(0);
-  }
-
-  @Test
-  public void testGetPeriodPositionDynamicWindowKnownDuration() {
-    long windowDurationUs = 1000;
-    SinglePeriodTimeline timeline = new SinglePeriodTimeline(windowDurationUs, windowDurationUs, 0,
-        0, false, true);
-    // Should return null with a positive position projection beyond window duration.
-    Pair<Integer, Long> position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET,
-        windowDurationUs + 1);
-    assertThat(position).isNull();
-    // Should return (0, duration) with a projection equal to window duration.
-    position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, windowDurationUs);
-    assertThat(position.first).isEqualTo(0);
-    assertThat(position.second).isEqualTo(windowDurationUs);
-    // Should return (0, 0) without a position projection.
-    position = timeline.getPeriodPosition(window, period, 0, C.TIME_UNSET, 0);
-    assertThat(position.first).isEqualTo(0);
-    assertThat(position.second).isEqualTo(0);
-  }
-
-}

From 75b90625839a548124d2f90788b790b3bcd21579 Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 22 Nov 2017 18:06:14 +0000
Subject: [PATCH 420/421] Send discontinuity at adjustments after
 shuffle/repeat mode changes.

---
 .../google/android/exoplayer2/ExoPlayerImplInternal.java  | 8 ++++++--
 1 file changed, 6 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 998779858b5..4d1767b64c6 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
@@ -474,8 +474,12 @@ private void validateExistingPeriodHolders() throws ExoPlaybackException {
       // position of the playing period to make sure none of the removed period is played.
       MediaPeriodId periodId = playingPeriodHolder.info.id;
       long newPositionUs = seekToPeriodPosition(periodId, playbackInfo.positionUs);
-      playbackInfo = playbackInfo.fromNewPosition(periodId, newPositionUs,
-          playbackInfo.contentPositionUs);
+      if (newPositionUs != playbackInfo.positionUs) {
+        playbackInfo = playbackInfo.fromNewPosition(periodId, newPositionUs,
+            playbackInfo.contentPositionUs);
+        eventHandler.obtainMessage(MSG_POSITION_DISCONTINUITY, Player.DISCONTINUITY_REASON_INTERNAL,
+            0, playbackInfo).sendToTarget();
+      }
     }
   }
 

From 3562fe1c69c8a085ff5c92449a6d4b2ff95a133e Mon Sep 17 00:00:00 2001
From: Oliver Woodman <olly@google.com>
Date: Wed, 22 Nov 2017 20:38:53 +0000
Subject: [PATCH 421/421] SampleStream fixes

---
 .../source/ExtractorMediaPeriod.java          | 11 ++++-
 .../source/chunk/ChunkSampleStream.java       |  8 +++-
 .../source/hls/HlsSampleStreamWrapper.java    | 41 +++++++++++++------
 3 files changed, 43 insertions(+), 17 deletions(-)

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 c418c427f72..1228061cdec 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
@@ -361,7 +361,7 @@ public long seekToUs(long positionUs) {
   // SampleStream methods.
 
   /* package */ boolean isReady(int track) {
-    return loadingFinished || (!isPendingReset() && sampleQueues[track].hasNextSample());
+    return !suppressRead() && (loadingFinished || sampleQueues[track].hasNextSample());
   }
 
   /* package */ void maybeThrowError() throws IOException {
@@ -370,7 +370,7 @@ public long seekToUs(long positionUs) {
 
   /* package */ int readData(int track, FormatHolder formatHolder, DecoderInputBuffer buffer,
       boolean formatRequired) {
-    if (notifyDiscontinuity || isPendingReset()) {
+    if (suppressRead()) {
       return C.RESULT_NOTHING_READ;
     }
     return sampleQueues[track].read(formatHolder, buffer, formatRequired, loadingFinished,
@@ -378,6 +378,9 @@ public long seekToUs(long positionUs) {
   }
 
   /* package */ int skipData(int track, long positionUs) {
+    if (suppressRead()) {
+      return 0;
+    }
     SampleQueue sampleQueue = sampleQueues[track];
     if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
       return sampleQueue.advanceToEnd();
@@ -387,6 +390,10 @@ public long seekToUs(long positionUs) {
     }
   }
 
+  private boolean suppressRead() {
+    return notifyDiscontinuity || isPendingReset();
+  }
+
   // Loader.Callback implementation.
 
   @Override
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 8a9be92d750..bb51ae074e3 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
@@ -272,9 +272,11 @@ public int readData(FormatHolder formatHolder, DecoderInputBuffer buffer,
 
   @Override
   public int skipData(long positionUs) {
+    if (isPendingReset()) {
+      return 0;
+    }
     int skipCount;
     if (loadingFinished && positionUs > primarySampleQueue.getLargestQueuedTimestampUs()) {
-      primarySampleQueue.advanceToEnd();
       skipCount = primarySampleQueue.advanceToEnd();
     } else {
       skipCount = primarySampleQueue.advanceTo(positionUs, true, true);
@@ -282,7 +284,9 @@ public int skipData(long positionUs) {
         skipCount = 0;
       }
     }
-    primarySampleQueue.discardToRead();
+    if (skipCount > 0) {
+      primarySampleQueue.discardToRead();
+    }
     return skipCount;
   }
 
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 3eae83624be..ddd6689fa65 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
@@ -385,7 +385,35 @@ public int readData(int trackGroupIndex, FormatHolder formatHolder,
     if (isPendingReset()) {
       return C.RESULT_NOTHING_READ;
     }
+    int result = sampleQueues[trackGroupIndex].read(formatHolder, buffer, requireFormat,
+        loadingFinished, lastSeekPositionUs);
+    if (result == C.RESULT_BUFFER_READ) {
+      discardToRead();
+    }
+    return result;
+  }
 
+  public int skipData(int trackGroupIndex, long positionUs) {
+    if (isPendingReset()) {
+      return 0;
+    }
+    int skipCount;
+    SampleQueue sampleQueue = sampleQueues[trackGroupIndex];
+    if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
+      skipCount = sampleQueue.advanceToEnd();
+    } else {
+      skipCount = sampleQueue.advanceTo(positionUs, true, true);
+      if (skipCount == SampleQueue.ADVANCE_FAILED) {
+        skipCount = 0;
+      }
+    }
+    if (skipCount > 0) {
+      discardToRead();
+    }
+    return skipCount;
+  }
+
+  private void discardToRead() {
     if (!mediaChunks.isEmpty()) {
       while (mediaChunks.size() > 1 && finishedReadingChunk(mediaChunks.getFirst())) {
         mediaChunks.removeFirst();
@@ -399,19 +427,6 @@ public int readData(int trackGroupIndex, FormatHolder formatHolder,
       }
       downstreamTrackFormat = trackFormat;
     }
-
-    return sampleQueues[trackGroupIndex].read(formatHolder, buffer, requireFormat, loadingFinished,
-        lastSeekPositionUs);
-  }
-
-  public int skipData(int trackGroupIndex, long positionUs) {
-    SampleQueue sampleQueue = sampleQueues[trackGroupIndex];
-    if (loadingFinished && positionUs > sampleQueue.getLargestQueuedTimestampUs()) {
-      return sampleQueue.advanceToEnd();
-    } else {
-      int skipCount = sampleQueue.advanceTo(positionUs, true, true);
-      return skipCount == SampleQueue.ADVANCE_FAILED ? 0 : skipCount;
-    }
   }
 
   private boolean finishedReadingChunk(HlsMediaChunk chunk) {