rx-player 4.0.0-beta.1 → 4.0.0-beta.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rx-player",
   "author": "Canal+",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.2",
   "description": "Canal+ HTML5 Video Player",
   "main": "./dist/rx-player.js",
   "keywords": [
@@ -40,12 +40,14 @@
     "check:appveyor": "npm run check:types && npm run lint && npm run lint:demo && npm run lint:tests && npm run test:appveyor",
     "check:types": "tsc --noEmit --project .",
     "check:types:watch": "tsc --noEmit --watch --project .",
+    "check:demo": "npm run check:demo:types && npm run lint:demo",
+    "check:demo:types": "tsc --noEmit --project demo/full",
     "demo": "node ./scripts/generate_full_demo.js --production-mode",
     "demo:min": "node ./scripts/generate_full_demo.js --production-mode --minify",
     "demo:watch": "node ./scripts/generate_full_demo.js --watch --production-mode",
-    "doc": "rm -rf doc/generated; node ./scripts/doc-generator/index.js doc/ doc/generated \"$(cat VERSION)\"",
+    "doc": "docgen.ico doc/ doc/generated \"$(cat VERSION)\"",
     "lint": "eslint src -c .eslintrc.js",
-    "lint:demo": "eslint demo/full/scripts",
+    "lint:demo": "eslint -c demo/full/.eslintrc.js demo/full/scripts",
     "lint:tests": "eslint tests/**/*.js --ignore-pattern '/tests/performance/bundle*'",
     "list": "node scripts/list-npm-scripts.js",
     "prepublishOnly": "npm run build:modular",
@@ -78,58 +80,59 @@
     "next-tick": "1.1.0"
   },
   "devDependencies": {
-    "@babel/core": "7.21.0",
-    "@babel/plugin-transform-runtime": "7.21.0",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-react": "7.18.6",
-    "@types/chai": "4.3.4",
-    "@types/jest": "29.4.0",
+    "@babel/core": "7.22.5",
+    "@babel/plugin-transform-runtime": "7.22.5",
+    "@babel/preset-env": "7.22.5",
+    "@babel/preset-react": "7.22.5",
+    "@types/chai": "4.3.5",
+    "@types/jest": "29.5.2",
     "@types/mocha": "10.0.1",
-    "@types/node": "18.14.0",
-    "@types/sinon": "10.0.13",
-    "@typescript-eslint/eslint-plugin": "5.53.0",
-    "@typescript-eslint/eslint-plugin-tslint": "5.53.0",
-    "@typescript-eslint/parser": "5.53.0",
+    "@types/node": "20.3.1",
+    "@types/react": "18.2.12",
+    "@types/react-dom": "18.2.5",
+    "@types/sinon": "10.0.15",
+    "@typescript-eslint/eslint-plugin": "5.59.11",
+    "@typescript-eslint/eslint-plugin-tslint": "5.59.11",
+    "@typescript-eslint/parser": "5.59.11",
     "arraybuffer-loader": "1.0.8",
     "babel-loader": "9.1.2",
     "chai": "4.3.7",
-    "cheerio": "1.0.0-rc.12",
-    "core-js": "3.28.0",
-    "esbuild": "0.17.10",
-    "eslint": "8.34.0",
+    "core-js": "3.31.0",
+    "docgen.ico": "^0.2.3",
+    "esbuild": "0.18.2",
+    "eslint": "8.42.0",
     "eslint-plugin-ban": "1.6.0",
     "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jsdoc": "40.0.0",
+    "eslint-plugin-jsdoc": "46.2.6",
     "eslint-plugin-react": "7.32.2",
     "esm": "3.2.25",
     "express": "4.18.2",
-    "highlight.js": "11.7.0",
-    "html-entities": "2.3.3",
-    "jest": "29.4.3",
-    "jest-environment-jsdom": "29.4.3",
-    "karma": "6.4.1",
-    "karma-chrome-launcher": "3.1.1",
+    "github-buttons": "2.27.0",
+    "html-entities": "2.3.6",
+    "jest": "29.5.0",
+    "jest-environment-jsdom": "29.5.0",
+    "karma": "6.4.2",
+    "karma-chrome-launcher": "3.2.0",
     "karma-firefox-launcher": "2.1.2",
     "karma-mocha": "2.0.1",
     "karma-webpack": "5.0.0",
-    "markdown-it": "13.0.1",
     "mocha": "10.2.0",
     "mocha-loader": "5.1.5",
     "raw-loader": "4.0.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "regenerator-runtime": "0.13.11",
-    "rimraf": "4.1.2",
-    "semver": "7.3.8",
-    "sinon": "15.0.1",
-    "terser-webpack-plugin": "5.3.6",
-    "ts-jest": "29.0.5",
-    "ts-loader": "9.4.2",
+    "rimraf": "5.0.1",
+    "semver": "7.5.1",
+    "sinon": "15.1.2",
+    "terser-webpack-plugin": "5.3.9",
+    "ts-jest": "29.1.0",
+    "ts-loader": "9.4.3",
     "tslint": "6.1.3",
-    "typescript": "4.9.5",
-    "webpack": "5.75.0",
-    "webpack-bundle-analyzer": "4.8.0",
-    "webpack-cli": "5.0.1"
+    "typescript": "5.1.3",
+    "webpack": "5.86.0",
+    "webpack-bundle-analyzer": "4.9.0",
+    "webpack-cli": "5.1.4"
   },
   "scripts-list": {
     "Build a demo page (e.g. to test a code change)": {
@@ -140,6 +143,9 @@
       "demo": "Build the demo in demo/bundle.js",
       "demo:min": "Build the demo and minify it in demo/bundle.js",
       "demo:watch": "Build the demo in demo/bundle.js each times the files update.",
+      "check:demo": "Check the validity of the full demo directory by running the type checker and linter on it",
+      "check:demo:types": "Check TypeScript types in full demo files",
+      "lint:demo": "Run linter on the full demo files",
       "standalone": "Build and launch the \"standalone\" demo (without any UI) on a local server. Re-build on file updates.",
       "certificate": "Generate a certificate to be able to use HTTPS locally for the demo pages (`npm run start` and `npm run standalone` will then listen to HTTPS requests through a communicated port)"
     },

package/scripts/build/generate_build.js

@@ -22,7 +22,7 @@ const { spawn } = require("child_process");
 const fs = require("fs/promises");
 const os = require("os");
 const path = require("path");
-const rimraf = require("rimraf");
+const { rimraf } = require("rimraf");
 
 const BUILD_DIR_FROM_ROOT = "dist/_esm5.processed";
 

package/scripts/fast_demo_build.js

@@ -66,8 +66,8 @@ function fastDemoBuild(options) {
           const { errors, warnings } = result;
           console.log(`\x1b[33m[${getHumanReadableHours()}]\x1b[0m ` +
             `Demo re-built with ${errors.length} error(s) and ` +
-            ` ${warnings.length} warning(s) ` +
-            `(in ${stats.endTime - stats.startTime} ms).`);
+            ` ${warnings.length} warning(s) `);
+          return;
         }
         console.log(`\x1b[32m[${getHumanReadableHours()}]\x1b[0m ` +
           "Demo built!");
