hls.js 1.5.13 → 1.5.14-0.canary.10415

package/package.json

@@ -58,52 +58,52 @@
     "test:func:sauce": "SAUCE=1 UA=safari OS='OS X 10.15' BABEL_ENV=development mocha --require @babel/register tests/functional/auto/setup.js --timeout 40000 --exit",
     "type-check": "tsc --noEmit",
     "type-check:watch": "npm run type-check -- --watch",
-    "prepare": "husky install"
+    "prepare": "husky"
   },
   "devDependencies": {
-    "@babel/core": "7.23.7",
-    "@babel/helper-module-imports": "7.22.15",
+    "@babel/core": "7.24.7",
+    "@babel/helper-module-imports": "7.24.7",
     "@babel/plugin-proposal-class-properties": "7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "7.20.7",
     "@babel/plugin-proposal-optional-chaining": "7.21.0",
-    "@babel/plugin-transform-object-assign": "7.23.3",
-    "@babel/preset-env": "7.23.7",
-    "@babel/preset-typescript": "7.23.3",
-    "@babel/register": "7.23.7",
-    "@microsoft/api-documenter": "7.23.16",
-    "@microsoft/api-extractor": "7.39.1",
+    "@babel/plugin-transform-object-assign": "7.24.7",
+    "@babel/preset-env": "7.24.7",
+    "@babel/preset-typescript": "7.24.7",
+    "@babel/register": "7.24.6",
+    "@microsoft/api-documenter": "7.25.3",
+    "@microsoft/api-extractor": "7.47.0",
     "@rollup/plugin-alias": "5.1.0",
     "@rollup/plugin-babel": "6.0.4",
-    "@rollup/plugin-commonjs": "25.0.7",
+    "@rollup/plugin-commonjs": "25.0.8",
     "@rollup/plugin-node-resolve": "15.2.3",
-    "@rollup/plugin-replace": "5.0.5",
+    "@rollup/plugin-replace": "5.0.7",
     "@rollup/plugin-terser": "0.4.4",
-    "@rollup/plugin-typescript": "11.1.5",
-    "@svta/common-media-library": "0.6.1",
-    "@types/chai": "4.3.11",
+    "@rollup/plugin-typescript": "11.1.6",
+    "@svta/common-media-library": "0.7.1",
+    "@types/chai": "4.3.16",
     "@types/chart.js": "2.9.41",
-    "@types/mocha": "10.0.6",
+    "@types/mocha": "10.0.7",
     "@types/sinon-chai": "3.2.12",
-    "@typescript-eslint/eslint-plugin": "6.17.0",
-    "@typescript-eslint/parser": "6.17.0",
+    "@typescript-eslint/eslint-plugin": "7.15.0",
+    "@typescript-eslint/parser": "7.15.0",
     "babel-loader": "9.1.3",
     "babel-plugin-transform-remove-console": "6.9.4",
-    "chai": "4.3.10",
+    "chai": "4.4.1",
     "chart.js": "2.9.4",
-    "chromedriver": "120.0.1",
+    "chromedriver": "125.0.3",
     "doctoc": "2.2.1",
-    "es-check": "7.1.1",
-    "eslint": "8.56.0",
+    "es-check": "7.2.1",
+    "eslint": "8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "2.29.1",
-    "eslint-plugin-mocha": "10.2.0",
-    "eslint-plugin-node": "11.1.0",
-    "eslint-plugin-promise": "6.1.1",
+    "eslint-plugin-mocha": "10.4.3",
+    "eslint-plugin-n": "17.9.0",
+    "eslint-plugin-promise": "6.2.0",
     "eventemitter3": "5.0.1",
     "http-server": "14.1.1",
-    "husky": "8.0.3",
+    "husky": "9.0.11",
     "jsonpack": "1.1.5",
-    "karma": "6.4.2",
+    "karma": "6.4.3",
     "karma-chrome-launcher": "3.2.0",
     "karma-coverage": "2.2.1",
     "karma-mocha": "2.0.1",
@@ -111,24 +111,24 @@
     "karma-rollup-preprocessor": "github:jlmakes/karma-rollup-preprocessor#7a7268d91149307b3cf2888ee4e65ccd079955a3",
     "karma-sinon-chai": "2.0.2",
     "karma-sourcemap-loader": "0.4.0",
-    "lint-staged": "15.2.0",
+    "lint-staged": "15.2.7",
     "markdown-styles": "3.2.0",
-    "micromatch": "4.0.5",
-    "mocha": "10.2.0",
+    "micromatch": "4.0.7",
+    "mocha": "10.5.2",
     "node-fetch": "3.3.2",
-    "npm-run-all": "4.1.5",
-    "prettier": "3.1.1",
+    "npm-run-all2": "6.2.0",
+    "prettier": "3.3.2",
     "promise-polyfill": "8.3.0",
-    "rollup": "4.9.4",
+    "rollup": "4.18.0",
     "rollup-plugin-istanbul": "5.0.0",
     "sauce-connect-launcher": "1.3.2",
-    "selenium-webdriver": "4.16.0",
-    "semver": "7.5.4",
-    "sinon": "17.0.1",
+    "selenium-webdriver": "4.22.0",
+    "semver": "7.6.2",
+    "sinon": "18.0.0",
     "sinon-chai": "3.7.0",
-    "typescript": "5.3.3",
+    "typescript": "5.4.5",
     "url-toolkit": "2.2.5",
-    "wrangler": "3.22.4"
+    "wrangler": "3.62.0"
   },
