rx-player 3.32.2-dev.2023110700 → 3.33.0-dev.2023111400

package/dist/rx-player.js

@@ -22292,6 +22292,21 @@ function parseTextTrackToElements(type, data, timestampOffset, language) {
  * Setting a value too high might lead to two segments targeting different times
  * to be wrongly believed to target the same time. In worst case scenarios, this
  * could lead to wanted text tracks being removed.
+ *
+ * When comparing 2 segments s1 and s2, you may want to take into account the duration
+ * of the segments:
+ *   - if s1 is [0, 2] and s2 is [0, 2.1] s1 and s2 can be considered as nearly equal as
+ *     there is a relative difference of: (2.1-2) / 2 = 5%;
+ *     Formula: (end_s1 - end_s2) / duration_s2 = relative_difference
+ *   - if s1 is [0, 0.04] and s2 is [0.04, 0.08] s1 and s2 may not considered as nearly
+ *     equal as there is a relative difference of: (0.04-0.08) / 0.04 = 100%
+ *
+ * To compare relatively to the duration of a segment you can provide and additional
+ * parameter "delta" that remplace MAX_DELTA_BUFFER_TIME.
+ * If parameter "delta" is higher than MAX_DELTA_BUFFER_TIME, MAX_DELTA_BUFFER_TIME
+ * is used instead of delta. This ensure that segments are nearly equal when comparing
+ * relatively AND absolutely.
+ *
  * @type Number
  */
 var MAX_DELTA_BUFFER_TIME = 0.2;
@@ -22299,10 +22314,14 @@ var MAX_DELTA_BUFFER_TIME = 0.2;
  * @see MAX_DELTA_BUFFER_TIME
  * @param {Number} a
  * @param {Number} b
+ * @param {Number} delta
  * @returns {Boolean}
  */
-function areNearlyEqual(a, b) {
-  return Math.abs(a - b) <= MAX_DELTA_BUFFER_TIME;
+function areNearlyEqual(a, b, delta) {
+  if (delta === void 0) {
+    delta = MAX_DELTA_BUFFER_TIME;
+  }
+  return Math.abs(a - b) <= Math.min(delta, MAX_DELTA_BUFFER_TIME);
 }
 /**
  * Get all cues which have data before the given time.
@@ -22375,6 +22394,22 @@ function removeCuesInfosBetween(cuesInfos, start, end) {
  */
 
 
+/**
+ * first or last IHTMLCue in a group can have a slighlty different start
+ * or end time than the start or end time of the ICuesGroup due to parsing
+ * approximation.
+ * DELTA_CUES_GROUP defines the tolerance level when comparing the start/end
+ * of a IHTMLCue to the start/end of a ICuesGroup.
+ * Having this value too high may lead to have unwanted subtitle displayed
+ * Having this value too low may lead to have subtitles not displayed
+ */
+var DELTA_CUES_GROUP = 1e-3;
+/**
+ * segment_duration / RELATIVE_DELTA_RATIO = relative_delta
+ *
+ * relative_delta is the tolerance to determine if two segements are the same
+ */
+var RELATIVE_DELTA_RATIO = 5;
 /**
  * Manage the buffer of the HTMLTextSegmentBuffer.
  * Allows to add, remove and recuperate cues at given times.
@@ -22418,6 +22453,17 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
             ret.push(cues[j].element);
           }
         }
+        // first or last IHTMLCue in a group can have a slighlty different start
+        // or end time than the start or end time of the ICuesGroup due to parsing
+        // approximation.
+        // Add a tolerance of 1ms to fix this issue
+        if (ret.length === 0 && cues.length > 0) {
+          for (var _j = 0; _j < cues.length; _j++) {
+            if (areNearlyEqual(time, cues[_j].start, DELTA_CUES_GROUP) || areNearlyEqual(time, cues[_j].end, DELTA_CUES_GROUP)) {
+              ret.push(cues[_j].element);
+            }
+          }
+        }
         return ret;
       }
     }
@@ -22504,6 +22550,11 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
       end: end,
       cues: cues
     };
+    // it's preferable to have a delta depending on the duration of the segment
+    // if the delta is one fifth of the length of the segment:
+    // a segment of [0, 2] is the "same" segment as [0, 2.1]
+    // but [0, 0.04] is not the "same" segement as [0,04, 0.08]
+    var relativeDelta = Math.abs(start - end) / RELATIVE_DELTA_RATIO;
     /**
      * Called when we found the index of the next cue relative to the cue we
      * want to insert (that is a cue starting after its start or at the same
@@ -22516,7 +22567,7 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
       var nextCue = cuesBuffer[indexOfNextCue];
       if (nextCue === undefined ||
       // no cue
-      areNearlyEqual(cuesInfosToInsert.end, nextCue.end))
+      areNearlyEqual(cuesInfosToInsert.end, nextCue.end, relativeDelta))
         // samey end
         {
           //   ours:            |AAAAA|
@@ -22551,8 +22602,8 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
     for (var cueIdx = 0; cueIdx < cuesBuffer.length; cueIdx++) {
       var cuesInfos = cuesBuffer[cueIdx];
       if (start < cuesInfos.end) {
-        if (areNearlyEqual(start, cuesInfos.start)) {
-          if (areNearlyEqual(end, cuesInfos.end)) {
+        if (areNearlyEqual(start, cuesInfos.start, relativeDelta)) {
+          if (areNearlyEqual(end, cuesInfos.end, relativeDelta)) {
             // exact same segment
             //   ours:            |AAAAA|
             //   the current one: |BBBBB|
@@ -22597,7 +22648,7 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
             //   - add ours before the current one
             cuesBuffer.splice(cueIdx, 0, cuesInfosToInsert);
             return;
-          } else if (areNearlyEqual(end, cuesInfos.start)) {
+          } else if (areNearlyEqual(end, cuesInfos.start, relativeDelta)) {
             // our cue goes just before the current one:
             //   ours:            |AAAAAAA|
             //   the current one:         |BBBB|
@@ -22608,7 +22659,7 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
             cuesInfos.start = end;
             cuesBuffer.splice(cueIdx, 0, cuesInfosToInsert);
             return;
-          } else if (areNearlyEqual(end, cuesInfos.end)) {
+          } else if (areNearlyEqual(end, cuesInfos.end, relativeDelta)) {
             //   ours:            |AAAAAAA|
             //   the current one:    |BBBB|
             //   Result:          |AAAAAAA|
@@ -22635,7 +22686,7 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
           return;
         }
         // else -> start > cuesInfos.start
-        if (areNearlyEqual(cuesInfos.end, end)) {
+        if (areNearlyEqual(cuesInfos.end, end, relativeDelta)) {
           //   ours:              |AAAAAA|
           //   the current one: |BBBBBBBB|
           //   Result:          |BBAAAAAA|
@@ -22671,6 +22722,21 @@ var TextTrackCuesStore = /*#__PURE__*/function () {
         }
       }
     }
