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

package/dist/hls.mjs

@@ -431,7 +431,7 @@ function enableLogs(debugConfig, context, id) {
     // 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.9965"}`);
+      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();
@@ -1591,6 +1591,12 @@ function readUint32(buffer, offset) {
   const val = readSint32(buffer, offset);
   return val < 0 ? 4294967296 + val : val;
 }
+function readUint64(buffer, offset) {
+  let 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];
 }
@@ -1653,15 +1659,14 @@ function parseSegmentIndex(sidx) {
   let index = 8;
   const timescale = readUint32(sidx, index);
   index += 4;
-
-  // TODO: parse earliestPresentationTime and firstOffset
-  // usually zero in our case
-  const earliestPresentationTime = 0;
-  const firstOffset = 0;
+  let earliestPresentationTime = 0;
+  let 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
@@ -2109,15 +2114,22 @@ function getDuration(data, initData) {
   }
   if (videoDuration === 0 && audioDuration === 0) {
     // If duration samples are not available in the traf use sidx subsegment_duration
+    let sidxMinStart = Infinity;
+    let sidxMaxEnd = 0;
     let sidxDuration = 0;
     const sidxs = findBox(data, ['sidx']);
     for (let i = 0; i < sidxs.length; i++) {
       const sidx = parseSegmentIndex(sidxs[i]);
       if (sidx != null && sidx.references) {
-        sidxDuration += sidx.references.reduce((dur, ref) => dur + ref.info.duration || 0, 0);
+        sidxMinStart = Math.min(sidxMinStart, sidx.earliestPresentationTime / sidx.timescale);
+        const subSegmentDuration = sidx.references.reduce((dur, ref) => 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;
@@ -7467,8 +7479,12 @@ class AbrController extends Logger {
     return -1;
   }
   set nextAutoLevel(nextLevel) {
-    const value = Math.max(this.hls.minAutoLevel, nextLevel);
-    if (this._nextAutoLevel != value) {
+    const {
+      maxAutoLevel,
+      minAutoLevel
+    } = this.hls;
+    const value = Math.min(Math.max(nextLevel, minAutoLevel), maxAutoLevel);
+    if (this._nextAutoLevel !== value) {
       this.nextAutoLevelKey = '';
       this._nextAutoLevel = value;
     }
@@ -16144,7 +16160,7 @@ class AudioStreamController extends BaseStreamController {
 
     // 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)) {
@@ -17058,7 +17074,7 @@ class SubtitleStreamController extends BaseStreamController {
     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
@@ -26734,7 +26750,8 @@ class StreamController extends BaseStreamController {
         }
         // 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
@@ -27787,7 +27804,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.2-0.canary.9965";
+    return "1.5.2-0.canary.9969";
   }
 
   /**