rx-player 4.0.0-dev.2023120600 → 4.0.0-dev.2023121900

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rx-player",
   "author": "Canal+",
-  "version": "4.0.0-dev.2023120600",
+  "version": "4.0.0-dev.2023121900",
   "description": "Canal+ HTML5 Video Player",
   "main": "./dist/commonjs/index.js",
   "module": "./dist/es2017/index.js",
@@ -144,6 +144,7 @@
     "lint:tests": "eslint tests/**/*.js --ignore-pattern '/tests/performance/bundle*'",
     "list": "node scripts/list-npm-scripts.mjs",
     "prepublishOnly": "npm run build:all",
+    "releases:dev": "./scripts/make-dev-releases",
     "standalone": "node ./scripts/run_standalone_demo.mjs",
     "start": "node ./scripts/start_demo_web_server.mjs",
     "sart:wasm": "node ./scripts/start_demo_web_server.mjs --include-wasm",
@@ -282,6 +283,9 @@
       "doc": "Generate the HTML documentation in doc/generated/pages"
     },
     "Update the RxPlayer's version": {
+    },
+    "Make a release": {
+      "releases:dev": "Produce dev npm releases (which are tagged pre-releases on npm) with the code in the current branch",
       "update-version": "Update the version to the string given in argument (example: `npm run update-version 3.8.0`). Will update the codebase and perform every builds."
     }
   }

package/scripts/canal-release.patch

