rx-player 4.0.0-dev.2023121900 → 4.0.0-rc.2

package/dist/commonjs/core/init/media_source_content_initializer.js

@@ -80,11 +80,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var compat_1 = require("../../compat");
 var config_1 = require("../../config");
 var errors_1 = require("../../errors");
+var features_1 = require("../../features");
 var log_1 = require("../../log");
+var are_arrays_of_numbers_equal_1 = require("../../utils/are_arrays_of_numbers_equal");
 var assert_1 = require("../../utils/assert");
 var create_cancellable_promise_1 = require("../../utils/create_cancellable_promise");
+var noop_1 = require("../../utils/noop");
 var object_assign_1 = require("../../utils/object_assign");
 var reference_1 = require("../../utils/reference");
+var sync_or_async_1 = require("../../utils/sync_or_async");
 var task_canceller_1 = require("../../utils/task_canceller");
 var adaptive_1 = require("../adaptive");
 var decrypt_1 = require("../decrypt");
@@ -92,15 +96,16 @@ var fetchers_1 = require("../fetchers");
 var segment_buffers_1 = require("../segment_buffers");
 var stream_1 = require("../stream");
 var types_1 = require("./types");
-var content_time_boundaries_observer_1 = require("./utils/content_time_boundaries_observer");
+/* eslint-disable-next-line max-len */
+var create_content_time_boundaries_observer_1 = require("./utils/create_content_time_boundaries_observer");
+var create_core_playback_observer_1 = require("./utils/create_core_playback_observer");
 var create_media_source_1 = require("./utils/create_media_source");
-var create_stream_playback_observer_1 = require("./utils/create_stream_playback_observer");
-var end_of_stream_1 = require("./utils/end_of_stream");
+var DecipherabilityFreezeDetector_1 = require("./utils/DecipherabilityFreezeDetector");
 var get_initial_time_1 = require("./utils/get_initial_time");
 var get_loaded_reference_1 = require("./utils/get_loaded_reference");
 var initial_seek_and_play_1 = require("./utils/initial_seek_and_play");
 var initialize_content_decryption_1 = require("./utils/initialize_content_decryption");
-var media_source_duration_updater_1 = require("./utils/media_source_duration_updater");
+var main_thread_text_displayer_interface_1 = require("./utils/main_thread_text_displayer_interface");
 var rebuffering_controller_1 = require("./utils/rebuffering_controller");
 var stream_events_emitter_1 = require("./utils/stream_events_emitter");
 var throw_on_media_error_1 = require("./utils/throw_on_media_error");
@@ -126,7 +131,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
         var _this = _super.call(this) || this;
         _this._settings = settings;
         _this._initCanceller = new task_canceller_1.default();
-        _this._initialManifestProm = null;
+        _this._manifest = null;
         var urls = settings.url === undefined ? undefined :
             [settings.url];
         _this._manifestFetcher = new fetchers_1.ManifestFetcher(urls, settings.transport, settings.manifestRequestSettings);
