hls.js 1.6.3-0.canary.11253 → 1.6.3-0.canary.11255

package/dist/hls.light.js

@@ -1165,7 +1165,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.3-0.canary.11253");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.3-0.canary.11255");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -4406,7 +4406,6 @@
     if (PDTValue >= (endPDT || 0)) {
       return null;
     }
-    maxFragLookUpTolerance = maxFragLookUpTolerance || 0;
     for (var seg = 0; seg < fragments.length; ++seg) {
       var frag = fragments[seg];
       if (pdtWithinToleranceTest(PDTValue, maxFragLookUpTolerance, frag)) {
@@ -4532,16 +4531,35 @@
     var endProgramDateTime = candidate.endProgramDateTime || 0;
     return endProgramDateTime - candidateLookupTolerance > pdtBufferEnd;
   }
-  function findFragWithCC(fragments, cc) {
-    return BinarySearch.search(fragments, function (candidate) {
-      if (candidate.cc < cc) {
-        return 1;
-      } else if (candidate.cc > cc) {
-        return -1;
-      } else {
-        return 0;
+  function findNearestWithCC(details, cc, pos) {
+    if (details) {
+      if (details.startCC <= cc && details.endCC >= cc) {
+        var fragments = details.fragments;
+        var fragmentHint = details.fragmentHint;
+        if (fragmentHint) {
+          fragments = fragments.concat(fragmentHint);
+        }
+        var closest;
+        BinarySearch.search(fragments, function (candidate) {
+          if (candidate.cc < cc) {
+            return 1;
+          }
+          if (candidate.cc > cc) {
+            return -1;
+          }
+          closest = candidate;
+          if (candidate.end <= pos) {
+            return 1;
+          }
+          if (candidate.start > pos) {
+            return -1;
+          }
+          return 0;
+        });
+        return closest || null;
       }
-    });
+    }
+    return null;
   }
 
   function isTimeoutError(error) {
@@ -15381,6 +15399,8 @@
     // used by eme-controller
     requestMediaKeySystemAccessFunc: null,
     // used by eme-controller
+    requireKeySystemAccessOnStart: false,
+    // used by eme-controller
     testBandwidth: true,
     progressive: false,
     lowLatencyMode: true,
@@ -17243,8 +17263,11 @@
         if (this.fragCurrent === null) {
           keyLoadingPromise = Promise.reject(new Error("frag load aborted, context changed in KEY_LOADING"));
         }
-      } else if (!frag.encrypted && details.encryptedFragments.length) {
-        this.keyLoader.loadClear(frag, details.encryptedFragments);
+      } else if (!frag.encrypted) {
+        keyLoadingPromise = this.keyLoader.loadClear(frag, details.encryptedFragments);
+        if (keyLoadingPromise) {
+          this.log("[eme] blocking frag load until media-keys acquired");
+        }
       }
       var fragPrevious = this.fragPrevious;
       if (isMediaFragment(frag) && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
@@ -17600,7 +17623,7 @@
             this.log("LL-Part loading ON for initial live fragment");
             this.loadingParts = true;
           }
-          frag = this.getInitialLiveFragment(levelDetails, fragments);
+          frag = this.getInitialLiveFragment(levelDetails);
           var mainStart = this.hls.startPosition;
           var liveSyncPosition = this.hls.liveSyncPosition;
           var startPosition = frag ? (mainStart !== -1 && mainStart >= start ? mainStart : liveSyncPosition) || frag.start : pos;
@@ -17693,7 +17716,8 @@
      "sliding" of the playlist, which is its offset from the start of playback. After sliding we can compute the real
      start and end times for each fragment in the playlist (after which this method will not need to be called).
     */;
-    _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails, fragments) {
+    _proto.getInitialLiveFragment = function getInitialLiveFragment(levelDetails) {
+      var fragments = levelDetails.fragments;
       var fragPrevious = this.fragPrevious;
       var frag = null;
       if (fragPrevious) {
@@ -17716,7 +17740,7 @@
           // It's important to stay within the continuity range if available; otherwise the fragments in the playlist
           // will have the wrong start times
           if (!frag) {
-            frag = findFragWithCC(fragments, fragPrevious.cc);
+            frag = findNearestWithCC(levelDetails, fragPrevious.cc, fragPrevious.end);
             if (frag) {
               this.log("Live playlist, switching playlist, load frag with same CC: " + frag.sn);
             }
@@ -20500,7 +20524,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.3-0.canary.11253";
+  var version = "1.6.3-0.canary.11255";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -22219,23 +22243,40 @@
     };
     _proto.loadClear = function loadClear(loadingFrag, encryptedFragments) {
       var _this = this;
-      if (this.emeController && this.config.emeEnabled) {
-        // access key-system with nearest key on start (loaidng frag is unencrypted)
-        var sn = loadingFrag.sn,
-          cc = loadingFrag.cc;
-        var _loop = function _loop() {
-          var frag = encryptedFragments[i];
-          if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
-            _this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
-              frag.setKeyFormat(keySystemFormat);
-            });
-            return 1; // break
+      if (this.emeController && this.config.emeEnabled && !this.emeController.getSelectedKeySystemFormats().length) {
+        // access key-system with nearest key on start (loading frag is unencrypted)
+        if (encryptedFragments.length) {
+          var sn = loadingFrag.sn,
+            cc = loadingFrag.cc;
+          var _loop = function _loop() {
+              var frag = encryptedFragments[i];
+              if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
+                return {
+                  v: _this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
+                    frag.setKeyFormat(keySystemFormat);
+                    if (_this.emeController && _this.config.requireKeySystemAccessOnStart) {
+                      var keySystem = emptyExports.keySystemFormatToKeySystemDomain(keySystemFormat);
+                      if (keySystem) {
+                        return _this.emeController.getKeySystemAccess([keySystem]);
+                      }
+                    }
+                  })
+                };
+              }
+            },
+            _ret;
+          for (var i = 0; i < encryptedFragments.length; i++) {
+            _ret = _loop();
+            if (_ret) return _ret.v;
+          }
+        } else if (this.config.requireKeySystemAccessOnStart) {
+          var keySystemsInConfig = emptyExports.getKeySystemsForConfig(this.config);
+          if (keySystemsInConfig.length) {
+            return this.emeController.getKeySystemAccess(keySystemsInConfig);
           }
-        };
-        for (var i = 0; i < encryptedFragments.length; i++) {
-          if (_loop()) break;
         }
       }
+      return null;
     };
     _proto.load = function load(frag) {
       var _this2 = this;