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

package/dist/es2017/core/api/track_management/tracks_store.js

@@ -20,6 +20,7 @@
 import config from "../../../config";
 import { MediaError } from "../../../errors";
 import log from "../../../log";
+import { getSupportedAdaptations, toAudioTrack, toTextTrack, toVideoTrack, } from "../../../manifest";
 import arrayFind from "../../../utils/array_find";
 import assert from "../../../utils/assert";
 import EventEmitter from "../../../utils/event_emitter";
@@ -65,8 +66,8 @@ export default class TracksStore extends EventEmitter {
      * track choice decision for each of them.
      * @param {Object} manifest - The new Manifest object
      */
-    updatePeriodList(manifest) {
-        var _a, _b, _c;
+    onManifestUpdate(manifest) {
+        var _a, _b, _c, _d, _e, _f;
         const { DEFAULT_VIDEO_TRACK_SWITCHING_MODE } = config.getCurrent();
         const { periods } = manifest;
         // We assume that they are always sorted chronologically
@@ -95,7 +96,7 @@ export default class TracksStore extends EventEmitter {
                 newPListIdx++;
                 const curWantedTextTrack = this._storedPeriodInfo[i].text.storedSettings;
                 if (curWantedTextTrack !== null) {
-                    const textAdaptations = newPeriod.getSupportedAdaptations("text");
+                    const textAdaptations = getSupportedAdaptations(newPeriod, "text");
                     const stillHere = textAdaptations
                         .some(a => a.id === curWantedTextTrack.adaptation.id);
                     if (!stillHere) {
@@ -118,7 +119,7 @@ export default class TracksStore extends EventEmitter {
                 }
                 const curWantedVideoTrack = this._storedPeriodInfo[i].video.storedSettings;
                 if (curWantedVideoTrack !== null) {
-                    const videoAdaptations = newPeriod.getSupportedAdaptations("video");
+                    const videoAdaptations = getSupportedAdaptations(newPeriod, "video");
                     const stillHere = videoAdaptations
                         .some(a => a.id === curWantedVideoTrack.adaptation.id);
                     if (!stillHere) {
@@ -155,7 +156,7 @@ export default class TracksStore extends EventEmitter {
                 }
                 const curWantedAudioTrack = this._storedPeriodInfo[i].audio.storedSettings;
                 if (curWantedAudioTrack !== null) {
-                    const audioAdaptations = newPeriod.getSupportedAdaptations("audio");
+                    const audioAdaptations = getSupportedAdaptations(newPeriod, "audio");
                     const stillHere = audioAdaptations
                         .some(a => a.id === curWantedAudioTrack.adaptation.id);
                     if (!stillHere) {
@@ -209,6 +210,19 @@ export default class TracksStore extends EventEmitter {
             this._storedPeriodInfo.push(...periodsToAdd);
             addedPeriods.push(...periodsToAdd);
         }
+        for (const storedPeriodInfo of this._storedPeriodInfo) {
+            (_d = storedPeriodInfo.audio.dispatcher) === null || _d === void 0 ? void 0 : _d.refresh();
+            (_e = storedPeriodInfo.video.dispatcher) === null || _e === void 0 ? void 0 : _e.refresh();
+            (_f = storedPeriodInfo.text.dispatcher) === null || _f === void 0 ? void 0 : _f.refresh();
+        }
+    }
+    onDecipherabilityUpdates() {
+        var _a, _b, _c;
+        for (const storedPeriodInfo of this._storedPeriodInfo) {
+            (_a = storedPeriodInfo.audio.dispatcher) === null || _a === void 0 ? void 0 : _a.refresh();
+            (_b = storedPeriodInfo.video.dispatcher) === null || _b === void 0 ? void 0 : _b.refresh();
+            (_c = storedPeriodInfo.text.dispatcher) === null || _c === void 0 ? void 0 : _c.refresh();
+        }
     }
     /**
      * Add shared reference to choose Adaptation for new "audio", "video" or
@@ -217,12 +231,11 @@ export default class TracksStore extends EventEmitter {
      * Note that such reference has to be removed through `removeTrackReference`
      * so ressources can be freed.
      * @param {string} bufferType - The concerned buffer type
-     * @param {Object} manifest
      * @param {Period} period - The concerned Period.
      * @param {Object} adaptationRef - A reference through which
      * the choice will be given.
      */
-    addTrackReference(bufferType, manifest, period, adaptationRef) {
+    addTrackReference(bufferType, period, adaptationRef) {
         let periodObj = getPeriodItem(this._storedPeriodInfo, period.id);
         if (periodObj === undefined) { // The Period has not yet been added.
             periodObj = generatePeriodInfo(period, false, this._isTrickModeTrackEnabled, this._defaultAudioTrackSwitchingMode);
@@ -252,21 +265,24 @@ export default class TracksStore extends EventEmitter {
             return;
         }
         const trackSetting = periodObj[bufferType].storedSettings;
-        const dispatcher = new TrackDispatcher(manifest, adaptationRef);
+        const dispatcher = new TrackDispatcher(adaptationRef);
         periodObj[bufferType].dispatcher = dispatcher;
         dispatcher.addEventListener("noPlayableRepresentation", () => {
-            var _a, _b, _c;
-            const nextAdaptation = arrayFind(period.getAdaptationsForType(bufferType), (a) => {
-                const playableRepresentations = a.getPlayableRepresentations();
+            var _a, _b, _c, _d;
+            const nextAdaptation = arrayFind((_a = period.adaptations[bufferType]) !== null && _a !== void 0 ? _a : [], (a) => {
+                if (a.isSupported === false) {
+                    return false;
+                }
+                const playableRepresentations = a.representations.filter(r => r.isSupported === true && r.decipherable !== false);
                 return playableRepresentations.length > 0;
             });
             if (nextAdaptation === undefined) {
-                const noRepErr = new MediaError("NO_PLAYABLE_REPRESENTATION", `No ${bufferType} Representation can be played`, { adaptations: undefined });
+                const noRepErr = new MediaError("NO_PLAYABLE_REPRESENTATION", `No ${bufferType} Representation can be played`, { tracks: undefined });
                 this.trigger("error", noRepErr);
                 this.dispose();
                 return;
             }
-            let typeInfo = (_a = getPeriodItem(this._storedPeriodInfo, period.id)) === null || _a === void 0 ? void 0 : _a[bufferType];
+            let typeInfo = (_b = getPeriodItem(this._storedPeriodInfo, period.id)) === null || _b === void 0 ? void 0 : _b[bufferType];
             if (isNullOrUndefined(typeInfo)) {
                 return;
             }
@@ -287,11 +303,11 @@ export default class TracksStore extends EventEmitter {
             if (this._isDisposed) {
                 return; // Someone disposed the `TracksStore` on the previous side-effect
             }
-            typeInfo = (_b = getPeriodItem(this._storedPeriodInfo, period.id)) === null || _b === void 0 ? void 0 : _b[bufferType];
+            typeInfo = (_c = getPeriodItem(this._storedPeriodInfo, period.id)) === null || _c === void 0 ? void 0 : _c[bufferType];
             if (isNullOrUndefined(typeInfo) || typeInfo.storedSettings !== storedSettings) {
                 return;
             }
-            (_c = typeInfo.dispatcher) === null || _c === void 0 ? void 0 : _c.updateTrack(storedSettings);
+            (_d = typeInfo.dispatcher) === null || _d === void 0 ? void 0 : _d.updateTrack(storedSettings);
         });
         dispatcher.addEventListener("noPlayableLockedRepresentation", () => {
             // TODO check that it doesn't already lead to segment loading or MediaSource
@@ -423,8 +439,16 @@ export default class TracksStore extends EventEmitter {
      * locked after switchingMode to that track.
      * `null` if no Audio Representation should be locked.
      */
-    setAudioTrack(periodObj, wantedId, switchingMode, reprsToLock) {
-        return this._setAudioOrTextTrack("audio", periodObj, wantedId, switchingMode !== null && switchingMode !== void 0 ? switchingMode : this._defaultAudioTrackSwitchingMode, reprsToLock);
+    setAudioTrack(payload) {
+        const { periodRef, trackId, switchingMode, lockedRepresentations, relativeResumingPosition } = payload;
+        return this._setAudioOrTextTrack({
+            bufferType: "audio",
+            periodRef,
+            trackId,
+            switchingMode: switchingMode !== null && switchingMode !== void 0 ? switchingMode : this._defaultAudioTrackSwitchingMode,
+            reprsToLock: lockedRepresentations,
+            relativeResumingPosition,
+        });
     }
     /**
      * Set text track based on the ID of its Adaptation for a given added Period.
@@ -432,7 +456,14 @@ export default class TracksStore extends EventEmitter {
      * @param {string} wantedId - adaptation id of the wanted track.
      */
     setTextTrack(periodObj, wantedId) {
-        return this._setAudioOrTextTrack("text", periodObj, wantedId, "direct", null);
+        return this._setAudioOrTextTrack({
+            bufferType: "text",
+            periodRef: periodObj,
+            trackId: wantedId,
+            switchingMode: "direct",
+            reprsToLock: null,
+            relativeResumingPosition: undefined,
+        });
     }
     /**
      * Set audio track based on the ID of its Adaptation for a given added Period.
@@ -444,14 +475,14 @@ export default class TracksStore extends EventEmitter {
      * locked after switchingMode to that track.
      * `null` if no Audio Representation should be locked.
      */
-    _setAudioOrTextTrack(bufferType, periodObj, wantedId, switchingMode, reprsToLock) {
-        var _a;
-        const period = periodObj.period;
-        const wantedAdaptation = arrayFind(period.getSupportedAdaptations(bufferType), ({ id }) => id === wantedId);
+    _setAudioOrTextTrack({ bufferType, periodRef, trackId, switchingMode, reprsToLock, relativeResumingPosition, }) {
+        var _a, _b;
+        const period = periodRef.period;
+        const wantedAdaptation = arrayFind((_a = period.adaptations[bufferType]) !== null && _a !== void 0 ? _a : [], ({ id, isSupported }) => isSupported === true && id === trackId);
         if (wantedAdaptation === undefined) {
             throw new Error(`Wanted ${bufferType} track not found.`);
         }
-        const typeInfo = periodObj[bufferType];
+        const typeInfo = periodRef[bufferType];
         let lockedRepresentations;
         if (reprsToLock === null) {
             lockedRepresentations = new SharedReference(null);
@@ -462,13 +493,14 @@ export default class TracksStore extends EventEmitter {
                 this._defaultAudioTrackSwitchingMode :
                 "direct";
             lockedRepresentations = new SharedReference({
-                representations: representationsToLock,
+                representationIds: representationsToLock,
                 switchingMode: repSwitchingMode,
             });
         }
         const storedSettings = { adaptation: wantedAdaptation,
             switchingMode,
-            lockedRepresentations };
+            lockedRepresentations,
+            relativeResumingPosition };
         typeInfo.storedSettings = storedSettings;
         this.trigger("trackUpdate", { period: toExposedPeriod(period),
             trackType: bufferType,
@@ -481,7 +513,7 @@ export default class TracksStore extends EventEmitter {
         const newPeriodItem = getPeriodItem(this._storedPeriodInfo, period.id);
         if (newPeriodItem !== undefined &&
             newPeriodItem[bufferType].storedSettings === storedSettings) {
-            (_a = newPeriodItem[bufferType].dispatcher) === null || _a === void 0 ? void 0 : _a.updateTrack(storedSettings);
+            (_b = newPeriodItem[bufferType].dispatcher) === null || _b === void 0 ? void 0 : _b.updateTrack(storedSettings);
         }
     }
     /**
@@ -494,32 +526,34 @@ export default class TracksStore extends EventEmitter {
      * locked after switchingMode to that track.
      * `null` if no Video Representation should be locked.
      */
-    setVideoTrack(periodObj, wantedId, switchingMode, reprsToLock) {
-        var _a;
-        const period = periodObj.period;
-        const wantedAdaptation = arrayFind(period.getSupportedAdaptations("video"), ({ id }) => id === wantedId);
+    setVideoTrack(payload) {
+        var _a, _b;
+        const { periodRef, trackId, switchingMode, lockedRepresentations, relativeResumingPosition } = payload;
+        const period = periodRef.period;
+        const wantedAdaptation = arrayFind((_a = period.adaptations.video) !== null && _a !== void 0 ? _a : [], ({ id, isSupported }) => isSupported === true && id === trackId);
         if (wantedAdaptation === undefined) {
             throw new Error("Wanted video track not found.");
         }
         const { DEFAULT_VIDEO_TRACK_SWITCHING_MODE } = config.getCurrent();
-        const typeInfo = periodObj.video;
+        const typeInfo = periodRef.video;
         const newAdaptation = getRightVideoTrack(wantedAdaptation, this._isTrickModeTrackEnabled);
-        let lockedRepresentations;
-        if (reprsToLock === null) {
-            lockedRepresentations = new SharedReference(null);
+        let lockedRepresentationsRef;
+        if (lockedRepresentations === null) {
+            lockedRepresentationsRef = new SharedReference(null);
         }
         else {
-            const representationsToLock = this._getRepresentationsToLock(wantedAdaptation, reprsToLock);
+            const representationsToLock = this._getRepresentationsToLock(wantedAdaptation, lockedRepresentations);
             const repSwitchingMode = DEFAULT_VIDEO_TRACK_SWITCHING_MODE;
-            lockedRepresentations = new SharedReference({
-                representations: representationsToLock,
+            lockedRepresentationsRef = new SharedReference({
+                representationIds: representationsToLock,
                 switchingMode: repSwitchingMode,
             });
         }
         const storedSettings = { adaptationBase: wantedAdaptation,
             switchingMode: switchingMode !== null && switchingMode !== void 0 ? switchingMode : DEFAULT_VIDEO_TRACK_SWITCHING_MODE,
             adaptation: newAdaptation,
-            lockedRepresentations };
+            relativeResumingPosition,
+            lockedRepresentations: lockedRepresentationsRef };
         typeInfo.storedSettings = storedSettings;
         this.trigger("trackUpdate", { period: toExposedPeriod(period),
             trackType: "video",
@@ -532,7 +566,7 @@ export default class TracksStore extends EventEmitter {
         const newPeriodItem = getPeriodItem(this._storedPeriodInfo, period.id);
         if (newPeriodItem !== undefined &&
             newPeriodItem.video.storedSettings === storedSettings) {
-            (_a = newPeriodItem.video.dispatcher) === null || _a === void 0 ? void 0 : _a.updateTrack(storedSettings);
+            (_b = newPeriodItem.video.dispatcher) === null || _b === void 0 ? void 0 : _b.updateTrack(storedSettings);
         }
     }
     /**
@@ -588,7 +622,7 @@ export default class TracksStore extends EventEmitter {
     getChosenAudioTrack(periodObj) {
         return periodObj.audio.storedSettings === null ?
             null :
-            periodObj.audio.storedSettings.adaptation.toAudioTrack(true);
+            toAudioTrack(periodObj.audio.storedSettings.adaptation, true);
     }
     /**
      * Returns an object describing the chosen text track for the given text
@@ -603,7 +637,7 @@ export default class TracksStore extends EventEmitter {
     getChosenTextTrack(periodObj) {
         return periodObj.text.storedSettings === null ?
             null :
-            periodObj.text.storedSettings.adaptation.toTextTrack();
+            toTextTrack(periodObj.text.storedSettings.adaptation);
     }
     /**
      * Returns an object describing the chosen video track for the given video
@@ -619,7 +653,7 @@ export default class TracksStore extends EventEmitter {
         if (periodObj.video.storedSettings === null) {
             return null;
         }
-        return periodObj.video.storedSettings.adaptation.toVideoTrack(true);
+        return toVideoTrack(periodObj.video.storedSettings.adaptation, true);
     }
     /**
      * Returns all available audio tracks for a given Period, as an array of
@@ -635,11 +669,12 @@ export default class TracksStore extends EventEmitter {
         const currentId = storedSettings !== null ?
             storedSettings.adaptation.id :
             null;
-        return periodObj.period.getSupportedAdaptations("audio")
+        const adaptations = getSupportedAdaptations(periodObj.period, "audio");
+        return adaptations
             .map((adaptation) => {
             const active = currentId === null ? false :
                 currentId === adaptation.id;
-            return objectAssign(adaptation.toAudioTrack(true), { active });
+            return objectAssign(toAudioTrack(adaptation, true), { active });
         });
     }
     /**
@@ -656,11 +691,12 @@ export default class TracksStore extends EventEmitter {
         const currentId = storedSettings !== null ?
             storedSettings.adaptation.id :
             null;
-        return periodObj.period.getSupportedAdaptations("text")
+        const adaptations = getSupportedAdaptations(periodObj.period, "text");
+        return adaptations
             .map((adaptation) => {
             const active = currentId === null ? false :
                 currentId === adaptation.id;
-            return objectAssign(adaptation.toTextTrack(), { active });
+            return objectAssign(toTextTrack(adaptation), { active });
         });
     }
     /**
@@ -677,11 +713,12 @@ export default class TracksStore extends EventEmitter {
         const currentId = storedSettings === null ?
             undefined :
             storedSettings.adaptation.id;
-        return periodObj.period.getSupportedAdaptations("video")
+        const adaptations = getSupportedAdaptations(periodObj.period, "video");
+        return adaptations
             .map((adaptation) => {
             const active = currentId === null ? false :
                 currentId === adaptation.id;
-            const track = adaptation.toVideoTrack(true);
+            const track = toVideoTrack(adaptation, true);
             const trickModeTracks = track.trickModeTracks !== undefined ?
                 track.trickModeTracks.map((trickModeAdaptation) => {
                     const isActive = currentId === null ? false :
@@ -704,7 +741,7 @@ export default class TracksStore extends EventEmitter {
         const lastLockedSettings = storedSettings.lockedRepresentations.getValue();
         return lastLockedSettings === null ?
             null :
-            lastLockedSettings.representations.map(r => r.id);
+            lastLockedSettings.representationIds;
     }
     getLockedVideoRepresentations(periodObj) {
         const { storedSettings } = periodObj.video;
@@ -714,7 +751,7 @@ export default class TracksStore extends EventEmitter {
         const lastLockedSettings = storedSettings.lockedRepresentations.getValue();
         return lastLockedSettings === null ?
             null :
-            lastLockedSettings.representations.map(r => r.id);
+            lastLockedSettings.representationIds;
     }
     lockAudioRepresentations(periodObj, lockSettings) {
         var _a;
@@ -725,7 +762,7 @@ export default class TracksStore extends EventEmitter {
         const { DEFAULT_AUDIO_REPRESENTATIONS_SWITCHING_MODE } = config.getCurrent();
         const filtered = this._getRepresentationsToLock(storedSettings.adaptation, lockSettings.representations);
         const switchingMode = (_a = lockSettings.switchingMode) !== null && _a !== void 0 ? _a : DEFAULT_AUDIO_REPRESENTATIONS_SWITCHING_MODE;
-        storedSettings.lockedRepresentations.setValue({ representations: filtered,
+        storedSettings.lockedRepresentations.setValue({ representationIds: filtered,
             switchingMode });
     }
     lockVideoRepresentations(periodObj, lockSettings) {
@@ -737,7 +774,7 @@ export default class TracksStore extends EventEmitter {
         const { DEFAULT_VIDEO_REPRESENTATIONS_SWITCHING_MODE } = config.getCurrent();
         const filtered = this._getRepresentationsToLock(storedSettings.adaptation, lockSettings.representations);
         const switchingMode = (_a = lockSettings.switchingMode) !== null && _a !== void 0 ? _a : DEFAULT_VIDEO_REPRESENTATIONS_SWITCHING_MODE;
-        storedSettings.lockedRepresentations.setValue({ representations: filtered,
+        storedSettings.lockedRepresentations.setValue({ representationIds: filtered,
             switchingMode });
     }
     unlockAudioRepresentations(periodObj) {
@@ -819,7 +856,7 @@ export default class TracksStore extends EventEmitter {
                 log.warn("API: Wanted locked Representation not found.");
             }
             else {
-                acc.push(foundRep);
+                acc.push(foundRep.id);
             }
             return acc;
         }, []);
@@ -892,9 +929,9 @@ function getRightVideoTrack(adaptation, isTrickModeEnabled) {
  * @returns {object}
  */
 function generatePeriodInfo(period, inManifest, isTrickModeTrackEnabled, defaultAudioTrackSwitchingMode) {
-    var _a;
-    const audioAdaptation = period.getSupportedAdaptations("audio")[0];
-    const baseVideoAdaptation = period.getSupportedAdaptations("video")[0];
+    var _a, _b;
+    const audioAdaptation = getSupportedAdaptations(period, "audio")[0];
+    const baseVideoAdaptation = getSupportedAdaptations(period, "video")[0];
     const videoAdaptation = getRightVideoTrack(baseVideoAdaptation, isTrickModeTrackEnabled);
     const { DEFAULT_VIDEO_TRACK_SWITCHING_MODE } = config.getCurrent();
     const audioSettings = audioAdaptation !== undefined ?
@@ -909,7 +946,7 @@ function generatePeriodInfo(period, inManifest, isTrickModeTrackEnabled, default
             lockedRepresentations: new SharedReference(null) } :
         null;
     let textAdaptation = null;
-    const forcedSubtitles = period.getAdaptationsForType("text")
+    const forcedSubtitles = ((_a = period.adaptations.text) !== null && _a !== void 0 ? _a : [])
         .filter((ad) => ad.isForcedSubtitles === true);
     if (forcedSubtitles.length > 0) {
         if (audioAdaptation !== null && audioAdaptation !== undefined) {
@@ -919,7 +956,7 @@ function generatePeriodInfo(period, inManifest, isTrickModeTrackEnabled, default
             }
         }
         if (textAdaptation === null) {
-            textAdaptation = (_a = arrayFind(forcedSubtitles, (f) => f.normalizedLanguage === undefined)) !== null && _a !== void 0 ? _a : null;
+            textAdaptation = (_b = arrayFind(forcedSubtitles, (f) => f.normalizedLanguage === undefined)) !== null && _b !== void 0 ? _b : null;
         }
     }
     let textSettings = null;

package/dist/es2017/core/decrypt/attach_media_keys.d.ts

@@ -21,8 +21,9 @@ import LoadedSessionsStore from "./utils/loaded_sessions_store";
  * Dispose of the MediaKeys instance attached to the given media element, if
  * one.
  * @param {Object} mediaElement
+ * @returns {Promise}
  */
-export declare function disableMediaKeys(mediaElement: HTMLMediaElement): void;
+export declare function disableMediaKeys(mediaElement: HTMLMediaElement): Promise<unknown>;
 /**
  * Attach MediaKeys and its associated state to an HTMLMediaElement.
  *

package/dist/es2017/core/decrypt/attach_media_keys.js

@@ -20,10 +20,11 @@ import MediaKeysInfosStore from "./utils/media_keys_infos_store";
  * Dispose of the MediaKeys instance attached to the given media element, if
  * one.
  * @param {Object} mediaElement
+ * @returns {Promise}
  */
 export function disableMediaKeys(mediaElement) {
     MediaKeysInfosStore.setState(mediaElement, null);
-    eme.setMediaKeys(mediaElement, null)
+    return eme.setMediaKeys(mediaElement, null)
         .then(() => {
         log.info("DRM: MediaKeys disabled with success");
     })

package/dist/es2017/core/decrypt/content_decryptor.js

@@ -22,6 +22,7 @@ import arrayFind from "../../utils/array_find";
 import arrayIncludes from "../../utils/array_includes";
 import EventEmitter from "../../utils/event_emitter";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
+import { objectValues } from "../../utils/object_values";
 import { bytesToHex } from "../../utils/string_parsing";
 import TaskCanceller from "../../utils/task_canceller";
 import attachMediaKeys from "./attach_media_keys";
@@ -263,7 +264,7 @@ export default class ContentDecryptor extends EventEmitter {
                         log.warn("DRM: Unable to fallback from a non-decipherable quality.");
                     }
                     else {
-                        blackListProtectionData(initializationData.content.manifest, initializationData);
+                        this.trigger("blackListProtectionData", initializationData);
                     }
                     return;
                 }
@@ -274,7 +275,11 @@ export default class ContentDecryptor extends EventEmitter {
                             .reduce((acc, kid) => `${acc}, ${bytesToHex(kid)}`, "");
                         log.debug("DRM: Blacklisting new key ids", hexKids);
                     }
-                    updateDecipherability(initializationData.content.manifest, [], keyIds, []);
+                    this.trigger("keyIdsCompatibilityUpdate", {
+                        whitelistedKeyIds: [],
+                        blacklistedKeyIds: keyIds,
+                        delistedKeyIds: [],
+                    });
                 }
                 return;
             }
@@ -302,7 +307,11 @@ export default class ContentDecryptor extends EventEmitter {
                                 createdSess.keyStatuses.blacklisted.push(innerKid);
                             }
                         }
-                        updateDecipherability(initializationData.content.manifest, createdSess.keyStatuses.whitelisted, createdSess.keyStatuses.blacklisted, []);
+                        this.trigger("keyIdsCompatibilityUpdate", {
+                            whitelistedKeyIds: createdSess.keyStatuses.whitelisted,
+                            blacklistedKeyIds: createdSess.keyStatuses.blacklisted,
+                            delistedKeyIds: [],
+                        });
                         return;
                     }
                 }
@@ -363,7 +372,11 @@ export default class ContentDecryptor extends EventEmitter {
                     isSessionPersisted = true;
                 }
                 if (initializationData.content !== undefined) {
-                    updateDecipherability(initializationData.content.manifest, linkedKeys.whitelisted, linkedKeys.blacklisted, []);
+                    this.trigger("keyIdsCompatibilityUpdate", {
+                        whitelistedKeyIds: linkedKeys.whitelisted,
+                        blacklistedKeyIds: linkedKeys.blacklisted,
+                        delistedKeyIds: [],
+                    });
                 }
                 this._unlockInitDataQueue();
             },
@@ -380,7 +393,11 @@ export default class ContentDecryptor extends EventEmitter {
                         this._currentSessions.splice(indexOf);
                     }
                     if (initializationData.content !== undefined) {
-                        updateDecipherability(initializationData.content.manifest, [], [], sessionInfo.record.getAssociatedKeyIds());
+                        this.trigger("keyIdsCompatibilityUpdate", {
+                            whitelistedKeyIds: [],
+                            blacklistedKeyIds: [],
+                            delistedKeyIds: sessionInfo.record.getAssociatedKeyIds(),
+                        });
                     }
                     (_a = stores.persistentSessionsStore) === null || _a === void 0 ? void 0 : _a.delete(mediaKeySession.sessionId);
                     stores.loadedSessionsStore.closeSession(mediaKeySession)
@@ -402,10 +419,9 @@ export default class ContentDecryptor extends EventEmitter {
                 }
                 sessionInfo.blacklistedSessionError = err;
                 if (initializationData.content !== undefined) {
-                    const { manifest } = initializationData.content;
                     log.info("DRM: blacklisting Representations based on " +
                         "protection data.");
-                    blackListProtectionData(manifest, initializationData);
+                    this.trigger("blackListProtectionData", initializationData);
                 }
                 this._unlockInitDataQueue();
                 // TODO warning for blacklisted session?
@@ -460,8 +476,7 @@ export default class ContentDecryptor extends EventEmitter {
             else {
                 log.info("DRM: This initialization data has already been blacklisted. " +
                     "Blacklisting the related content.");
-                const { manifest } = initializationData.content;
-                blackListProtectionData(manifest, initializationData);
+                this.trigger("blackListProtectionData", initializationData);
                 return true;
             }
         }
@@ -501,7 +516,11 @@ export default class ContentDecryptor extends EventEmitter {
                 }
                 log.info("DRM: Current initialization data is linked to blacklisted keys. " +
                     "Marking Representations as not decipherable");
-                updateDecipherability(initializationData.content.manifest, [], initializationData.keyIds, []);
+                this.trigger("keyIdsCompatibilityUpdate", {
+                    whitelistedKeyIds: [],
+                    blacklistedKeyIds: initializationData.keyIds,
+                    delistedKeyIds: [],
+                });
                 return true;
             }
         }
@@ -617,84 +636,6 @@ function canCreatePersistentSession(mediaKeySystemAccess) {
     return sessionTypes !== undefined &&
         arrayIncludes(sessionTypes, "persistent-license");
 }
-/**
- * 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 updateDecipherability(manifest, whitelistedKeyIds, blacklistedKeyIds, delistedKeyIds) {
-    manifest.updateRepresentationsDeciperability((representation) => {
-        if (representation.contentProtections === undefined) {
-            return representation.decipherable;
-        }
-        const contentKIDs = representation.contentProtections.keyIds;
-        if (contentKIDs !== undefined) {
-            for (const elt of contentKIDs) {
-                for (const blacklistedKeyId of blacklistedKeyIds) {
-                    if (areArraysOfNumbersEqual(blacklistedKeyId, elt.keyId)) {
-                        return false;
-                    }
-                }
-                for (const whitelistedKeyId of whitelistedKeyIds) {
-                    if (areArraysOfNumbersEqual(whitelistedKeyId, elt.keyId)) {
-                        return true;
-                    }
-                }
-                for (const delistedKeyId of delistedKeyIds) {
-                    if (areArraysOfNumbersEqual(delistedKeyId, elt.keyId)) {
-                        return undefined;
-                    }
-                }
-            }
-        }
-        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 blackListProtectionData(manifest, initData) {
-    manifest.updateRepresentationsDeciperability((representation) => {
-        var _a, _b;
-        if (representation.decipherable === false) {
-            return false;
-        }
-        const segmentProtections = (_b = (_a = representation.contentProtections) === null || _a === void 0 ? void 0 : _a.initData) !== null && _b !== void 0 ? _b : [];
-        for (const protection of segmentProtections) {
-            if (initData.type === undefined ||
-                protection.type === initData.type) {
-                const containedInitData = initData.values.getFormattedValues()
-                    .every(undecipherableVal => {
-                    return protection.values.some(currVal => {
-                        return (undecipherableVal.systemId === undefined ||
-                            currVal.systemId === undecipherableVal.systemId) &&
-                            areArraysOfNumbersEqual(currVal.data, undecipherableVal.data);
-                    });
-                });
-                if (containedInitData) {
-                    return false;
-                }
-            }
-        }
-        return representation.decipherable;
-    });
-}
 /**
  * Returns set of all usable and unusable keys - explicit or implicit - that are
  * linked to a `MediaKeySession`.
@@ -833,7 +774,12 @@ function mergeKeyIdSetIntoArray(set, arr) {
  * @param {Object} period
  */
 function addKeyIdsFromPeriod(set, period) {
-    for (const adaptation of period.getAdaptations()) {
+    const adaptationsByType = period.adaptations;
+    const adaptations = objectValues(adaptationsByType).reduce(
+    // Note: the second case cannot happen. TS is just being dumb here
+    (acc, adaps) => adaps != null ? acc.concat(adaps) :
+        acc, []);
+    for (const adaptation of adaptations) {
         for (const representation of adaptation.representations) {
             if (representation.contentProtections !== undefined &&
                 representation.contentProtections.keyIds !== undefined) {

package/dist/es2017/core/decrypt/init_media_keys.js

@@ -13,7 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { isWebOs } from "../../compat/browser_detection";
 import log from "../../log";
+import noop from "../../utils/noop";
 import { disableMediaKeys } from "./attach_media_keys";
 import getMediaKeysInfos from "./get_media_keys";
 /**
@@ -31,7 +33,15 @@ export default async function initMediaKeys(mediaElement, keySystemsConfigs, can
         mediaKeys !== mediaElement.mediaKeys;
     if (shouldDisableOldMediaKeys) {
         log.debug("DRM: Disabling old MediaKeys");
-        disableMediaKeys(mediaElement);
+        // TODO should we be awaiting always?
+        // Should be tested on all devices, we may want to wait for another
+        // version to make this important change.
+        if (isWebOs) {
+            await disableMediaKeys(mediaElement);
+        }
+        else {
+            disableMediaKeys(mediaElement).catch(noop);
+        }
     }
     return mediaKeysInfo;
 }