@@ -77,8 +77,9 @@ function fastDemoBuild(options) {
 
   // Create a context for incremental builds
   esbuild.context({
-    entryPoints: [path.join(__dirname, "../demo/full/scripts/index.jsx")],
+    entryPoints: [path.join(__dirname, "../demo/full/scripts/index.tsx")],
     bundle: true,
+    target: "es2017",
     minify,
     outfile: path.join(__dirname, "../demo/full/bundle.js"),
     plugins: [consolePlugin],

package/scripts/generate_full_demo.js

@@ -60,7 +60,7 @@ function generateFullDemo(options) {
 
   const webpackDemoConfig = {
     mode: isDevMode ? "development" : "production",
-    entry: path.join(__dirname, "../demo/full/scripts/index.jsx"),
+    entry: path.join(__dirname, "../demo/full/scripts/index.tsx"),
     resolve: {
       extensions: [".ts", ".tsx", ".js", ".jsx", ".json"],
     },

package/sonar-project.properties

@@ -1,7 +1,7 @@
 sonar.projectKey=rx-player
 sonar.organization=rx-player
 sonar.projectName=rx-player
-sonar.projectVersion=4.0.0-beta.1
+sonar.projectVersion=4.0.0-beta.2
 sonar.sources=./src,./demo,./tests
 sonar.exclusions=demo/full/bundle.js,demo/standalone/lib.js,demo/bundle.js
 sonar.host.url=https://sonarcloud.io

package/src/compat/browser_detection.ts

@@ -60,6 +60,9 @@ let isWebOs2022 = false;
 /** `true` for Panasonic devices. */
 let isPanasonic = false;
 
+/** `true` for the PlayStation 5 game console. */
+let isPlayStation5 = false;
+
 ((function findCurrentBrowser() : void {
   if (isNode) {
     return ;
@@ -101,7 +104,9 @@ let isPanasonic = false;
     isSamsungBrowser = true;
   }
 
-  if (/Tizen/.test(navigator.userAgent)) {
+  if (navigator.userAgent.indexOf("PlayStation 5") !== -1) {
+    isPlayStation5 = true;
+  } else if (/Tizen/.test(navigator.userAgent)) {
     isTizen = true;
 
   // Inspired form: http://webostv.developer.lge.com/discover/specifications/web-engine/
@@ -136,6 +141,7 @@ export {
   isIEOrEdge,
   isFirefox,
   isPanasonic,
+  isPlayStation5,
   isSafariDesktop,
   isSafariMobile,
   isSamsungBrowser,

package/src/compat/eme/load_session.ts

@@ -36,7 +36,7 @@ export default async function loadSession(
   session : MediaKeySession | ICustomMediaKeySession,
   sessionId : string
 ) : Promise<boolean> {
-  log.info("Compat/DRM: Load persisted session", sessionId);
+  log.info("DRM: Load persisted session", sessionId);
   const isLoaded = await session.load(sessionId);
 
   if (!isLoaded || session.keyStatuses.size > 0) {

package/src/compat/has_issues_with_high_media_source_duration.ts

@@ -0,0 +1,27 @@
+import { isPlayStation5 } from "./browser_detection";
+
+/**
+ * Some platforms have issues when the `MediaSource`'s `duration` property
+ * is set to a very high value (playback freezes) but not when setting it
+ * to `Infinity`, which is what the HTML spec as of now (2023-05-15) recommends
+ * for live contents.
+ *
+ * However setting the `MediaSource`'s `duration` property to `Infinity` seems
+ * more risky, considering all platforms we now support, than setting it at a
+ * relatively high ~2**32 value which is what we do generally.
+ *
+ * Moreover, setting it to `Infinity` require us to use another MSE API,
+ * `setLiveSeekableRange` to properly allow seeking. We're used to MSE issues so
+ * I'm not too confident of using another MSE API for all platforms directly.
+ *
+ * So this methods just return `true` based on a whitelist of platform for which
+ * it has been detected that high `duration` values cause issues but setting it
+ * to Infinity AND playing with `setLiveSeekableRange` does not.
+ *
+ * @returns {boolean}
+ */
+export default function hasIssuesWithHighMediaSourceDuration(): boolean {
+  // For now only seen on the Webkit present in the PlayStation 5, for which the
+  // alternative is known to work.
+  return isPlayStation5;
+}

package/src/core/adaptive/__tests__/buffer_based_chooser.test.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+import { ScoreConfidenceLevel } from "../utils/representation_score_calculator";
+
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-var-requires */
@@ -47,12 +49,25 @@ describe("BufferBasedChooser", () => {
       bufferGap: 0,
       speed: 1,
       currentBitrate: undefined,
-      currentScore: 4,
+      currentScore: { score: 4, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(1);
+    expect(new BufferBasedChooser([1, 2, 3]).getEstimate({
+      bufferGap: 0,
+      speed: 1,
+      currentBitrate: undefined,
+      currentScore: { score: 4, confidenceLevel: ScoreConfidenceLevel.HIGH },
+    })).toEqual(1);
+    expect(new BufferBasedChooser([1, 2, 3]).getEstimate({
+      bufferGap: 0,
+      speed: 1,
+      currentBitrate: undefined,
+      currentScore: { score: 1, confidenceLevel: ScoreConfidenceLevel.LOW },
     })).toEqual(1);
     expect(new BufferBasedChooser([1, 2, 3]).getEstimate({
       bufferGap: 0,
       speed: 1,
-      currentScore: 1,
+      currentBitrate: undefined,
+      currentScore: { score: 1, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(1);
   });
 
@@ -76,7 +91,7 @@ describe("BufferBasedChooser", () => {
   });
 
   /* eslint-disable max-len */
-  it("should go to the next bitrate if the current one is maintainable and we have more buffer than the next level", () => {
+  it("should not go to the next bitrate if we don't have a high enough maintainability score", () => {
   /* eslint-enable max-len */
     const logger = { debug: jest.fn() };
     jest.mock("../../../log", () => ({ __esModule: true as const,
@@ -86,82 +101,82 @@ describe("BufferBasedChooser", () => {
       bufferGap: 16,
       speed: 1,
       currentBitrate: 10,
-      currentScore: 1.01,
-    })).toEqual(20);
+      currentScore: { score: 1.15, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(10);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
       bufferGap: 30,
       speed: 1,
       currentBitrate: 20,
-      currentScore: 1.01,
-    })).toEqual(40);
+      currentScore: { score: 1.15, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
       bufferGap: 30,
       speed: 1,
       currentBitrate: 20,
-      currentScore: 100,
-    })).toEqual(40);
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
       bufferGap: 30,
       speed: 2,
       currentBitrate: 20,
-      currentScore: 2.1,
-    })).toEqual(40);
+      currentScore: { score: 2.30, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 20, 40]).getEstimate({
       bufferGap: 30,
       speed: 2,
       currentBitrate: 20,
-      currentScore: 2.1,
-    })).toEqual(40);
+      currentScore: { score: 2.30, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
       bufferGap: 30,
       speed: 0, // 0 is a special case
       currentBitrate: 20,
-      currentScore: 100,
-    })).toEqual(40);
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
   });
 
   /* eslint-disable max-len */
-  it("should go to the next bitrate if the current one is maintainable and we have the buffer corresponding to the next level", () => {
+  it("should go to the next bitrate if the current one is maintainable and we have more buffer than the next level", () => {
   /* eslint-enable max-len */
     const logger = { debug: jest.fn() };
     jest.mock("../../../log", () => ({ __esModule: true as const,
                                        default: logger }));
     const BufferBasedChooser = jest.requireActual("../buffer_based_chooser").default;
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 15,
+      bufferGap: 16,
       speed: 1,
       currentBitrate: 10,
-      currentScore: 1.01,
+      currentScore: { score: 1.15, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 30,
       speed: 1,
       currentBitrate: 20,
-      currentScore: 1.01,
+      currentScore: { score: 1.15, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(40);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 30,
       speed: 1,
       currentBitrate: 20,
-      currentScore: 100,
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(40);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 30,
       speed: 2,
       currentBitrate: 20,
-      currentScore: 2.1,
+      currentScore: { score: 2.30, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(40);
     expect(new BufferBasedChooser([10, 20, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 30,
       speed: 2,
       currentBitrate: 20,
-      currentScore: 2.1,
+      currentScore: { score: 2.30, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(40);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 30,
       speed: 0, // 0 is a special case
       currentBitrate: 20,
-      currentScore: 100,
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(40);
   });
 
@@ -176,31 +191,31 @@ describe("BufferBasedChooser", () => {
       bufferGap: 6,
       speed: 1,
       currentBitrate: 10,
-      currentScore: 1.01,
+      currentScore: { score: 1.15, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(10);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 10,
+      bufferGap: 13,
       speed: 1,
       currentBitrate: 20,
-      currentScore: 1.01,
+      currentScore: { score: 1.15, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 10,
+      bufferGap: 13,
       speed: 1,
       currentBitrate: 20,
-      currentScore: 100,
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 20, 40]).getEstimate({
-      bufferGap: 10,
+      bufferGap: 13,
       speed: 1,
       currentBitrate: 20,
-      currentScore: 100,
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 10,
+      bufferGap: 13,
       speed: 2,
       currentBitrate: 20,
-      currentScore: 2.1,
+      currentScore: { score: 2.30, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
   });
 
@@ -216,13 +231,13 @@ describe("BufferBasedChooser", () => {
       bufferGap: 100000000000,
       speed: 1,
       currentBitrate: 40,
-      currentScore: 1000000,
+      currentScore: { score: 1000000, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(40);
     expect(new BufferBasedChooser([10, 20, 40, 40]).getEstimate({
       bufferGap: 100000000000,
       speed: 1,
       currentBitrate: 40,
-      currentScore: 1000000,
+      currentScore: { score: 1000000, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(40);
   });
 
@@ -237,31 +252,115 @@ describe("BufferBasedChooser", () => {
       bufferGap: 15,
       speed: 2,
       currentBitrate: 10,
-      currentScore: 1.01,
+      currentScore: { score: 2, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(10);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 22,
       speed: 2,
       currentBitrate: 20,
-      currentScore: 1.01,
+      currentScore: { score: 2, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 22,
       speed: 100,
       currentBitrate: 20,
-      currentScore: 100,
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 22,
       speed: 100,
       currentBitrate: 20,
-      currentScore: 100,
+      currentScore: { score: 100, confidenceLevel: ScoreConfidenceLevel.HIGH },
     })).toEqual(20);
     expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
-      bufferGap: 20,
+      bufferGap: 22,
+      speed: 3,
+      currentBitrate: 20,
+      currentScore: { score: 3, confidenceLevel: ScoreConfidenceLevel.HIGH },
+    })).toEqual(20);
+  });
+
+  /* eslint-disable max-len */
+  it("should lower bitrate if the current one is not maintainable due to the speed", () => {
+  /* eslint-enable max-len */
+    const logger = { debug: jest.fn() };
+    jest.mock("../../../log", () => ({ __esModule: true as const,
+                                       default: logger }));
+    const BufferBasedChooser = jest.requireActual("../buffer_based_chooser").default;
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 15,
+      speed: 2,
+      currentBitrate: 10,
+      currentScore: { score: 1.9, confidenceLevel: ScoreConfidenceLevel.HIGH },
+    })).toEqual(10);
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 2,
+      currentBitrate: 20,
+      currentScore: { score: 1.9, confidenceLevel: ScoreConfidenceLevel.HIGH },
+    })).toEqual(10);
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 100,
+      currentBitrate: 20,
+      currentScore: { score: 99, confidenceLevel: ScoreConfidenceLevel.HIGH },
+    })).toEqual(10);
+    expect(new BufferBasedChooser([10, 20, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 100,
+      currentBitrate: 20,
+      currentScore: { score: 99, confidenceLevel: ScoreConfidenceLevel.HIGH },
+    })).toEqual(10);
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 3,
+      currentBitrate: 20,
+      currentScore: { score: 2.5, confidenceLevel: ScoreConfidenceLevel.HIGH },
+    })).toEqual(10);
+  });
+
+  /* eslint-disable max-len */
+  it("should not lower bitrate if the current one is not maintainable due to the speed but confidence on the score is low", () => {
+  /* eslint-enable max-len */
+    const logger = { debug: jest.fn() };
+    jest.mock("../../../log", () => ({ __esModule: true as const,
+                                       default: logger }));
+    const BufferBasedChooser = jest.requireActual("../buffer_based_chooser").default;
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 15,
+      speed: 2,
+      currentBitrate: 10,
+      currentScore: { score: 1.9, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(10);
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 2,
+      currentBitrate: 20,
+      currentScore: undefined,
+    })).toEqual(20);
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 2,
+      currentBitrate: 20,
+      currentScore: { score: 1.9, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 100,
+      currentBitrate: 20,
+      currentScore: { score: 99, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
+    expect(new BufferBasedChooser([10, 20, 20, 40]).getEstimate({
+      bufferGap: 22,
+      speed: 100,
+      currentBitrate: 20,
+      currentScore: { score: 99, confidenceLevel: ScoreConfidenceLevel.LOW },
+    })).toEqual(20);
+    expect(new BufferBasedChooser([10, 20, 40]).getEstimate({
+      bufferGap: 22,
       speed: 3,
       currentBitrate: 20,
-      currentScore: 2.1,
+      currentScore: { score: 2.5, confidenceLevel: ScoreConfidenceLevel.LOW },
     })).toEqual(20);
   });
 

package/src/core/adaptive/adaptive_representation_selector.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 
+import config from "../../config";
 import log from "../../log";
 import Manifest, {
   Adaptation,
@@ -260,8 +261,7 @@ function getEstimateReference(
       const timeRanges = val.buffered;
       const bufferGap = getLeftSizeOfRange(timeRanges, position.last);
       const { representation } = val.content;
-      const scoreData = scoreCalculator.getEstimate(representation);
-      const currentScore = scoreData?.[0];
+      const currentScore = scoreCalculator.getEstimate(representation);
       const currentBitrate = representation.bitrate;
       const observation = { bufferGap, currentBitrate, currentScore, speed };
       currentBufferBasedEstimate = bufferBasedChooser.getEstimate(observation);
@@ -307,11 +307,14 @@ function getEstimateReference(
                                           lastPlaybackObservation.speed :
                                           1);
 
-      if (allowBufferBasedEstimates && bufferGap <= 5) {
+      const { ABR_ENTER_BUFFER_BASED_ALGO,
+              ABR_EXIT_BUFFER_BASED_ALGO } = config.getCurrent();
+
+      if (allowBufferBasedEstimates && bufferGap <= ABR_EXIT_BUFFER_BASED_ALGO) {
         allowBufferBasedEstimates = false;
       } else if (!allowBufferBasedEstimates &&
                  isFinite(bufferGap) &&
-                  bufferGap > 10)
+                  bufferGap >= ABR_ENTER_BUFFER_BASED_ALGO)
       {
         allowBufferBasedEstimates = true;
       }