hls.js 1.5.2-0.canary.9966 → 1.5.2-0.canary.9970

package/dist/hls.js

@@ -556,7 +556,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.5.2-0.canary.9966");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.2-0.canary.9970");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -1799,6 +1799,12 @@
     var val = readSint32(buffer, offset);
     return val < 0 ? 4294967296 + val : val;
   }
+  function readUint64(buffer, offset) {
+    var result = readUint32(buffer, offset);
+    result *= Math.pow(2, 32);
+    result += readUint32(buffer, offset + 4);
+    return result;
+  }
   function readSint32(buffer, offset) {
     return buffer[offset] << 24 | buffer[offset + 1] << 16 | buffer[offset + 2] << 8 | buffer[offset + 3];
   }
@@ -1861,15 +1867,14 @@
     var index = 8;
     var timescale = readUint32(sidx, index);
     index += 4;
-
-    // TODO: parse earliestPresentationTime and firstOffset
-    // usually zero in our case
     var earliestPresentationTime = 0;
     var firstOffset = 0;
     if (version === 0) {
-      index += 8;
+      earliestPresentationTime = readUint32(sidx, index += 4);
+      firstOffset = readUint32(sidx, index += 4);
     } else {
-      index += 16;
+      earliestPresentationTime = readUint64(sidx, index += 8);
+      firstOffset = readUint64(sidx, index += 8);
     }
 
     // skip reserved
@@ -2319,17 +2324,24 @@
     }
     if (videoDuration === 0 && audioDuration === 0) {
       // If duration samples are not available in the traf use sidx subsegment_duration
+      var sidxMinStart = Infinity;
+      var sidxMaxEnd = 0;
       var sidxDuration = 0;
       var sidxs = findBox(data, ['sidx']);
       for (var _i2 = 0; _i2 < sidxs.length; _i2++) {
         var sidx = parseSegmentIndex(sidxs[_i2]);
         if (sidx != null && sidx.references) {
-          sidxDuration += sidx.references.reduce(function (dur, ref) {
+          sidxMinStart = Math.min(sidxMinStart, sidx.earliestPresentationTime / sidx.timescale);
+          var subSegmentDuration = sidx.references.reduce(function (dur, ref) {
             return dur + ref.info.duration || 0;
           }, 0);
+          sidxMaxEnd = Math.max(sidxMaxEnd, subSegmentDuration + sidx.earliestPresentationTime / sidx.timescale);
+          sidxDuration = sidxMaxEnd - sidxMinStart;
         }
       }
-      return sidxDuration;
+      if (sidxDuration && isFiniteNumber(sidxDuration)) {
+        return sidxDuration;
+      }
     }
     if (videoDuration) {
       return videoDuration;
@@ -7797,8 +7809,11 @@
         return nextABRAutoLevel;
       },
       set: function set(nextLevel) {
-        var value = Math.max(this.hls.minAutoLevel, nextLevel);
-        if (this._nextAutoLevel != value) {
+        var _this$hls3 = this.hls,
+          maxAutoLevel = _this$hls3.maxAutoLevel,
+          minAutoLevel = _this$hls3.minAutoLevel;
+        var value = Math.min(Math.max(nextLevel, minAutoLevel), maxAutoLevel);
+        if (this._nextAutoLevel !== value) {
           this.nextAutoLevelKey = '';
           this._nextAutoLevel = value;
         }
@@ -9532,6 +9547,7 @@
       _this.startFragRequested = false;
       _this.decrypter = void 0;
       _this.initPTS = [];
+      _this.buffering = true;
       _this.onMediaSeeking = function () {
         var _assertThisInitialize = _assertThisInitialized(_this),
           config = _assertThisInitialize.config,
@@ -9635,6 +9651,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
@@ -16490,12 +16512,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];
@@ -16681,7 +16704,7 @@
 
       // compute start position if we are aligned with the main playlist
       if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-        this.setStartPosition(track.details, sliding);
+        this.setStartPosition(this.mainDetails || newDetails, sliding);
       }
       // only switch back to IDLE state if we were waiting for track to start downloading a new fragment
       if (this.state === State.WAITING_TRACK && !this.waitForCdnTuneIn(newDetails)) {
@@ -17578,7 +17601,7 @@
       track.details = newDetails;
       this.levelLastLoaded = track;
       if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-        this.setStartPosition(track.details, sliding);
+        this.setStartPosition(this.mainDetails || newDetails, sliding);
       }
 
       // trigger handler right now
@@ -18521,6 +18544,7 @@
         _this2.resetBuffer(type);
       });
       this._initSourceBuffer();
+      this.hls.resumeBuffering();
     };
     _proto.resetBuffer = function resetBuffer(type) {
       var sb = this.sourceBuffer[type];
@@ -27393,7 +27417,8 @@
           }
           // set new level to playlist loader : this will trigger start level load
           // hls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
-          this.level = hls.nextLoadLevel = startLevel;
+          hls.nextLoadLevel = startLevel;
+          this.level = hls.loadLevel;
           this.loadedmetadata = false;
         }
         // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
@@ -27478,7 +27503,7 @@
       if (this.altAudio && this.audioOnly) {
         return;
       }
-      if (!(levels != null && levels[level])) {
+      if (!this.buffering || !(levels != null && levels[level])) {
         return;
       }
       var levelInfo = levels[level];
@@ -28456,7 +28481,6 @@
       this.logger = void 0;
       this.coreComponents = void 0;
       this.networkControllers = void 0;
-      this.started = false;
       this._emitter = new EventEmitter();
       this._autoLevelCapping = -1;
       this._maxHdcpLevel = null;
@@ -28687,7 +28711,6 @@
         startPosition = -1;
       }
       this.logger.log("startLoad(" + startPosition + ")");
-      this.started = true;
       this.networkControllers.forEach(function (controller) {
         controller.startLoad(startPosition);
       });
@@ -28698,33 +28721,30 @@
      */;
     _proto.stopLoad = function stopLoad() {
       this.logger.log('stopLoad');
-      this.started = false;
       this.networkControllers.forEach(function (controller) {
         controller.stopLoad();
       });
     }
 
     /**
-     * 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);
-          }
-        });
-      }
+      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() {
       this.networkControllers.forEach(function (controller) {
-        if ('fragmentLoader' in controller) {
-          controller.stopLoad();
+        if (controller.pauseBuffering) {
+          controller.pauseBuffering();
         }
       });
     }
@@ -29281,7 +29301,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.2-0.canary.9966";
+        return "1.5.2-0.canary.9970";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -246,6 +246,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected startFragRequested: boolean;
     protected decrypter: Decrypter;
     protected initPTS: RationalTimestamp[];
+    protected buffering: boolean;
     constructor(hls: Hls, fragmentTracker: FragmentTracker, keyLoader: KeyLoader, logPrefix: string, playlistType: PlaylistLevelType);
     protected registerListeners(): void;
     protected unregisterListeners(): void;
@@ -253,6 +254,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;
@@ -1318,7 +1321,6 @@ declare class Hls implements HlsEventEmitter {
     readonly logger: ILogger;
     private coreComponents;
     private networkControllers;
-    private started;
     private _emitter;
     private _autoLevelCapping;
     private _maxHdcpLevel;
@@ -1405,11 +1407,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;
@@ -2411,6 +2413,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 {