hls.js 1.5.17 → 1.5.18

package/dist/hls.js

@@ -552,7 +552,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.18");
       } catch (e) {
         exportedLogger = fakeLogger;
       }
@@ -9542,6 +9542,7 @@
       _this.startFragRequested = false;
       _this.decrypter = void 0;
       _this.initPTS = [];
+      _this.buffering = true;
       _this.onvseeking = null;
       _this.onvended = null;
       _this.logPrefix = '';
@@ -9584,6 +9585,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
@@ -14030,19 +14037,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');
       }
@@ -16487,12 +16498,13 @@
         trackId = this.trackId;
       var config = hls.config;
 
-      // 1. if video not attached AND
+      // 1. if buffering is suspended
+      // 2. if video not attached AND
       //    start fragment already requested OR start frag prefetch not enabled
-      // 2. if tracks or track not loaded and selected
+      // 3. if tracks or track not loaded and selected
       // then exit loop
       // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
-      if (!media && (this.startFragRequested || !config.startFragPrefetch) || !(levels != null && levels[trackId])) {
+      if (!this.buffering || !media && (this.startFragRequested || !config.startFragPrefetch) || !(levels != null && levels[trackId])) {
         return;
       }
       var levelInfo = levels[trackId];
@@ -18529,6 +18541,7 @@
         _this2.resetBuffer(type);
       });
       this._initSourceBuffer();
+      this.hls.resumeBuffering();
     };
     _proto.resetBuffer = function resetBuffer(type) {
       var sb = this.sourceBuffer[type];
@@ -25370,47 +25383,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);
           }
         }
       }
@@ -27472,7 +27489,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;
       }
@@ -27494,6 +27511,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) {
@@ -28702,9 +28722,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;
+        }
+      }
     }
 
     /**
@@ -28713,32 +28737,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();
         }
       });
     }
@@ -29295,7 +29322,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.17";
+        return "1.5.18";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -249,6 +249,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected startFragRequested: boolean;
     protected decrypter: Decrypter;
     protected initPTS: RationalTimestamp[];
+    protected buffering: boolean;
     protected onvseeking: EventListener | null;
     protected onvended: EventListener | null;
     private readonly logPrefix;
@@ -259,6 +260,8 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected onTickEnd(): void;
     startLoad(startPosition: number): void;
     stopLoad(): void;
+    pauseBuffering(): void;
+    resumeBuffering(): void;
     protected _streamEnded(bufferInfo: BufferInfo, levelDetails: LevelDetails): boolean;
     protected getLevelDetails(): LevelDetails | undefined;
     protected onMediaAttached(event: Events.MEDIA_ATTACHED, data: MediaAttachedData): void;
@@ -1410,11 +1413,11 @@ declare class Hls implements HlsEventEmitter {
      */
     stopLoad(): void;
     /**
-     * Resumes stream controller segment loading if previously started.
+     * Resumes stream controller segment loading after `pauseBuffering` has been called.
      */
     resumeBuffering(): void;
     /**
-     * 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.
      */
     pauseBuffering(): void;
@@ -2401,6 +2404,8 @@ export declare type MP4RemuxerConfig = {
 export declare interface NetworkComponentAPI extends ComponentAPI {
     startLoad(startPosition: number): void;
     stopLoad(): void;
+    pauseBuffering?(): void;
+    resumeBuffering?(): void;
 }
 
 export declare const enum NetworkErrorAction {