hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Embed: more fixes to do with showing the correct seek window in the progress bar

Browse source 
Embed: display more consistent timestamps across protocols and correctly show seekable range
Embed: fix: don't force nonexistent forcePlayer value
Embed: when info.unixoffset is known, display clock time based timestamps
This commit is contained in:
Cat 2021-10-20 13:46:10 +02:00 • committed by Thulinma
parent c542155e10
commit 67d992e352
12 changed files with 178 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

13
embed/wrappers/html5.js
View file

@ -195,6 +195,7 @@ p.prototype.build = function (MistVideo,callback) {
MistVideo.player.api.setSource(MistUtil.http.url.addParam(MistVideo.source.url,params));
}
MistUtil.event.addListener(video,"progress",function(){
MistVideo.player.api.lastProgress = new Date();
});
@ -217,9 +218,21 @@ p.prototype.build = function (MistVideo,callback) {
};
if (MistVideo.source.type == "html5/video/mp4") {
var otherdurationoverride = overrides.get.duration;
overrides.get.duration = function(){
return otherdurationoverride.apply(this,arguments) - MistVideo.player.api.liveOffset + MistVideo.info.lastms * 1e-3;
}
overrides.get.currentTime = function(){
return this.currentTime - MistVideo.player.api.liveOffset + MistVideo.info.lastms * 1e-3;
}
overrides.get.buffered = function(){
var video = this;
return {
length: video.buffered.length,
start: function(i) { return video.buffered.start(i) - MistVideo.player.api.liveOffset + MistVideo.info.lastms * 1e-3; },
end: function(i) { return video.buffered.end(i) - MistVideo.player.api.liveOffset + MistVideo.info.lastms * 1e-3; }
}
};
}
}
else {

4
embed/wrappers/mews.js
View file

@ -1067,7 +1067,7 @@ p.prototype.build = function (MistVideo,callback) {
}
});
//override duration
var lastduration = 1;
var lastduration = Infinity;
Object.defineProperty(this.api,"duration",{
get: function(){
return lastduration;
@ -1079,7 +1079,7 @@ p.prototype.build = function (MistVideo,callback) {
},
set: function(value){
var f = function(msg){
video.playbackRate = msg.data.play_rate;
video.playbackRate = msg.data.play_rate_curr;
};
player.ws.addListener("set_speed",f);
send({type: "set_speed", play_rate: (value == 1 ? "auto" : value)});

26
embed/wrappers/videojs.js
View file

@ -100,6 +100,14 @@ p.prototype.build = function (MistVideo,callback) {
MistVideo.log("Building videojs");
me.videojs = videojs(ele,vjsopts,function(){
MistVideo.log("Videojs initialized");
if (MistVideo.info.type == "live") {
//overwrite the stream info's buffer window to the seekable range as indicated by the m3u8
MistUtil.event.addListener(ele,"progress",function(e){
var i = MistVideo.player.videojs.seekable().length-1;
MistVideo.info.meta.buffer_window = (Math.max(MistVideo.player.videojs.seekable().end(i),ele.duration) - MistVideo.player.videojs.seekable().start(i))*1e3;
});
}
});
MistUtil.event.addListener(ele,"error",function(e){
@ -160,6 +168,7 @@ p.prototype.build = function (MistVideo,callback) {
};
if (MistVideo.info.type == "live") {
function getLastBuffer(video) {
var buffer_end = 0;
if (video.buffered.length) {
@ -171,8 +180,7 @@ p.prototype.build = function (MistVideo,callback) {
overrides.get.duration = function(){
if (MistVideo.info) {
var duration = (MistVideo.info.lastms + (new Date()).getTime() - MistVideo.info.updated.getTime())*1e-3;
//if (isNaN(duration)) { return 1e9; }
var duration = ele.duration;
return duration;
}
return 0;
@ -186,19 +194,25 @@ p.prototype.build = function (MistVideo,callback) {
overrides.set.currentTime = function(value){
var diff = MistVideo.player.api.currentTime - value;
var offset = value - MistVideo.player.api.duration;
//MistVideo.player.api.liveOffset = offset;
MistVideo.log("Seeking to "+MistUtil.format.time(value)+" ("+Math.round(offset*-10)/10+"s from live)");
//MistVideo.video.currentTime -= diff;
MistVideo.player.videojs.currentTime(MistVideo.video.currentTime - diff); //seeking backwards does not work if we set it on the video directly
MistVideo.player.videojs.currentTime(MistVideo.video.currentTime - diff);
}
var lastms = 0;
overrides.get.currentTime = function(){
if (MistVideo.info) { lastms = MistVideo.info.lastms*1e-3; }
var time = this.currentTime + lastms - MistVideo.player.api.liveOffset - HLSlatency;
var time = MistVideo.player.videojs ? MistVideo.player.videojs.currentTime() : ele.currentTime;
if (isNaN(time)) { return 0; }
return time;
}
overrides.get.buffered = function(){
var buffered = MistVideo.player.videojs ? MistVideo.player.videojs.buffered() : ele.buffered;
return {
length: buffered.length,
start: function(i) { return buffered.start(i); },
end: function(i) { return buffered.end(i); i}
}
};
}
}
else {

2
embed/wrappers/webrtc.js
View file

@ -129,6 +129,8 @@ p.prototype.build = function (MistVideo,callback) {
duration = d;
MistUtil.event.send("durationchange",d,video);
}
MistVideo.info.meta.buffer_window = ev.end - ev.begin;
if ((ev.tracks) && (currenttracks != ev.tracks)) {
var tracks = MistVideo.info ? MistUtil.tracks.parse(MistVideo.info.meta.tracks) : [];