+    if (cuesBuffer.length) {
+      var lastCue = cuesBuffer[cuesBuffer.length - 1];
+      if (areNearlyEqual(lastCue.end, start, relativeDelta)) {
+        // Match the end of the previous cue to the start of the following one
+        // if they are close enough. If there is a small gap between two segments
+        // it can lead to having no subtitles for a short time, this is noticeable when
+        // two successive segments displays the same text, making it diseappear
+        // and reappear quickly, which gives the impression of blinking
+        //
+        //   ours:                   |AAAAA|
+        //   the current one: |BBBBB|...
+        //   Result:          |BBBBBBBAAAAA|
+        lastCue.end = start;
+      }
+    }
     // no cues group has the end after our current start.
     // These cues should be the last one
     cuesBuffer.push(cuesInfosToInsert);
@@ -25713,6 +25779,7 @@ var Representation = /*#__PURE__*/function () {
    * @param {Object} args
    */
   function Representation(args, opts) {
+    var _a;
     this.id = args.id;
     this.uniqueId = generateRepresentationUniqueId();
     this.bitrate = args.bitrate;
@@ -25741,12 +25808,24 @@ var Representation = /*#__PURE__*/function () {
     this.cdnMetadata = args.cdnMetadata;
     this.index = args.index;
     if (opts.type === "audio" || opts.type === "video") {
-      var mimeTypeStr = this.getMimeTypeString();
-      var isSupported = isCodecSupported(mimeTypeStr);
-      if (!isSupported) {
-        log/* default */.Z.info("Unsupported Representation", mimeTypeStr, this.id, this.bitrate);
+      this.isSupported = false;
+      // Supplemental codecs are defined as backwards-compatible codecs enhancing
+      // the experience of a base layer codec
+      if (args.supplementalCodecs !== undefined) {
+        var supplementalCodecMimeTypeStr = ((_a = this.mimeType) !== null && _a !== void 0 ? _a : "") + ";codecs=\"" + args.supplementalCodecs + "\"";
+        if (isCodecSupported(supplementalCodecMimeTypeStr)) {
+          this.codec = args.supplementalCodecs;
+          this.isSupported = true;
+        }
+      }
+      if (!this.isSupported) {
+        var mimeTypeStr = this.getMimeTypeString();
+        var isSupported = isCodecSupported(mimeTypeStr);
+        if (!isSupported) {
+          log/* default */.Z.info("Unsupported Representation", mimeTypeStr, this.id, this.bitrate);
+        }
+        this.isSupported = isSupported;
       }
-      this.isSupported = isSupported;
     } else {
       this.isSupported = true; // TODO for other types
     }
@@ -29073,7 +29152,7 @@ function createDashUrlDetokenizer(time, nb) {
 
 /***/ }),
 
-/***/ 4541:
+/***/ 1707:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -29533,6 +29612,11 @@ function flattenOverlappingPeriods(parsedPeriods) {
         // `lastFlattenedPeriod` has now a negative or `0` duration.
         // Remove it, consider the next Period in its place, and re-start the loop.
         flattenedPeriods.pop();
+        if (flattenedPeriods.length === 0) {
+          // There's no remaining Period to compare to `parsedPeriod`
+          break;
+        }
+        // Take the previous Period as reference and compare it now to `parsedPeriod`
         lastFlattenedPeriod = flattenedPeriods[flattenedPeriods.length - 1];
       }
     }
@@ -29886,6 +29970,31 @@ function inferAdaptationType(representations, adaptationMimeType, adaptationCode
 }
 // EXTERNAL MODULE: ./src/utils/object_assign.ts
 var object_assign = __webpack_require__(8026);
+;// CONCATENATED MODULE: ./src/parsers/manifest/dash/common/convert_supplemental_codecs.ts
+
+var supplementalCodecSeparator = /[, ]+/g;
+/**
+ * Converts SCTE 214 supplemental codec string into RFC4281 codec string
+ *
+ * The returned value is a codec string respecting RFC6381
+ *
+ * SCTE 214 defines supplemental codecs as a whitespace-separated multiple list of
+ * codec strings
+ *
+ * RFC6381 defines codecs as a comma-separated list of codec strings.
+ *
+ * This two syntax differs and this parser is used to convert SCTE214
+ * to be compliant with what MSE APIs expect
+ *
+ * @param {string} val - The codec string to parse
+ * @returns { Array.<string | undefined | null>}
+ */
+function convertSupplementalCodecsToRFC6381(val) {
+  if ((0,is_non_empty_string/* default */.Z)(val)) {
+    return val.trim().replace(supplementalCodecSeparator, ", ");
+  }
+  return "";
+}
 ;// CONCATENATED MODULE: ./src/parsers/manifest/dash/common/get_hdr_information.ts
 /**
  * Copyright 2015 CANAL+ Group
@@ -31653,6 +31762,7 @@ function parse_representations_arrayLikeToArray(arr, len) { if (len == null || l
 
 
 
+
 /**
  * Combine inband event streams from representation and
  * adaptation data.
@@ -31728,7 +31838,7 @@ function parseRepresentations(representationsIR, adaptation, context) {
   var _loop = function _loop() {
     var representation = _step.value;
     // Compute Representation ID
-    var representationID = representation.attributes.id != null ? representation.attributes.id : String(representation.attributes.bitrate) + (representation.attributes.height != null ? "-" + representation.attributes.height : "") + (representation.attributes.width != null ? "-" + representation.attributes.width : "") + (representation.attributes.mimeType != null ? "-" + representation.attributes.mimeType : "") + (representation.attributes.codecs != null ? "-" + representation.attributes.codecs : "");
+    var representationID = representation.attributes.id !== undefined ? representation.attributes.id : String(representation.attributes.bitrate) + (representation.attributes.height !== undefined ? "-" + representation.attributes.height : "") + (representation.attributes.width !== undefined ? "-" + representation.attributes.width : "") + (representation.attributes.mimeType !== undefined ? "-" + representation.attributes.mimeType : "") + (representation.attributes.codecs !== undefined ? "-" + representation.attributes.codecs : "");
     // Avoid duplicate IDs
     while (parsedRepresentations.some(function (r) {
       return r.id === representationID;
@@ -31750,7 +31860,7 @@ function parseRepresentations(representationsIR, adaptation, context) {
     var representationIndex = parseRepresentationIndex(representation, reprIndexCtxt);
     // Find bitrate
     var representationBitrate;
-    if (representation.attributes.bitrate == null) {
+    if (representation.attributes.bitrate === undefined) {
       log/* default */.Z.warn("DASH: No usable bitrate found in the Representation.");
       representationBitrate = 0;
     } else {
@@ -31785,33 +31895,42 @@ function parseRepresentations(representationsIR, adaptation, context) {
     }
     // Add optional attributes
     var codecs;
-    if (representation.attributes.codecs != null) {
+    if (representation.attributes.codecs !== undefined) {
       codecs = representation.attributes.codecs;
-    } else if (adaptation.attributes.codecs != null) {
+    } else if (adaptation.attributes.codecs !== undefined) {
       codecs = adaptation.attributes.codecs;
     }
-    if (codecs != null) {
+    if (codecs !== undefined) {
       codecs = codecs === "mp4a.40.02" ? "mp4a.40.2" : codecs;
       parsedRepresentation.codecs = codecs;
     }
-    if (representation.attributes.frameRate != null) {
+    var supplementalCodecs;
+    if (representation.attributes.supplementalCodecs !== undefined) {
+      supplementalCodecs = representation.attributes.supplementalCodecs;
+    } else if (adaptation.attributes.supplementalCodecs !== undefined) {
+      supplementalCodecs = adaptation.attributes.supplementalCodecs;
+    }
+    if (supplementalCodecs !== undefined) {
+      parsedRepresentation.supplementalCodecs = convertSupplementalCodecsToRFC6381(supplementalCodecs);
+    }
+    if (representation.attributes.frameRate !== undefined) {
       parsedRepresentation.frameRate = representation.attributes.frameRate;
-    } else if (adaptation.attributes.frameRate != null) {
+    } else if (adaptation.attributes.frameRate !== undefined) {
       parsedRepresentation.frameRate = adaptation.attributes.frameRate;
     }
-    if (representation.attributes.height != null) {
+    if (representation.attributes.height !== undefined) {
       parsedRepresentation.height = representation.attributes.height;
-    } else if (adaptation.attributes.height != null) {
+    } else if (adaptation.attributes.height !== undefined) {
       parsedRepresentation.height = adaptation.attributes.height;
     }
-    if (representation.attributes.mimeType != null) {
+    if (representation.attributes.mimeType !== undefined) {
       parsedRepresentation.mimeType = representation.attributes.mimeType;
-    } else if (adaptation.attributes.mimeType != null) {
+    } else if (adaptation.attributes.mimeType !== undefined) {
       parsedRepresentation.mimeType = adaptation.attributes.mimeType;
     }
-    if (representation.attributes.width != null) {
+    if (representation.attributes.width !== undefined) {
       parsedRepresentation.width = representation.attributes.width;
-    } else if (adaptation.attributes.width != null) {
+    } else if (adaptation.attributes.width !== undefined) {
       parsedRepresentation.width = adaptation.attributes.width;
     }
     var contentProtectionsIr = adaptation.children.contentProtections !== undefined ? adaptation.children.contentProtections : [];
@@ -33846,6 +33965,9 @@ function parseRepresentationAttributes(representationElement) {
           dashName: "qualityRanking"
         });
         break;
+      case "scte214:supplementalCodecs":
+        attributes.supplementalCodecs = attr.value;
+        break;
       case "segmentProfiles":
         attributes.segmentProfiles = attr.value;
         break;
@@ -34166,6 +34288,9 @@ function parseAdaptationSetAttributes(root) {
       case "codecs":
         parsedAdaptation.codecs = attribute.value;
         break;
+      case "scte214:supplementalCodecs":
+        parsedAdaptation.supplementalCodecs = attribute.value;
+        break;
       case "codingDependency":
         parseValue(attribute.value, {
           asKey: "codingDependency",
@@ -50595,6 +50720,12 @@ function checkReloadOptions(options) {
   if (typeof ((_c = options === null || options === void 0 ? void 0 : options.reloadAt) === null || _c === void 0 ? void 0 : _c.relative) !== "number" && ((_d = options === null || options === void 0 ? void 0 : options.reloadAt) === null || _d === void 0 ? void 0 : _d.relative) !== undefined) {
     throw new Error("API: reload - Invalid 'reloadAt.relative' option format.");
   }
+  if (!Array.isArray(options === null || options === void 0 ? void 0 : options.keySystems) && (options === null || options === void 0 ? void 0 : options.keySystems) !== undefined) {
+    throw new Error("API: reload - Invalid 'keySystems' option format.");
+  }
+  if ((options === null || options === void 0 ? void 0 : options.autoPlay) !== undefined && typeof options.autoPlay !== "boolean") {
+    throw new Error("API: reload - Invalid 'autoPlay' option format.");
+  }
 }
 /**
  * Parse options given to loadVideo and set default options as found
@@ -52604,7 +52735,7 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
     // Workaround to support Firefox autoplay on FF 42.
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
-    _this.version = /* PLAYER_VERSION */"3.32.2-dev.2023110700";
+    _this.version = /* PLAYER_VERSION */"3.33.0-dev.2023111400";
     _this.log = log/* default */.Z;
     _this.state = "STOPPED";
     _this.videoElement = videoElement;
@@ -52764,7 +52895,7 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
    * @param {Object} reloadOpts
    */;
   _proto.reload = function reload(reloadOpts) {
-    var _a, _b;
+    var _a, _b, _c;
     var _this$_priv_reloading = this._priv_reloadingMetadata,
       options = _this$_priv_reloading.options,
       manifest = _this$_priv_reloading.manifest,
@@ -52798,6 +52929,12 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
     } else if (reloadInPause !== undefined) {
       autoPlay = !reloadInPause;
     }
+    var keySystems;
+    if ((reloadOpts === null || reloadOpts === void 0 ? void 0 : reloadOpts.keySystems) !== undefined) {
+      keySystems = reloadOpts.keySystems;
+    } else if (((_c = this._priv_reloadingMetadata.options) === null || _c === void 0 ? void 0 : _c.keySystems) !== undefined) {
+      keySystems = this._priv_reloadingMetadata.options.keySystems;
+    }
     var newOptions = Object.assign(Object.assign({}, options), {
       initialManifest: manifest
     });
@@ -52807,6 +52944,9 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
     if (autoPlay !== undefined) {
       newOptions.autoPlay = autoPlay;
     }
+    if (keySystems !== undefined) {
+      newOptions.keySystems = keySystems;
+    }
     this._priv_initializeContentPlayback(newOptions);
   };
   _proto.createDebugElement = function createDebugElement(element) {
@@ -55018,7 +55158,7 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
   }]);
   return Player;
 }(event_emitter/* default */.Z);
-Player.version = /* PLAYER_VERSION */"3.32.2-dev.2023110700";
+Player.version = /* PLAYER_VERSION */"3.33.0-dev.2023111400";
 /* harmony default export */ var public_api = (Player);
 ;// CONCATENATED MODULE: ./src/core/api/index.ts
 /**
@@ -55082,7 +55222,7 @@ function initializeFeaturesObject() {
   }
   if (true) {
     features_object/* default */.Z.transports.dash = (__webpack_require__(85)/* ["default"] */ .Z);
-    features_object/* default */.Z.dashParsers.js = (__webpack_require__(4541)/* ["default"] */ .Z);
+    features_object/* default */.Z.dashParsers.js = (__webpack_require__(1707)/* ["default"] */ .Z);
   }
   if (false) {}
   if (false) {}