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

Embed: videojs stability tweaks, videojs and dashjs updated

Browse source
This commit is contained in:
Cat 2021-05-05 10:35:05 +02:00 • committed by Thulinma
parent dee1495302
commit e96799d5ac
10 changed files with 41 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embed/min/player.js
View file

File diff suppressed because one or more lines are too long

2
embed/min/skins/default.css
View file

@ -62,7 +62,7 @@ svg.icon .stroke,svg.icon.stroke{stroke:$stroke;vector-effect:non-scaling-stroke
svg.icon.off .toggle .fill,svg.icon.off .toggle .semiFill,svg.icon.off .toggle.fill,svg.icon.off .toggle.semiFill{fill:none}
svg.icon .spin,svg.icon.spin{animation:mistvideo-spin 1.5s infinite linear;transform-origin:50% 50%}
.vjs-text-track-display{pointer-events:none}
.vjs-controls-disabled .vjs-control-bar,.vjs-error .vjs-control-bar,.vjs-hidden,.vjs-using-native-controls .vjs-control-bar{display:none!important}
.vjs-controls-disabled .vjs-control-bar,.vjs-error .vjs-control-bar,.vjs-error-display,.vjs-hidden,.vjs-using-native-controls .vjs-control-bar{display:none!important}
.vjs-controls-disabled .vjs-big-play-button,.vjs-controls-disabled .vjs-loading-spinner,.vjs-error .vjs-big-play-button,.vjs-has-started .vjs-big-play-button,.vjs-using-native-controls .vjs-big-play-button{display:none}
.mistvideo{line-height:1.2;font-size:14.5px}
.mistvideo svg{margin:2.5px}

2
embed/min/skins/dev.css
View file

@ -62,7 +62,7 @@ svg.icon .stroke,svg.icon.stroke{stroke:$stroke;vector-effect:non-scaling-stroke
svg.icon.off .toggle .fill,svg.icon.off .toggle .semiFill,svg.icon.off .toggle.fill,svg.icon.off .toggle.semiFill{fill:none}
svg.icon .spin,svg.icon.spin{animation:mistvideo-spin 1.5s infinite linear;transform-origin:50% 50%}
.vjs-text-track-display{pointer-events:none}
.vjs-controls-disabled .vjs-control-bar,.vjs-error .vjs-control-bar,.vjs-hidden,.vjs-using-native-controls .vjs-control-bar{display:none!important}
.vjs-controls-disabled .vjs-control-bar,.vjs-error .vjs-control-bar,.vjs-error-display,.vjs-hidden,.vjs-using-native-controls .vjs-control-bar{display:none!important}
.vjs-controls-disabled .vjs-big-play-button,.vjs-controls-disabled .vjs-loading-spinner,.vjs-error .vjs-big-play-button,.vjs-has-started .vjs-big-play-button,.vjs-using-native-controls .vjs-big-play-button{display:none}
.mistvideo{line-height:1.2;font-size:14.5px}
.mistvideo svg{margin:2.5px}

2
embed/min/wrappers/videojs.js
View file

File diff suppressed because one or more lines are too long

4
embed/players/dash.all.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
embed/players/update.sh
View file

@ -5,4 +5,4 @@ wget https://cdn.dashjs.org/latest/dash.all.min.js -O dash.all.min.js
echo "Videojs"
echo "You'll want to check for the latest version at https://videojs.com/getting-started/#download-cdn"
wget https://vjs.zencdn.net/7.6.6/video.min.js -O video.min.js
wget https://vjs.zencdn.net/7.8.4/video.min.js -O video.min.js

22
embed/players/video.min.js vendored
View file

File diff suppressed because one or more lines are too long

1
embed/skins/general.css
View file

@ -232,6 +232,7 @@ svg.icon.spin, svg.icon .spin {
.vjs-controls-disabled .vjs-control-bar,
.vjs-using-native-controls .vjs-control-bar,
.vjs-error .vjs-control-bar,
.vjs-error-display,
.vjs-hidden {
display: none !important;
}

2
embed/util.js
View file

@ -647,7 +647,7 @@ var MistUtil = {
this.list[src].subscribers.push(onevent.onerror);
//execute onload
if ("onload" in onevent) {
if (this.hasLoaded) {
if (this.list[src].tag.hasLoaded) {
onevent.onload();
}
else {

22
embed/wrappers/videojs.js
View file

@ -102,9 +102,21 @@ p.prototype.build = function (MistVideo,callback) {
MistVideo.log("Videojs initialized");
});
MistUtil.event.addListener(ele,"error",function(e){
if (e.target.error.message.indexOf("NS_ERROR_DOM_MEDIA_OVERFLOW_ERR") >= 0) {
//there is a problem with a certain segment, try reloading
MistVideo.timers.start(function(){
MistVideo.log("Reloading player because of NS_ERROR_DOM_MEDIA_OVERFLOW_ERR");
MistVideo.reload();
},1e3);
}
});
me.api.unload = function(){
if (me.videojs) {
videojs(ele).dispose();
me.videojs.autoplay(false); //don't play again ffs
me.videojs.pause(); //pause goddamn
me.videojs.dispose(); //and now die, bitch
me.videojs = false;
MistVideo.log("Videojs instance disposed");
}
@ -260,12 +272,12 @@ p.prototype.build = function (MistVideo,callback) {
var timer = false;
function reloadVJSrateLimited(){
try {
MistVideo.video.pause();
} catch (e) {}
MistVideo.showError("Error in videojs player");
//rate limit the reload
if (!window.mistplayer_videojs_failures) {
window.mistplayer_videojs_failures = 1;
@ -301,15 +313,17 @@ p.prototype.build = function (MistVideo,callback) {
};
window.addEventListener("error",f);
var old_console_error = console.error;
//disabled for now because it seemed to cause more issues than it solved
/*var old_console_error = console.error;
console.error = function(){
if (arguments[0] == "VIDEOJS:") {
if ((arguments.length > 3) && arguments[4] && (arguments[4].code == 3)) { return; } //it's a decoding error, nothing in videojs itself
//videojs reports an error
console.error = old_console_error;
reloadVJSrateLimited();
}
return old_console_error.apply(this,arguments);
};
};*/
scripttag = MistUtil.scripts.insert(scripturl,{
onerror: function(e){