Merge branch 'master' into feature/audio-track-fallback

dailymotion · May 10, 2018 · afd6579 · afd6579
2 parents 3fc7b77 + cc3046b
commit afd6579
Show file tree

Hide file tree

Showing 10 changed files with 795 additions and 1,152 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -67,7 +67,7 @@
     "chromedriver": "^2.38.3",
     "cross-env": "^5.0.2",
     "deep-strict-equal": "^0.2.0",
-    "esdoc": "^1.0.4",
+    "esdoc": "^1.1.0",
     "esdoc-standard-plugin": "^1.0.0",
     "eslint": "^4.13.1",
     "eslint-config-standard": "^11.0.0",

diff --git a/src/controller/abr-controller.js b/src/controller/abr-controller.js
@@ -34,6 +34,7 @@ class AbrController extends EventHandler {
     const frag = data.frag;
     if (frag.type === 'main') {
       if (!this.timer) {
+        this.fragCurrent = frag;
         this.timer = setInterval(this.onCheck, 100);
       }
 
@@ -55,8 +56,6 @@ class AbrController extends EventHandler {
         }
         this._bwEstimator = new EwmaBandWidthEstimator(hls, ewmaSlow, ewmaFast, config.abrEwmaDefaultEstimate);
       }
-
-      this.fragCurrent = frag;
     }
   }
 

