Skip to content

Commit 5739caa

Browse files
StypoxStypox
authored
Merge pull request #5856 from Redirion/exo213
Update to ExoPlayer 2.13.2
2 parents 73cfa54 + 83d1693 commit 5739caa

9 files changed

Lines changed: 50 additions & 59 deletions

File tree

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ ext {
100100
checkstyleVersion = '8.38'
101101
stethoVersion = '1.5.1'
102102
leakCanaryVersion = '2.5'
103-
exoPlayerVersion = '2.12.3'
103+
exoPlayerVersion = '2.13.2'
104104
androidxLifecycleVersion = '2.2.0'
105105
androidxRoomVersion = '2.3.0-alpha03'
106106
groupieVersion = '2.8.1'

‎app/src/main/java/org/schabi/newpipe/player/Player.java‎

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -489,10 +489,7 @@ private void initPlayer(final boolean playOnReady) {
489489
simpleExoPlayer.addTextOutput(binding.subtitleView);
490490

491491
// Setup audio session with onboard equalizer
492-
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
493-
trackSelector.setParameters(trackSelector.buildUponParameters()
494-
.setTunnelingAudioSessionId(C.generateAudioSessionIdV21(context)));
495-
}
492+
trackSelector.setParameters(trackSelector.buildUponParameters().setTunnelingEnabled(true));
496493
}
497494