-  "version": "1.5.13"
+  "version": "1.5.14-0.canary.10415"
 }

package/src/config.ts

@@ -17,10 +17,10 @@ import XhrLoader from './utils/xhr-loader';
 import FetchLoader, { fetchSupported } from './utils/fetch-loader';
 import Cues from './utils/cues';
 import { requestMediaKeySystemAccess } from './utils/mediakeys-helper';
-import { ILogger, logger } from './utils/logger';
 
 import type Hls from './hls';
 import type { CuesInterface } from './utils/cues';
+import type { ILogger } from './utils/logger';
 import type { MediaKeyFunc, KeySystems } from './utils/mediakeys-helper';
 import type {
   FragmentLoaderContext,
@@ -235,6 +235,7 @@ export type LatencyControllerConfig = {
   liveSyncDuration?: number;
   liveMaxLatencyDuration?: number;
   maxLiveSyncPlaybackRate: number;
+  liveSyncOnStallIncrease: number;
 };
 
 export type MetadataControllerConfig = {
@@ -352,6 +353,7 @@ export const hlsDefaultConfig: HlsConfig = {
   nudgeMaxRetry: 3, // used by stream-controller
   maxFragLookUpTolerance: 0.25, // used by stream-controller
   liveSyncDurationCount: 3, // used by latency-controller
+  liveSyncOnStallIncrease: 1, // used by latency-controller
   liveMaxLatencyDurationCount: Infinity, // used by latency-controller
   liveSyncDuration: undefined, // used by latency-controller
   liveMaxLatencyDuration: undefined, // used by latency-controller
@@ -558,6 +560,7 @@ function timelineConfig(): TimelineControllerConfig {
 export function mergeConfig(
   defaultConfig: HlsConfig,
   userConfig: Partial<HlsConfig>,
+  logger: ILogger,
 ): HlsConfig {
   if (
     (userConfig.liveSyncDurationCount ||
@@ -664,7 +667,7 @@ function deepCpy(obj: any): any {
 /**
  * @ignore
  */
-export function enableStreamingMode(config) {
+export function enableStreamingMode(config: HlsConfig, logger: ILogger) {
   const currentLoader = config.loader;
   if (currentLoader !== FetchLoader && currentLoader !== XhrLoader) {
     // If a developer has configured their own loader, respect that choice

package/src/controller/abr-controller.ts

@@ -2,7 +2,7 @@ import EwmaBandWidthEstimator from '../utils/ewma-bandwidth-estimator';
 import { Events } from '../events';
 import { ErrorDetails } from '../errors';
 import { PlaylistLevelType } from '../types/loader';
-import { logger } from '../utils/logger';
+import { Logger } from '../utils/logger';
 import {
   SUPPORTED_INFO_DEFAULT,
   getMediaDecodingInfoPromise,
@@ -31,7 +31,7 @@ import type {
 } from '../types/events';
 import type { AbrComponentAPI } from '../types/component-api';
 
-class AbrController implements AbrComponentAPI {
+class AbrController extends Logger implements AbrComponentAPI {
   protected hls: Hls;
   private lastLevelLoadSec: number = 0;
   private lastLoadedFragLevel: number = -1;
@@ -48,6 +48,7 @@ class AbrController implements AbrComponentAPI {
   public bwEstimator: EwmaBandWidthEstimator;
 
   constructor(hls: Hls) {
+    super('abr', hls.logger);
     this.hls = hls;
     this.bwEstimator = this.initEstimator();
     this.registerListeners();
@@ -55,7 +56,7 @@ class AbrController implements AbrComponentAPI {
 
   public resetEstimator(abrEwmaDefaultEstimate?: number) {
     if (abrEwmaDefaultEstimate) {
-      logger.log(`setting initial bwe to ${abrEwmaDefaultEstimate}`);
+      this.log(`setting initial bwe to ${abrEwmaDefaultEstimate}`);
       this.hls.config.abrEwmaDefaultEstimate = abrEwmaDefaultEstimate;
     }
     this.firstSelection = -1;
@@ -355,7 +356,7 @@ class AbrController implements AbrComponentAPI {
     }
 
     this.clearTimer();
-    logger.warn(`[abr] Fragment ${frag.sn}${
+    this.warn(`Fragment ${frag.sn}${
       part ? ' part ' + part.index : ''
     } of level ${frag.level} is loading too slowly;
       Time to underbuffer: ${bufferStarvationDelay.toFixed(3)} s
@@ -479,8 +480,8 @@ class AbrController implements AbrComponentAPI {
     }
     const firstLevel = this.hls.firstLevel;
     const clamped = Math.min(Math.max(firstLevel, minAutoLevel), maxAutoLevel);
-    logger.warn(
-      `[abr] Could not find best starting auto level. Defaulting to first in playlist ${firstLevel} clamped to ${clamped}`,
+    this.warn(
+      `Could not find best starting auto level. Defaulting to first in playlist ${firstLevel} clamped to ${clamped}`,
     );
     return clamped;
   }
@@ -538,6 +539,9 @@ class AbrController implements AbrComponentAPI {
 
   private getNextABRAutoLevel(): number {
     const { fragCurrent, partCurrent, hls } = this;
+    if (hls.levels.length <= 1) {
+      return hls.loadLevel;
+    }
     const { maxAutoLevel, config, minAutoLevel } = hls;
     const currentFragDuration = partCurrent
       ? partCurrent.duration
@@ -584,8 +588,8 @@ class AbrController implements AbrComponentAPI {
           ? Math.min(currentFragDuration, config.maxLoadingDelay)
           : config.maxLoadingDelay;
         maxStarvationDelay = maxLoadingDelay - bitrateTestDelay;
-        logger.info(
-          `[abr] bitrate test took ${Math.round(
+        this.info(
+          `bitrate test took ${Math.round(
             1000 * bitrateTestDelay,
           )}ms, set first fragment max fetchDuration to ${Math.round(
             1000 * maxStarvationDelay,
@@ -604,8 +608,8 @@ class AbrController implements AbrComponentAPI {
       bwFactor,
       bwUpFactor,
     );
-    logger.info(
-      `[abr] ${
+    this.info(
+      `${
         bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty'
       }, optimal quality level ${bestLevel}`,
     );
@@ -671,6 +675,7 @@ class AbrController implements AbrComponentAPI {
     const audioTracksByGroup =
       this.audioTracksByGroup ||
       (this.audioTracksByGroup = getAudioTracksByGroup(allAudioTracks));
+    let minStartIndex = -1;
     if (firstSelection) {
       if (this.firstSelection !== -1) {
         return this.firstSelection;
@@ -690,15 +695,22 @@ class AbrController implements AbrComponentAPI {
         audioPreference,
         videoPreference,
       );
-      const { codecSet, videoRanges, minFramerate, minBitrate, preferHDR } =
-        startTier;
+      const {
+        codecSet,
+        videoRanges,
+        minFramerate,
+        minBitrate,
+        minIndex,
+        preferHDR,
+      } = startTier;
+      minStartIndex = minIndex;
       currentCodecSet = codecSet;
       currentVideoRange = preferHDR
         ? videoRanges[videoRanges.length - 1]
         : videoRanges[0];
       currentFrameRate = minFramerate;
       currentBw = Math.max(currentBw, minBitrate);
-      logger.log(`[abr] picked start tier ${JSON.stringify(startTier)}`);
+      this.log(`picked start tier ${JSON.stringify(startTier)}`);
     } else {
       currentCodecSet = level?.codecSet;
       currentVideoRange = level?.videoRange;
@@ -751,19 +763,19 @@ class AbrController implements AbrComponentAPI {
             const levels = this.hls.levels;
             const index = levels.indexOf(levelInfo);
             if (decodingInfo.error) {
-              logger.warn(
-                `[abr] MediaCapabilities decodingInfo error: "${
+              this.warn(
+                `MediaCapabilities decodingInfo error: "${
                   decodingInfo.error
                 }" for level ${index} ${JSON.stringify(decodingInfo)}`,
               );
             } else if (!decodingInfo.supported) {
-              logger.warn(
-                `[abr] Unsupported MediaCapabilities decodingInfo result for level ${index} ${JSON.stringify(
+              this.warn(
+                `Unsupported MediaCapabilities decodingInfo result for level ${index} ${JSON.stringify(
                   decodingInfo,
                 )}`,
               );
               if (index > -1 && levels.length > 1) {
-                logger.log(`[abr] Removing unsupported level ${index}`);
+                this.log(`Removing unsupported level ${index}`);
                 this.hls.removeLevel(index);
               }
             }
@@ -785,8 +797,10 @@ class AbrController implements AbrComponentAPI {
         (levelInfo.supportedResult &&
           !levelInfo.supportedResult.decodingInfoResults?.[0].smooth)
       ) {
-        levelsSkipped.push(i);
-        continue;
+        if (!firstSelection || i !== minStartIndex) {
+          levelsSkipped.push(i);
+          continue;
+        }
       }
 
       const levelDetails = levelInfo.details;
@@ -842,8 +856,8 @@ class AbrController implements AbrComponentAPI {
           (forcedAutoLevel === -1 || forcedAutoLevel !== loadLevel)
         ) {
           if (levelsSkipped.length) {
-            logger.trace(
-              `[abr] Skipped level(s) ${levelsSkipped.join(
+            this.trace(
+              `Skipped level(s) ${levelsSkipped.join(
                 ',',
               )} of ${maxAutoLevel} max with CODECS and VIDEO-RANGE:"${
                 levels[levelsSkipped[0]].codecs
@@ -852,8 +866,8 @@ class AbrController implements AbrComponentAPI {
               }" ${currentVideoRange}`,
             );
           }
-          logger.info(
-            `[abr] switch candidate:${selectionBaseLevel}->${i} adjustedbw(${Math.round(
+          this.info(
+            `switch candidate:${selectionBaseLevel}->${i} adjustedbw(${Math.round(
               adjustedbw,
             )})-bitrate=${Math.round(
               adjustedbw - bitrate,
@@ -865,7 +879,7 @@ class AbrController implements AbrComponentAPI {
               1,
             )} fetchDuration:${fetchDuration.toFixed(
               1,
-            )} firstSelection:${firstSelection} codecSet:${currentCodecSet} videoRange:${currentVideoRange} hls.loadLevel:${loadLevel}`,
+            )} firstSelection:${firstSelection} codecSet:${levelInfo.codecSet} videoRange:${levelInfo.videoRange} hls.loadLevel:${loadLevel}`,
           );
         }
         if (firstSelection) {