hls.js 1.5.17 → 1.5.19

package/dist/hls.light.js

@@ -521,7 +521,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        exportedLogger.log("Debug logs enabled for \"" + id + "\" in hls.js version " + "1.5.17");
+        exportedLogger.log("Debug logs enabled for \"" + id + "\" in hls.js version " + "1.5.19");
       } catch (e) {
         exportedLogger = fakeLogger;
       }
@@ -4979,15 +4979,16 @@
       delete oldDetails.fragmentHint.endPTS;
     }
     // check if old/new playlists have fragments in common
-    // loop through overlapping SN and update startPTS , cc, and duration if any found
-    var ccOffset = 0;
+    // loop through overlapping SN and update startPTS, cc, and duration if any found
     var PTSFrag;
-    mapFragmentIntersection(oldDetails, newDetails, function (oldFrag, newFrag) {
-      if (oldFrag.relurl) {
-        // Do not compare CC if the old fragment has no url. This is a level.fragmentHint used by LL-HLS parts.
-        // It maybe be off by 1 if it was created before any parts or discontinuity tags were appended to the end
-        // of the playlist.
-        ccOffset = oldFrag.cc - newFrag.cc;
+    mapFragmentIntersection(oldDetails, newDetails, function (oldFrag, newFrag, newFragIndex, newFragments) {
+      if (newDetails.skippedSegments) {
+        if (newFrag.cc !== oldFrag.cc) {
+          var ccOffset = oldFrag.cc - newFrag.cc;
+          for (var _i = newFragIndex; _i < newFragments.length; _i++) {
+            newFragments[_i].cc += ccOffset;
+          }
+        }
       }
       if (isFiniteNumber(oldFrag.startPTS) && isFiniteNumber(oldFrag.endPTS)) {
         newFrag.start = newFrag.startPTS = oldFrag.startPTS;
@@ -5012,8 +5013,9 @@
         currentInitSegment = oldFrag.initSegment;
       }
     });
+    var newFragments = newDetails.fragments;
     if (currentInitSegment) {
-      var fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
+      var fragmentsToCheck = newDetails.fragmentHint ? newFragments.concat(newDetails.fragmentHint) : newFragments;
       fragmentsToCheck.forEach(function (frag) {
         var _currentInitSegment;
         if (frag && (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) == null ? void 0 : _currentInitSegment.relurl))) {
@@ -5022,29 +5024,22 @@
       });
     }
     if (newDetails.skippedSegments) {
-      newDetails.deltaUpdateFailed = newDetails.fragments.some(function (frag) {
+      newDetails.deltaUpdateFailed = newFragments.some(function (frag) {
         return !frag;
       });
       if (newDetails.deltaUpdateFailed) {
         logger.warn('[level-helper] Previous playlist missing segments skipped in delta playlist');
-        for (var _i = newDetails.skippedSegments; _i--;) {
-          newDetails.fragments.shift();
+        for (var _i2 = newDetails.skippedSegments; _i2--;) {
+          newFragments.shift();
+        }
+        newDetails.startSN = newFragments[0].sn;
+      } else {
+        if (newDetails.canSkipDateRanges) {
+          newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails.dateRanges, newDetails.recentlyRemovedDateranges);
         }
-        newDetails.startSN = newDetails.fragments[0].sn;
-        newDetails.startCC = newDetails.fragments[0].cc;
-      } else if (newDetails.canSkipDateRanges) {
-        newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails.dateRanges, newDetails.recentlyRemovedDateranges);
-      }
-    }
-    var newFragments = newDetails.fragments;
-    if (ccOffset) {
-      logger.warn('discontinuity sliding from playlist, take drift into account');
-      for (var _i2 = 0; _i2 < newFragments.length; _i2++) {
-        newFragments[_i2].cc += ccOffset;
       }
-    }
-    if (newDetails.skippedSegments) {
       newDetails.startCC = newDetails.fragments[0].cc;
+      newDetails.endCC = newFragments[newFragments.length - 1].cc;
     }
 
     // Merge parts
@@ -5128,7 +5123,7 @@
         _newFrag = newDetails.fragments[i] = _oldFrag;
       }
       if (_oldFrag && _newFrag) {
-        intersectionFn(_oldFrag, _newFrag);
+        intersectionFn(_oldFrag, _newFrag, i, newFrags);
       }
     }
   }
