Merge remote-tracking branch 'dailymotion/master'

.jshintrc

@@ -24,6 +24,7 @@
   "globals"   : {
     "console"     : true,
     "MediaSource" : true,
-    "performance" : true
+    "performance" : true,
+    "crypto"      : true
   }
 }

API.md

@@ -339,7 +339,7 @@ This allows user to easily modify/setup XHR. see example below.
 
 ```js
 var config = {
-  xhrSetup: function(xhr) {
+  xhrSetup: function(xhr, url) {
     xhr.withCredentials = true; // do send cookies
   }
 }
@@ -366,7 +366,7 @@ calling this method will :
  - create MediaSource and set it as video source
  - once MediaSource object is successfully created, MSE_ATTACHED event will be fired.
 
-#### ```hls.detachVideo()```
+#### ```hls.detachMedia()```
 calling this method will :
 
  - unbind VideoElement from hls instance,

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "hls.js",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Media Source Extension - HLS library, by/for Dailymotion",
   "homepage": "https://github.com/dailymotion/hls.js",
   "authors": [

demo/index.html

@@ -202,12 +202,12 @@ <h4> Stats Display </h4>
    $('#metricsButtonWindow').toggle(windowSliding);
    $('#metricsButtonFixed').toggle(!windowSliding);
    $('#enableStream').click(function()      { enableStreaming = this.checked; loadStream($('#streamURL').val());});
-   $('#autoRecoverError').prop( "checked", false );
+   $('#autoRecoverError').prop( "checked", true );
    $('#autoRecoverError').click(function()  { autoRecoverError = this.checked; });
 });
 
   'use strict';
-  var hls,events, stats, enableStreaming = true, autoRecoverError = false;
+  var hls,events, stats, enableStreaming = true, autoRecoverError = true;
   var video = $('#video')[0];
   video.volume = 0.05;
 
@@ -242,6 +242,7 @@ <h4> Stats Display </h4>
 
       $("#HlsStatus").text('loading ' + url);
        events = { url : url, t0 : performance.now(), load : [], buffer : [], video : [], level : [], bitrate : []};
+       recoverDecodingErrorDate = null;
        hls = new Hls({debug:true});
        $("#HlsStatus").text('loading manifest and attaching video element...');
        hls.loadSource(url);
@@ -461,8 +462,14 @@ <h4> Stats Display </h4>
           switch(data.type) {
             case Hls.ErrorTypes.MEDIA_ERROR:
               if(autoRecoverError) {
-                $("#HlsStatus").append(",try to recover media Error ...");
-                hls.recoverMediaError();
+                var now = performance.now();
+                if(!recoverDecodingErrorDate || (now - recoverDecodingErrorDate) > 3000) {
+                  recoverDecodingErrorDate = performance.now();
+                  $("#HlsStatus").append(",try to recover media Error ...");
+                  hls.recoverMediaError();
+                } else {
+                  $("#HlsStatus").append(",cannot recover, last media error recovery failed ...");
+                }
               }
               break;
             case Hls.ErrorTypes.NETWORK_ERROR:
@@ -568,8 +575,14 @@ <h4> Stats Display </h4>
             case mediaError.MEDIA_ERR_DECODE:
               errorTxt = "The video playback was aborted due to a corruption problem or because the video used features your browser did not support";
               if(autoRecoverError) {
-                errorTxt+=",try to recover video Error";
-                hls.recoverMediaError();
+                var now = performance.now();
+                if(!recoverDecodingErrorDate || (now - recoverDecodingErrorDate) > 3000) {
+                  recoverDecodingErrorDate = performance.now();
+                  $("#HlsStatus").append(",try to recover media Error ...");
+                  hls.recoverMediaError();
+                } else {
+                  $("#HlsStatus").append(",cannot recover, last media error recovery failed ...");
+                }
               }
               break;
             case mediaError.MEDIA_ERR_NETWORK:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hls.js",
-  "version": "0.3.4",
+  "version": "0.3.5",
   "description": "Media Source Extension - HLS library, by/for Dailymotion",
   "homepage": "https://github.com/dailymotion/hls.js",
   "authors": "Guillaume du Pontavice <[email protected]>",

src/controller/level-controller.js

@@ -44,7 +44,7 @@ class LevelController {
       }
       var redundantLevelId = bitrateSet[level.bitrate];
       if (redundantLevelId === undefined) {
-        bitrateSet[level.bitrate] = levels.length;
+        bitrateSet[level.bitrate] = levels0.length;
         level.url = [level.url];
         level.urlId = 0;
         levels0.push(level);