rx-player 3.26.3-dev.2022021400 → 3.27.0-dev.20220317

package/dist/_esm5.processed/experimental/index.d.ts

@@ -0,0 +1,2 @@
+import configHandler from "../config";
+export { configHandler as config, };

package/dist/_esm5.processed/experimental/index.js

@@ -0,0 +1,2 @@
+import configHandler from "../config";
+export { configHandler as config, };

package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/push_data.d.ts

@@ -16,6 +16,7 @@ export default function pushData(inventoryInfos: {
     adaptation: Adaptation;
     representation: Representation;
     segment: ISegment;
+    chunkSize: number | undefined;
     start: number;
     end: number;
 }, parsed: ISegmentParserParsedMediaChunk<Uint8Array | ArrayBuffer>, videoSourceBuffer: AudioVideoSegmentBuffer): Observable<void>;

package/dist/_esm5.processed/experimental/tools/VideoThumbnailLoader/thumbnail_loader.js

@@ -166,7 +166,7 @@ var VideoThumbnailLoader = /** @class */ (function () {
                     if (end === undefined) {
                         end = start + (segment.duration / segment.timescale);
                     }
-                    var inventoryInfos = objectAssign({ segment: segment, start: start, end: end }, contentInfos);
+                    var inventoryInfos = objectAssign({ chunkSize: data.chunkSize, segment: segment, start: start, end: end }, contentInfos);
                     return pushData(inventoryInfos, data, videoSourceBuffer)
                         .pipe(tap(function () {
                         freeRequest(getCompleteSegmentId(inventoryInfos, segment));

package/dist/_esm5.processed/experimental/tools/mediaCapabilitiesProber/probers/DRMInfos.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { lastValueFrom } from "rxjs";
 import { requestMediaKeySystemAccess } from "../../../../compat";
 import PPromise from "../../../../utils/promise";
 import log from "../log";
@@ -39,7 +38,7 @@ export default function probeDRMInfos(mediaConfig) {
         // So, the DRM configuration is not supported.
         return PPromise.resolve([ProberStatus.NotSupported, result]);
     }
-    return lastValueFrom(requestMediaKeySystemAccess(type, [configuration]))
+    return requestMediaKeySystemAccess(type, [configuration])
         .then(function (keySystemAccess) {
         result.compatibleConfiguration = keySystemAccess.getConfiguration();
         var status = [ProberStatus.Supported, result];

package/dist/_esm5.processed/experimental/tools/mediaCapabilitiesProber/probers/HDCPPolicy.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { lastValueFrom } from "rxjs";
 import { requestMediaKeySystemAccess } from "../../../../compat";
 import PPromise from "../../../../utils/promise";
 import { ProberStatus, } from "../types";
@@ -42,7 +41,7 @@ export default function probeHDCPPolicy(config) {
                 contentType: "video/mp4;codecs=\"avc1.42E01E\"",
             }],
     };
-    return lastValueFrom(requestMediaKeySystemAccess(keySystem, [drmConfig]))
+    return requestMediaKeySystemAccess(keySystem, [drmConfig])
         .then(function (mediaKeysSystemAccess) {
         return mediaKeysSystemAccess.createMediaKeys().then(function (mediaKeys) {
             if (!("getStatusForPolicy" in mediaKeys)) {

package/dist/_esm5.processed/features/features_object.js

@@ -20,7 +20,7 @@
 var features = { dashParsers: { wasm: null,
         js: null },
     directfile: null,
-    emeManager: null,
+    ContentDecryptor: null,
     htmlTextTracksBuffer: null,
     htmlTextTracksParsers: {},
     imageBuffer: null,

package/dist/_esm5.processed/features/initialize_features.js

@@ -24,7 +24,7 @@ import features from "./features_object";
  */
 export default function initializeFeaturesObject() {
     if (0 /* EME */ === 1 /* IS_ENABLED */) {
-        features.emeManager = require("../core/eme/index.ts").default;
+        features.ContentDecryptor = require("../core/decrypt/index.ts").default;
     }
     if (0 /* BIF_PARSER */ === 1 /* IS_ENABLED */) {
         features.imageBuffer =

package/dist/_esm5.processed/features/list/eme.d.ts

@@ -18,6 +18,6 @@ import { IFeaturesObject } from "../types";
  * Add ability to play encrypted contents
  * @param {Object} features
  */
-declare function addEMEManagerFeature(features: IFeaturesObject): void;
-export { addEMEManagerFeature as EME };
-export default addEMEManagerFeature;
+declare function addEMEFeature(features: IFeaturesObject): void;
+export { addEMEFeature as EME };
+export default addEMEFeature;

package/dist/_esm5.processed/features/list/eme.js

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import EMEManager from "../../core/eme";
+import ContentDecryptor from "../../core/decrypt";
 /**
  * Add ability to play encrypted contents
  * @param {Object} features
  */
-function addEMEManagerFeature(features) {
-    features.emeManager = EMEManager;
+function addEMEFeature(features) {
+    features.ContentDecryptor = ContentDecryptor;
 }
-export { addEMEManagerFeature as EME };
-export default addEMEManagerFeature;
+export { addEMEFeature as EME };
+export default addEMEFeature;

package/dist/_esm5.processed/features/types.d.ts

@@ -15,7 +15,7 @@
  */
 import { Observable } from "rxjs";
 import MediaElementTrackChoiceManager from "../core/api/media_element_track_choice_manager";
-import { IContentProtection, IEMEManagerEvent, IKeySystemOption } from "../core/eme";
+import type ContentDecryptor from "../core/decrypt";
 import { IDirectfileEvent, IDirectFileOptions } from "../core/init/initialize_directfile";
 import { SegmentBuffer } from "../core/segment_buffers";
 import { IDashParserResponse, IMPDParserArguments } from "../parsers/manifest/dash/parsers_types";
@@ -23,7 +23,7 @@ import DashWasmParser from "../parsers/manifest/dash/wasm-parser";
 import { IHTMLTextTracksParserFn, INativeTextTracksParserFn } from "../parsers/texttracks";
 import { ITransportFunction } from "../transports";
 export declare type IDirectFileInit = (args: IDirectFileOptions) => Observable<IDirectfileEvent>;
-export declare type IEMEManager = (mediaElement: HTMLMediaElement, keySystems: IKeySystemOption[], contentProtections$: Observable<IContentProtection>) => Observable<IEMEManagerEvent>;
+export declare type IContentDecryptorClass = typeof ContentDecryptor;
 export declare type IHTMLTextTracksBuffer = new (mediaElement: HTMLMediaElement, textTrackElement: HTMLElement) => SegmentBuffer;
 export declare type INativeTextTracksBuffer = new (mediaElement: HTMLMediaElement, hideNativeSubtitle: boolean) => SegmentBuffer;
 export declare type IMediaElementTrackChoiceManager = typeof MediaElementTrackChoiceManager;
@@ -53,7 +53,7 @@ export interface IFeaturesObject {
         initDirectFile: IDirectFileInit;
         mediaElementTrackChoiceManager: IMediaElementTrackChoiceManager;
     } | null;
-    emeManager: IEMEManager | null;
+    ContentDecryptor: IContentDecryptorClass | null;
     htmlTextTracksBuffer: IHTMLTextTracksBuffer | null;
     htmlTextTracksParsers: Partial<Record<string, IHTMLTextTracksParserFn>>;
     imageBuffer: IImageBuffer | null;

package/dist/_esm5.processed/manifest/manifest.d.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IInitializationDataInfo } from "../core/eme";
 import { ICustomError } from "../errors";
 import { IParsedManifest } from "../parsers/manifest";
 import EventEmitter from "../utils/event_emitter";
@@ -271,19 +270,7 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
      * changes performed.
      * @param {Object} keyUpdates
      */
-    updateDeciperabilitiesBasedOnKeyIds({ whitelistedKeyIds, blacklistedKeyIDs }: {
-        whitelistedKeyIds: Uint8Array[];
-        blacklistedKeyIDs: Uint8Array[];
-    }): void;
-    /**
-     * Look in the Manifest for Representations linked to the given content
-     * protection initialization data and mark them as being impossible to
-     * decrypt.
-     * Then trigger a "decipherabilityUpdate" event to notify everyone of the
-     * changes performed.
-     * @param {Object} initData
-     */
-    addUndecipherableProtectionData(initData: IInitializationDataInfo): void;
+    updateRepresentationsDeciperability(isDecipherableCb: (rep: Representation) => boolean | undefined): void;
     /**
      * @deprecated only returns adaptations for the first period
      * @returns {Array.<Object>}

package/dist/_esm5.processed/manifest/manifest.js

@@ -29,7 +29,6 @@ var __extends = (this && this.__extends) || (function () {
     };
 })();
 import { MediaError, } from "../errors";
-import areArraysOfNumbersEqual from "../utils/are_arrays_of_numbers_equal";
 import arrayFind from "../utils/array_find";
 import EventEmitter from "../utils/event_emitter";
 import idGenerator from "../utils/id_generator";
@@ -72,8 +71,9 @@ var Manifest = /** @class */ (function (_super) {
      * @param {Object} options
      */
     function Manifest(parsedManifest, options) {
+        var _this = this;
         var _a;
-        var _this = _super.call(this) || this;
+        _this = _super.call(this) || this;
         var _b = options.supplementaryTextTracks, supplementaryTextTracks = _b === void 0 ? [] : _b, _c = options.supplementaryImageTracks, supplementaryImageTracks = _c === void 0 ? [] : _c, representationFilter = options.representationFilter, manifestUpdateUrl = options.manifestUpdateUrl;
         _this.contentWarnings = [];
         _this.id = generateNewManifestId();
@@ -234,70 +234,8 @@ var Manifest = /** @class */ (function (_super) {
      * changes performed.
      * @param {Object} keyUpdates
      */
-    Manifest.prototype.updateDeciperabilitiesBasedOnKeyIds = function (_a) {
-        var whitelistedKeyIds = _a.whitelistedKeyIds, blacklistedKeyIDs = _a.blacklistedKeyIDs;
-        var updates = updateDeciperability(this, function (representation) {
-            if (representation.decipherable === false ||
-                representation.contentProtections === undefined) {
-                return representation.decipherable;
-            }
-            var contentKIDs = representation.contentProtections.keyIds;
-            for (var i = 0; i < contentKIDs.length; i++) {
-                var elt = contentKIDs[i];
-                for (var j = 0; j < blacklistedKeyIDs.length; j++) {
-                    if (areArraysOfNumbersEqual(blacklistedKeyIDs[j], elt.keyId)) {
-                        return false;
-                    }
-                }
-                for (var j = 0; j < whitelistedKeyIds.length; j++) {
-                    if (areArraysOfNumbersEqual(whitelistedKeyIds[j], elt.keyId)) {
-                        return true;
-                    }
-                }
-            }
-            return representation.decipherable;
-        });
-        if (updates.length > 0) {
-            this.trigger("decipherabilityUpdate", updates);
-        }
-    };
-    /**
-     * Look in the Manifest for Representations linked to the given content
-     * protection initialization data and mark them as being impossible to
-     * decrypt.
-     * Then trigger a "decipherabilityUpdate" event to notify everyone of the
-     * changes performed.
-     * @param {Object} initData
-     */
-    Manifest.prototype.addUndecipherableProtectionData = function (initData) {
-        var updates = updateDeciperability(this, function (representation) {
-            var _a, _b;
-            if (representation.decipherable === false) {
-                return false;
-            }
-            var segmentProtections = (_b = (_a = representation.contentProtections) === null || _a === void 0 ? void 0 : _a.initData) !== null && _b !== void 0 ? _b : [];
-            var _loop_1 = function (i) {
-                if (initData.type === undefined ||
-                    segmentProtections[i].type === initData.type) {
-                    var containedInitData = initData.values.every(function (undecipherableVal) {
-                        return segmentProtections[i].values.some(function (currVal) {
-                            return (undecipherableVal.systemId === undefined ||
-                                currVal.systemId === undecipherableVal.systemId) &&
-                                areArraysOfNumbersEqual(currVal.data, undecipherableVal.data);
-                        });
-                    });
-                    if (containedInitData) {
-                        return { value: false };
-                    }
-                }
-            };
-            for (var i = 0; i < segmentProtections.length; i++) {
-                var state_1 = _loop_1(i);
-                if (typeof state_1 === "object")
-                    return state_1.value;
-            }
-            return representation.decipherable;
-        });
+    Manifest.prototype.updateRepresentationsDeciperability = function (isDecipherableCb) {
+        var updates = updateDeciperability(this, isDecipherableCb);
         if (updates.length > 0) {
             this.trigger("decipherabilityUpdate", updates);
         }
@@ -501,14 +439,12 @@ export default Manifest;
  */
 function updateDeciperability(manifest, isDecipherable) {
     var updates = [];
-    for (var i = 0; i < manifest.periods.length; i++) {
-        var period = manifest.periods[i];
-        var adaptations = period.getAdaptations();
-        for (var j = 0; j < adaptations.length; j++) {
-            var adaptation = adaptations[j];
-            var representations = adaptation.representations;
-            for (var k = 0; k < representations.length; k++) {
-                var representation = representations[k];
+    for (var _i = 0, _a = manifest.periods; _i < _a.length; _i++) {
+        var period = _a[_i];
+        for (var _b = 0, _c = period.getAdaptations(); _b < _c.length; _b++) {
+            var adaptation = _c[_b];
+            for (var _d = 0, _e = adaptation.representations; _d < _e.length; _d++) {
+                var representation = _e[_d];
                 var result = isDecipherable(representation);
                 if (result !== representation.decipherable) {
                     updates.push({ manifest: manifest, period: period, adaptation: adaptation, representation: representation });

package/dist/_esm5.processed/manifest/representation.d.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IContentProtection } from "../core/eme";
 import { IContentProtections, IParsedRepresentation } from "../parsers/manifest";
 import { IRepresentationIndex } from "./representation_index";
 import { IAdaptationType, IHDRInformation } from "./types";
@@ -107,7 +106,7 @@ declare class Representation {
      * @param {string} drmSystemId - The hexa-encoded DRM system ID
      * @returns {Array.<Object>}
      */
-    getEncryptionData(drmSystemId: string): IContentProtection[];
+    getEncryptionData(drmSystemId: string): IRepresentationProtectionData[];
     /**
      * Returns all currently-known encryption initialization data linked to this
      * Representation.
@@ -134,7 +133,7 @@ declare class Representation {
      * after parsing this Representation's initialization segment, if one exists.
      * @returns {Array.<Object>}
      */
-    getAllEncryptionData(): IContentProtection[];
+    getAllEncryptionData(): IRepresentationProtectionData[];
     /**
      * Add new encryption initialization data to this Representation if it was not
      * already included.
@@ -156,4 +155,37 @@ declare class Representation {
         data: Uint8Array;
     }>): boolean;
 }
+/** Protection data as returned by a Representation. */
+export interface IRepresentationProtectionData {
+    /**
+     * Initialization data type.
+     * String describing the format of the initialization data sent through this
+     * event.
+     * https://www.w3.org/TR/eme-initdata-registry/
+     */
+    type: string;
+    /**
+     * The key ids linked to those initialization data.
+     * This should be the key ids for the key concerned by the media which have
+     * the present initialization data.
+     *
+     * `undefined` when not known (different from an empty array - which would
+     * just mean that there's no key id involved).
+     */
+    keyIds: Uint8Array[] | undefined;
+    /** Every initialization data for that type. */
+    values: Array<{
+        /**
+         * Hex encoded system id, which identifies the key system.
+         * https://dashif.org/identifiers/content_protection/
+         */
+        systemId: string;
+        /**
+         * The initialization data itself for that type and systemId.
+         * For example, with "cenc" initialization data found in an ISOBMFF file,
+         * this will be the whole PSSH box.
+         */
+        data: Uint8Array;
+    }>;
+}
 export default Representation;

package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/is_period_fulfilled.js

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import config from "../../../../../config";
-var DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR = config.DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR;
 /**
  * In Javascript, numbers are encoded in a way that a floating number may be
  * represented internally with a rounding error.
@@ -28,6 +27,6 @@ var DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR = config.DEFAULT_MAXIMUM_TIME_ROUNDING_E
  * @returns {boolean}
  */
 export default function isPeriodFulfilled(timescale, lastSegmentEnd, periodEnd) {
-    var scaledRoundingError = DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR * timescale;
+    var scaledRoundingError = config.getCurrent().DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR * timescale;
     return (lastSegmentEnd + scaledRoundingError) >= periodEnd;
 }

package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/template.js

@@ -17,7 +17,6 @@ import config from "../../../../../config";
 import getInitSegment from "./get_init_segment";
 import isPeriodFulfilled from "./is_period_fulfilled";
 import { createDashUrlDetokenizer, createIndexURLs, } from "./tokens";
-var MINIMUM_SEGMENT_SIZE = config.MINIMUM_SEGMENT_SIZE;
 /**
  * IRepresentationIndex implementation for DASH' SegmentTemplate without a
  * SegmentTimeline.
@@ -327,7 +326,7 @@ var TemplateRepresentationIndex = /** @class */ (function () {
             // segment that there actually is due to a very little difference between
             // the period's duration and a multiple of a segment's duration.
             // Check that we're within a good margin
-            var minimumDuration = MINIMUM_SEGMENT_SIZE * timescale;
+            var minimumDuration = config.getCurrent().MINIMUM_SEGMENT_SIZE * timescale;
             if (maximumTime - regularLastSegmentStart > minimumDuration ||
                 numberIndexedToZero === 0) {
                 return regularLastSegmentStart;

package/dist/_esm5.processed/parsers/manifest/dash/common/indexes/timeline/timeline_representation_index.js

@@ -27,7 +27,6 @@ import { createIndexURLs } from "../tokens";
 import constructTimelineFromElements from "./construct_timeline_from_elements";
 // eslint-disable-next-line max-len
 import constructTimelineFromPreviousTimeline from "./construct_timeline_from_previous_timeline";
-var MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY = config.MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY;
 var TimelineRepresentationIndex = /** @class */ (function () {
     /**
      * @param {Object} index
@@ -328,6 +327,7 @@ var TimelineRepresentationIndex = /** @class */ (function () {
         }
         var newElements = this._parseTimeline();
         this._parseTimeline = null; // Free memory
+        var MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY = config.getCurrent().MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY;
         if (this._unsafelyBaseOnPreviousIndex === null ||
             newElements.length < MIN_DASH_S_ELEMENTS_TO_PARSE_UNSAFELY) {
             // Just completely parse the current timeline

package/dist/_esm5.processed/parsers/manifest/dash/common/parse_adaptation_sets.js

@@ -14,7 +14,9 @@
  * limitations under the License.
  */
 import log from "../../../../log";
+import { SUPPORTED_ADAPTATIONS_TYPE, } from "../../../../manifest";
 import arrayFind from "../../../../utils/array_find";
+import arrayFindIndex from "../../../../utils/array_find_index";
 import arrayIncludes from "../../../../utils/array_includes";
 import isNonEmptyString from "../../../../utils/is_non_empty_string";
 import attachTrickModeTrack from "./attach_trickmode_track";
@@ -142,29 +144,24 @@ function getAdaptationSetSwitchingIDs(adaptation) {
  */
 export default function parseAdaptationSets(adaptationsIR, context) {
     var _a;
-    var _b, _c, _d, _e, _f, _g, _h;
-    var parsedAdaptations = {};
+    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var parsedAdaptations = { video: [],
+        audio: [],
+        text: [],
+        image: [] };
     var trickModeAdaptations = [];
     var adaptationSwitchingInfos = {};
     var parsedAdaptationsIDs = [];
     /**
-     * Index of the last parsed AdaptationSet with a Role set as "main" in
-     * `parsedAdaptations` for a given type.
-     * Not defined for a type with no main Adaptation inside.
-     * This is used to put main AdaptationSet first in the resulting array of
-     * Adaptation while still preserving the MPD order among them.
+     * Index of the last parsed Video AdaptationSet with a Role set as "main" in
+     * `parsedAdaptations.video`.
+     * `-1` if not yet encountered.
+     * Used as we merge all main video AdaptationSet due to a comprehension of the
+     * DASH-IF IOP.
      */
-    var lastMainAdaptationIndex = {};
-    // first sort AdaptationSets by absolute priority.
-    adaptationsIR.sort(function (a, b) {
-        var _a, _b;
-        /* As of DASH-IF 4.3, `1` is the default value. */
-        var priority1 = (_a = a.attributes.selectionPriority) !== null && _a !== void 0 ? _a : 1;
-        var priority2 = (_b = b.attributes.selectionPriority) !== null && _b !== void 0 ? _b : 1;
-        return priority2 - priority1;
-    });
-    for (var _i = 0, adaptationsIR_1 = adaptationsIR; _i < adaptationsIR_1.length; _i++) {
-        var adaptation = adaptationsIR_1[_i];
+    var lastMainVideoAdapIdx = -1;
+    for (var adaptationIdx = 0; adaptationIdx < adaptationsIR.length; adaptationIdx++) {
+        var adaptation = adaptationsIR[adaptationIdx];
         var adaptationChildren = adaptation.children;
         var essentialProperties = adaptationChildren.essentialProperties, roles = adaptationChildren.roles;
         var isMainAdaptation = Array.isArray(roles) &&
@@ -186,6 +183,7 @@ export default function parseAdaptationSets(adaptationsIR, context) {
         if (type === undefined) {
             continue;
         }
+        var priority = (_d = adaptation.attributes.selectionPriority) !== null && _d !== void 0 ? _d : 1;
         var originalID = adaptation.attributes.id;
         var newID = void 0;
         var adaptationSetSwitchingIDs = getAdaptationSetSwitchingIDs(adaptation);
@@ -216,19 +214,16 @@ export default function parseAdaptationSets(adaptationsIR, context) {
             arrayFind(essentialProperties, function (scheme) {
                 return scheme.schemeIdUri === "http://dashif.org/guidelines/trickmode";
             }) : undefined;
-        var trickModeAttachedAdaptationIds = (_d = trickModeProperty === null || trickModeProperty === void 0 ? void 0 : trickModeProperty.value) === null || _d === void 0 ? void 0 : _d.split(" ");
+        var trickModeAttachedAdaptationIds = (_e = trickModeProperty === null || trickModeProperty === void 0 ? void 0 : trickModeProperty.value) === null || _e === void 0 ? void 0 : _e.split(" ");
         var isTrickModeTrack = trickModeAttachedAdaptationIds !== undefined;
         if (type === "video" &&
             isMainAdaptation &&
-            parsedAdaptations.video !== undefined &&
-            parsedAdaptations.video.length > 0 &&
-            lastMainAdaptationIndex.video !== undefined &&
+            lastMainVideoAdapIdx >= 0 &&
+            parsedAdaptations.video.length > lastMainVideoAdapIdx &&
             !isTrickModeTrack) {
-            // Add to the already existing main video adaptation
-            // TODO remove that ugly custom logic?
-            var videoMainAdaptation = parsedAdaptations.video[lastMainAdaptationIndex.video];
-            reprCtxt.unsafelyBaseOnPreviousAdaptation = (_f = (_e = context
-                .unsafelyBaseOnPreviousPeriod) === null || _e === void 0 ? void 0 : _e.getAdaptation(videoMainAdaptation.id)) !== null && _f !== void 0 ? _f : null;
+            var videoMainAdaptation = parsedAdaptations.video[lastMainVideoAdapIdx][0];
+            reprCtxt.unsafelyBaseOnPreviousAdaptation = (_g = (_f = context
+                .unsafelyBaseOnPreviousPeriod) === null || _f === void 0 ? void 0 : _f.getAdaptation(videoMainAdaptation.id)) !== null && _g !== void 0 ? _g : null;
             var representations = parseRepresentations(representationsIR, adaptation, reprCtxt);
             (_a = videoMainAdaptation.representations).push.apply(_a, representations);
             newID = videoMainAdaptation.id;
@@ -268,8 +263,8 @@ export default function parseAdaptationSets(adaptationsIR, context) {
             }
             newID = adaptationID;
             parsedAdaptationsIDs.push(adaptationID);
-            reprCtxt.unsafelyBaseOnPreviousAdaptation = (_h = (_g = context
-                .unsafelyBaseOnPreviousPeriod) === null || _g === void 0 ? void 0 : _g.getAdaptation(adaptationID)) !== null && _h !== void 0 ? _h : null;
+            reprCtxt.unsafelyBaseOnPreviousAdaptation = (_j = (_h = context
+                .unsafelyBaseOnPreviousPeriod) === null || _h === void 0 ? void 0 : _h.getAdaptation(adaptationID)) !== null && _j !== void 0 ? _j : null;
             var representations = parseRepresentations(representationsIR, adaptation, reprCtxt);
             var parsedAdaptationSet = { id: adaptationID, representations: representations, type: type, isTrickModeTrack: isTrickModeTrack };
             if (adaptation.attributes.language != null) {
@@ -287,75 +282,92 @@ export default function parseAdaptationSets(adaptationsIR, context) {
             if (isSignInterpreted === true) {
                 parsedAdaptationSet.isSignInterpreted = true;
             }
-            var adaptationsOfTheSameType = parsedAdaptations[type];
             if (trickModeAttachedAdaptationIds !== undefined) {
                 trickModeAdaptations.push({ adaptation: parsedAdaptationSet, trickModeAttachedAdaptationIds: trickModeAttachedAdaptationIds });
             }
-            else if (adaptationsOfTheSameType === undefined) {
-                parsedAdaptations[type] = [parsedAdaptationSet];
-                if (isMainAdaptation) {
-                    lastMainAdaptationIndex[type] = 0;
-                }
-            }
             else {
-                var mergedInto = null;
+                // look if we have to merge this into another Adaptation
+                var mergedIntoIdx = -1;
                 var _loop_1 = function (id) {
                     var _k;
                     var switchingInfos = adaptationSwitchingInfos[id];
-                    if (switchingInfos != null &&
+                    if (switchingInfos !== undefined &&
                         switchingInfos.newID !== newID &&
                         arrayIncludes(switchingInfos.adaptationSetSwitchingIDs, originalID)) {
-                        var adaptationToMergeInto = arrayFind(adaptationsOfTheSameType, function (a) { return a.id === id; });
-                        if (adaptationToMergeInto != null &&
-                            adaptationToMergeInto.audioDescription ===
+                        mergedIntoIdx = arrayFindIndex(parsedAdaptations[type], function (a) { return a[0].id === id; });
+                        var mergedInto = parsedAdaptations[type][mergedIntoIdx];
+                        if (mergedInto !== undefined &&
+                            mergedInto[0].audioDescription ===
                                 parsedAdaptationSet.audioDescription &&
-                            adaptationToMergeInto.closedCaption ===
+                            mergedInto[0].closedCaption ===
                                 parsedAdaptationSet.closedCaption &&
-                            adaptationToMergeInto.language === parsedAdaptationSet.language) {
+                            mergedInto[0].language === parsedAdaptationSet.language) {
                             log.info("DASH Parser: merging \"switchable\" AdaptationSets", originalID, id);
-                            (_k = adaptationToMergeInto.representations)
-                                .push.apply(_k, parsedAdaptationSet.representations);
-                            mergedInto = adaptationToMergeInto;
+                            (_k = mergedInto[0].representations).push.apply(_k, parsedAdaptationSet.representations);
+                            if (type === "video" &&
+                                isMainAdaptation &&
+                                !mergedInto[1].isMainAdaptation) {
+                                lastMainVideoAdapIdx = Math.max(lastMainVideoAdapIdx, mergedIntoIdx);
+                            }
+                            mergedInto[1] = {
+                                priority: Math.max(priority, mergedInto[1].priority),
+                                isMainAdaptation: isMainAdaptation ||
+                                    mergedInto[1].isMainAdaptation,
+                                indexInMpd: Math.min(adaptationIdx, mergedInto[1].indexInMpd),
+                            };
                         }
                     }
                 };
-                // look if we have to merge this into another Adaptation
-                for (var _j = 0, adaptationSetSwitchingIDs_1 = adaptationSetSwitchingIDs; _j < adaptationSetSwitchingIDs_1.length; _j++) {
-                    var id = adaptationSetSwitchingIDs_1[_j];
+                for (var _i = 0, adaptationSetSwitchingIDs_1 = adaptationSetSwitchingIDs; _i < adaptationSetSwitchingIDs_1.length; _i++) {
+                    var id = adaptationSetSwitchingIDs_1[_i];
                     _loop_1(id);
                 }
-                if (isMainAdaptation) {
-                    var oldLastMainIdx = lastMainAdaptationIndex[type];
-                    var newLastMainIdx = oldLastMainIdx === undefined ? 0 :
-                        oldLastMainIdx + 1;
-                    if (mergedInto === null) {
-                        // put "main" Adaptation after all other Main Adaptations
-                        adaptationsOfTheSameType.splice(newLastMainIdx, 0, parsedAdaptationSet);
-                        lastMainAdaptationIndex[type] = newLastMainIdx;
-                    }
-                    else {
-                        var indexOf = adaptationsOfTheSameType.indexOf(mergedInto);
-                        if (indexOf < 0) { // Weird, not found
-                            adaptationsOfTheSameType.splice(newLastMainIdx, 0, parsedAdaptationSet);
-                            lastMainAdaptationIndex[type] = newLastMainIdx;
-                        }
-                        else if (oldLastMainIdx === undefined || indexOf > oldLastMainIdx) {
-                            // Found but was not main
-                            adaptationsOfTheSameType.splice(indexOf, 1);
-                            adaptationsOfTheSameType.splice(newLastMainIdx, 0, mergedInto);
-                            lastMainAdaptationIndex[type] = newLastMainIdx;
-                        }
+                if (mergedIntoIdx < 0) {
+                    parsedAdaptations[type].push([parsedAdaptationSet,
+                        { priority: priority, isMainAdaptation: isMainAdaptation, indexInMpd: adaptationIdx }]);
+                    if (type === "video" && isMainAdaptation) {
+                        lastMainVideoAdapIdx = parsedAdaptations.video.length - 1;
                     }
                 }
-                else if (mergedInto === null) {
-                    adaptationsOfTheSameType.push(parsedAdaptationSet);
-                }
             }
         }
         if (originalID != null && adaptationSwitchingInfos[originalID] == null) {
             adaptationSwitchingInfos[originalID] = { newID: newID, adaptationSetSwitchingIDs: adaptationSetSwitchingIDs };
         }
     }
-    attachTrickModeTrack(parsedAdaptations, trickModeAdaptations);
-    return parsedAdaptations;
+    var adaptationsPerType = SUPPORTED_ADAPTATIONS_TYPE
+        .reduce(function (acc, adaptationType) {
+        var adaptationsParsedForType = parsedAdaptations[adaptationType];
+        if (adaptationsParsedForType.length > 0) {
+            adaptationsParsedForType.sort(compareAdaptations);
+            acc[adaptationType] = adaptationsParsedForType
+                .map(function (_a) {
+                var parsedAdaptation = _a[0];
+                return parsedAdaptation;
+            });
+        }
+        return acc;
+    }, {});
+    parsedAdaptations.video.sort(compareAdaptations);
+    attachTrickModeTrack(adaptationsPerType, trickModeAdaptations);
+    return adaptationsPerType;
+}
+/**
+ * Compare groups of parsed AdaptationSet, alongside some ordering metadata,
+ * allowing to easily sort them through JavaScript's `Array.prototype.sort`
+ * method.
+ * @param {Array.<Object>} a
+ * @param {Array.<Object>} b
+ * @returns {number}
+ */
+function compareAdaptations(a, b) {
+    var priorityDiff = b[1].priority - a[1].priority;
+    if (priorityDiff !== 0) {
+        return priorityDiff;
+    }
+    if (a[1].isMainAdaptation !== b[1].isMainAdaptation) {
+        return a[1].isMainAdaptation ? -1 :
+            1;
+    }
+    return a[1].indexInMpd - b[1].indexInMpd;
 }