rx-player 4.1.0 → 4.2.0-dev.2024080600

package/dist/commonjs/core/fetchers/segment/segment_fetcher.js

@@ -51,7 +51,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSegmentFetcherOptions = void 0;
+exports.default = createSegmentFetcher;
+exports.getSegmentFetcherRequestOptions = getSegmentFetcherRequestOptions;
 var config_1 = require("../../../config");
 var errors_1 = require("../../../errors");
 var log_1 = require("../../../log");
@@ -71,37 +72,25 @@ var generateRequestID = (0, id_generator_1.default)();
  * Create an `ISegmentFetcher` object which will allow to easily fetch and parse
  * segments.
  * An `ISegmentFetcher` also implements a retry mechanism, based on the given
- * `options` argument, which may retry a segment request when it fails.
- *
- * @param {string} bufferType - Type of  buffer concerned (e.g. `"audio"`,
- * `"video"`, `"text" etc.)
- * @param {Object} pipeline - The transport-specific logic allowing to load
- * segments of the given buffer type and transport protocol (e.g. DASH).
- * @param {Object|null} cdnPrioritizer - Abstraction allowing to synchronize,
- * update and keep track of the priorization of the CDN to use to load any given
- * segment, in cases where multiple ones are available.
+ * `requestOptions` argument, which may retry a segment request when it fails.
  *
- * Can be set to `null` in which case a minimal priorization logic will be used
- * instead.
- * @param {Object} lifecycleCallbacks - Callbacks that can be registered to be
- * informed when new requests are made, ended, new metrics are available etc.
- * This should be mainly useful to implement an adaptive logic relying on those
- * metrics and events.
- * @param {Object} options - Various tweaking options allowing to configure the
- * behavior of the returned `ISegmentFetcher`.
+ * @param {Object} args
  * @returns {Function}
  */
-function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCallbacks, options) {
+function createSegmentFetcher(_a) {
+    var bufferType = _a.bufferType, pipeline = _a.pipeline, cdnPrioritizer = _a.cdnPrioritizer, cmcdDataBuilder = _a.cmcdDataBuilder, eventListeners = _a.eventListeners, requestOptions = _a.requestOptions;
     var connectionTimeout;
-    if (options.connectionTimeout === undefined || options.connectionTimeout < 0) {
+    if (requestOptions.connectionTimeout === undefined ||
+        requestOptions.connectionTimeout < 0) {
         connectionTimeout = undefined;
     }
     else {
-        connectionTimeout = options.connectionTimeout;
+        connectionTimeout = requestOptions.connectionTimeout;
     }
-    var requestOptions = {
-        timeout: options.requestTimeout < 0 ? undefined : options.requestTimeout,
+    var pipelineRequestOptions = {
+        timeout: requestOptions.requestTimeout < 0 ? undefined : requestOptions.requestTimeout,
         connectionTimeout: connectionTimeout,
+        cmcdPayload: undefined,
     };
     /**
      * Cache audio and video initialization segments.
@@ -120,7 +109,6 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
      * @returns {Promise}
      */
     return function fetchSegment(content, fetcherCallbacks, cancellationSignal) {
-        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
             function onCancellation() {
                 var _a;
@@ -129,7 +117,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                 }
                 log_1.default.debug("SF: Segment request cancelled", segmentIdString);
                 requestInfo = null;
-                (_a = lifecycleCallbacks.onRequestEnd) === null || _a === void 0 ? void 0 : _a.call(lifecycleCallbacks, { id: requestId });
+                (_a = eventListeners.onRequestEnd) === null || _a === void 0 ? void 0 : _a.call(eventListeners, { id: requestId });
             }
             /**
              * Call a segment loader for the given URL with the right arguments.
@@ -137,7 +125,9 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
              * @returns {Promise}
              */
             function callLoaderWithUrl(cdnMetadata) {
-                return loadSegment(cdnMetadata, context, requestOptions, cancellationSignal, loaderCallbacks);
+                pipelineRequestOptions.cmcdPayload =
+                    cmcdDataBuilder === null || cmcdDataBuilder === void 0 ? void 0 : cmcdDataBuilder.getCmcdDataForSegmentRequest(content);
+                return loadSegment(cdnMetadata, context, pipelineRequestOptions, cancellationSignal, loaderCallbacks);
             }
             /**
              * Generate function allowing to parse a loaded segment.
@@ -195,7 +185,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                     parsedChunks.length > 0 &&
                     parsedChunks.every(function (isParsed) { return isParsed; })) {
                     metricsSent = true;
-                    (_a = lifecycleCallbacks.onMetrics) === null || _a === void 0 ? void 0 : _a.call(lifecycleCallbacks, {
+                    (_a = eventListeners.onMetrics) === null || _a === void 0 ? void 0 : _a.call(eventListeners, {
                         size: requestInfo.size,
                         requestDuration: requestInfo.requestDuration,
                         content: content,
@@ -204,6 +194,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                 }
             }
             var segment, adaptation, representation, manifest, period, segmentIdString, requestId, requestInfo, parsedChunks, segmentDurationAcc, metricsSent, context, loaderCallbacks, cached, res, loadedData, err_1;
+            var _a, _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -236,7 +227,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                                     return; // request already termminated
                                 }
                                 if (info.totalSize !== undefined && info.size < info.totalSize) {
-                                    (_a = lifecycleCallbacks.onProgress) === null || _a === void 0 ? void 0 : _a.call(lifecycleCallbacks, {
+                                    (_a = eventListeners.onProgress) === null || _a === void 0 ? void 0 : _a.call(eventListeners, {
                                         duration: info.duration,
                                         size: info.size,
                                         totalSize: info.totalSize,
@@ -262,7 +253,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                             return [2 /*return*/, Promise.resolve()];
                         }
                         log_1.default.debug("SF: Beginning request", segmentIdString);
-                        (_a = lifecycleCallbacks.onRequestBegin) === null || _a === void 0 ? void 0 : _a.call(lifecycleCallbacks, {
+                        (_a = eventListeners.onRequestBegin) === null || _a === void 0 ? void 0 : _a.call(eventListeners, {
                             requestTimestamp: (0, monotonic_timestamp_1.default)(),
                             id: requestId,
                             content: content,
@@ -271,7 +262,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, (0, schedule_request_1.scheduleRequestWithCdns)(content.representation.cdnMetadata, cdnPrioritizer, callLoaderWithUrl, (0, object_assign_1.default)({ onRetry: onRetry }, options), cancellationSignal)];
+                        return [4 /*yield*/, (0, schedule_request_1.scheduleRequestWithCdns)(content.representation.cdnMetadata, cdnPrioritizer, callLoaderWithUrl, (0, object_assign_1.default)({ onRetry: onRetry }, requestOptions), cancellationSignal)];
                     case 2:
                         res = _d.sent();
                         if (res.resultType === "segment-loaded") {
@@ -297,7 +288,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                             // The current task could have been canceled as a result of one
                             // of the previous callbacks call. In that case, we don't want to send
                             // a "requestEnd" again as it has already been sent on cancellation.
-                            (_b = lifecycleCallbacks.onRequestEnd) === null || _b === void 0 ? void 0 : _b.call(lifecycleCallbacks, { id: requestId });
+                            (_b = eventListeners.onRequestEnd) === null || _b === void 0 ? void 0 : _b.call(eventListeners, { id: requestId });
                         }
                         cancellationSignal.deregister(onCancellation);
                         return [3 /*break*/, 4];
@@ -310,7 +301,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                             throw err_1;
                         }
                         log_1.default.debug("SF: Segment request failed", segmentIdString);
-                        (_c = lifecycleCallbacks.onRequestEnd) === null || _c === void 0 ? void 0 : _c.call(lifecycleCallbacks, { id: requestId });
+                        (_c = eventListeners.onRequestEnd) === null || _c === void 0 ? void 0 : _c.call(eventListeners, { id: requestId });
                         throw (0, error_selector_1.default)(err_1);
                     case 4: return [2 /*return*/];
                 }
@@ -318,13 +309,11 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
         });
     };
 }
-exports.default = createSegmentFetcher;
 /**
- * @param {string} bufferType
- * @param {Object}
+ * @param {Object} baseOptions
  * @returns {Object}
  */
-function getSegmentFetcherOptions(_a) {
+function getSegmentFetcherRequestOptions(_a) {
     var maxRetry = _a.maxRetry, lowLatencyMode = _a.lowLatencyMode, requestTimeout = _a.requestTimeout, connectionTimeout = _a.connectionTimeout;
     var _b = config_1.default.getCurrent(), DEFAULT_MAX_REQUESTS_RETRY_ON_ERROR = _b.DEFAULT_MAX_REQUESTS_RETRY_ON_ERROR, DEFAULT_REQUEST_TIMEOUT = _b.DEFAULT_REQUEST_TIMEOUT, DEFAULT_CONNECTION_TIMEOUT = _b.DEFAULT_CONNECTION_TIMEOUT, INITIAL_BACKOFF_DELAY_BASE = _b.INITIAL_BACKOFF_DELAY_BASE, MAX_BACKOFF_DELAY_BASE = _b.MAX_BACKOFF_DELAY_BASE;
     return {
@@ -339,4 +328,3 @@ function getSegmentFetcherOptions(_a) {
         connectionTimeout: connectionTimeout === undefined ? DEFAULT_CONNECTION_TIMEOUT : connectionTimeout,
     };
 }
-exports.getSegmentFetcherOptions = getSegmentFetcherOptions;

package/dist/commonjs/core/fetchers/segment/segment_fetcher_creator.d.ts

@@ -15,6 +15,7 @@
  */
 import type { ITransportPipelines } from "../../../transports";
 import type { CancellationSignal } from "../../../utils/task_canceller";
+import type CmcdDataBuilder from "../../cmcd";
 import type { IBufferType } from "../../segment_sinks";
 import type { IPrioritizedSegmentFetcher } from "./prioritized_segment_fetcher";
 import type { ISegmentFetcherLifecycleCallbacks } from "./segment_fetcher";
@@ -45,18 +46,19 @@ export default class SegmentFetcherCreator {
      */
     private readonly _backoffOptions;
     private readonly _cdnPrioritizer;
+    private _cmcdDataBuilder;
     /**
      * @param {Object} transport
      */
-    constructor(transport: ITransportPipelines, options: ISegmentFetcherCreatorBackoffOptions, cancelSignal: CancellationSignal);
+    constructor(transport: ITransportPipelines, cmcdDataBuilder: CmcdDataBuilder | null, options: ISegmentFetcherCreatorBackoffOptions, cancelSignal: CancellationSignal);
     /**
      * Create a segment fetcher, allowing to easily perform segment requests.
      * @param {string} bufferType - The type of buffer concerned (e.g. "audio",
      * "video", etc.)
-     * @param {Object} callbacks
+     * @param {Object} eventListeners
      * @returns {Object}
      */
-    createSegmentFetcher(bufferType: IBufferType, callbacks: ISegmentFetcherLifecycleCallbacks): IPrioritizedSegmentFetcher<unknown>;
+    createSegmentFetcher(bufferType: IBufferType, eventListeners: ISegmentFetcherLifecycleCallbacks): IPrioritizedSegmentFetcher<unknown>;
 }
 /** Options used by the `SegmentFetcherCreator`. */
 export interface ISegmentFetcherCreatorBackoffOptions {

package/dist/commonjs/core/fetchers/segment/segment_fetcher_creator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"segment_fetcher_creator.d.ts","sourceRoot":"","sources":["../../../../../src/core/fetchers/segment/segment_fetcher_creator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAoB,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAI3E;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACxC;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACjD;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;IACrD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IAEvE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD;;OAEG;gBAED,SAAS,EAAE,mBAAmB,EAC9B,OAAO,EAAE,oCAAoC,EAC7C,YAAY,EAAE,kBAAkB;IAgBlC;;;;;;OAMG;IACH,oBAAoB,CAClB,UAAU,EAAE,WAAW,EACvB,SAAS,EAAE,iCAAiC,GAC3C,0BAA0B,CAAC,OAAO,CAAC;CAcvC;AAED,mDAAmD;AACnD,MAAM,WAAW,oCAAoC;IACnD;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB,iEAAiE;IACjE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B;;;;;OAKG;IACH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC"}
+{"version":3,"file":"segment_fetcher_creator.d.ts","sourceRoot":"","sources":["../../../../../src/core/fetchers/segment/segment_fetcher_creator.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAoB,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACxE,OAAO,KAAK,eAAe,MAAM,YAAY,CAAC;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,KAAK,EAAE,iCAAiC,EAAE,MAAM,mBAAmB,CAAC;AAI3E;;;;;GAKG;AACH,MAAM,CAAC,OAAO,OAAO,qBAAqB;IACxC;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAsB;IACjD;;;;;;;OAOG;IACH,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAwB;IACrD;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAuC;IAEvE,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAiB;IAEjD,OAAO,CAAC,gBAAgB,CAAyB;IAEjD;;OAEG;gBAED,SAAS,EAAE,mBAAmB,EAC9B,eAAe,EAAE,eAAe,GAAG,IAAI,EACvC,OAAO,EAAE,oCAAoC,EAC7C,YAAY,EAAE,kBAAkB;IAiBlC;;;;;;OAMG;IACH,oBAAoB,CAClB,UAAU,EAAE,WAAW,EACvB,cAAc,EAAE,iCAAiC,GAChD,0BAA0B,CAAC,OAAO,CAAC;CAevC;AAED,mDAAmD;AACnD,MAAM,WAAW,oCAAoC;IACnD;;;OAGG;IACH,cAAc,EAAE,OAAO,CAAC;IACxB,iEAAiE;IACjE,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAC;IAC7B;;;;;OAKG;IACH,cAAc,EAAE,MAAM,GAAG,SAAS,CAAC;IACnC,iBAAiB,EAAE,MAAM,GAAG,SAAS,CAAC;CACvC"}

package/dist/commonjs/core/fetchers/segment/segment_fetcher_creator.js

@@ -30,7 +30,7 @@ var SegmentFetcherCreator = /** @class */ (function () {
     /**
      * @param {Object} transport
      */
-    function SegmentFetcherCreator(transport, options, cancelSignal) {
+    function SegmentFetcherCreator(transport, cmcdDataBuilder, options, cancelSignal) {
         var cdnPrioritizer = new cdn_prioritizer_1.default(cancelSignal);
         var _a = config_1.default.getCurrent(), MIN_CANCELABLE_PRIORITY = _a.MIN_CANCELABLE_PRIORITY, MAX_HIGH_PRIORITY_LEVEL = _a.MAX_HIGH_PRIORITY_LEVEL;
         this._transport = transport;
@@ -42,19 +42,27 @@ var SegmentFetcherCreator = /** @class */ (function () {
         });
         this._cdnPrioritizer = cdnPrioritizer;
         this._backoffOptions = options;
+        this._cmcdDataBuilder = cmcdDataBuilder;
     }
     /**
      * Create a segment fetcher, allowing to easily perform segment requests.
      * @param {string} bufferType - The type of buffer concerned (e.g. "audio",
      * "video", etc.)
-     * @param {Object} callbacks
+     * @param {Object} eventListeners
      * @returns {Object}
      */
-    SegmentFetcherCreator.prototype.createSegmentFetcher = function (bufferType, callbacks) {
-        var backoffOptions = (0, segment_fetcher_1.getSegmentFetcherOptions)(this._backoffOptions);
+    SegmentFetcherCreator.prototype.createSegmentFetcher = function (bufferType, eventListeners) {
+        var requestOptions = (0, segment_fetcher_1.getSegmentFetcherRequestOptions)(this._backoffOptions);
         var pipelines = this._transport[bufferType];
         // Types are very complicated here as they are per-type of buffer.
-        var segmentFetcher = (0, segment_fetcher_1.default)(bufferType, pipelines, this._cdnPrioritizer, callbacks, backoffOptions);
+        var segmentFetcher = (0, segment_fetcher_1.default)({
+            bufferType: bufferType,
+            pipeline: pipelines,
+            cdnPrioritizer: this._cdnPrioritizer,
+            cmcdDataBuilder: this._cmcdDataBuilder,
+            eventListeners: eventListeners,
+            requestOptions: requestOptions,
+        });
         return (0, prioritized_segment_fetcher_1.default)(this._prioritizer, segmentFetcher);
     };
     return SegmentFetcherCreator;

package/dist/commonjs/core/fetchers/utils/error_selector.js

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = errorSelector;
 var errors_1 = require("../../../errors");
 var request_1 = require("../../../utils/request");
 /**
@@ -31,4 +32,3 @@ function errorSelector(error) {
         defaultReason: "Unknown error when fetching the Manifest",
     });
 }
-exports.default = errorSelector;

package/dist/commonjs/core/fetchers/utils/schedule_request.js

@@ -51,7 +51,8 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scheduleRequestPromise = exports.scheduleRequestWithCdns = void 0;
+exports.scheduleRequestWithCdns = scheduleRequestWithCdns;
+exports.scheduleRequestPromise = scheduleRequestPromise;
 var errors_1 = require("../../../errors");
 var log_1 = require("../../../log");
 var cancellable_sleep_1 = require("../../../utils/cancellable_sleep");
@@ -378,7 +379,6 @@ function scheduleRequestWithCdns(cdns, cdnPrioritizer, performRequest, options,
         });
     });
 }
-exports.scheduleRequestWithCdns = scheduleRequestWithCdns;
 /**
  * Lightweight version of the request algorithm, this time with only a simple
  * Promise given.
@@ -390,4 +390,3 @@ function scheduleRequestPromise(performRequest, options, cancellationSignal) {
     // same than for a single unknown CDN
     return scheduleRequestWithCdns(null, null, performRequest, options, cancellationSignal);
 }
-exports.scheduleRequestPromise = scheduleRequestPromise;

package/dist/commonjs/core/main/common/create_content_time_boundaries_observer.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = createContentTimeBoundariesObserver;
 var log_1 = require("../../../log");
 var content_time_boundaries_observer_1 = require("./content_time_boundaries_observer");
 /**
@@ -45,4 +46,3 @@ function createContentTimeBoundariesObserver(manifest, mediaSource, streamObserv
     mediaSource.setDuration(obj.endingPosition, obj.isEnd);
     return contentTimeBoundariesObserver;
 }
-exports.default = createContentTimeBoundariesObserver;

package/dist/commonjs/core/main/common/get_buffered_data_per_media_buffer.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = getBufferedDataPerMediaBuffer;
 var array_find_1 = require("../../../utils/array_find");
 /**
  * Returns a JS object where keys are the type of buffers (e.g. "audio",
@@ -34,4 +35,3 @@ function getBufferedDataPerMediaBuffer(mediaSourceInterface, textDisplayer) {
     }
     return buffered;
 }
-exports.default = getBufferedDataPerMediaBuffer;

package/dist/commonjs/core/main/worker/content_preparer.d.ts

@@ -2,6 +2,7 @@ import type { IManifest, IManifestMetadata } from "../../../manifest";
 import type { IMediaSourceInterface } from "../../../mse";
 import type { IContentInitializationData } from "../../../multithread_types";
 import type { IRepresentationEstimator } from "../../adaptive";
+import CmcdDataBuilder from "../../cmcd";
 import type { IManifestRefreshSettings } from "../../fetchers";
 import { ManifestFetcher, SegmentFetcherCreator } from "../../fetchers";
 import SegmentSinksStore from "../../segment_sinks";
@@ -50,6 +51,12 @@ export interface IPreparedContentData {
      * Protects against all kind of race conditions or asynchronous issues.
      */
     contentId: string;
+    /**
+     * Perform data collection and retrieval for the "Common Media Client Data"
+     * scheme, which is a specification allowing to communicate about playback
+     * conditions with a CDN.
+     */
+    cmcdDataBuilder: CmcdDataBuilder | null;
     /**
      * Interface to the MediaSource implementation, allowing to buffer audio
      * and video media segments.

package/dist/commonjs/core/main/worker/content_preparer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content_preparer.d.ts","sourceRoot":"","sources":["../../../../../src/core/main/worker/content_preparer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,KAAK,EAEV,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,6BAA6B,MAAM,yCAAyC,CAAC;AAGpF,OAAO,iBAAiB,MAAM,uBAAuB,CAAC;AACtD,OAAO,4BAA4B,MAAM,mCAAmC,CAAC;AAI7E,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,4BAA4B,CAAgB;IACpD,OAAO,CAAC,iBAAiB,CAAgB;IAEzC,uBAAuB;IACvB,OAAO,CAAC,eAAe,CAAU;IAEjC,uBAAuB;IACvB,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;;;;;;;OAYG;gBACS,EACV,cAAc,EACd,QAAQ,GACT,EAAE;QACD,cAAc,EAAE,OAAO,CAAC;QACxB,QAAQ,EAAE,OAAO,CAAC;KACnB;IASM,oBAAoB,CACzB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,iBAAiB,CAAC;IAoKtB,iBAAiB,IAAI,oBAAoB,GAAG,IAAI;IAIhD,uBAAuB,CAAC,QAAQ,EAAE,wBAAwB,GAAG,IAAI;IAIjE,iBAAiB,CAAC,UAAU,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;IAmD5E,qBAAqB;CAI7B;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;OAGG;IACH,WAAW,EAAE,qBAAqB,CAAC;IACnC,0DAA0D;IAC1D,eAAe,EAAE,eAAe,CAAC;IACjC;;;;OAIG;IACH,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B;;;OAGG;IACH,6BAA6B,EAAE,6BAA6B,CAAC;IAC7D;;;OAGG;IACH,uBAAuB,EAAE,wBAAwB,CAAC;IAClD;;;OAGG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kEAAkE;IAClE,gBAAgB,EAAE,4BAA4B,GAAG,IAAI,CAAC;IACtD;;;OAGG;IACH,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C;;;OAGG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;CACtC"}
+{"version":3,"file":"content_preparer.d.ts","sourceRoot":"","sources":["../../../../../src/core/main/worker/content_preparer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEtE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAG1D,OAAO,KAAK,EAEV,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AAWpC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAE/D,OAAO,eAAe,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,cAAc,CAAC;AACnE,OAAO,6BAA6B,MAAM,yCAAyC,CAAC;AAGpF,OAAO,iBAAiB,MAAM,uBAAuB,CAAC;AACtD,OAAO,4BAA4B,MAAM,mCAAmC,CAAC;AAI7E,MAAM,CAAC,OAAO,OAAO,eAAe;IAClC,OAAO,CAAC,eAAe,CAA8B;IACrD,OAAO,CAAC,4BAA4B,CAAgB;IACpD,OAAO,CAAC,iBAAiB,CAAgB;IAEzC,uBAAuB;IACvB,OAAO,CAAC,eAAe,CAAU;IAEjC,uBAAuB;IACvB,OAAO,CAAC,SAAS,CAAU;IAE3B;;;;;;;;;;;;OAYG;gBACS,EACV,cAAc,EACd,QAAQ,GACT,EAAE;QACD,cAAc,EAAE,OAAO,CAAC;QACxB,QAAQ,EAAE,OAAO,CAAC;KACnB;IASM,oBAAoB,CACzB,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,iBAAiB,CAAC;IA4KtB,iBAAiB,IAAI,oBAAoB,GAAG,IAAI;IAIhD,uBAAuB,CAAC,QAAQ,EAAE,wBAAwB,GAAG,IAAI;IAIjE,iBAAiB,CAAC,UAAU,EAAE,8BAA8B,GAAG,OAAO,CAAC,IAAI,CAAC;IAmD5E,qBAAqB;CAI7B;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,SAAS,EAAE,MAAM,CAAC;IAClB;;;;OAIG;IACH,eAAe,EAAE,eAAe,GAAG,IAAI,CAAC;IACxC;;;OAGG;IACH,WAAW,EAAE,qBAAqB,CAAC;IACnC,0DAA0D;IAC1D,eAAe,EAAE,eAAe,CAAC;IACjC;;;;OAIG;IACH,QAAQ,EAAE,SAAS,GAAG,IAAI,CAAC;IAC3B;;;OAGG;IACH,6BAA6B,EAAE,6BAA6B,CAAC;IAC7D;;;OAGG;IACH,uBAAuB,EAAE,wBAAwB,CAAC;IAClD;;;OAGG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;IACrC,kEAAkE;IAClE,gBAAgB,EAAE,4BAA4B,GAAG,IAAI,CAAC;IACtD;;;OAGG;IACH,qBAAqB,EAAE,qBAAqB,CAAC;IAC7C;;;OAGG;IACH,iBAAiB,EAAE,iBAAiB,CAAC;CACtC"}

package/dist/commonjs/core/main/worker/content_preparer.js

@@ -37,6 +37,7 @@ var id_generator_1 = require("../../../utils/id_generator");
 var object_assign_1 = require("../../../utils/object_assign");
 var task_canceller_1 = require("../../../utils/task_canceller");
 var adaptive_1 = require("../../adaptive");
+var cmcd_1 = require("../../cmcd");
 var fetchers_1 = require("../../fetchers");
 var segment_sinks_1 = require("../../segment_sinks");
 var DecipherabilityFreezeDetector_1 = require("../common/DecipherabilityFreezeDetector");
@@ -85,7 +86,8 @@ var ContentPreparer = /** @class */ (function () {
                 ? (0, manifest_1.createRepresentationFilterFromFnString)(transportOptions.representationFilter)
                 : undefined;
             var dashPipelines = features_1.default.transports.dash(__assign(__assign({}, transportOptions), { representationFilter: representationFilter }));
-            var manifestFetcher = new fetchers_1.ManifestFetcher(url === undefined ? undefined : [url], dashPipelines, context.manifestRetryOptions);
+            var cmcdDataBuilder = context.cmcd === undefined ? null : new cmcd_1.default(context.cmcd);
+            var manifestFetcher = new fetchers_1.ManifestFetcher(url === undefined ? undefined : [url], dashPipelines, __assign({ cmcdDataBuilder: cmcdDataBuilder }, context.manifestRetryOptions));
             var representationEstimator = (0, adaptive_1.default)({
                 initialBitrates: {
                     audio: (_a = context.initialAudioBitrate) !== null && _a !== void 0 ? _a : 0,
@@ -100,7 +102,7 @@ var ContentPreparer = /** @class */ (function () {
             var unbindRejectOnCancellation = currentMediaSourceCanceller.signal.register(function (error) {
                 rej(error);
             });
-            var segmentFetcherCreator = new fetchers_1.SegmentFetcherCreator(dashPipelines, context.segmentRetryOptions, contentCanceller.signal);
+            var segmentFetcherCreator = new fetchers_1.SegmentFetcherCreator(dashPipelines, cmcdDataBuilder, context.segmentRetryOptions, contentCanceller.signal);
             var trackChoiceSetter = new track_choice_setter_1.default();
             var _c = __read(createMediaSourceAndBuffersStore(contentId, {
                 hasMseInWorker: _this._hasMseInWorker,
@@ -109,6 +111,7 @@ var ContentPreparer = /** @class */ (function () {
             }, currentMediaSourceCanceller.signal), 3), mediaSource = _c[0], segmentSinksStore = _c[1], workerTextSender = _c[2];
             var decipherabilityFreezeDetector = new DecipherabilityFreezeDetector_1.default(segmentSinksStore);
             _this._currentContent = {
+                cmcdDataBuilder: cmcdDataBuilder,
                 contentId: contentId,
                 decipherabilityFreezeDetector: decipherabilityFreezeDetector,
                 mediaSource: mediaSource,

package/dist/commonjs/core/main/worker/send_message.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatErrorForSender = void 0;
+exports.default = sendMessage;
+exports.formatErrorForSender = formatErrorForSender;
 var errors_1 = require("../../../errors");
 var log_1 = require("../../../log");
 function sendMessage(msg, transferables) {
@@ -14,7 +15,6 @@ function sendMessage(msg, transferables) {
         postMessage(msg, transferables);
     }
 }
-exports.default = sendMessage;
 function formatErrorForSender(error) {
     var formattedError = (0, errors_1.formatError)(error, {
         defaultCode: "NONE",
@@ -22,4 +22,3 @@ function formatErrorForSender(error) {
     });
     return formattedError.serialize();
 }
-exports.formatErrorForSender = formatErrorForSender;

package/dist/commonjs/core/main/worker/worker_main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker_main.d.ts","sourceRoot":"","sources":["../../../../../src/core/main/worker/worker_main.ts"],"names":[],"mappings":"AAiDA,MAAM,CAAC,OAAO,UAAU,oBAAoB,SAwW3C"}
+{"version":3,"file":"worker_main.d.ts","sourceRoot":"","sources":["../../../../../src/core/main/worker/worker_main.ts"],"names":[],"mappings":"AA+CA,MAAM,CAAC,OAAO,UAAU,oBAAoB,SAwW3C"}

package/dist/commonjs/core/main/worker/worker_main.js

@@ -47,13 +47,12 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = initializeWorkerMain;
 var config_1 = require("../../../config");
 var errors_1 = require("../../../errors");
 var features_1 = require("../../../features");
 var log_1 = require("../../../log");
 var classes_1 = require("../../../manifest/classes");
-var main_codec_support_prober_1 = require("../../../mse/main_codec_support_prober");
-var worker_codec_support_prober_1 = require("../../../mse/worker_codec_support_prober");
 var fast_js_parser_1 = require("../../../parsers/manifest/dash/fast-js-parser");
 var wasm_parser_1 = require("../../../parsers/manifest/dash/wasm-parser");
 var playback_observer_1 = require("../../../playback_observer");
@@ -103,8 +102,7 @@ function initializeWorkerMain() {
      */
     var playbackObservationRef = null;
     onmessage = function (e) {
-        var e_1, _a;
-        var _b, _c, _d;
+        var _a, _b;
         log_1.default.debug("Worker: received message", e.data.type);
         var msg = e.data;
         switch (msg.type) {
@@ -112,7 +110,7 @@ function initializeWorkerMain() {
                 (0, assert_1.default)(!isInitialized);
                 isInitialized = true;
                 (0, monotonic_timestamp_1.scaleTimestamp)(msg.value);
-                updateLoggerLevel(msg.value.logLevel, msg.value.sendBackLogs);
+                updateLoggerLevel(msg.value.logLevel, msg.value.logFormat, msg.value.sendBackLogs);
                 if (msg.value.dashWasmUrl !== undefined && dashWasmParser.isCompatible()) {
                     dashWasmParser.initialize({ wasmUrl: msg.value.dashWasmUrl }).catch(function (err) {
                         var error = err instanceof Error ? err.toString() : "Unknown Error";
@@ -126,13 +124,10 @@ function initializeWorkerMain() {
                         hasVideo: msg.value.hasVideo,
                     });
                 }
-                features_1.default.codecSupportProber = msg.value.hasMseInWorker
-                    ? main_codec_support_prober_1.default
-                    : worker_codec_support_prober_1.default;
                 (0, send_message_1.default)({ type: "init-success" /* WorkerMessageType.InitSuccess */, value: null });
                 break;
             case "log-level-update" /* MainThreadMessageType.LogLevelUpdate */:
-                updateLoggerLevel(msg.value.logLevel, msg.value.sendBackLogs);
+                updateLoggerLevel(msg.value.logLevel, msg.value.logFormat, msg.value.sendBackLogs);
                 break;
             case "prepare" /* MainThreadMessageType.PrepareContent */:
                 prepareNewContent(contentPreparer, msg.value);
@@ -181,7 +176,7 @@ function initializeWorkerMain() {
                 updateGlobalReference(msg);
                 break;
             case "stop" /* MainThreadMessageType.StopContent */:
-                if (msg.contentId !== ((_b = contentPreparer.getCurrentContent()) === null || _b === void 0 ? void 0 : _b.contentId)) {
+                if (msg.contentId !== ((_a = contentPreparer.getCurrentContent()) === null || _a === void 0 ? void 0 : _a.contentId)) {
                     return;
                 }
                 contentPreparer.disposeCurrentContent();
@@ -239,7 +234,7 @@ function initializeWorkerMain() {
                 break;
             }
             case "decipherability-update" /* MainThreadMessageType.DecipherabilityStatusUpdate */: {
-                if (msg.contentId !== ((_c = contentPreparer.getCurrentContent()) === null || _c === void 0 ? void 0 : _c.contentId)) {
+                if (msg.contentId !== ((_b = contentPreparer.getCurrentContent()) === null || _b === void 0 ? void 0 : _b.contentId)) {
                     return;
                 }
                 var currentContent = contentPreparer.getCurrentContent();
@@ -248,7 +243,7 @@ function initializeWorkerMain() {
                 }
                 var updates_1 = msg.value;
                 currentContent.manifest.updateRepresentationsDeciperability(function (content) {
-                    var e_2, _a;
+                    var e_1, _a;
                     try {
                         for (var updates_2 = __values(updates_1), updates_2_1 = updates_2.next(); !updates_2_1.done; updates_2_1 = updates_2.next()) {
                             var update = updates_2_1.value;
@@ -257,12 +252,12 @@ function initializeWorkerMain() {
                             }
                         }
                     }
-                    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
                     finally {
                         try {
                             if (updates_2_1 && !updates_2_1.done && (_a = updates_2.return)) _a.call(updates_2);
                         }
-                        finally { if (e_2) throw e_2.error; }
+                        finally { if (e_1) throw e_1.error; }
                     }
                     return content.representation.decipherable;
                 });
@@ -273,23 +268,9 @@ function initializeWorkerMain() {
                 if (preparedContent === null || preparedContent.manifest === null) {
                     return;
                 }
-                if (typeof ((_d = features_1.default.codecSupportProber) === null || _d === void 0 ? void 0 : _d.updateCache) === "function") {
-                    try {
-                        for (var _e = __values(msg.value), _f = _e.next(); !_f.done; _f = _e.next()) {
-                            var _g = _f.value, mimeType = _g.mimeType, codec = _g.codec, result = _g.result;
-                            features_1.default.codecSupportProber.updateCache(mimeType, codec, result);
-                        }
-                    }
-                    catch (e_1_1) { e_1 = { error: e_1_1 }; }
-                    finally {
-                        try {
-                            if (_f && !_f.done && (_a = _e.return)) _a.call(_e);
-                        }
-                        finally { if (e_1) throw e_1.error; }
-                    }
-                }
+                var newEvaluatedCodecs = msg.value;
                 try {
-                    var warning = preparedContent.manifest.refreshCodecSupport(msg.value);
+                    var warning = preparedContent.manifest.updateCodecSupport(newEvaluatedCodecs);
                     if (warning !== null) {
                         (0, send_message_1.default)({
                             type: "warning" /* WorkerMessageType.Warning */,
@@ -388,7 +369,6 @@ function initializeWorkerMain() {
         }
     };
 }
-exports.default = initializeWorkerMain;
 function prepareNewContent(contentPreparer, contentInitData) {
     contentPreparer.initializeNewContent(contentInitData).then(function (manifest) {
         (0, send_message_1.default)({
@@ -451,7 +431,7 @@ function loadOrReloadPreparedContent(val, contentPreparer, playbackObservationRe
         });
         return;
     }
-    var contentId = preparedContent.contentId, manifest = preparedContent.manifest, mediaSource = preparedContent.mediaSource, representationEstimator = preparedContent.representationEstimator, segmentSinksStore = preparedContent.segmentSinksStore, segmentFetcherCreator = preparedContent.segmentFetcherCreator;
+    var contentId = preparedContent.contentId, cmcdDataBuilder = preparedContent.cmcdDataBuilder, manifest = preparedContent.manifest, mediaSource = preparedContent.mediaSource, representationEstimator = preparedContent.representationEstimator, segmentSinksStore = preparedContent.segmentSinksStore, segmentFetcherCreator = preparedContent.segmentFetcherCreator;
     var drmSystemId = val.drmSystemId, enableFastSwitching = val.enableFastSwitching, initialTime = val.initialTime, onCodecSwitch = val.onCodecSwitch;
     playbackObservationRef.onUpdate(function (observation) {
         if (preparedContent.decipherabilityFreezeDetector.needToReload(observation)) {
@@ -481,6 +461,10 @@ function loadOrReloadPreparedContent(val, contentPreparer, playbackObservationRe
         return;
     }
     var playbackObserver = new worker_playback_observer_1.default(playbackObservationRef, contentId, send_message_1.default, currentLoadCanceller.signal);
+    cmcdDataBuilder === null || cmcdDataBuilder === void 0 ? void 0 : cmcdDataBuilder.startMonitoringPlayback(playbackObserver);
+    currentLoadCanceller.signal.register(function () {
+        cmcdDataBuilder === null || cmcdDataBuilder === void 0 ? void 0 : cmcdDataBuilder.stopMonitoringPlayback();
+    });
     var contentTimeBoundariesObserver = (0, create_content_time_boundaries_observer_1.default)(manifest, mediaSource, playbackObserver, segmentSinksStore, {
         onWarning: function (err) {
             return (0, send_message_1.default)({
@@ -637,6 +621,10 @@ function loadOrReloadPreparedContent(val, contentPreparer, playbackObservationRe
                 });
             },
             bitrateEstimateChange: function (payload) {
+                var _a;
+                if (preparedContent !== null) {
+                    (_a = preparedContent.cmcdDataBuilder) === null || _a === void 0 ? void 0 : _a.updateThroughput(payload.type, payload.bitrate);
+                }
                 // TODO for low-latency contents it is __VERY__ frequent.
                 // Considering this is only for an unimportant undocumented API, we may
                 // throttle such messages. (e.g. max one per 2 seconds for each type?).
@@ -660,7 +648,7 @@ function loadOrReloadPreparedContent(val, contentPreparer, playbackObservationRe
                 });
             },
             encryptionDataEncountered: function (values) {
-                var e_3, _a;
+                var e_2, _a;
                 try {
                     for (var values_1 = __values(values), values_1_1 = values_1.next(); !values_1_1.done; values_1_1 = values_1.next()) {
                         var value = values_1_1.value;
@@ -690,12 +678,12 @@ function loadOrReloadPreparedContent(val, contentPreparer, playbackObservationRe
                         });
                     }
                 }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                catch (e_2_1) { e_2 = { error: e_2_1 }; }
                 finally {
                     try {
                         if (values_1_1 && !values_1_1.done && (_a = values_1.return)) _a.call(values_1);
                     }
-                    finally { if (e_3) throw e_3.error; }
+                    finally { if (e_2) throw e_2.error; }
                 }
             },
             error: function (error) {
@@ -763,12 +751,14 @@ function loadOrReloadPreparedContent(val, contentPreparer, playbackObservationRe
         });
     }
 }
-function updateLoggerLevel(logLevel, sendBackLogs) {
+function updateLoggerLevel(logLevel, logFormat, sendBackLogs) {
     if (!sendBackLogs) {
-        log_1.default.setLevel(logLevel);
+        log_1.default.setLevel(logLevel, logFormat);
     }
     else {
-        log_1.default.setLevel(logLevel, function (levelStr, logs) {
+        // Here we force the log format to "standard" as the full formatting will be
+        // performed on main thread.
+        log_1.default.setLevel(logLevel, "standard", function (levelStr, logs) {
             var sentLogs = logs.map(function (e) {
                 if (e instanceof Error) {
                     return (0, send_message_1.formatErrorForSender)(e);

package/dist/commonjs/core/segment_sinks/garbage_collector.js

@@ -62,6 +62,7 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = BufferGarbageCollector;
 var log_1 = require("../../log");
 var is_null_or_undefined_1 = require("../../utils/is_null_or_undefined");
 var ranges_1 = require("../../utils/ranges");
@@ -99,7 +100,6 @@ function BufferGarbageCollector(_a, cancellationSignal) {
     maxBufferAhead.onUpdate(clean, { clearSignal: cancellationSignal });
     clean();
 }
-exports.default = BufferGarbageCollector;
 /**
  * Remove buffer from the browser's memory based on the user's
  * maxBufferAhead / maxBufferBehind settings.

package/dist/commonjs/core/segment_sinks/inventory/utils.js

@@ -26,7 +26,8 @@ var __values = (this && this.__values) || function(o) {
     throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFirstSegmentAfterPeriod = exports.getLastSegmentBeforePeriod = void 0;
+exports.getLastSegmentBeforePeriod = getLastSegmentBeforePeriod;
+exports.getFirstSegmentAfterPeriod = getFirstSegmentAfterPeriod;
 /**
  * Returns the last segment in the `inventory` which is linked to a Period
  * before `period`.
@@ -45,7 +46,6 @@ function getLastSegmentBeforePeriod(inventory, period) {
     }
     return inventory.length > 0 ? inventory[inventory.length - 1] : null;
 }
-exports.getLastSegmentBeforePeriod = getLastSegmentBeforePeriod;
 /**
  * Returns the first segment in the `inventory` which is linked to a Period
  * after `period`.
@@ -72,4 +72,3 @@ function getFirstSegmentAfterPeriod(inventory, period) {
     }
     return null;
 }
-exports.getFirstSegmentAfterPeriod = getFirstSegmentAfterPeriod;