498495
private void initListeners() {
@@ -624,10 +621,10 @@ public void handleIntent(@NonNull final Intent intent) {
624621
&& newQueue.getItem().getUrl().equals(playQueue.getItem().getUrl())
625622
&& newQueue.getItem().getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET) {
626623
// Player can have state = IDLE when playback is stopped or failed
627-
// and we should retry() in this case
624+
// and we should retry in this case
628625
if (simpleExoPlayer.getPlaybackState()
629626
== com.google.android.exoplayer2.Player.STATE_IDLE) {
630-
simpleExoPlayer.retry();
627+
simpleExoPlayer.prepare();
631628
}
632629
simpleExoPlayer.seekTo(playQueue.getIndex(), newQueue.getItem().getRecoveryPosition());
633630
simpleExoPlayer.setPlayWhenReady(playWhenReady);
@@ -638,10 +635,10 @@ public void handleIntent(@NonNull final Intent intent) {
638635
&& !playQueue.isDisposed()) {
639636
// Do not re-init the same PlayQueue. Save time
640637
// Player can have state = IDLE when playback is stopped or failed
641-
// and we should retry() in this case
638+
// and we should retry in this case
642639
if (simpleExoPlayer.getPlaybackState()
643640
== com.google.android.exoplayer2.Player.STATE_IDLE) {
644-
simpleExoPlayer.retry();
641+
simpleExoPlayer.prepare();
645642
}
646643
simpleExoPlayer.setPlayWhenReady(playWhenReady);
647644

@@ -1649,7 +1646,7 @@ public void onStartTrackingTouch(final SeekBar seekBar) {
16491646

16501647
saveWasPlaying();
16511648
if (isPlaying()) {
1652-
simpleExoPlayer.setPlayWhenReady(false);
1649+
simpleExoPlayer.pause();
16531650
}
16541651

16551652
showControls(0);
@@ -1665,7 +1662,7 @@ public void onStopTrackingTouch(final SeekBar seekBar) {
16651662

16661663
seekTo(seekBar.getProgress());
16671664
if (wasPlaying || simpleExoPlayer.getDuration() == seekBar.getProgress()) {
1668-
simpleExoPlayer.setPlayWhenReady(true);
1665+
simpleExoPlayer.play();
16691666
}
16701667

16711668
binding.playbackCurrentTime.setText(getTimeString(seekBar.getProgress()));
@@ -1908,7 +1905,7 @@ public void onPlayerStateChanged(final boolean playWhenReady, final int playback
19081905
}
19091906

19101907
@Override // exoplayer listener
1911-
public void onLoadingChanged(final boolean isLoading) {
1908+
public void onIsLoadingChanged(final boolean isLoading) {
19121909
if (DEBUG) {
19131910
Log.d(TAG, "ExoPlayer - onLoadingChanged() called with: "
19141911
+ "isLoading = [" + isLoading + "]");
@@ -1952,7 +1949,8 @@ public void onPlaybackUnblock(final MediaSource mediaSource) {
19521949
if (currentState == STATE_BLOCKED) {
19531950
changeState(STATE_BUFFERING);
19541951
}
1955-
simpleExoPlayer.prepare(mediaSource);
1952+
simpleExoPlayer.setMediaSource(mediaSource);
1953+
simpleExoPlayer.prepare();
19561954
}
19571955

19581956
public void changeState(final int state) {
@@ -2351,6 +2349,12 @@ public void onPositionDiscontinuity(@DiscontinuityReason final int discontinuity
23512349
break;
23522350
}
23532351
case DISCONTINUITY_REASON_SEEK:
2352+
if (DEBUG) {
2353+
Log.d(TAG, "ExoPlayer - onSeekProcessed() called");
2354+
}
2355+
if (isPrepared) {
2356+
saveStreamProgressState();
2357+
}
23542358
case DISCONTINUITY_REASON_SEEK_ADJUSTMENT:
23552359
case DISCONTINUITY_REASON_INTERNAL:
23562360
if (playQueue.getIndex() != newWindowIndex) {
@@ -2415,10 +2419,8 @@ public void onPlayerError(@NonNull final ExoPlaybackException error) {
24152419
setRecovery();
24162420
reloadPlayQueueManager();
24172421
break;
2418-
case ExoPlaybackException.TYPE_OUT_OF_MEMORY:
24192422
case ExoPlaybackException.TYPE_REMOTE:
24202423
case ExoPlaybackException.TYPE_RENDERER:
2421-
case ExoPlaybackException.TYPE_TIMEOUT:
24222424
default:
24232425
showUnrecoverableError(error);
24242426
onPlaybackShutdown();
@@ -2623,16 +2625,6 @@ public void seekToDefault() {
26232625
simpleExoPlayer.seekToDefaultPosition();
26242626
}
26252627
}
2626-
2627-
@Override // exoplayer override
2628-
public void onSeekProcessed() {
2629-
if (DEBUG) {
2630-
Log.d(TAG, "ExoPlayer - onSeekProcessed() called");
2631-
}
2632-
if (isPrepared) {
2633-
saveStreamProgressState();
2634-
}
2635-
}
26362628
//endregion
26372629

26382630

@@ -2660,7 +2652,7 @@ public void play() {
26602652
}
26612653
}
26622654

2663-
simpleExoPlayer.setPlayWhenReady(true);
2655+
simpleExoPlayer.play();
26642656
saveStreamProgressState();
26652657
}
26662658

@@ -2673,7 +2665,7 @@ public void pause() {
26732665
}
26742666

26752667
audioReactor.abandonAudioFocus();
2676-
simpleExoPlayer.setPlayWhenReady(false);
2668+
simpleExoPlayer.pause();
26772669
saveStreamProgressState();
26782670
}
26792671

‎app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@ private void onAudioFocusGain() {
103103
animateAudio(DUCK_AUDIO_TO, 1.0f);
104104

105105
if (PlayerHelper.isResumeAfterAudioFocusGain(context)) {
106-
player.setPlayWhenReady(true);
106+
player.play();
107107
}
108108
}
109109

110110
private void onAudioFocusLoss() {
111111
Log.d(TAG, "onAudioFocusLoss() called");
112-
player.setPlayWhenReady(false);
112+
player.pause();
113113
}
114114

115115
private void onAudioFocusLossCanDuck() {
@@ -148,7 +148,7 @@ public void onAnimationEnd(final Animator animation) {
148148
//////////////////////////////////////////////////////////////////////////*/
149149

150150
@Override
151-
public void onAudioSessionId(final EventTime eventTime, final int audioSessionId) {
151+
public void onAudioSessionIdChanged(final EventTime eventTime, final int audioSessionId) {
152152
if (!PlayerHelper.isUsingDSP()) {
153153
return;
154154
}

‎app/src/main/java/org/schabi/newpipe/player/helper/LoadController.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import com.google.android.exoplayer2.LoadControl;
55
import com.google.android.exoplayer2.Renderer;
66
import com.google.android.exoplayer2.source.TrackGroupArray;
7-
import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
7+
import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
88
import com.google.android.exoplayer2.upstream.Allocator;
99

1010
public class LoadController implements LoadControl {
@@ -33,7 +33,7 @@ private LoadController(final int initialPlaybackBufferMs,
3333
final DefaultLoadControl.Builder builder = new DefaultLoadControl.Builder();
3434
builder.setBufferDurationsMs(minimumPlaybackBufferMs, optimalPlaybackBufferMs,
3535
initialPlaybackBufferMs, initialPlaybackBufferMs);
36-
internalLoadControl = builder.createDefaultLoadControl();
36+
internalLoadControl = builder.build();
3737
}
3838

3939
/*//////////////////////////////////////////////////////////////////////////
@@ -47,9 +47,9 @@ public void onPrepared() {
4747
}
4848

4949
@Override
50-
public void onTracksSelected(final Renderer[] renderers, final TrackGroupArray trackGroupArray,
51-
final TrackSelectionArray trackSelectionArray) {
52-
internalLoadControl.onTracksSelected(renderers, trackGroupArray, trackSelectionArray);
50+
public void onTracksSelected(final Renderer[] renderers, final TrackGroupArray trackGroups,
51+
final ExoTrackSelection[] trackSelections) {
52+
internalLoadControl.onTracksSelected(renderers, trackGroups, trackSelections);
5353
}
5454

5555
@Override
@@ -92,11 +92,12 @@ public boolean shouldContinueLoading(final long playbackPositionUs,
9292

9393
@Override
9494
public boolean shouldStartPlayback(final long bufferedDurationUs, final float playbackSpeed,
95-
final boolean rebuffering) {
95+
final boolean rebuffering, final long targetLiveOffsetUs) {
9696
final boolean isInitialPlaybackBufferFilled
9797
= bufferedDurationUs >= this.initialPlaybackBufferUs * playbackSpeed;
9898
final boolean isInternalStartingPlayback = internalLoadControl
99-
.shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering);
99+
.shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering,
100+
targetLiveOffsetUs);
100101
return isInitialPlaybackBufferFilled || isInternalStartingPlayback;
101102
}
102103

‎app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public MediaSessionManager(@NonNull final Context context,
3636
@NonNull final Player player,
3737
@NonNull final MediaSessionCallback callback) {
3838
mediaSession = new MediaSessionCompat(context, TAG);
39-
mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
40-
| MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS);
4139
mediaSession.setActive(true);
4240

4341
mediaSession.setPlaybackState(new PlaybackStateCompat.Builder()

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import com.google.android.exoplayer2.SeekParameters;
2424
import com.google.android.exoplayer2.text.CaptionStyleCompat;
2525
import com.google.android.exoplayer2.trackselection.AdaptiveTrackSelection;
26-
import com.google.android.exoplayer2.trackselection.TrackSelection;
26+
import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
2727
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout;
2828
import com.google.android.exoplayer2.ui.AspectRatioFrameLayout.ResizeMode;
2929
import com.google.android.exoplayer2.util.MimeTypes;
@@ -323,7 +323,7 @@ public static int getPlaybackOptimalBufferMs() {
323323
return 60000;
324324
}
325325

326-
public static TrackSelection.Factory getQualitySelector() {
326+
public static ExoTrackSelection.Factory getQualitySelector() {
327327
return new AdaptiveTrackSelection.Factory(
328328
1000,
329329
AdaptiveTrackSelection.DEFAULT_MAX_DURATION_FOR_QUALITY_DECREASE_MS,

‎app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.google.android.exoplayer2.source.TrackGroup;
1414
import com.google.android.exoplayer2.source.TrackGroupArray;
1515
import com.google.android.exoplayer2.trackselection.DefaultTrackSelector;
16-
import com.google.android.exoplayer2.trackselection.TrackSelection;
16+
import com.google.android.exoplayer2.trackselection.ExoTrackSelection;
1717
import com.google.android.exoplayer2.util.Assertions;
1818

1919
/**
@@ -28,7 +28,7 @@ public class CustomTrackSelector extends DefaultTrackSelector {
2828
private String preferredTextLanguage;
2929

3030
public CustomTrackSelector(final Context context,
31-
final TrackSelection.Factory adaptiveTrackSelectionFactory) {
31+
final ExoTrackSelection.Factory adaptiveTrackSelectionFactory) {
3232
super(context, adaptiveTrackSelectionFactory);
3333
}
3434

@@ -50,7 +50,7 @@ public void setPreferredTextLanguage(@NonNull final String label) {
5050

5151
@Override
5252
@Nullable
53-
protected Pair<TrackSelection.Definition, TextTrackScore> selectTextTrack(
53+
protected Pair<ExoTrackSelection.Definition, TextTrackScore> selectTextTrack(
5454
final TrackGroupArray groups,
5555
@NonNull final int[][] formatSupport,
5656
@NonNull final Parameters params,
@@ -86,7 +86,7 @@ protected Pair<TrackSelection.Definition, TextTrackScore> selectTextTrack(
8686
}
8787
}
8888
return selectedGroup == null ? null
89-
: Pair.create(new TrackSelection.Definition(selectedGroup, selectedTrackIndex),
89+
: Pair.create(new ExoTrackSelection.Definition(selectedGroup, selectedTrackIndex),
9090
Assertions.checkNotNull(selectedTrackScore));
9191
}
9292
}

‎app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import androidx.annotation.Nullable;
88

99
import com.google.android.exoplayer2.C;
10+
import com.google.android.exoplayer2.MediaItem;
1011
import com.google.android.exoplayer2.source.MediaSource;
1112
import com.google.android.exoplayer2.util.Util;
1213

@@ -43,13 +44,13 @@ default MediaSource buildLiveMediaSource(@NonNull final PlayerDataSource dataSou
4344
switch (type) {
4445
case C.TYPE_SS:
4546
return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
46-
.createMediaSource(uri);
47+
.createMediaSource(MediaItem.fromUri(uri));
4748
case C.TYPE_DASH:
4849
return dataSource.getLiveDashMediaSourceFactory().setTag(metadata)
49-
.createMediaSource(uri);
50+
.createMediaSource(MediaItem.fromUri(uri));
5051
case C.TYPE_HLS:
5152
return dataSource.getLiveHlsMediaSourceFactory().setTag(metadata)
52-
.createMediaSource(uri);
53+
.createMediaSource(MediaItem.fromUri(uri));
5354
default:
5455
throw new IllegalStateException("Unsupported type: " + type);
5556
}
@@ -68,16 +69,16 @@ default MediaSource buildMediaSource(@NonNull final PlayerDataSource dataSource,
6869
switch (type) {
6970
case C.TYPE_SS:
7071
return dataSource.getLiveSsMediaSourceFactory().setTag(metadata)
71-
.createMediaSource(uri);
72+
.createMediaSource(MediaItem.fromUri(uri));
7273
case C.TYPE_DASH:
7374
return dataSource.getDashMediaSourceFactory().setTag(metadata)
74-
.createMediaSource(uri);
75+
.createMediaSource(MediaItem.fromUri(uri));
7576
case C.TYPE_HLS:
7677
return dataSource.getHlsMediaSourceFactory().setTag(metadata)
77-
.createMediaSource(uri);
78+
.createMediaSource(MediaItem.fromUri(uri));
7879
case C.TYPE_OTHER:
7980
return dataSource.getExtractorMediaSourceFactory(cacheKey).setTag(metadata)
80-
.createMediaSource(uri);
81+
.createMediaSource(MediaItem.fromUri(uri));
8182
default:
8283
throw new IllegalStateException("Unsupported type: " + type);
8384
}

‎app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import androidx.annotation.NonNull;
77
import androidx.annotation.Nullable;
88

9-
import com.google.android.exoplayer2.Format;
9+
import com.google.android.exoplayer2.MediaItem;
1010
import com.google.android.exoplayer2.source.MediaSource;
1111
import com.google.android.exoplayer2.source.MergingMediaSource;
1212

@@ -22,7 +22,6 @@
2222
import java.util.ArrayList;
2323
import java.util.List;
2424

25-
import static com.google.android.exoplayer2.C.SELECTION_FLAG_AUTOSELECT;
2625
import static com.google.android.exoplayer2.C.TIME_UNSET;
2726

2827
public class VideoPlaybackResolver implements PlaybackResolver {
@@ -101,12 +100,12 @@ public MediaSource resolve(@NonNull final StreamInfo info) {
101100
if (mimeType == null) {
102101
continue;
103102
}
104-
105-
final Format textFormat = Format.createTextSampleFormat(null, mimeType,
106-
SELECTION_FLAG_AUTOSELECT,
107-
PlayerHelper.captionLanguageOf(context, subtitle));
108103
final MediaSource textSource = dataSource.getSampleMediaSourceFactory()
109-
.createMediaSource(Uri.parse(subtitle.getUrl()), textFormat, TIME_UNSET);
104+
.createMediaSource(
105+
new MediaItem.Subtitle(Uri.parse(subtitle.getUrl()),
106+
mimeType,
107+
PlayerHelper.captionLanguageOf(context, subtitle)),
108+
TIME_UNSET);
110109
mediaSources.add(textSource);
111110
}
112111
}

0 commit comments

Comments
 (0)