Merge pull request TeamNewPipe/NewPipe#5856 from Redirion/exo213

Update to ExoPlayer 2.13.2

app/build.gradle

@@ -100,7 +100,7 @@ ext {
     checkstyleVersion = '8.38'
     stethoVersion = '1.5.1'
     leakCanaryVersion = '2.5'
-    exoPlayerVersion = '2.12.3'
+    exoPlayerVersion = '2.13.2'
     androidxLifecycleVersion = '2.2.0'
     androidxRoomVersion = '2.3.0-alpha03'
     groupieVersion = '2.8.1'

app/src/main/java/org/schabi/newpipelegacy/player/Player.java

@@ -489,10 +489,7 @@ private void initPlayer(final boolean playOnReady) {
         simpleExoPlayer.addTextOutput(binding.subtitleView);
 
         // Setup audio session with onboard equalizer
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-            trackSelector.setParameters(trackSelector.buildUponParameters()
-                    .setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context)));
-        }
+        trackSelector.setParameters(trackSelector.buildUponParameters().setTunnelingEnabled(true));
     }
 
     private void initListeners() {
@@ -624,10 +621,10 @@ public void handleIntent(@NonNull final Intent intent) {
                 && newQueue.getItem().getUrl().equals(playQueue.getItem().getUrl())
                 && newQueue.getItem().getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
             // Player can have state = IDLE when playback is stopped or failed
-            // and we should retry() in this case
+            // and we should retry in this case
             if (simpleExoPlayer.getPlaybackState()
                     == com.google.android.exoplayer2.Player.STATE_IDLE) {
-                simpleExoPlayer.retry();
+                simpleExoPlayer.prepare();
             }
             simpleExoPlayer.seekTo(playQueue.getIndex(), newQueue.getItem().getRecoveryPosition());
             simpleExoPlayer.setPlayWhenReady(playWhenReady);
@@ -638,10 +635,10 @@ public void handleIntent(@NonNull final Intent intent) {
                 && !playQueue.isDisposed()) {
             // Do not re-init the same PlayQueue. Save time
             // Player can have state = IDLE when playback is stopped or failed
-            // and we should retry() in this case
+            // and we should retry in this case
             if (simpleExoPlayer.getPlaybackState()
                     == com.google.android.exoplayer2.Player.STATE_IDLE) {
-                simpleExoPlayer.retry();
+                simpleExoPlayer.prepare();
             }
             simpleExoPlayer.setPlayWhenReady(playWhenReady);
 
@@ -1649,7 +1646,7 @@ public void onStartTrackingTouch(final SeekBar seekBar) {
 
         saveWasPlaying();
         if (isPlaying()) {
-            simpleExoPlayer.setPlayWhenReady(false);
+            simpleExoPlayer.pause();
         }
 
         showControls(0);
@@ -1665,7 +1662,7 @@ public void onStopTrackingTouch(final SeekBar seekBar) {
 
         seekTo(seekBar.getProgress());
         if (wasPlaying || simpleExoPlayer.getDuration() == seekBar.getProgress()) {
-            simpleExoPlayer.setPlayWhenReady(true);
+            simpleExoPlayer.play();
         }
 
         binding.playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
@@ -1908,7 +1905,7 @@ public void onPlayerStateChanged(final boolean playWhenReady, final int playback
     }
 
     @Override // exoplayer listener
-    public void onLoadingChanged(final boolean isLoading) {
+    public void onIsLoadingChanged(final boolean isLoading) {
         if (DEBUG) {
             Log.d(TAG, "ExoPlayer - onLoadingChanged() called with: "
                     + "isLoading = [" + isLoading + "]");
@@ -1952,7 +1949,8 @@ public void onPlaybackUnblock(final MediaSource mediaSource) {
         if (currentState == STATE_BLOCKED) {
             changeState(STATE_BUFFERING);
         }
-        simpleExoPlayer.prepare(mediaSource);
+        simpleExoPlayer.setMediaSource(mediaSource);
+        simpleExoPlayer.prepare();
     }
 
     public void changeState(final int state) {
@@ -2351,6 +2349,12 @@ public void onPositionDiscontinuity(@DiscontinuityReason final int discontinuity
                     break;
                 }
             case DISCONTINUITY_REASON_SEEK:
+                if (DEBUG) {
+                    Log.d(TAG, "ExoPlayer - onSeekProcessed() called");
+                }
+                if (isPrepared) {
+                    saveStreamProgressState();
+                }
             case DISCONTINUITY_REASON_SEEK_ADJUSTMENT:
             case DISCONTINUITY_REASON_INTERNAL:
                 if (playQueue.getIndex() != newWindowIndex) {
@@ -2415,10 +2419,8 @@ public void onPlayerError(@NonNull final ExoPlaybackException error) {
                 setRecovery();
                 reloadPlayQueueManager();
                 break;
-            case ExoPlaybackException.TYPE_OUT_OF_MEMORY:
             case ExoPlaybackException.TYPE_REMOTE:
             case ExoPlaybackException.TYPE_RENDERER:
-            case ExoPlaybackException.TYPE_TIMEOUT:
             default:
                 showUnrecoverableError(error);
                 onPlaybackShutdown();
@@ -2623,16 +2625,6 @@ public void seekToDefault() {
             simpleExoPlayer.seekToDefaultPosition();
         }
     }
-
-    @Override // exoplayer override
-    public void onSeekProcessed() {
-        if (DEBUG) {
-            Log.d(TAG, "ExoPlayer - onSeekProcessed() called");
-        }
-        if (isPrepared) {
-            saveStreamProgressState();
-        }
-    }
     //endregion
 
 
@@ -2660,7 +2652,7 @@ public void play() {
             }
         }
 
-        simpleExoPlayer.setPlayWhenReady(true);
+        simpleExoPlayer.play();
         saveStreamProgressState();
     }
 
@@ -2673,7 +2665,7 @@ public void pause() {
         }
 
         audioReactor.abandonAudioFocus();
-        simpleExoPlayer.setPlayWhenReady(false);
+        simpleExoPlayer.pause();
         saveStreamProgressState();
     }
 

app/src/main/java/org/schabi/newpipelegacy/player/helper/AudioReactor.java

@@ -103,13 +103,13 @@ private void onAudioFocusGain() {
         animateAudio(DUCK_AUDIO_TO, 1.0f);
 
         if (PlayerHelper.isResumeAfterAudioFocusGain(context)) {
-            player.setPlayWhenReady(true);
+            player.play();
         }
     }
 
     private void onAudioFocusLoss() {
         Log.d(TAG, "onAudioFocusLoss() called");
-        player.setPlayWhenReady(false);
+        player.pause();
     }
 
     private void onAudioFocusLossCanDuck() {
@@ -148,7 +148,7 @@ public void onAnimationEnd(final Animator animation) {
     //////////////////////////////////////////////////////////////////////////*/
 
     @Override
-    public void onAudioSessionId(final EventTime eventTime, final int audioSessionId) {
+    public void onAudioSessionIdChanged(final EventTime eventTime, final int audioSessionId) {
         if (!PlayerHelper.isUsingDSP()) {
             return;
         }

app/src/main/java/org/schabi/newpipelegacy/player/helper/LoadController.java

@@ -4,7 +4,7 @@
 import com.google.android.exoplayer2.LoadControl;
 import com.google.android.exoplayer2.Renderer;
 import com.google.android.exoplayer2.source.TrackGroupArray;
-import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.upstream.Allocator;
 
 public class LoadController implements LoadControl {
@@ -33,7 +33,7 @@ private LoadController(final int initialPlaybackBufferMs,
         final DefaultLoadControl.Builder builder = new DefaultLoadControl.Builder();
         builder.setBufferDurationsMs(minimumPlaybackBufferMs, optimalPlaybackBufferMs,
                 initialPlaybackBufferMs, initialPlaybackBufferMs);
-        internalLoadControl = builder.createDefaultLoadControl();
+        internalLoadControl = builder.build();
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -47,9 +47,9 @@ public void onPrepared() {
     }
 
     @Override
-    public void onTracksSelected(final Renderer[] renderers, final TrackGroupArray trackGroupArray,
-                                 final TrackSelectionArray trackSelectionArray) {
-        internalLoadControl.onTracksSelected(renderers, trackGroupArray, trackSelectionArray);
+    public void onTracksSelected(final Renderer[] renderers, final TrackGroupArray trackGroups,
+                                 final ExoTrackSelection[] trackSelections) {
+        internalLoadControl.onTracksSelected(renderers, trackGroups, trackSelections);
     }
 
     @Override
@@ -92,11 +92,12 @@ public boolean shouldContinueLoading(final long playbackPositionUs,
 
     @Override
     public boolean shouldStartPlayback(final long bufferedDurationUs, final float playbackSpeed,
-                                       final boolean rebuffering) {
+                                       final boolean rebuffering, final long targetLiveOffsetUs) {
         final boolean isInitialPlaybackBufferFilled
                 = bufferedDurationUs >= this.initialPlaybackBufferUs * playbackSpeed;
         final boolean isInternalStartingPlayback = internalLoadControl
-                .shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering);
+                .shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering,
+                        targetLiveOffsetUs);
         return isInitialPlaybackBufferFilled || isInternalStartingPlayback;
     }
 

app/src/main/java/org/schabi/newpipelegacy/player/helper/MediaSessionManager.java

@@ -36,8 +36,6 @@ public MediaSessionManager(@NonNull final Context context,
                                @NonNull final Player player,
                                @NonNull final MediaSessionCallback callback) {
         mediaSession = new MediaSessionCompat(context, TAG);
-        mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
-                | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
         mediaSession.setActive(true);
 
         mediaSession.setPlaybackState(new PlaybackStateCompat.Builder()

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

@@ -23,7 +23,7 @@
 import com.google.android.exoplayer2.SeekParameters;
 import com.google.android.exoplayer2.text.CaptionStyleCompat;
 import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
 import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
 import com.google.android.exoplayer2.util.MimeTypes;
@@ -323,7 +323,7 @@ public static int getPlaybackOptimalBufferMs() {
         return 60000;
     }
 
-    public static TrackSelection.Factory getQualitySelector() {
+    public static ExoTrackSelection.Factory getQualitySelector() {
         return new AdaptiveTrackSelection.Factory(
                 1000,
                 AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,

app/src/main/java/org/schabi/newpipelegacy/player/playback/CustomTrackSelector.java

@@ -13,7 +13,7 @@
 import com.google.android.exoplayer2.source.TrackGroup;
 import com.google.android.exoplayer2.source.TrackGroupArray;
 import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
-import com.google.android.exoplayer2.trackselection.TrackSelection;
+import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
 import com.google.android.exoplayer2.util.Assertions;
 
 /**
@@ -28,7 +28,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
     private String preferredTextLanguage;
 
     public CustomTrackSelector(final Context context,
-                               final TrackSelection.Factory adaptiveTrackSelectionFactory) {
+                               final ExoTrackSelection.Factory adaptiveTrackSelectionFactory) {
         super(context, adaptiveTrackSelectionFactory);
     }
 
@@ -50,7 +50,7 @@ public void setPreferredTextLanguage(@NonNull final String label) {
 
     @Override
     @Nullable
-    protected Pair<TrackSelection.Definition, TextTrackScore> selectTextTrack(
+    protected Pair<ExoTrackSelection.Definition, TextTrackScore> selectTextTrack(
             final TrackGroupArray groups,
             @NonNull final int[][] formatSupport,
             @NonNull final Parameters params,
@@ -86,7 +86,7 @@ protected Pair<TrackSelection.Definition, TextTrackScore> selectTextTrack(
             }
         }
         return selectedGroup == null ? null
-                : Pair.create(new TrackSelection.Definition(selectedGroup, selectedTrackIndex),
+                : Pair.create(new ExoTrackSelection.Definition(selectedGroup, selectedTrackIndex),
                         Assertions.checkNotNull(selectedTrackScore));
     }
 }

app/src/main/java/org/schabi/newpipelegacy/player/resolver/PlaybackResolver.java

@@ -7,6 +7,7 @@
 import androidx.annotation.Nullable;
 
 import com.google.android.exoplayer2.C;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.util.Util;
 
@@ -43,13 +44,13 @@ default MediaSource buildLiveMediaSource(@NonNull final PlayerDataSource dataSou
         switch (type) {
             case C.TYPE_SS:
                 return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(uri);
+                        .createMediaSource(MediaItem.fromUri(uri));
             case C.TYPE_DASH:
                 return dataSource.getLiveDashMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(uri);
+                        .createMediaSource(MediaItem.fromUri(uri));
             case C.TYPE_HLS:
                 return dataSource.getLiveHlsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(uri);
+                        .createMediaSource(MediaItem.fromUri(uri));
             default:
                 throw new IllegalStateException("Unsupported type: " + type);
         }
@@ -68,16 +69,16 @@ default MediaSource buildMediaSource(@NonNull final PlayerDataSource dataSource,
         switch (type) {
             case C.TYPE_SS:
                 return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(uri);
+                        .createMediaSource(MediaItem.fromUri(uri));
             case C.TYPE_DASH:
                 return dataSource.getDashMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(uri);
+                        .createMediaSource(MediaItem.fromUri(uri));
             case C.TYPE_HLS:
                 return dataSource.getHlsMediaSourceFactory().setTag(metadata)
-                        .createMediaSource(uri);
+                        .createMediaSource(MediaItem.fromUri(uri));
             case C.TYPE_OTHER:
                 return dataSource.getExtractorMediaSourceFactory(cacheKey).setTag(metadata)
-                        .createMediaSource(uri);
+                        .createMediaSource(MediaItem.fromUri(uri));
             default:
                 throw new IllegalStateException("Unsupported type: " + type);
         }

app/src/main/java/org/schabi/newpipelegacy/player/resolver/VideoPlaybackResolver.java

@@ -6,7 +6,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.google.android.exoplayer2.Format;
+import com.google.android.exoplayer2.MediaItem;
 import com.google.android.exoplayer2.source.MediaSource;
 import com.google.android.exoplayer2.source.MergingMediaSource;
 
@@ -22,7 +22,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static com.google.android.exoplayer2.C.SELECTION_FLAG_AUTOSELECT;
 import static com.google.android.exoplayer2.C.TIME_UNSET;
 
 public class VideoPlaybackResolver implements PlaybackResolver {
@@ -101,12 +100,12 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
                 if (mimeType == null) {
                     continue;
                 }
-
-                final Format textFormat = Format.createTextSampleFormat(null, mimeType,
-                        SELECTION_FLAG_AUTOSELECT,
-                        PlayerHelper.captionLanguageOf(context, subtitle));
                 final MediaSource textSource = dataSource.getSampleMediaSourceFactory()
-                        .createMediaSource(Uri.parse(subtitle.getUrl()), textFormat, TIME_UNSET);
+                        .createMediaSource(
+                                new MediaItem.Subtitle(Uri.parse(subtitle.getUrl()),
+                                        mimeType,
+                                        PlayerHelper.captionLanguageOf(context, subtitle)),
+                                TIME_UNSET);
                 mediaSources.add(textSource);
             }
         }