hls.js 1.5.6-0.canary.9999 → 1.5.7-0.canary.10014

package/package.json

@@ -114,12 +114,12 @@
     "lint-staged": "15.2.2",
     "markdown-styles": "3.2.0",
     "micromatch": "4.0.5",
-    "mocha": "10.2.0",
+    "mocha": "10.3.0",
     "node-fetch": "3.3.2",
     "npm-run-all2": "5.0.2",
     "prettier": "3.2.4",
     "promise-polyfill": "8.3.0",
-    "rollup": "4.9.6",
+    "rollup": "4.12.0",
     "rollup-plugin-istanbul": "5.0.0",
     "sauce-connect-launcher": "1.3.2",
     "selenium-webdriver": "4.17.0",
@@ -128,7 +128,7 @@
     "sinon-chai": "3.7.0",
     "typescript": "5.3.3",
     "url-toolkit": "2.2.5",
-    "wrangler": "3.26.0"
+    "wrangler": "3.28.2"
   },
-  "version": "1.5.6-0.canary.9999"
+  "version": "1.5.7-0.canary.10014"
 }

package/src/controller/abr-controller.ts

@@ -534,27 +534,20 @@ class AbrController extends Logger implements AbrComponentAPI {
   }
 
   private getAutoLevelKey(): string {
-    return `${this.getBwEstimate()}_${this.hls.mainForwardBufferInfo?.len}`;
+    return `${this.getBwEstimate()}_${this.getStarvationDelay().toFixed(2)}`;
   }
 
   private getNextABRAutoLevel(): number {
     const { fragCurrent, partCurrent, hls } = this;
-    const { maxAutoLevel, config, minAutoLevel, media } = hls;
+    const { maxAutoLevel, config, minAutoLevel } = hls;
     const currentFragDuration = partCurrent
       ? partCurrent.duration
       : fragCurrent
         ? fragCurrent.duration
         : 0;
-
-    // playbackRate is the absolute value of the playback rate; if media.playbackRate is 0, we use 1 to load as
-    // if we're playing back at the normal rate.
-    const playbackRate =
-      media && media.playbackRate !== 0 ? Math.abs(media.playbackRate) : 1.0;
     const avgbw = this.getBwEstimate();
     // bufferStarvationDelay is the wall-clock time left until the playback buffer is exhausted.
-    const bufferInfo = hls.mainForwardBufferInfo;
-    const bufferStarvationDelay =
-      (bufferInfo ? bufferInfo.len : 0) / playbackRate;
+    const bufferStarvationDelay = this.getStarvationDelay();
 
     let bwFactor = config.abrBandWidthFactor;
     let bwUpFactor = config.abrBandWidthUpFactor;
@@ -630,6 +623,20 @@ class AbrController extends Logger implements AbrComponentAPI {
     return hls.loadLevel;
   }
 
+  private getStarvationDelay(): number {
+    const hls = this.hls;
+    const media = hls.media;
+    if (!media) {
+      return Infinity;
+    }
+    // playbackRate is the absolute value of the playback rate; if media.playbackRate is 0, we use 1 to load as
+    // if we're playing back at the normal rate.
+    const playbackRate =
+      media && media.playbackRate !== 0 ? Math.abs(media.playbackRate) : 1.0;
+    const bufferInfo = hls.mainForwardBufferInfo;
+    return (bufferInfo ? bufferInfo.len : 0) / playbackRate;
+  }
+
   private getBwEstimate(): number {
     return this.bwEstimator.canEstimate()
       ? this.bwEstimator.getEstimate()
@@ -738,6 +745,9 @@ class AbrController extends Logger implements AbrComponentAPI {
             mediaCapabilities,
           );
           levelInfo.supportedPromise.then((decodingInfo) => {
+            if (!this.hls) {
+              return;
+            }
             levelInfo.supportedResult = decodingInfo;
             const levels = this.hls.levels;
             const index = levels.indexOf(levelInfo);

package/src/controller/stream-controller.ts

@@ -215,14 +215,13 @@ export default class StreamController
 
   private doTickIdle() {
     const { hls, levelLastLoaded, levels, media } = this;
-    const { config, nextLoadLevel: level } = hls;
 
     // if start level not parsed yet OR
     // if video not attached AND start fragment already requested OR start frag prefetch not enabled
     // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
     if (
       levelLastLoaded === null ||
-      (!media && (this.startFragRequested || !config.startFragPrefetch))
+      (!media && (this.startFragRequested || !hls.config.startFragPrefetch))
     ) {
       return;
     }
@@ -232,7 +231,8 @@ export default class StreamController
       return;
     }
 
-    if (!this.buffering || !levels?.[level]) {
+    const level = hls.nextLoadLevel;
+    if (!levels?.[level]) {
       return;
     }
 

package/src/utils/mp4-tools.ts

@@ -136,11 +136,13 @@ export function parseSegmentIndex(sidx: Uint8Array): SidxInfo | null {
   let firstOffset = 0;
 
   if (version === 0) {
-    earliestPresentationTime = readUint32(sidx, (index += 4));
-    firstOffset = readUint32(sidx, (index += 4));
+    earliestPresentationTime = readUint32(sidx, index);
+    firstOffset = readUint32(sidx, index + 4);
+    index += 8;
   } else {
-    earliestPresentationTime = readUint64(sidx, (index += 8));
-    firstOffset = readUint64(sidx, (index += 8));
+    earliestPresentationTime = readUint64(sidx, index);
+    firstOffset = readUint64(sidx, index + 8);
+    index += 16;
   }
 
   // skip reserved