@@ -7503,6 +7498,7 @@
         _this2.resetBuffer(type);
       });
       this._initSourceBuffer();
+      this.hls.resumeBuffering();
     };
     _proto.resetBuffer = function resetBuffer(type) {
       var sb = this.sourceBuffer[type];
@@ -9145,47 +9141,51 @@
           xhr.onprogress = null;
           var _status = xhr.status;
           // http status between 200 to 299 are all successful
-          var useResponse = xhr.responseType !== 'text';
-          if (_status >= 200 && _status < 300 && (useResponse && xhr.response || xhr.responseText !== null)) {
-            stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
-            var data = useResponse ? xhr.response : xhr.responseText;
-            var len = xhr.responseType === 'arraybuffer' ? data.byteLength : data.length;
-            stats.loaded = stats.total = len;
-            stats.bwEstimate = stats.total * 8000 / (stats.loading.end - stats.loading.first);
-            if (!this.callbacks) {
-              return;
-            }
-            var onProgress = this.callbacks.onProgress;
-            if (onProgress) {
-              onProgress(stats, context, data, xhr);
-            }
-            if (!this.callbacks) {
+          var useResponseText = xhr.responseType === 'text' ? xhr.responseText : null;
+          if (_status >= 200 && _status < 300) {
+            var data = useResponseText != null ? useResponseText : xhr.response;
+            if (data != null) {
+              stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
+              var len = xhr.responseType === 'arraybuffer' ? data.byteLength : data.length;
+              stats.loaded = stats.total = len;
+              stats.bwEstimate = stats.total * 8000 / (stats.loading.end - stats.loading.first);
+              if (!this.callbacks) {
+                return;
+              }
+              var onProgress = this.callbacks.onProgress;
+              if (onProgress) {
+                onProgress(stats, context, data, xhr);
+              }
+              if (!this.callbacks) {
+                return;
+              }
+              var _response = {
+                url: xhr.responseURL,
+                data: data,
+                code: _status
+              };
+              this.callbacks.onSuccess(_response, stats, context, xhr);
               return;
             }
-            var response = {
-              url: xhr.responseURL,
-              data: data,
-              code: _status
-            };
-            this.callbacks.onSuccess(response, stats, context, xhr);
+          }
+
+          // Handle bad status or nullish response
+          var retryConfig = config.loadPolicy.errorRetry;
+          var retryCount = stats.retry;
+          // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
+          var response = {
+            url: context.url,
+            data: undefined,
+            code: _status
+          };
+          if (shouldRetry(retryConfig, retryCount, false, response)) {
+            this.retry(retryConfig);
           } else {
-            var retryConfig = config.loadPolicy.errorRetry;
-            var retryCount = stats.retry;
-            // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
-            var _response = {
-              url: context.url,
-              data: undefined,
-              code: _status
-            };
-            if (shouldRetry(retryConfig, retryCount, false, _response)) {
-              this.retry(retryConfig);
-            } else {
-              logger.error(_status + " while loading " + context.url);
-              this.callbacks.onError({
-                code: _status,
-                text: xhr.statusText
-              }, context, xhr, stats);
-            }
+            logger.error(_status + " while loading " + context.url);
+            this.callbacks.onError({
+              code: _status,
+              text: xhr.statusText
+            }, context, xhr, stats);
           }
         }
       }
@@ -11261,7 +11261,7 @@
     };
     _proto.load = function load(frag) {
       var _this2 = this;
-      if (!frag.decryptdata && frag.encrypted && this.emeController) {
+      if (!frag.decryptdata && frag.encrypted && this.emeController && this.config.emeEnabled) {
         // Multiple keys, but none selected, resolve in eme-controller
         return this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
           return _this2.loadInternal(frag, keySystemFormat);
@@ -12238,6 +12238,7 @@
       _this.startFragRequested = false;
       _this.decrypter = void 0;
       _this.initPTS = [];
+      _this.buffering = true;
       _this.onvseeking = null;
       _this.onvended = null;
       _this.logPrefix = '';
@@ -12280,6 +12281,12 @@
       this.clearNextTick();
       this.state = State.STOPPED;
     };
+    _proto.pauseBuffering = function pauseBuffering() {
+      this.buffering = false;
+    };
+    _proto.resumeBuffering = function resumeBuffering() {
+      this.buffering = true;
+    };
     _proto._streamEnded = function _streamEnded(bufferInfo, levelDetails) {
       // If playlist is live, there is another buffered range after the current range, nothing buffered, media is detached,
       // of nothing loading/loaded return false
@@ -16548,19 +16555,23 @@
       this.videoTrackConfig = undefined;
     };
     _proto.getVideoStartPts = function getVideoStartPts(videoSamples) {
+      // Get the minimum PTS value relative to the first sample's PTS, normalized for 33-bit wrapping
       var rolloverDetected = false;
+      var firstPts = videoSamples[0].pts;
       var startPTS = videoSamples.reduce(function (minPTS, sample) {
-        var delta = sample.pts - minPTS;
+        var pts = sample.pts;
+        var delta = pts - minPTS;
         if (delta < -4294967296) {
           // 2^32, see PTSNormalize for reasoning, but we're hitting a rollover here, and we don't want that to impact the timeOffset calculation
           rolloverDetected = true;
-          return normalizePts(minPTS, sample.pts);
-        } else if (delta > 0) {
+          pts = normalizePts(pts, firstPts);
+          delta = pts - minPTS;
+        }
+        if (delta > 0) {
           return minPTS;
-        } else {
-          return sample.pts;
         }
-      }, videoSamples[0].pts);
+        return pts;
+      }, firstPts);
       if (rolloverDetected) {
         logger.debug('PTS rollover detected');
       }
@@ -19241,7 +19252,7 @@
       if (this.altAudio && this.audioOnly) {
         return;
       }
-      var level = hls.nextLoadLevel;
+      var level = this.buffering ? hls.nextLoadLevel : hls.loadLevel;
       if (!(levels != null && levels[level])) {
         return;
       }
@@ -19263,6 +19274,9 @@
         this.state = State.ENDED;
         return;
       }
