Server-side sync tick syncs by tick delta, preventing video desync during server-slowdowns.
This commit is contained in:
parent
227458c517
commit
de392d8d57
1 changed files with 31 additions and 6 deletions
|
|
@ -57,11 +57,18 @@ class queue{
|
||||||
/**
|
/**
|
||||||
* Sync Delta in MS
|
* Sync Delta in MS
|
||||||
*/
|
*/
|
||||||
this.syncDelta = 1000;
|
this.syncDelay = 1000;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Epoch of last sync
|
||||||
|
*/
|
||||||
|
this.syncEpoch;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Current Timestamp in Media
|
* Current Timestamp in Media
|
||||||
*/
|
*/
|
||||||
this.timestamp = 0;
|
this.timestamp = 0;
|
||||||
|
|
||||||
//Delay between pre-switch function call and start of media
|
//Delay between pre-switch function call and start of media
|
||||||
//This should be enough time to do things like pre-fetch updated raw links from youtube
|
//This should be enough time to do things like pre-fetch updated raw links from youtube
|
||||||
/**
|
/**
|
||||||
|
|
@ -1193,7 +1200,7 @@ class queue{
|
||||||
clearTimeout(this.syncTimer);
|
clearTimeout(this.syncTimer);
|
||||||
|
|
||||||
//Kick off the sync timer
|
//Kick off the sync timer
|
||||||
this.syncTimer = setTimeout(this.sync.bind(this), this.syncDelta);
|
this.syncTimer = setTimeout(this.sync.bind(this), this.syncDelay);
|
||||||
|
|
||||||
//Setup the next video
|
//Setup the next video
|
||||||
this.refreshNextTimer();
|
this.refreshNextTimer();
|
||||||
|
|
@ -1207,6 +1214,21 @@ class queue{
|
||||||
* Called auto-magically by the Synchronization Timer
|
* Called auto-magically by the Synchronization Timer
|
||||||
*/
|
*/
|
||||||
sync(){
|
sync(){
|
||||||
|
//define sync delta
|
||||||
|
let syncDelta = 0;
|
||||||
|
|
||||||
|
//Get current time by epoch
|
||||||
|
const now = new Date().getTime();
|
||||||
|
|
||||||
|
//if this isnt the first sync call
|
||||||
|
if(this.syncEpoch != null && this.syncEpoch != 0){
|
||||||
|
//Get time between now and last sync tick
|
||||||
|
syncDelta = now - this.syncEpoch;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Increment the time stamp by delta between now and last sync tick
|
||||||
|
this.timestamp += (syncDelta / 1000);
|
||||||
|
|
||||||
//Send sync signal out to the channel
|
//Send sync signal out to the channel
|
||||||
this.server.io.in(this.channel.name).emit("sync", {timestamp: this.timestamp});
|
this.server.io.in(this.channel.name).emit("sync", {timestamp: this.timestamp});
|
||||||
|
|
||||||
|
|
@ -1218,11 +1240,8 @@ class queue{
|
||||||
|
|
||||||
//If the media has over a second to go
|
//If the media has over a second to go
|
||||||
if((this.timestamp + 1) < this.nowPlaying.duration){
|
if((this.timestamp + 1) < this.nowPlaying.duration){
|
||||||
//Increment the time stamp
|
|
||||||
this.timestamp += (this.syncDelta / 1000);
|
|
||||||
|
|
||||||
//Call the sync function in another second
|
//Call the sync function in another second
|
||||||
this.syncTimer = setTimeout(this.sync.bind(this), this.syncDelta);
|
this.syncTimer = setTimeout(this.sync.bind(this), this.syncDelay);
|
||||||
}else{
|
}else{
|
||||||
//Get leftover video length in ms
|
//Get leftover video length in ms
|
||||||
const leftover = (this.nowPlaying.duration - this.timestamp) * 1000;
|
const leftover = (this.nowPlaying.duration - this.timestamp) * 1000;
|
||||||
|
|
@ -1230,6 +1249,9 @@ class queue{
|
||||||
//Call the end function once the video is over
|
//Call the end function once the video is over
|
||||||
this.syncTimer = setTimeout(this.end.bind(this), leftover);
|
this.syncTimer = setTimeout(this.end.bind(this), leftover);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//Set sync epoch for the next go-around
|
||||||
|
this.syncEpoch = now;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1259,6 +1281,9 @@ class queue{
|
||||||
//Clear now playing
|
//Clear now playing
|
||||||
this.nowPlaying = null;
|
this.nowPlaying = null;
|
||||||
|
|
||||||
|
//Drop epoch timer like a bad habit
|
||||||
|
this.syncEpoch = null;
|
||||||
|
|
||||||
//Clear timestamp
|
//Clear timestamp
|
||||||
this.timestamp = 0;
|
this.timestamp = 0;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue