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

package/dist/hls.mjs

@@ -512,7 +512,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.6-0.canary.9999"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.7-0.canary.10014"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1663,11 +1663,13 @@ function parseSegmentIndex(sidx) {
   let earliestPresentationTime = 0;
   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
@@ -7280,8 +7282,7 @@ class AbrController extends Logger {
     return nextABRAutoLevel;
   }
   getAutoLevelKey() {
-    var _this$hls$mainForward;
-    return `${this.getBwEstimate()}_${(_this$hls$mainForward = this.hls.mainForwardBufferInfo) == null ? void 0 : _this$hls$mainForward.len}`;
+    return `${this.getBwEstimate()}_${this.getStarvationDelay().toFixed(2)}`;
   }
   getNextABRAutoLevel() {
     const {
@@ -7292,18 +7293,12 @@ class AbrController extends Logger {
     const {
       maxAutoLevel,
       config,
-      minAutoLevel,
-      media
+      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;
 
@@ -7346,6 +7341,18 @@ class AbrController extends Logger {
     // or if bitrate is not lower, continue to use loadLevel
     return hls.loadLevel;
   }
+  getStarvationDelay() {
+    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;
+  }
   getBwEstimate() {
     return this.bwEstimator.canEstimate() ? this.bwEstimator.getEstimate() : this.hls.config.abrEwmaDefaultEstimate;
   }
@@ -7415,6 +7422,9 @@ class AbrController extends Logger {
         if (typeof (mediaCapabilities == null ? void 0 : mediaCapabilities.decodingInfo) === 'function' && requiresMediaCapabilitiesDecodingInfo(levelInfo, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference)) {
           levelInfo.supportedPromise = getMediaDecodingInfoPromise(levelInfo, audioTracksByGroup, mediaCapabilities);
           levelInfo.supportedPromise.then(decodingInfo => {
+            if (!this.hls) {
+              return;
+            }
             levelInfo.supportedResult = decodingInfo;
             const levels = this.hls.levels;
             const index = levels.indexOf(levelInfo);
@@ -27618,15 +27628,11 @@ class StreamController extends BaseStreamController {
       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)) {
+    if (levelLastLoaded === null || !media && (this.startFragRequested || !hls.config.startFragPrefetch)) {
       return;
     }
 
@@ -27634,7 +27640,8 @@ class StreamController extends BaseStreamController {
     if (this.altAudio && this.audioOnly) {
       return;
     }
-    if (!this.buffering || !(levels != null && levels[level])) {
+    const level = hls.nextLoadLevel;
+    if (!(levels != null && levels[level])) {
       return;
     }
     const levelInfo = levels[level];
@@ -28594,7 +28601,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.6-0.canary.9999";
+    return "1.5.7-0.canary.10014";
   }
 
   /**