@@ -138,10 +143,10 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
      */
     MediaSourceContentInitializer.prototype.prepare = function () {
         var _this = this;
-        if (this._initialManifestProm !== null) {
+        if (this._manifest !== null) {
             return;
         }
-        this._initialManifestProm = (0, create_cancellable_promise_1.default)(this._initCanceller.signal, function (res, rej) {
+        this._manifest = sync_or_async_1.default.createAsync((0, create_cancellable_promise_1.default)(this._initCanceller.signal, function (res, rej) {
             _this._manifestFetcher.addEventListener("warning", function (err) {
                 return _this.trigger("warning", err);
             });
@@ -152,7 +157,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
             _this._manifestFetcher.addEventListener("manifestReady", function (manifest) {
                 res(manifest);
             });
-        });
+        }));
         this._manifestFetcher.start();
         this._initCanceller.signal.register(function () {
             _this._manifestFetcher.dispose();
@@ -201,8 +206,62 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
         return (0, create_cancellable_promise_1.default)(initCanceller.signal, function (resolve) {
             var keySystems = _this._settings.keySystems;
             /** Initialize decryption capabilities. */
-            var drmInitRef = (0, initialize_content_decryption_1.default)(mediaElement, keySystems, protectionRef, { onWarning: function (err) { return _this.trigger("warning", err); },
-                onError: function (err) { return _this._onFatalError(err); } }, initCanceller.signal);
+            var drmInitRef = (0, initialize_content_decryption_1.default)(mediaElement, keySystems, protectionRef, {
+                onWarning: function (err) { return _this.trigger("warning", err); },
+                onError: function (err) { return _this._onFatalError(err); },
+                onBlackListProtectionData: function (val) {
+                    // Ugly IIFE workaround to allow async event listener
+                    (function () { return __awaiter(_this, void 0, void 0, function () {
+                        var manifest, _a;
+                        var _b;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
+                                case 0:
+                                    if (this._manifest === null) {
+                                        return [2 /*return*/];
+                                    }
+                                    if (!((_b = this._manifest.syncValue) !== null && _b !== void 0)) return [3 /*break*/, 1];
+                                    _a = _b;
+                                    return [3 /*break*/, 3];
+                                case 1: return [4 /*yield*/, this._manifest.getValueAsAsync()];
+                                case 2:
+                                    _a = _c.sent();
+                                    _c.label = 3;
+                                case 3:
+                                    manifest = _a;
+                                    blackListProtectionDataOnManifest(manifest, val);
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })().catch(noop_1.default);
+                },
+                onKeyIdsCompatibilityUpdate: function (updates) {
+                    // Ugly IIFE workaround to allow async event listener
+                    (function () { return __awaiter(_this, void 0, void 0, function () {
+                        var manifest, _a;
+                        var _b;
+                        return __generator(this, function (_c) {
+                            switch (_c.label) {
+                                case 0:
+                                    if (this._manifest === null) {
+                                        return [2 /*return*/];
+                                    }
+                                    if (!((_b = this._manifest.syncValue) !== null && _b !== void 0)) return [3 /*break*/, 1];
+                                    _a = _b;
+                                    return [3 /*break*/, 3];
+                                case 1: return [4 /*yield*/, this._manifest.getValueAsAsync()];
+                                case 2:
+                                    _a = _c.sent();
+                                    _c.label = 3;
+                                case 3:
+                                    manifest = _a;
+                                    updateKeyIdsDecipherabilityOnManifest(manifest, updates.whitelistedKeyIds, updates.blacklistedKeyIds, updates.delistedKeyIds);
+                                    return [2 /*return*/];
+                            }
+                        });
+                    }); })().catch(noop_1.default);
+                },
+            }, initCanceller.signal);
             drmInitRef.onUpdate(function (drmStatus, stopListeningToDrmUpdates) {
                 if (drmStatus.initializationState.type === "uninitialized") {
                     return;
@@ -240,6 +299,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
         });
     };
     MediaSourceContentInitializer.prototype._onInitialMediaSourceReady = function (mediaElement, initialMediaSource, playbackObserver, drmSystemId, protectionRef, initialMediaSourceCanceller) {
+        var _a;
         return __awaiter(this, void 0, void 0, function () {
             /**
              * Load the content defined by the Manifest in the mediaSource given at the
@@ -278,28 +338,36 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                     });
                 }
             }
-            var _a, adaptiveOptions, autoPlay, bufferOptions, lowLatencyMode, segmentRequestOptions, speed, startAt, textTrackOptions, transport, initCanceller, manifestProm, manifest, _e_1, initialTime, representationEstimator, subBufferOptions, segmentFetcherCreator, bufferOnMediaSource, triggerEvent, onFatalError;
+            var _b, adaptiveOptions, autoPlay, bufferOptions, lowLatencyMode, segmentRequestOptions, speed, startAt, textTrackOptions, transport, initCanceller, manifest, _c, _e_1, initialTime, representationEstimator, subBufferOptions, segmentFetcherCreator, bufferOnMediaSource, triggerEvent, onFatalError;
             var _this = this;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            return __generator(this, function (_d) {
+                switch (_d.label) {
                     case 0:
-                        _a = this._settings, adaptiveOptions = _a.adaptiveOptions, autoPlay = _a.autoPlay, bufferOptions = _a.bufferOptions, lowLatencyMode = _a.lowLatencyMode, segmentRequestOptions = _a.segmentRequestOptions, speed = _a.speed, startAt = _a.startAt, textTrackOptions = _a.textTrackOptions, transport = _a.transport;
+                        _b = this._settings, adaptiveOptions = _b.adaptiveOptions, autoPlay = _b.autoPlay, bufferOptions = _b.bufferOptions, lowLatencyMode = _b.lowLatencyMode, segmentRequestOptions = _b.segmentRequestOptions, speed = _b.speed, startAt = _b.startAt, textTrackOptions = _b.textTrackOptions, transport = _b.transport;
                         initCanceller = this._initCanceller;
-                        (0, assert_1.default)(this._initialManifestProm !== null);
-                        manifestProm = this._initialManifestProm;
-                        _b.label = 1;
+                        (0, assert_1.default)(this._manifest !== null);
+                        _d.label = 1;
                     case 1:
-                        _b.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, manifestProm];
-                    case 2:
-                        manifest = _b.sent();
+                        _d.trys.push([1, 5, , 6]);
+                        if (!((_a = this._manifest.syncValue) !== null && _a !== void 0)) return [3 /*break*/, 2];
+                        _c = _a;
                         return [3 /*break*/, 4];
+                    case 2: return [4 /*yield*/, this._manifest.getValueAsAsync()];
                     case 3:
-                        _e_1 = _b.sent();
-                        return [2 /*return*/]; // The error should already have been processed through an event listener
+                        _c = _d.sent();
+                        _d.label = 4;
                     case 4:
-                        manifest.addEventListener("manifestUpdate", function () {
-                            _this.trigger("manifestUpdate", null);
+                        manifest = _c;
+                        return [3 /*break*/, 6];
+                    case 5:
+                        _e_1 = _d.sent();
+                        return [2 /*return*/]; // The error should already have been processed through an event listener
+                    case 6:
+                        manifest.addEventListener("manifestUpdate", function (updates) {
+                            _this.trigger("manifestUpdate", updates);
+                        }, initCanceller.signal);
+                        manifest.addEventListener("decipherabilityUpdate", function (elts) {
+                            _this.trigger("decipherabilityUpdate", elts);
                         }, initCanceller.signal);
                         log_1.default.debug("Init: Calculating initial time");
                         initialTime = (0, get_initial_time_1.default)(manifest, lowLatencyMode, startAt);
@@ -336,8 +404,25 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
             var error = new errors_1.MediaError("MEDIA_STARTING_TIME_NOT_FOUND", "Wanted starting time not found in the Manifest.");
             return this._onFatalError(error);
         }
+        var textDisplayerInterface = null;
+        var textDisplayer = null;
+        if (this._settings.textTrackOptions.textTrackMode === "html" &&
+            features_1.default.htmlTextDisplayer !== null) {
+            textDisplayer = new features_1.default.htmlTextDisplayer(mediaElement, this._settings.textTrackOptions.textTrackElement);
+        }
+        else if (features_1.default.nativeTextDisplayer !== null) {
+            textDisplayer = new features_1.default.nativeTextDisplayer(mediaElement);
+        }
+        if (textDisplayer !== null) {
+            var sender_1 = new main_thread_text_displayer_interface_1.default(textDisplayer);
+            textDisplayerInterface = sender_1;
+            cancelSignal.register(function () {
+                sender_1.stop();
+                textDisplayer === null || textDisplayer === void 0 ? void 0 : textDisplayer.stop();
+            });
+        }
         /** Interface to create media buffers. */
-        var segmentBuffersStore = new segment_buffers_1.default(mediaElement, mediaSource);
+        var segmentBuffersStore = new segment_buffers_1.default(mediaSource, mediaElement.nodeName === "VIDEO", textDisplayerInterface);
         cancelSignal.register(function () {
             segmentBuffersStore.disposeAll();
         });
@@ -352,6 +437,9 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
             if (isPerformed) {
                 stopListening();
                 var streamEventsEmitter_1 = new stream_events_emitter_1.default(manifest, mediaElement, playbackObserver);
+                manifest.addEventListener("manifestUpdate", function () {
+                    streamEventsEmitter_1.onManifestUpdate(manifest);
+                }, cancelSignal);
                 streamEventsEmitter_1.addEventListener("event", function (payload) {
                     _this.trigger("streamEvent", payload);
                 }, cancelSignal);
@@ -364,26 +452,41 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                 });
             }
         }, { clearSignal: cancelSignal, emitCurrentValue: true });
-        var streamObserver = (0, create_stream_playback_observer_1.default)(playbackObserver, { autoPlay: autoPlay, manifest: manifest, initialPlayPerformed: initialPlayPerformed, speed: speed }, cancelSignal);
-        var rebufferingController = this._createRebufferingController(playbackObserver, manifest, segmentBuffersStore, speed, cancelSignal);
-        rebufferingController.addEventListener("needsReload", function () {
-            var position;
-            var lastObservation = playbackObserver.getReference().getValue();
-            if (lastObservation.position.isAwaitingFuturePosition()) {
-                position = lastObservation.position.getWanted();
-            }
-            else {
-                position = playbackObserver.getCurrentTime();
+        var coreObserver = (0, create_core_playback_observer_1.default)(playbackObserver, { autoPlay: autoPlay, manifest: manifest, mediaSource: mediaSource, textDisplayer: textDisplayer, initialPlayPerformed: initialPlayPerformed, speed: speed }, cancelSignal);
+        var rebufferingController = this._createRebufferingController(playbackObserver, manifest, speed, cancelSignal);
+        var decipherabilityFreezeDetector = new DecipherabilityFreezeDetector_1.default(segmentBuffersStore);
+        playbackObserver.listen(function (observation) {
+            if (decipherabilityFreezeDetector.needToReload(observation)) {
+                var position = void 0;
+                var lastObservation = playbackObserver.getReference().getValue();
+                if (lastObservation.position.isAwaitingFuturePosition()) {
+                    position = lastObservation.position.getWanted();
+                }
+                else {
+                    position = playbackObserver.getCurrentTime();
+                }
+                var autoplay = initialPlayPerformed.getValue() ?
+                    !playbackObserver.getIsPaused() :
+                    autoPlay;
+                onReloadOrder({ position: position, autoPlay: autoplay });
             }
-            // NOTE couldn't both be always calculated at event destination?
-            // Maybe there are exceptions?
-            var autoplay = initialPlayPerformed.getValue() ?
-                !playbackObserver.getIsPaused() :
-                autoPlay;
-            onReloadOrder({ position: position, autoPlay: autoplay });
+        }, { clearSignal: cancelSignal });
+        // Synchronize SegmentBuffers with what has been buffered.
+        coreObserver.listen(function (observation) {
+            ["video", "audio", "text"].forEach(function (tType) {
+                var _a;
+                var segmentBufferStatus = segmentBuffersStore.getStatus(tType);
+                if (segmentBufferStatus.type === "initialized") {
+                    segmentBufferStatus.value.synchronizeInventory((_a = observation.buffered[tType]) !== null && _a !== void 0 ? _a : []);
+                }
+            });
+        }, { clearSignal: cancelSignal });
+        var contentTimeBoundariesObserver = (0, create_content_time_boundaries_observer_1.default)(manifest, mediaSource, coreObserver, segmentBuffersStore, {
+            onWarning: function (err) { return _this.trigger("warning", err); },
+            onPeriodChanged: function (period) {
+                return _this.trigger("activePeriodChanged", { period: period });
+            },
         }, cancelSignal);
-        var contentTimeBoundariesObserver = this
-            ._createContentTimeBoundariesObserver(manifest, mediaSource, streamObserver, segmentBuffersStore, cancelSignal);
         /**
          * Emit a "loaded" events once the initial play has been performed and the
          * media can begin playback.
@@ -407,7 +510,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
         });
         /* eslint-disable-next-line @typescript-eslint/no-this-alias */
         var self = this;
-        (0, stream_1.default)({ manifest: manifest, initialPeriod: initialPeriod }, streamObserver, representationEstimator, segmentBuffersStore, segmentFetcherCreator, bufferOptions, handleStreamOrchestratorCallbacks(), cancelSignal);
+        (0, stream_1.default)({ manifest: manifest, initialPeriod: initialPeriod }, coreObserver, representationEstimator, segmentBuffersStore, segmentFetcherCreator, bufferOptions, handleStreamOrchestratorCallbacks(), cancelSignal);
         /**
          * Returns Object handling the callbacks from a `StreamOrchestrator`, which
          * are basically how it communicates about events.
@@ -415,9 +518,21 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
          */
         function handleStreamOrchestratorCallbacks() {
             return {
-                needsBufferFlush: function () {
-                    var seekedTime = mediaElement.currentTime + 0.001;
-                    playbackObserver.setCurrentTime(seekedTime);
+                needsBufferFlush: function (payload) {
+                    var _a;
+                    var wantedSeekingTime;
+                    var currentTime = playbackObserver.getCurrentTime();
+                    var relativeResumingPosition = (_a = payload === null || payload === void 0 ? void 0 : payload.relativeResumingPosition) !== null && _a !== void 0 ? _a : 0;
+                    var canBeApproximateSeek = Boolean(payload === null || payload === void 0 ? void 0 : payload.relativePosHasBeenDefaulted);
+                    if (relativeResumingPosition === 0 && canBeApproximateSeek) {
+                        // in case relativeResumingPosition is 0, we still perform
+                        // a tiny seek to be sure that the browser will correclty reload the video.
+                        wantedSeekingTime = currentTime + 0.001;
+                    }
+                    else {
+                        wantedSeekingTime = currentTime + relativeResumingPosition;
+                    }
+                    playbackObserver.setCurrentTime(wantedSeekingTime);
                     // Seek again once data begins to be buffered.
                     // This is sadly necessary on some browsers to avoid decoding
                     // issues after a flush.
@@ -437,7 +552,7 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                         // Data is buffered around the current position
                         obs.currentRange !== null ||
                             // Or, for whatever reason, we have no buffer but we're already advancing
-                            obs.position.getPolled() > seekedTime + 0.1) {
+                            obs.position.getPolled() > wantedSeekingTime + 0.1) {
                             stopListening();
                             playbackObserver.setCurrentTime(obs.position.getWanted() + 0.001);
                         }
@@ -515,12 +630,12 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                     return self.trigger("bitrateEstimateChange", value);
                 },
                 needsMediaSourceReload: function (payload) {
-                    var _a;
-                    var lastObservation = streamObserver.getReference().getValue();
+                    var _a, _b, _c;
+                    var lastObservation = coreObserver.getReference().getValue();
                     var currentPosition = lastObservation.position.isAwaitingFuturePosition() ?
                         lastObservation.position.getWanted() :
-                        streamObserver.getCurrentTime();
-                    var isPaused = (_a = lastObservation.paused.pending) !== null && _a !== void 0 ? _a : streamObserver.getIsPaused();
+                        ((_a = coreObserver.getCurrentTime()) !== null && _a !== void 0 ? _a : lastObservation.position.getPolled());
+                    var isPaused = (_c = (_b = lastObservation.paused.pending) !== null && _b !== void 0 ? _b : coreObserver.getIsPaused()) !== null && _c !== void 0 ? _c : lastObservation.paused.last;
                     var position = currentPosition + payload.timeOffset;
                     if (payload.minimumPosition !== undefined) {
                         position = Math.max(payload.minimumPosition, position);
@@ -531,21 +646,21 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
                     onReloadOrder({ position: position, autoPlay: !isPaused });
                 },
                 needsDecipherabilityFlush: function () {
-                    var _a;
+                    var _a, _b, _c, _d;
                     var keySystem = (0, decrypt_1.getKeySystemConfiguration)(mediaElement);
                     if ((0, compat_1.shouldReloadMediaSourceOnDecipherabilityUpdate)(keySystem === null || keySystem === void 0 ? void 0 : keySystem[0])) {
-                        var lastObservation = streamObserver.getReference().getValue();
+                        var lastObservation = coreObserver.getReference().getValue();
                         var position = lastObservation.position.isAwaitingFuturePosition() ?
                             lastObservation.position.getWanted() :
-                            streamObserver.getCurrentTime();
-                        var isPaused = (_a = lastObservation.paused.pending) !== null && _a !== void 0 ? _a : streamObserver.getIsPaused();
+                            ((_a = coreObserver.getCurrentTime()) !== null && _a !== void 0 ? _a : lastObservation.position.getPolled());
+                        var isPaused = (_c = (_b = lastObservation.paused.pending) !== null && _b !== void 0 ? _b : coreObserver.getIsPaused()) !== null && _c !== void 0 ? _c : lastObservation.paused.last;
                         onReloadOrder({ position: position, autoPlay: !isPaused });
                     }
                     else {
-                        var lastObservation = streamObserver.getReference().getValue();
+                        var lastObservation = coreObserver.getReference().getValue();
                         var position = lastObservation.position.isAwaitingFuturePosition() ?
                             lastObservation.position.getWanted() :
-                            streamObserver.getCurrentTime();
+                            ((_d = coreObserver.getCurrentTime()) !== null && _d !== void 0 ? _d : lastObservation.position.getPolled());
                         // simple seek close to the current position
                         // to flush the buffers
                         if (position + 0.001 < lastObservation.duration) {
@@ -579,60 +694,6 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
             };
         }
     };
-    /**
-     * Creates a `ContentTimeBoundariesObserver`, a class indicating various
-     * events related to media time (such as duration updates, period changes,
-     * warnings about being out of the Manifest time boundaries or "endOfStream"
-     * management), handle those events and returns the class.
-     *
-     * Various methods from that class need then to be called at various events
-     * (see `ContentTimeBoundariesObserver`).
-     * @param {Object} manifest
-     * @param {MediaSource} mediaSource
-     * @param {Object} streamObserver
-     * @param {Object} segmentBuffersStore
-     * @param {Object} cancelSignal
-     * @returns {Object}
-     */
-    MediaSourceContentInitializer.prototype._createContentTimeBoundariesObserver = function (manifest, mediaSource, streamObserver, segmentBuffersStore, cancelSignal) {
-        var _this = this;
-        /** Maintains the MediaSource's duration up-to-date with the Manifest */
-        var mediaSourceDurationUpdater = new media_source_duration_updater_1.default(mediaSource);
-        cancelSignal.register(function () {
-            mediaSourceDurationUpdater.stopUpdating();
-        });
-        /** Allows to cancel a pending `end-of-stream` operation. */
-        var endOfStreamCanceller = null;
-        var contentTimeBoundariesObserver = new content_time_boundaries_observer_1.default(manifest, streamObserver, segmentBuffersStore.getBufferTypes());
-        cancelSignal.register(function () {
-            contentTimeBoundariesObserver.dispose();
-        });
-        contentTimeBoundariesObserver.addEventListener("warning", function (err) {
-            return _this.trigger("warning", err);
-        });
-        contentTimeBoundariesObserver.addEventListener("periodChange", function (period) {
-            _this.trigger("activePeriodChanged", { period: period });
-        });
-        contentTimeBoundariesObserver.addEventListener("endingPositionChange", function (x) { return mediaSourceDurationUpdater.updateDuration(x.endingPosition, x.isEnd); });
-        contentTimeBoundariesObserver.addEventListener("endOfStream", function () {
-            if (endOfStreamCanceller === null) {
-                endOfStreamCanceller = new task_canceller_1.default();
-                endOfStreamCanceller.linkToSignal(cancelSignal);
-                log_1.default.debug("Init: end-of-stream order received.");
-                (0, end_of_stream_1.maintainEndOfStream)(mediaSource, endOfStreamCanceller.signal);
-            }
-        });
-        contentTimeBoundariesObserver.addEventListener("resumeStream", function () {
-            if (endOfStreamCanceller !== null) {
-                log_1.default.debug("Init: resume-stream order received.");
-                endOfStreamCanceller.cancel();
-                endOfStreamCanceller = null;
-            }
-        });
-        var endInfo = contentTimeBoundariesObserver.getCurrentEndingTime();
-        mediaSourceDurationUpdater.updateDuration(endInfo.endingPosition, endInfo.isEnd);
-        return contentTimeBoundariesObserver;
-    };
     /**
      * Creates a `RebufferingController`, a class trying to avoid various stalling
      * situations (such as rebuffering periods), and returns it.
@@ -651,9 +712,9 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
      * @param {Object} cancelSignal
      * @returns {Object}
      */
-    MediaSourceContentInitializer.prototype._createRebufferingController = function (playbackObserver, manifest, segmentBuffersStore, speed, cancelSignal) {
+    MediaSourceContentInitializer.prototype._createRebufferingController = function (playbackObserver, manifest, speed, cancelSignal) {
         var _this = this;
-        var rebufferingController = new rebuffering_controller_1.default(playbackObserver, manifest, segmentBuffersStore, speed);
+        var rebufferingController = new rebuffering_controller_1.default(playbackObserver, manifest, speed);
         // Bubble-up events
         rebufferingController.addEventListener("stalled", function (evt) { return _this.trigger("stalled", evt); });
         rebufferingController.addEventListener("unstalled", function () { return _this.trigger("unstalled", null); });
@@ -665,3 +726,140 @@ var MediaSourceContentInitializer = /** @class */ (function (_super) {
     return MediaSourceContentInitializer;
 }(types_1.ContentInitializer));
 exports.default = MediaSourceContentInitializer;
+/**
+ * Change the decipherability of Representations which have their key id in one
+ * of the given Arrays:
+ *
+ *   - Those who have a key id listed in `whitelistedKeyIds` will have their
+ *     decipherability updated to `true`
+ *
+ *   - Those who have a key id listed in `blacklistedKeyIds` will have their
+ *     decipherability updated to `false`
+ *
+ *   - Those who have a key id listed in `delistedKeyIds` will have their
+ *     decipherability updated to `undefined`.
+ *
+ * @param {Object} manifest
+ * @param {Array.<Uint8Array>} whitelistedKeyIds
+ * @param {Array.<Uint8Array>} blacklistedKeyIds
+ * @param {Array.<Uint8Array>} delistedKeyIds
+ */
+function updateKeyIdsDecipherabilityOnManifest(manifest, whitelistedKeyIds, blacklistedKeyIds, delistedKeyIds) {
+    manifest.updateRepresentationsDeciperability(function (ctx) {
+        var e_2, _a, e_3, _b, e_4, _c, e_5, _d;
+        var representation = ctx.representation;
+        if (representation.contentProtections === undefined) {
+            return representation.decipherable;
+        }
+        var contentKIDs = representation.contentProtections.keyIds;
+        if (contentKIDs !== undefined) {
+            try {
+                for (var contentKIDs_1 = __values(contentKIDs), contentKIDs_1_1 = contentKIDs_1.next(); !contentKIDs_1_1.done; contentKIDs_1_1 = contentKIDs_1.next()) {
+                    var elt = contentKIDs_1_1.value;
+                    try {
+                        for (var blacklistedKeyIds_1 = (e_3 = void 0, __values(blacklistedKeyIds)), blacklistedKeyIds_1_1 = blacklistedKeyIds_1.next(); !blacklistedKeyIds_1_1.done; blacklistedKeyIds_1_1 = blacklistedKeyIds_1.next()) {
+                            var blacklistedKeyId = blacklistedKeyIds_1_1.value;
+                            if ((0, are_arrays_of_numbers_equal_1.default)(blacklistedKeyId, elt.keyId)) {
+                                return false;
+                            }
+                        }
+                    }
+                    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+                    finally {
+                        try {
+                            if (blacklistedKeyIds_1_1 && !blacklistedKeyIds_1_1.done && (_b = blacklistedKeyIds_1.return)) _b.call(blacklistedKeyIds_1);
+                        }
+                        finally { if (e_3) throw e_3.error; }
+                    }
+                    try {
+                        for (var whitelistedKeyIds_1 = (e_4 = void 0, __values(whitelistedKeyIds)), whitelistedKeyIds_1_1 = whitelistedKeyIds_1.next(); !whitelistedKeyIds_1_1.done; whitelistedKeyIds_1_1 = whitelistedKeyIds_1.next()) {
+                            var whitelistedKeyId = whitelistedKeyIds_1_1.value;
+                            if ((0, are_arrays_of_numbers_equal_1.default)(whitelistedKeyId, elt.keyId)) {
+                                return true;
+                            }
+                        }
+                    }
+                    catch (e_4_1) { e_4 = { error: e_4_1 }; }
+                    finally {
+                        try {
+                            if (whitelistedKeyIds_1_1 && !whitelistedKeyIds_1_1.done && (_c = whitelistedKeyIds_1.return)) _c.call(whitelistedKeyIds_1);
+                        }
+                        finally { if (e_4) throw e_4.error; }
+                    }
+                    try {
+                        for (var delistedKeyIds_1 = (e_5 = void 0, __values(delistedKeyIds)), delistedKeyIds_1_1 = delistedKeyIds_1.next(); !delistedKeyIds_1_1.done; delistedKeyIds_1_1 = delistedKeyIds_1.next()) {
+                            var delistedKeyId = delistedKeyIds_1_1.value;
+                            if ((0, are_arrays_of_numbers_equal_1.default)(delistedKeyId, elt.keyId)) {
+                                return undefined;
+                            }
+                        }
+                    }
+                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+                    finally {
+                        try {
+                            if (delistedKeyIds_1_1 && !delistedKeyIds_1_1.done && (_d = delistedKeyIds_1.return)) _d.call(delistedKeyIds_1);
+                        }
+                        finally { if (e_5) throw e_5.error; }
+                    }
+                }
+            }
+            catch (e_2_1) { e_2 = { error: e_2_1 }; }
+            finally {
+                try {
+                    if (contentKIDs_1_1 && !contentKIDs_1_1.done && (_a = contentKIDs_1.return)) _a.call(contentKIDs_1);
+                }
+                finally { if (e_2) throw e_2.error; }
+            }
+        }
+        return representation.decipherable;
+    });
+}
+/**
+ * Update decipherability to `false` to any Representation which is linked to
+ * the given initialization data.
+ * @param {Object} manifest
+ * @param {Object} initData
+ */
+function blackListProtectionDataOnManifest(manifest, initData) {
+    manifest.updateRepresentationsDeciperability(function (ctx) {
+        var e_6, _a;
+        var _b, _c;
+        var rep = ctx.representation;
+        if (rep.decipherable === false) {
+            return false;
+        }
+        var segmentProtections = (_c = (_b = rep.contentProtections) === null || _b === void 0 ? void 0 : _b.initData) !== null && _c !== void 0 ? _c : [];
+        var _loop_1 = function (protection) {
+            if (initData.type === undefined ||
+                protection.type === initData.type) {
+                var containedInitData = initData.values.getFormattedValues()
+                    .every(function (undecipherableVal) {
+                    return protection.values.some(function (currVal) {
+                        return (undecipherableVal.systemId === undefined ||
+                            currVal.systemId === undecipherableVal.systemId) &&
+                            (0, are_arrays_of_numbers_equal_1.default)(currVal.data, undecipherableVal.data);
+                    });
+                });
+                if (containedInitData) {
+                    return { value: false };
+                }
+            }
+        };
+        try {
+            for (var segmentProtections_1 = __values(segmentProtections), segmentProtections_1_1 = segmentProtections_1.next(); !segmentProtections_1_1.done; segmentProtections_1_1 = segmentProtections_1.next()) {
+                var protection = segmentProtections_1_1.value;
+                var state_1 = _loop_1(protection);
+                if (typeof state_1 === "object")
+                    return state_1.value;
+            }
+        }
+        catch (e_6_1) { e_6 = { error: e_6_1 }; }
+        finally {
+            try {
+                if (segmentProtections_1_1 && !segmentProtections_1_1.done && (_a = segmentProtections_1.return)) _a.call(segmentProtections_1);
+            }
+            finally { if (e_6) throw e_6.error; }
+        }
+        return rep.decipherable;
+    });
+}