-Updated ExoPlayer to 2.8.0

-Updated MediaSource contracts in ManagedMediaSource.
-Changed PlaceholderMediaSource and FailedMediaSource to use built-in BaseMediaSource implementation.
-Changed deprecated DynamicConcatenatingMediaSource to ConcatenatingMediaSource.
-Removed manual playlist media source disposal in favor of player built-in disposal.

app/build.gradle

@@ -42,7 +42,7 @@ android {
 
 ext {
     supportLibVersion = '27.1.1'
-    exoPlayerLibVersion = '2.7.3'
+    exoPlayerLibVersion = '2.8.0'
     roomDbLibVersion = '1.1.1'
     leakCanaryLibVersion = '1.5.4'
     okHttpLibVersion = '3.10.0'

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java

@@ -241,7 +241,6 @@ public class PlayerHelper {
     public static TrackSelection.Factory getQualitySelector(@NonNull final Context context,
                                                             @NonNull final BandwidthMeter meter) {
         return new AdaptiveTrackSelection.Factory(meter,
-                AdaptiveTrackSelection.DEFAULT_MAX_INITIAL_BITRATE,
                 /*bufferDurationRequiredForQualityIncrease=*/1000,
                 AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,
                 AdaptiveTrackSelection.DEFAULT_MIN_DURATION_TO_RETAIN_AFTER_DISCARD_MS,

app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java

@@ -4,6 +4,7 @@ import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.upstream.Allocator;
 
@@ -11,7 +12,7 @@ import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 
 import java.io.IOException;
 
-public class FailedMediaSource implements ManagedMediaSource {
+public class FailedMediaSource extends BaseMediaSource implements ManagedMediaSource {
     private final String TAG = "FailedMediaSource@" + Integer.toHexString(hashCode());
 
     public static class FailedMediaSourceException extends Exception {
@@ -72,11 +73,6 @@ public class FailedMediaSource implements ManagedMediaSource {
         return System.currentTimeMillis() >= retryTimestamp;
     }
 
-    @Override
-    public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
-        Log.e(TAG, "Loading failed source: ", error);
-    }
-
     @Override
     public void maybeThrowSourceInfoRefreshError() throws IOException {
         throw new IOException(error);
@@ -90,8 +86,14 @@ public class FailedMediaSource implements ManagedMediaSource {
     @Override
     public void releasePeriod(MediaPeriod mediaPeriod) {}
 
+
     @Override
-    public void releaseSource() {}
+    protected void prepareSourceInternal(ExoPlayer player, boolean isTopLevelSource) {
+        Log.e(TAG, "Loading failed source: ", error);
+    }
+
+    @Override
+    protected void releaseSourceInternal() {}
 
     @Override
     public boolean shouldBeReplacedWith(@NonNull final PlayQueueItem newIdentity,

app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java

@@ -1,10 +1,12 @@
 package org.schabi.newpipe.player.mediasource;
 
+import android.os.Handler;
 import android.support.annotation.NonNull;
 
 import com.google.android.exoplayer2.ExoPlayer;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.source.MediaSource;
+import com.google.android.exoplayer2.source.MediaSourceEventListener;
 import com.google.android.exoplayer2.upstream.Allocator;
 
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
@@ -34,7 +36,8 @@ public class LoadedMediaSource implements ManagedMediaSource {
     }
 
     @Override
-    public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {
+    public void prepareSource(ExoPlayer player, boolean isTopLevelSource,
+                              SourceInfoRefreshListener listener) {
         source.prepareSource(player, isTopLevelSource, listener);
     }
 
@@ -54,8 +57,18 @@ public class LoadedMediaSource implements ManagedMediaSource {
     }
 
     @Override
-    public void releaseSource() {
+    public void releaseSource(SourceInfoRefreshListener listener) {
-        source.releaseSource();
+        source.releaseSource(listener);
+    }
+
+    @Override
+    public void addEventListener(Handler handler, MediaSourceEventListener eventListener) {
+        source.addEventListener(handler, eventListener);
+    }
+
+    @Override
+    public void removeEventListener(MediaSourceEventListener eventListener) {
+        source.removeEventListener(eventListener);
     }
 
     @Override

app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java

@@ -3,14 +3,14 @@ package org.schabi.newpipe.player.mediasource;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
-import com.google.android.exoplayer2.source.DynamicConcatenatingMediaSource;
+import com.google.android.exoplayer2.source.ConcatenatingMediaSource;
 import com.google.android.exoplayer2.source.ShuffleOrder;
 
 public class ManagedMediaSourcePlaylist {
-    @NonNull private final DynamicConcatenatingMediaSource internalSource;
+    @NonNull private final ConcatenatingMediaSource internalSource;
 
     public ManagedMediaSourcePlaylist() {
-        internalSource = new DynamicConcatenatingMediaSource(/*isPlaylistAtomic=*/false,
+        internalSource = new ConcatenatingMediaSource(/*isPlaylistAtomic=*/false,
                 new ShuffleOrder.UnshuffledShuffleOrder(0));
     }
 
@@ -32,12 +32,8 @@ public class ManagedMediaSourcePlaylist {
                 null : (ManagedMediaSource) internalSource.getMediaSource(index);
     }
 
-    public void dispose() {
-        internalSource.releaseSource();
-    }
-
     @NonNull
-    public DynamicConcatenatingMediaSource getParentMediaSource() {
+    public ConcatenatingMediaSource getParentMediaSource() {
         return internalSource;
     }
 
@@ -46,7 +42,7 @@ public class ManagedMediaSourcePlaylist {
     //////////////////////////////////////////////////////////////////////////*/
 
     /**
-     * Expands the {@link DynamicConcatenatingMediaSource} by appending it with a
+     * Expands the {@link ConcatenatingMediaSource} by appending it with a
      * {@link PlaceholderMediaSource}.
      *
      * @see #append(ManagedMediaSource)
@@ -56,17 +52,17 @@ public class ManagedMediaSourcePlaylist {
     }
 
     /**
-     * Appends a {@link ManagedMediaSource} to the end of {@link DynamicConcatenatingMediaSource}.
+     * Appends a {@link ManagedMediaSource} to the end of {@link ConcatenatingMediaSource}.
-     * @see DynamicConcatenatingMediaSource#addMediaSource
+     * @see ConcatenatingMediaSource#addMediaSource
      * */
     public synchronized void append(@NonNull final ManagedMediaSource source) {
         internalSource.addMediaSource(source);
     }
 
     /**
-     * Removes a {@link ManagedMediaSource} from {@link DynamicConcatenatingMediaSource}
+     * Removes a {@link ManagedMediaSource} from {@link ConcatenatingMediaSource}
      * at the given index. If this index is out of bound, then the removal is ignored.
-     * @see DynamicConcatenatingMediaSource#removeMediaSource(int)
+     * @see ConcatenatingMediaSource#removeMediaSource(int)
      * */
     public synchronized void remove(final int index) {
         if (index < 0 || index > internalSource.getSize()) return;
@@ -75,10 +71,10 @@ public class ManagedMediaSourcePlaylist {
     }
 
     /**
-     * Moves a {@link ManagedMediaSource} in {@link DynamicConcatenatingMediaSource}
+     * Moves a {@link ManagedMediaSource} in {@link ConcatenatingMediaSource}
      * from the given source index to the target index. If either index is out of bound,
      * then the call is ignored.
-     * @see DynamicConcatenatingMediaSource#moveMediaSource(int, int)
+     * @see ConcatenatingMediaSource#moveMediaSource(int, int)
      * */
     public synchronized void move(final int source, final int target) {
         if (source < 0 || target < 0) return;
@@ -99,7 +95,7 @@ public class ManagedMediaSourcePlaylist {
     }
 
     /**
-     * Updates the {@link ManagedMediaSource} in {@link DynamicConcatenatingMediaSource}
+     * Updates the {@link ManagedMediaSource} in {@link ConcatenatingMediaSource}
      * at the given index with a given {@link ManagedMediaSource}.
      * @see #update(int, ManagedMediaSource, Runnable)
      * */
@@ -108,11 +104,11 @@ public class ManagedMediaSourcePlaylist {
     }
 
     /**
-     * Updates the {@link ManagedMediaSource} in {@link DynamicConcatenatingMediaSource}
+     * Updates the {@link ManagedMediaSource} in {@link ConcatenatingMediaSource}
      * at the given index with a given {@link ManagedMediaSource}. If the index is out of bound,
      * then the replacement is ignored.
-     * @see DynamicConcatenatingMediaSource#addMediaSource
+     * @see ConcatenatingMediaSource#addMediaSource
-     * @see DynamicConcatenatingMediaSource#removeMediaSource(int, Runnable)
+     * @see ConcatenatingMediaSource#removeMediaSource(int, Runnable)
      * */
     public synchronized void update(final int index, @NonNull final ManagedMediaSource source,
                                     @Nullable final Runnable finalizingAction) {

app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java

@@ -3,20 +3,19 @@ package org.schabi.newpipe.player.mediasource;
 import android.support.annotation.NonNull;
 
 import com.google.android.exoplayer2.ExoPlayer;
+import com.google.android.exoplayer2.source.BaseMediaSource;
 import com.google.android.exoplayer2.source.MediaPeriod;
 import com.google.android.exoplayer2.upstream.Allocator;
 
 import org.schabi.newpipe.player.playqueue.PlayQueueItem;
 
-import java.io.IOException;
+public class PlaceholderMediaSource extends BaseMediaSource implements ManagedMediaSource {
-
-public class PlaceholderMediaSource implements ManagedMediaSource {
     // Do nothing, so this will stall the playback
-    @Override public void prepareSource(ExoPlayer player, boolean isTopLevelSource, Listener listener) {}
+    @Override public void maybeThrowSourceInfoRefreshError() {}
-    @Override public void maybeThrowSourceInfoRefreshError() throws IOException {}
     @Override public MediaPeriod createPeriod(MediaPeriodId id, Allocator allocator) { return null; }
     @Override public void releasePeriod(MediaPeriod mediaPeriod) {}
-    @Override public void releaseSource() {}
+    @Override protected void prepareSourceInternal(ExoPlayer player, boolean isTopLevelSource) {}
+    @Override protected void releaseSourceInternal() {}
 
     @Override
     public boolean shouldBeReplacedWith(@NonNull PlayQueueItem newIdentity,

app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java

@@ -172,7 +172,6 @@ public class MediaSourceManager {
         playQueueReactor.cancel();
         loaderReactor.dispose();
         syncReactor.dispose();
-        playlist.dispose();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -481,8 +480,6 @@ public class MediaSourceManager {
 
     private void resetSources() {
         if (DEBUG) Log.d(TAG, "resetSources() called.");
-
-        playlist.dispose();
         playlist = new ManagedMediaSourcePlaylist();
     }