+      if (!this.buffering) {
+        return;
+      }
 
       // set next load level : this will trigger a playlist load if needed
       if (hls.loadLevel !== level && hls.manualLevel === -1) {
@@ -20471,9 +20485,13 @@
       }
       logger.log("startLoad(" + startPosition + ")");
       this.started = true;
-      this.networkControllers.forEach(function (controller) {
-        controller.startLoad(startPosition);
-      });
+      this.resumeBuffering();
+      for (var i = 0; i < this.networkControllers.length; i++) {
+        this.networkControllers[i].startLoad(startPosition);
+        if (!this.started || !this.networkControllers) {
+          break;
+        }
+      }
     }
 
     /**
@@ -20482,32 +20500,35 @@
     _proto.stopLoad = function stopLoad() {
       logger.log('stopLoad');
       this.started = false;
-      this.networkControllers.forEach(function (controller) {
-        controller.stopLoad();
-      });
+      for (var i = 0; i < this.networkControllers.length; i++) {
+        this.networkControllers[i].stopLoad();
+        if (this.started || !this.networkControllers) {
+          break;
+        }
+      }
     }
 
     /**
-     * Resumes stream controller segment loading if previously started.
+     * Resumes stream controller segment loading after `pauseBuffering` has been called.
      */;
     _proto.resumeBuffering = function resumeBuffering() {
-      if (this.started) {
-        this.networkControllers.forEach(function (controller) {
-          if ('fragmentLoader' in controller) {
-            controller.startLoad(-1);
-          }
-        });
-      }
+      logger.log("resume buffering");
+      this.networkControllers.forEach(function (controller) {
+        if (controller.resumeBuffering) {
+          controller.resumeBuffering();
+        }
+      });
     }
 
     /**
-     * Stops stream controller segment loading without changing 'started' state like stopLoad().
+     * Prevents stream controller from loading new segments until `resumeBuffering` is called.
      * This allows for media buffering to be paused without interupting playlist loading.
      */;
     _proto.pauseBuffering = function pauseBuffering() {
+      logger.log("pause buffering");
       this.networkControllers.forEach(function (controller) {
-        if ('fragmentLoader' in controller) {
-          controller.stopLoad();
+        if (controller.pauseBuffering) {
+          controller.pauseBuffering();
         }
       });
     }
@@ -21064,7 +21085,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.17";
+        return "1.5.19";
       }
     }, {
       key: "Events",