@@ -0,0 +1,78 @@
+diff --git a/src/parsers/texttracks/ttml/html/apply_extent.ts b/src/parsers/texttracks/ttml/html/apply_extent.ts
+index 5772fa8fb..eb3a051e4 100644
+--- a/src/parsers/texttracks/ttml/html/apply_extent.ts
++++ b/src/parsers/texttracks/ttml/html/apply_extent.ts
+@@ -54,7 +54,14 @@ export default function applyExtent(
+         secondExtent[2] === "%" ||
+         secondExtent[2] === "em")
+     {
+-      element.style.height = secondExtent[1] + secondExtent[2];
++      const toNum = Number(secondExtent[1]);
++      if (secondExtent[2] === "%" && !isNaN(toNum) &&
++          (toNum < 0 || toNum > 100))
++      {
++        element.style.width = "80%";
++      } else {
++        element.style.height = secondExtent[1] + secondExtent[2];
++      }
+     } else if (secondExtent[2] === "c") {
+       addClassName(element, "proportional-style");
+       element.setAttribute("data-proportional-height", secondExtent[1]);
+diff --git a/src/parsers/texttracks/ttml/html/apply_line_height.ts b/src/parsers/texttracks/ttml/html/apply_line_height.ts
+index 4f727229a..253aa1a72 100644
+--- a/src/parsers/texttracks/ttml/html/apply_line_height.ts
++++ b/src/parsers/texttracks/ttml/html/apply_line_height.ts
+@@ -14,16 +14,15 @@
+  * limitations under the License.
+  */
+ 
+-import { addClassName } from "../../../../compat";
+ import log from "../../../../log";
+ import { REGXP_LENGTH } from "../regexps";
+ 
+ /**
+- * @param {HTMLElement} element
++ * @param {HTMLElement} _element
+  * @param {string} lineHeight
+  */
+ export default function applyLineHeight(
+-  element : HTMLElement,
++  _element : HTMLElement,
+   lineHeight : string
+ ) : void {
+   const trimmedLineHeight = lineHeight.trim();
+@@ -40,10 +39,10 @@ export default function applyLineHeight(
+       firstLineHeight[2] === "%" ||
+       firstLineHeight[2] === "em")
+   {
+-    element.style.lineHeight = firstLineHeight[1] + firstLineHeight[2];
++    // element.style.lineHeight = firstLineHeight[1] + firstLineHeight[2];
+   } else if (firstLineHeight[2] === "c") {
+-    addClassName(element, "proportional-style");
+-    element.setAttribute("data-proportional-line-height", firstLineHeight[1]);
++    // addClassName(element, "proportional-style");
++    // element.setAttribute("data-proportional-line-height", firstLineHeight[1]);
+   } else {
+     log.warn("TTML Parser: unhandled lineHeight unit:", firstLineHeight[2]);
+   }
+diff --git a/src/parsers/texttracks/ttml/html/apply_origin.ts b/src/parsers/texttracks/ttml/html/apply_origin.ts
+index 01a205aad..91d69fa3c 100644
+--- a/src/parsers/texttracks/ttml/html/apply_origin.ts
++++ b/src/parsers/texttracks/ttml/html/apply_origin.ts
+@@ -53,7 +53,15 @@ export default function applyOrigin(
+         secondOrigin[2] === "%" ||
+         secondOrigin[2] === "em")
+     {
+-      element.style.top = secondOrigin[1] + secondOrigin[2];
++      const toNum = Number(secondOrigin[1]);
++      if (secondOrigin[2] === "%" && !isNaN(toNum) &&
++          (toNum < 0 || toNum > 100))
++      {
++        element.style.bottom = "5%";
++        element.style.left = "10%";
++      } else {
++        element.style.top = secondOrigin[1] + secondOrigin[2];
++      }
+     } else if (secondOrigin[2] === "c") {
+       addClassName(element, "proportional-style");
+       element.setAttribute("data-proportional-top", secondOrigin[1]);

package/scripts/make-dev-releases

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# make-dev-releases
+# =================
+#
+# This script produces pre-releases on top of the current branch for the
+# `dev-v4` and `canal-v4` versions (as per their npm tags).
+#
+# To use it:
+#
+#   1. Be sure that you're on the branch corresponding to the pre-release you
+#      want to publish, at the repository's root directory.
+#
+#   2. Call this script followed with the corresponding version number it would
+#      have as an official release in the `MAJOR.MINOR.PATCH` format (e.g.
+#      `./update-version 4.1.3`). Special suffix corresponding to the date and
+#      tag will be added automatically by this script.
+#
+#   3. When the script ask you to confirm, check that the preceding commands did
+#      not output any issue and if it didn't you can confirm.
+#
+#   4. That's it!
+
+set -e
+
+current_branch=$(git branch | sed -n -e 's/^\* \(.*\)/\1/p')
+version=$1
+date=$(date "+%Y%m%d")
+dev_branch="release/v${version}-dev.${date}00"
+canal_branch="release/v${version}-canal.${date}00"
+
+git checkout -b ${dev_branch}
+./scripts/update-version $1-dev.${date}00
+git add --all
+git commit -m "update version"
+while true; do
+  read -n1 -p "Do you wish to push and publish the dev build? [y/n] " yn
+  echo ""
+  case $yn in
+    [Yy]* ) break;;
+    [Nn]* ) exit;;
+    * ) echo "Please answer y or n.";;
+  esac
+done
+git push origin ${dev_branch}
+npm publish --tag dev-v4
+
+git checkout $current_branch
+
+git checkout -b ${canal_branch}
+git apply ./scripts/canal-release.patch
+./scripts/update-version $1-canal.${date}00
+git add --all
+git commit -m "update version"
+git push origin ${canal_branch}
+while true; do
+  read -n1 -p "Do you wish to push and publish the canal build? [y/n] " yn
+  echo ""
+  case $yn in
+    [Yy]* ) break;;
+    [Nn]* ) exit;;
+    * ) echo "Please answer y or n.";;
+  esac
+done
+npm publish --tag canal-v4

package/scripts/update-version

@@ -21,6 +21,11 @@
 
 set -e
 
