level-controller: avoid LEVEL_SWITCH_ERROR reporting in case of setti…

…ng hls.loadLevel to -1
wuwx · Jul 9, 2015 · ccb9f03 · ccb9f03
1 parent 6759164
commit ccb9f03
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/controller/level-controller.js b/src/controller/level-controller.js
@@ -137,7 +137,9 @@
 
   set manualLevel(newLevel) {
     this._manualLevel = newLevel;
-    this.level = newLevel;
+    if(newLevel !==-1) {
+      this.level = newLevel;
+    }
   }
 
   /** Return the capping/max level value that could be used by automatic level selection algorithm **/
@@ -181,19 +183,21 @@
   }
 
   onError(event,data) {
+    var details = data.details,fatal=data.fatal;
     // try to recover not fatal errors
-    switch(data.details) {
+    switch(details) {
       case ErrorDetails.FRAG_LOAD_ERROR:
       case ErrorDetails.FRAG_LOAD_TIMEOUT:
-        if(!data.fatal) {
-          logger.log(`level controller,${data.details}: emergency switch-down for next fragment`);
+      case ErrorDetails.FRAG_LOOP_LOADING_ERROR:
+        if(!fatal) {
+          logger.log(`level controller,${details}: emergency switch-down for next fragment`);
           this.lastbw = 0;
           this.lastfetchduration = 0;
         }
         break;
       case ErrorDetails.LEVEL_LOAD_ERROR:
       case ErrorDetails.LEVEL_LOAD_TIMEOUT:
-        if(data.fatal) {
+        if(fatal) {
           this._level = undefined;
         }
         break;