Mirroristas/owncast
2
0
Fork 0
mirror of https://github.com/owncast/owncast.git synced 2024-10-10 19:16:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit seeking to live edge on play event to only if not previously playing.

Browse Source
This commit is contained in:
Gabe Kangas 2022-05-27 12:55:01 -07:00 committed by GitHub
parent 75309703e9
commit af1e786c99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
webroot/js/components/latencyCompensator.js
View File

@ -47,6 +47,7 @@ const STARTUP_WAIT_TIME = 10 * 1000; // The amount of time after we start up tha
class LatencyCompensator { class LatencyCompensator {
constructor(player) { constructor(player) {
this.player = player; this.player = player;
this.playing = false;
this.enabled = false; this.enabled = false;
this.running = false; this.running = false;
this.inTimeout = false; this.inTimeout = false;
@ -61,6 +62,7 @@ class LatencyCompensator {
this.clockSkewMs = 0; this.clockSkewMs = 0;
this.player.on('playing', this.handlePlaying.bind(this)); this.player.on('playing', this.handlePlaying.bind(this));
this.player.on('pause', this.handlePause.bind(this));
this.player.on('error', this.handleError.bind(this)); this.player.on('error', this.handleError.bind(this));
this.player.on('waiting', this.handleBuffering.bind(this)); this.player.on('waiting', this.handleBuffering.bind(this));
this.player.on('stalled', this.handleBuffering.bind(this)); this.player.on('stalled', this.handleBuffering.bind(this));
@ -274,6 +276,12 @@ class LatencyCompensator {
} }
shouldJumpToLive() { shouldJumpToLive() {
// If we've been rebuffering some recently then don't make it worse by
// jumping more into the future.
if (this.bufferingCounter > 1) {
return false;
}
const now = new Date().getTime(); const now = new Date().getTime();
const delta = now - this.lastJumpOccurred; const delta = now - this.lastJumpOccurred;
return delta > MAX_JUMP_FREQUENCY; return delta > MAX_JUMP_FREQUENCY;
@ -362,6 +370,9 @@ class LatencyCompensator {
} }
handlePlaying() { handlePlaying() {
const wasPreviouslyPlaying = this.playing;
this.playing = true;
clearTimeout(this.bufferingTimer); clearTimeout(this.bufferingTimer);
if (!this.enabled) { if (!this.enabled) {
return; return;
@ -371,11 +382,21 @@ class LatencyCompensator {
return; return;
} }
// Seek to live immediately on starting playback to handle any long-pause // If we were not previously playing (was paused, or this is a cold start)
// seek to live immediately on starting playback to handle any long-pause
// scenarios or somebody starting far back from the live edge. // scenarios or somebody starting far back from the live edge.
this.jumpingToLiveIgnoreBuffer = true; // If we were playing previously then that means we're probably coming back
this.player.liveTracker.seekToLiveEdge(); // from a rebuffering event, meaning we should not be adding more seeking
this.lastJumpOccurred = new Date(); // to the mix, just let it play.
if (!wasPreviouslyPlaying) {
this.jumpingToLiveIgnoreBuffer = true;
this.player.liveTracker.seekToLiveEdge();
this.lastJumpOccurred = new Date();
}
}
handlePause() {
this.playing = false;
} }
handleEnded() { handleEnded() {