diff --git a/src/controller/audio-stream-controller.js b/src/controller/audio-stream-controller.js
@@ -324,7 +324,7 @@ class AudioStreamController extends TaskLoop {
         }
         if (frag) {
           // logger.log('      loading frag ' + i +',pos/bufEnd:' + pos.toFixed(3) + '/' + bufferEnd.toFixed(3));
-          if (frag.decryptdata && (frag.decryptdata.uri != null) && (frag.decryptdata.key == null)) {
+          if (frag.encrypted) {
             logger.log(`Loading key for ${frag.sn} of [${trackDetails.startSN} ,${trackDetails.endSN}],track ${trackId}`);
             this.state = State.KEY_LOADING;
             hls.trigger(Event.KEY_LOADING, { frag: frag });

diff --git a/src/controller/fragment-tracker.js b/src/controller/fragment-tracker.js
@@ -232,8 +232,9 @@ export class FragmentTracker extends EventHandler {
    */
   onFragLoaded (e) {
     let fragment = e.frag;
-    // dont track initsegment (for which sn is not a number)
-    if (!isNaN(fragment.sn)) {
+    // don't track initsegment (for which sn is not a number)
+    // don't track frags used for bitrateTest, they're irrelevant.
+    if (!isNaN(fragment.sn) && !fragment.bitrateTest) {
       let fragKey = this.getFragmentKey(fragment);
       let fragmentEntity = {
         body: fragment,

diff --git a/src/controller/stream-controller.js b/src/controller/stream-controller.js
@@ -307,7 +307,13 @@ class StreamController extends TaskLoop {
     }
 
     if (frag) {
-      this._loadFragmentOrKey(frag, level, levelDetails, pos, bufferEnd);
+      if (frag.encrypted) {
+        logger.log(`Loading key for ${frag.sn} of [${levelDetails.startSN} ,${levelDetails.endSN}],level ${level}`);
+        this._loadKey(frag);
+      } else {
+        logger.log(`Loading ${frag.sn} of [${levelDetails.startSN} ,${levelDetails.endSN}],level ${level}, currentTime:${pos.toFixed(3)},bufferEnd:${bufferEnd.toFixed(3)}`);
+        this._loadFragment(frag);
+      }
     }
   }
 
@@ -523,41 +529,38 @@ class StreamController extends TaskLoop {
     return frag;
   }
 
-  _loadFragmentOrKey (frag, level, levelDetails, pos, bufferEnd) {
-    // logger.log('loading frag ' + i +',pos/bufEnd:' + pos.toFixed(3) + '/' + bufferEnd.toFixed(3));
-    if ((frag.decryptdata && frag.decryptdata.uri != null) && (frag.decryptdata.key == null)) {
-      logger.log(`Loading key for ${frag.sn} of [${levelDetails.startSN} ,${levelDetails.endSN}],level ${level}`);
-      this.state = State.KEY_LOADING;
-      this.hls.trigger(Event.KEY_LOADING, { frag });
-    } else {
-      logger.log(`Loading ${frag.sn} of [${levelDetails.startSN} ,${levelDetails.endSN}],level ${level}, currentTime:${pos.toFixed(3)},bufferEnd:${bufferEnd.toFixed(3)}`);
-      // Check if fragment is not loaded
-      let fragState = this.fragmentTracker.getState(frag);
-
-      this.fragCurrent = frag;
-      this.startFragRequested = true;
-      // Don't update nextLoadPosition for fragments which are not buffered
-      if (!isNaN(frag.sn) && !frag.bitrateTest) {
-        this.nextLoadPosition = frag.start + frag.duration;
-      }
+  _loadKey (frag) {
+    this.state = State.KEY_LOADING;
+    this.hls.trigger(Event.KEY_LOADING, { frag });
+  }
 
-      // Allow backtracked fragments to load
-      if (frag.backtracked || fragState === FragmentState.NOT_LOADED) {
-        frag.autoLevel = this.hls.autoLevelEnabled;
-        frag.bitrateTest = this.bitrateTest;
+  _loadFragment (frag) {
+    // Check if fragment is not loaded
+    let fragState = this.fragmentTracker.getState(frag);
 
-        this.hls.trigger(Event.FRAG_LOADING, { frag });
-        // lazy demuxer init, as this could take some time ... do it during frag loading
-        if (!this.demuxer) {
-          this.demuxer = new Demuxer(this.hls, 'main');
-        }
+    this.fragCurrent = frag;
+    this.startFragRequested = true;
+    // Don't update nextLoadPosition for fragments which are not buffered
+    if (!isNaN(frag.sn) && !frag.bitrateTest) {
+      this.nextLoadPosition = frag.start + frag.duration;
+    }
 
-        this.state = State.FRAG_LOADING;
-      } else if (fragState === FragmentState.APPENDING) {
-        // Lower the buffer size and try again
-        if (this._reduceMaxBufferLength(frag.duration)) {
-          this.fragmentTracker.removeFragment(frag);
-        }
+    // Allow backtracked fragments to load
+    if (frag.backtracked || fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
+      frag.autoLevel = this.hls.autoLevelEnabled;
+      frag.bitrateTest = this.bitrateTest;
+
+      this.hls.trigger(Event.FRAG_LOADING, { frag });
+      // lazy demuxer init, as this could take some time ... do it during frag loading
+      if (!this.demuxer) {
+        this.demuxer = new Demuxer(this.hls, 'main');
+      }
+
+      this.state = State.FRAG_LOADING;
+    } else if (fragState === FragmentState.APPENDING) {
+      // Lower the buffer size and try again
+      if (this._reduceMaxBufferLength(frag.duration)) {
+        this.fragmentTracker.removeFragment(frag);
       }
     }
   }
@@ -1167,9 +1170,9 @@ class StreamController extends TaskLoop {
           if (!frag.backtracked) {
             const levelDetails = level.details;
             if (levelDetails && frag.sn === levelDetails.startSN) {
-              logger.warn('missing video frame(s) on first frag, appending with gap');
+              logger.warn('missing video frame(s) on first frag, appending with gap', frag.sn);
             } else {
-              logger.warn('missing video frame(s), backtracking fragment');
+              logger.warn('missing video frame(s), backtracking fragment', frag.sn);
               // Return back to the IDLE state without appending to buffer
               // Causes findFragments to backtrack a segment and find the keyframe
               // Audio fragments arriving before video sets the nextLoadPosition, causing _findFragments to skip the backtracked fragment
@@ -1182,7 +1185,7 @@ class StreamController extends TaskLoop {
               return;
             }
           } else {
-            logger.warn('Already backtracked on this fragment, appending with the gap');
+            logger.warn('Already backtracked on this fragment, appending with the gap', frag.sn);
           }
         } else {
           // Only reset the backtracked flag if we've loaded the frag without any dropped frames

diff --git a/src/controller/subtitle-stream-controller.js b/src/controller/subtitle-stream-controller.js
@@ -125,7 +125,7 @@ class SubtitleStreamController extends TaskLoop {
       trackDetails.fragments.forEach(frag => {
         if (!(alreadyProcessed(frag) || frag.sn === currentFragSN || alreadyInQueue(frag))) {
           // Load key if subtitles are encrypted
-          if ((frag.decryptdata && frag.decryptdata.uri != null) && (frag.decryptdata.key == null)) {
+          if (frag.encrypted) {
             logger.log(`Loading key for ${frag.sn}`);
             this.state = State.KEY_LOADING;
             this.hls.trigger(Event.KEY_LOADING, { frag: frag });

diff --git a/src/loader/fragment.js b/src/loader/fragment.js
@@ -92,6 +92,10 @@ export default class Fragment {
     return this._decryptdata;
   }
 
+  get encrypted () {
+    return !!((this.decryptdata && this.decryptdata.uri !== null) && (this.decryptdata.key === null));
+  }
+
   /**
    * @param {ElementaryStreamType} type
    */