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

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.9969");
       } 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;
         }
@@ -16681,7 +16696,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 +17593,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
@@ -27393,7 +27408,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
@@ -29281,7 +29297,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.2-0.canary.9966";
+        return "1.5.2-0.canary.9969";
       }
     }, {
       key: "Events",