Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Merge pull request #13197 from TeamNewPipe/backport-13195-to-release-0.28.3

Browse source 
[Backport release-0.28.3] Fix 13139 resume playback
This commit is contained in:
Tobi 2026-02-05 08:27:48 -08:00 • committed by GitHub
commit 89c681886b
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/src/main/java/org/schabi/newpipe/player/Player.java
View file

@ -567,11 +567,7 @@ public final class Player implements PlaybackListener, Listener {
if (queueCache == null) { if (queueCache == null) {
return null; return null;
} }
final PlayQueue newQueue = SerializedCache.getInstance().take(queueCache, PlayQueue.class); return SerializedCache.getInstance().take(queueCache, PlayQueue.class);
if (newQueue == null) {
return null;
}
return newQueue;
} }
private void initUIsForCurrentPlayerType() { private void initUIsForCurrentPlayerType() {
@ -2041,7 +2037,7 @@ public final class Player implements PlaybackListener, Listener {
// resolver was called when the app was in background, the app will only stream audio when // resolver was called when the app was in background, the app will only stream audio when
// the user come back to the app and will never fetch the video stream. // the user come back to the app and will never fetch the video stream.
// Note that the video is not fetched when the app is in background because the video // Note that the video is not fetched when the app is in background because the video
// renderer is fully disabled (see useVideoSource method), except for HLS streams // renderer is fully disabled (see useVideoAndSubtitles method), except for HLS streams
// (see https://github.com/google/ExoPlayer/issues/9282). // (see https://github.com/google/ExoPlayer/issues/9282).
return videoResolver.resolve(info); return videoResolver.resolve(info);
} }
@ -2214,13 +2210,23 @@ public final class Player implements PlaybackListener, Listener {
isAudioOnly = !videoAndSubtitlesEnabled; isAudioOnly = !videoAndSubtitlesEnabled;
final var item = playQueue.getItem();
final boolean hasPendingRecovery =
item != null && item.getRecoveryPosition() != PlayQueueItem.RECOVERY_UNSET;
final boolean hasTimeline =
!exoPlayerIsNull() && !simpleExoPlayer.getCurrentTimeline().isEmpty();
getCurrentStreamInfo().ifPresentOrElse(info -> { getCurrentStreamInfo().ifPresentOrElse(info -> {
// In case we don't know the source type, fall back to either video-with-audio, or // In case we don't know the source type, fall back to either video-with-audio, or
// audio-only source type // audio-only source type
final SourceType sourceType = videoResolver.getStreamSourceType() final SourceType sourceType = videoResolver.getStreamSourceType()
.orElse(SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY); .orElse(SourceType.VIDEO_WITH_AUDIO_OR_AUDIO_ONLY);
setRecovery(); // making sure to save playback position before reloadPlayQueueManager() if (hasTimeline || !hasPendingRecovery) {
// making sure to save playback position before reloadPlayQueueManager()
setRecovery();
}
if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) { if (playQueueManagerReloadingNeeded(sourceType, info, getVideoRendererIndex())) {
reloadPlayQueueManager(); reloadPlayQueueManager();
@ -2233,7 +2239,10 @@ public final class Player implements PlaybackListener, Listener {
Reload the play queue manager in this case, which is the behavior when we don't know the Reload the play queue manager in this case, which is the behavior when we don't know the
index of the video renderer or playQueueManagerReloadingNeeded returns true index of the video renderer or playQueueManagerReloadingNeeded returns true
*/ */
setRecovery(); // making sure to save playback position before reloadPlayQueueManager() if (hasTimeline || !hasPendingRecovery) {
// making sure to save playback position before reloadPlayQueueManager()
setRecovery();
}
reloadPlayQueueManager(); reloadPlayQueueManager();
}); });