+if [ $# -eq 0 ]; then
+ echo "no version in argument"
+ exit 1
+fi
+
 version=$1
 date_iso=$(date "+%Y-%m-%d")
 

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-dev.2023120600
+sonar.projectVersion=4.0.0-dev.2023121900
 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/core/adaptive/adaptive_representation_selector.ts

@@ -30,7 +30,7 @@ import SharedReference, {
 import TaskCanceller, {
   CancellationSignal,
 } from "../../utils/task_canceller";
-import { IReadOnlyPlaybackObserver } from "../api";
+import { IObservationPosition, IReadOnlyPlaybackObserver } from "../api";
 import { IBufferType } from "../segment_buffers";
 import BufferBasedChooser from "./buffer_based_chooser";
 import GuessBasedChooser from "./guess_based_chooser";
@@ -272,7 +272,7 @@ function getEstimateReference(
       }
       const { position, speed } = lastPlaybackObservation;
       const timeRanges = val.buffered;
-      const bufferGap = getLeftSizeOfBufferedTimeRange(timeRanges, position.last);
+      const bufferGap = getLeftSizeOfBufferedTimeRange(timeRanges, position.getWanted());
       const { representation } = val.content;
       const currentScore = scoreCalculator.getEstimate(representation);
       const currentBitrate = representation.bitrate;
@@ -389,7 +389,7 @@ function getEstimateReference(
       if (lowLatencyMode &&
           currentRepresentationVal !== null &&
           context.manifest.isDynamic &&
-          maximumPosition - position.last < 40)
+          maximumPosition - position.getWanted() < 40)
       {
         chosenRepFromGuessMode = guessBasedChooser
           .getGuess(sortedRepresentations,
@@ -595,24 +595,7 @@ export interface IRepresentationEstimatorPlaybackObservation {
    * Information on the current media position in seconds at the time of a
    * Playback Observation.
    */
-  position : {
-    /**
-     * Known position at the time the Observation was emitted, in seconds.
-     *
-     * Note that it might have changed since. If you want truly precize
-     * information, you should recuperate it from the HTMLMediaElement directly
-     * through another mean.
-     */
-    last : number;
-    /**
-     * Actually wanted position in seconds that is not yet reached.
-     *
-     * This might for example be set to the initial position when the content is
-     * loading (and thus potentially at a `0` position) but which will be seeked
-     * to a given position once possible.
-     */
-    pending : number | undefined;
-  };
+  position : IObservationPosition;
   /**
    * Last "playback rate" set by the user. This is the ideal "playback rate" at
    * which the media should play.

package/src/core/adaptive/network_analyzer.ts

@@ -154,7 +154,7 @@ function estimateStarvationModeBitrate(
   const { bufferGap, speed, position } = playbackInfo;
   const realBufferGap = isFinite(bufferGap) ? bufferGap :
                                               0;
-  const nextNeededPosition = position.last + realBufferGap;
+  const nextNeededPosition = position.getWanted() + realBufferGap;
   const concernedRequests = getConcernedRequests(pendingRequests, nextNeededPosition);
 
   if (concernedRequests.length !== 1) { // 0  == no request
@@ -238,7 +238,7 @@ function shouldDirectlySwitchToLowBitrate(
   }
   const realBufferGap = isFinite(playbackInfo.bufferGap) ? playbackInfo.bufferGap :
                                                            0;
-  const nextNeededPosition = playbackInfo.position.last + realBufferGap;
+  const nextNeededPosition = playbackInfo.position.getWanted() + realBufferGap;
   const nextRequest = arrayFind(requests, ({ content }) =>
     content.segment.duration > 0 &&
     (content.segment.time + content.segment.duration) > nextNeededPosition);
@@ -334,7 +334,7 @@ export default class NetworkAnalyzer {
     const { ABR_STARVATION_DURATION_DELTA } = config.getCurrent();
     // check if should get in/out of starvation mode
     if (isNaN(duration) ||
-        realBufferGap + position.last < duration - ABR_STARVATION_DURATION_DELTA)
+        realBufferGap + position.getWanted() < duration - ABR_STARVATION_DURATION_DELTA)
     {
       if (!this._inStarvationMode && realBufferGap <= localConf.starvationGap) {
         log.info("ABR: enter starvation mode.");

package/src/core/api/index.ts

@@ -18,6 +18,7 @@ import PlaybackObserver from "./playback_observer";
 import Player from "./public_api";
 export { PlaybackObserver };
 export {
+  IObservationPosition,
   IPlaybackObservation,
   IPlaybackObserverEventType,
   IReadOnlyPlaybackObserver,