hls.js 1.5.2 → 1.5.4

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.2");
+        exportedLogger.log("Debug logs enabled for \"" + id + "\" in hls.js version " + "1.5.4");
       } catch (e) {
         exportedLogger = fakeLogger;
       }
@@ -1774,6 +1774,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];
   }
@@ -1836,15 +1842,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
@@ -2294,17 +2299,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;
@@ -7613,7 +7625,7 @@
       var ttfbEstimateSec = this.bwEstimator.getEstimateTTFB() / 1000;
       var levelsSkipped = [];
       var _loop = function _loop() {
-          var _levelInfo$supportedR, _levelInfo$supportedR2;
+          var _levelInfo$supportedR;
           var levelInfo = levels[i];
           var upSwitch = i > selectionBaseLevel;
           if (!levelInfo) {
@@ -7644,7 +7656,7 @@
 
           // skip candidates which change codec-family or video-range,
           // and which decrease or increase frame-rate for up and down-switch respectfully
-          if (currentCodecSet && levelInfo.codecSet !== currentCodecSet || currentVideoRange && levelInfo.videoRange !== currentVideoRange || upSwitch && currentFrameRate > levelInfo.frameRate || !upSwitch && currentFrameRate > 0 && currentFrameRate < levelInfo.frameRate || !((_levelInfo$supportedR = levelInfo.supportedResult) != null && (_levelInfo$supportedR2 = _levelInfo$supportedR.decodingInfoResults) != null && _levelInfo$supportedR2[0].smooth)) {
+          if (currentCodecSet && levelInfo.codecSet !== currentCodecSet || currentVideoRange && levelInfo.videoRange !== currentVideoRange || upSwitch && currentFrameRate > levelInfo.frameRate || !upSwitch && currentFrameRate > 0 && currentFrameRate < levelInfo.frameRate || levelInfo.supportedResult && !((_levelInfo$supportedR = levelInfo.supportedResult.decodingInfoResults) != null && _levelInfo$supportedR[0].smooth)) {
             levelsSkipped.push(i);
             return 0; // continue
           }
@@ -7757,8 +7769,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;
         }
@@ -16583,7 +16598,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)) {
@@ -17486,7 +17501,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
@@ -27260,7 +27275,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
@@ -29166,7 +29182,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.2";
+        return "1.5.4";
       }
     }, {
       key: "Events",