various embed tweaks

embed/wrappers/html5.js

@@ -95,11 +95,15 @@ p.prototype.build = function (options) {
     else { ele.pause(); }
   };
   
-  if (options.live) {
-    ele.addEventListener('error',function(e){
+  this.addlog('Built html');
+  
+  //forward events
+  ele.addEventListener('error',function(e){
+    
+    if (options.live) {
       if ((ele.error) && (ele.error.code == 3)) {
-        e.stopPropagation();
-        ele.load();
+        e.stopPropagation(); //dont let this error continue to prevent the core from trying to handle the error
+        me.load();
         me.cancelAskNextCombo();
         e.message = 'Handled decoding error';
         me.addlog('Decoding error: reloading..');
@@ -107,18 +111,19 @@ p.prototype.build = function (options) {
           type: 'playback',
           warn: 'A decoding error was encountered, but handled'
         });
+        return;
       }
-    },true);
-  }
-  
-  this.addlog('Built html');
-  
-  //forward events
-  ele.addEventListener('error',function(e){
+    }
+    
     var msg;
     if ('message' in e) {
       msg = e.message;
     }
+    else if ((e.target.tagName == 'SOURCE') && (e.target.getAttribute('src') == '')) {
+      e.stopPropagation();
+      //this error is triggered because the unload function was fired
+      return;
+    }
     else {
       msg = 'readyState: ';
       switch (me.element.readyState) {
@@ -155,12 +160,12 @@ p.prototype.build = function (options) {
       }
     }
     me.adderror(msg);
-  },true);
+  });
   var events = ['abort','canplay','canplaythrough','durationchange','emptied','ended','interruptbegin','interruptend','loadeddata','loadedmetadata','loadstart','pause','play','playing','ratechange','seeked','seeking','stalled','volumechange','waiting','progress'];
   for (var i in events) {
     ele.addEventListener(events[i],function(e){
       me.addlog('Player event fired: '+e.type);
-    },true);
+    });
   }
   return cont;
 }
@@ -176,7 +181,32 @@ p.prototype.loop = function(bool){
   }
   return this.element.loop = bool;
 };
-p.prototype.load = function(){ return this.element.load(); };
+p.prototype.load = function(){
+  var load;
+  if (this.element.paused) {
+    load = this.element.load();
+  }
+  else {
+    //sometimes there is a play / pause interrupt: try again
+    //TODO figure out if this happens on paused or on playing
+    this.load();
+    return;
+  }
+  
+  //this helps to prevent the player from just showing a black screen after a reload
+  if (this.element.paused) {
+    var me = this;
+    var unpause = function(){
+      if (me.element.paused) {
+        me.element.play();
+      }
+      me.element.removeEventListener('progress',unpause);
+    }
+    this.element.addEventListener('progress',unpause);
+  }
+
+  return load;
+};
 if (document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled || document.msFullscreenEnabled) {
   p.prototype.fullscreen = function(){
     if(this.element.requestFullscreen) {

embed/wrappers/videojs.js

@@ -6,15 +6,30 @@ mistplayers.videojs = {
     return (this.mimes.indexOf(mimetype) == -1 ? false : true);
   },
   isBrowserSupported: function (mimetype,source,options,streaminfo,logfunc) {
+    
+    //dont use https if the player is loaded over http
     if ((options.host.substr(0,7) == 'http://') && (source.url.substr(0,8) == 'https://')) {
       if (logfunc) { logfunc('HTTP/HTTPS mismatch for this source'); }
       return false;
     }
-    var support = true;
+    
+    //dont use videojs if this location is loaded over file://
     if ((location.protocol == 'file:') && (mimetype == 'html5/application/vnd.apple.mpegurl')) {
       if (logfunc) { logfunc('This source ('+mimetype+') won\'t work if the page is run via file://'); }
       return false;
     }
+    
+    //dont use HLS if there is an MP3 audio track, unless we're on apple or edge
+    if ((mimetype == 'html5/application/vnd.apple.mpegurl') && (['iPad','iPhone','iPod','MacIntel'].indexOf(navigator.platform) == -1) && (navigator.userAgent.indexOf('Edge') == -1)) {
+      for (var i in streaminfo.meta.tracks) {
+        var t = streaminfo.meta.tracks[i];
+        if (t.codec == 'MP3') {
+          return false;
+        }
+      }
+    }
+    
+    
     return ('MediaSource' in window);
   },
   player: function(){},