1
0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2024-12-23 08:30:44 +00:00

Merge pull request #4246 from avently/preloading

Disabled preloading when switching streams
This commit is contained in:
Tobias Groza 2020-09-25 21:22:31 +02:00 committed by GitHub
commit e0f02d4080
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 0 deletions

View File

@ -958,6 +958,9 @@ public class VideoDetailFragment
return; return;
} }
setInitialData(sid, videoUrl, title, queue); setInitialData(sid, videoUrl, title, queue);
if (player != null) {
player.disablePreloadingOfCurrentTrack();
}
startLoading(false, true); startLoading(false, true);
} }

View File

@ -1410,6 +1410,11 @@ public abstract class BasePlayer implements
return currentMetadata; return currentMetadata;
} }
@NonNull
public LoadController getLoadController() {
return (LoadController) loadControl;
}
@NonNull @NonNull
public String getVideoUrl() { public String getVideoUrl() {
return currentMetadata == null return currentMetadata == null

View File

@ -1484,6 +1484,10 @@ public class VideoPlayerImpl extends VideoPlayer
} }
} }
public void disablePreloadingOfCurrentTrack() {
getLoadController().disablePreloadingOfCurrentTrack();
}
/** /**
* Measures width and height of controls visible on screen. * Measures width and height of controls visible on screen.
* It ensures that controls will be side-by-side with NavigationBar and notches * It ensures that controls will be side-by-side with NavigationBar and notches

View File

@ -13,6 +13,7 @@ public class LoadController implements LoadControl {
private final long initialPlaybackBufferUs; private final long initialPlaybackBufferUs;
private final LoadControl internalLoadControl; private final LoadControl internalLoadControl;
private boolean preloadingEnabled = true;
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
// Default Load Control // Default Load Control
@ -41,6 +42,7 @@ public class LoadController implements LoadControl {
@Override @Override
public void onPrepared() { public void onPrepared() {
preloadingEnabled = true;
internalLoadControl.onPrepared(); internalLoadControl.onPrepared();
} }
@ -52,11 +54,13 @@ public class LoadController implements LoadControl {
@Override @Override
public void onStopped() { public void onStopped() {
preloadingEnabled = true;
internalLoadControl.onStopped(); internalLoadControl.onStopped();
} }
@Override @Override
public void onReleased() { public void onReleased() {
preloadingEnabled = true;
internalLoadControl.onReleased(); internalLoadControl.onReleased();
} }
@ -78,6 +82,9 @@ public class LoadController implements LoadControl {
@Override @Override
public boolean shouldContinueLoading(final long bufferedDurationUs, public boolean shouldContinueLoading(final long bufferedDurationUs,
final float playbackSpeed) { final float playbackSpeed) {
if (!preloadingEnabled) {
return false;
}
return internalLoadControl.shouldContinueLoading(bufferedDurationUs, playbackSpeed); return internalLoadControl.shouldContinueLoading(bufferedDurationUs, playbackSpeed);
} }
@ -90,4 +97,8 @@ public class LoadController implements LoadControl {
.shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering); .shouldStartPlayback(bufferedDurationUs, playbackSpeed, rebuffering);
return isInitialPlaybackBufferFilled || isInternalStartingPlayback; return isInitialPlaybackBufferFilled || isInternalStartingPlayback;
} }
public void disablePreloadingOfCurrentTrack() {
preloadingEnabled = false;
}
} }