rx-player 4.0.0-beta.0 → 4.0.0-beta.2

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

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import log from "../log";
 import arrayFind from "../utils/array_find";
 import isNullOrUndefined from "../utils/is_null_or_undefined";
 import normalizeLanguage from "../utils/languages";
@@ -21,7 +22,7 @@ import Representation from "./representation";
 export var SUPPORTED_ADAPTATIONS_TYPE = ["audio", "video", "text"];
 /**
  * Normalized Adaptation structure.
- * An Adaptation describes a single `Track`. For example a specific audio
+ * An `Adaptation` describes a single `Track`. For example a specific audio
  * track (in a given language) or a specific video track.
  * It istelf can be represented in different qualities, which we call here
  * `Representation`.
@@ -109,6 +110,9 @@ var Adaptation = /** @class */ (function () {
                     isSupported = true;
                 }
             }
+            else {
+                log.debug("Filtering Representation due to representationFilter", this.type, "Adaptation: ".concat(this.id), "Representation: ".concat(representation.id), "(".concat(representation.bitrate, ")"));
+            }
         }
         representations.sort(function (a, b) { return a.bitrate - b.bitrate; });
         this.representations = representations;
@@ -135,6 +139,81 @@ var Adaptation = /** @class */ (function () {
             return wantedId === id;
         });
     };
+    /**
+     * Format an `Adaptation`, generally of type `"audio"`, as an `IAudioTrack`.
+     * @param {boolean} filterPlayable - If `true` only "playable" Representation
+     * will be returned.
+     * @returns {Object}
+     */
+    Adaptation.prototype.toAudioTrack = function (filterPlayable) {
+        var _a, _b;
+        var formatted = {
+            language: (_a = this.language) !== null && _a !== void 0 ? _a : "",
+            normalized: (_b = this.normalizedLanguage) !== null && _b !== void 0 ? _b : "",
+            audioDescription: this.isAudioDescription === true,
+            id: this.id,
+            representations: (filterPlayable ?
+                this.getPlayableRepresentations() :
+                this.representations).map(function (r) { return r.toAudioRepresentation(); }),
+            label: this.label,
+        };
+        if (this.isDub === true) {
+            formatted.dub = true;
+        }
+        return formatted;
+    };
+    /**
+     * Format an `Adaptation`, generally of type `"audio"`, as an `IAudioTrack`.
+     * @returns {Object}
+     */
+    Adaptation.prototype.toTextTrack = function () {
+        var _a, _b;
+        return {
+            language: (_a = this.language) !== null && _a !== void 0 ? _a : "",
+            normalized: (_b = this.normalizedLanguage) !== null && _b !== void 0 ? _b : "",
+            closedCaption: this.isClosedCaption === true,
+            id: this.id,
+            label: this.label,
+            forced: this.isForcedSubtitles,
+        };
+    };
+    /**
+     * Format an `Adaptation`, generally of type `"video"`, as an `IAudioTrack`.
+     * @param {boolean} filterPlayable - If `true` only "playable" Representation
+     * will be returned.
+     * @returns {Object}
+     */
+    Adaptation.prototype.toVideoTrack = function (filterPlayable) {
+        var trickModeTracks = this.trickModeTracks !== undefined ?
+            this.trickModeTracks.map(function (trickModeAdaptation) {
+                var representations = (filterPlayable ?
+                    trickModeAdaptation.getPlayableRepresentations() :
+                    trickModeAdaptation.representations).map(function (r) { return r.toVideoRepresentation(); });
+                var trickMode = { id: trickModeAdaptation.id, representations: representations, isTrickModeTrack: true };
+                if (trickModeAdaptation.isSignInterpreted === true) {
+                    trickMode.signInterpreted = true;
+                }
+                return trickMode;
+            }) :
+            undefined;
+        var videoTrack = {
+            id: this.id,
+            representations: (filterPlayable ?
+                this.getPlayableRepresentations() :
+                this.representations).map(function (r) { return r.toVideoRepresentation(); }),
+            label: this.label,
+        };
+        if (this.isSignInterpreted === true) {
+            videoTrack.signInterpreted = true;
+        }
+        if (this.isTrickModeTrack === true) {
+            videoTrack.isTrickModeTrack = true;
+        }
+        if (trickModeTracks !== undefined) {
+            videoTrack.trickModeTracks = trickModeTracks;
+        }
+        return videoTrack;
+    };
     return Adaptation;
 }());
 export default Adaptation;

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

@@ -28,6 +28,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+import log from "../log";
 import arrayFind from "../utils/array_find";
 import EventEmitter from "../utils/event_emitter";
 import idGenerator from "../utils/id_generator";
@@ -373,6 +374,7 @@ function updateDeciperability(manifest, isDecipherable) {
                 if (result !== representation.decipherable) {
                     updates.push({ manifest: manifest, period: period, adaptation: adaptation, representation: representation });
                     representation.decipherable = result;
+                    log.debug("Decipherability changed for \"".concat(representation.id, "\""), "(".concat(representation.bitrate, ")"), String(representation.decipherable));
                 }
             }
         }

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

@@ -42,7 +42,7 @@ var Period = /** @class */ (function () {
                 .map(function (adaptation) {
                 var newAdaptation = new Adaptation(adaptation, { representationFilter: representationFilter });
                 if (newAdaptation.representations.length > 0 && !newAdaptation.isSupported) {
-                    var error = new MediaError("MANIFEST_INCOMPATIBLE_CODECS_ERROR", "An Adaptation contains only incompatible codecs.");
+                    var error = new MediaError("MANIFEST_INCOMPATIBLE_CODECS_ERROR", "An Adaptation contains only incompatible codecs.", { adaptation: newAdaptation });
                     _this.contentWarnings.push(error);
                 }
                 return newAdaptation;
@@ -53,7 +53,7 @@ var Period = /** @class */ (function () {
             if (filteredAdaptations.every(function (adaptation) { return !adaptation.isSupported; }) &&
                 adaptationsForType.length > 0 &&
                 (type === "video" || type === "audio")) {
-                throw new MediaError("MANIFEST_INCOMPATIBLE_CODECS_ERROR", "No supported " + type + " adaptations");
+                throw new MediaError("MANIFEST_INCOMPATIBLE_CODECS_ERROR", "No supported " + type + " adaptations", { adaptation: undefined });
             }
             if (filteredAdaptations.length > 0) {
                 acc[type] = filteredAdaptations;

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

@@ -14,15 +14,36 @@
  * limitations under the License.
  */
 import { ICdnMetadata, IContentProtections, IParsedRepresentation } from "../parsers/manifest";
-import { ITrackType, IHDRInformation } from "../public_types";
+import { IAudioRepresentation, ITrackType, IHDRInformation, IVideoRepresentation } from "../public_types";
 import { IRepresentationIndex } from "./representation_index";
 /**
  * Normalized Representation structure.
  * @class Representation
  */
 declare class Representation {
-    /** ID uniquely identifying the Representation in the Adaptation. */
+    /**
+     * ID uniquely identifying the `Representation` in its parent `Adaptation`.
+     *
+     * This identifier might be linked to an identifier present in the original
+     * Manifest file, it is thus the identifier to use to determine if a
+     * `Representation` from a refreshed `Manifest` is actually the same one than
+     * one in the previously loaded Manifest (as long as the `Adaptation` and
+     * `Period` are also the same).
+     *
+     * For a globally unique identifier regardless of the `Adaptation`, `Period`
+     * or even `Manifest`, you can rely on `uniqueId` instead.
+     */
     readonly id: string;
+    /**
+     * Globally unique identifier for this `Representation` object.
+     *
+     * This identifier is guaranteed to be unique for any `Representation`s of all
+     * `Manifest` objects created in the current JS Realm.
+     * As such, it can be used as an identifier for the JS object itself, whereas
+     * `id` is the identifier for the original Manifest's Representation in the
+     * scope of its parent `Adaptation`.
+     */
+    readonly uniqueId: string;
     /**
      * Interface allowing to get information about segments available for this
      * Representation.
@@ -165,6 +186,16 @@ declare class Representation {
         systemId: string;
         data: Uint8Array;
     }>): boolean;
+    /**
+     * Format Representation as an `IAudioRepresentation`.
+     * @returns {Object}
+     */
+    toAudioRepresentation(): IAudioRepresentation;
+    /**
+     * Format Representation as an `IVideoRepresentation`.
+     * @returns {Object}
+     */
+    toVideoRepresentation(): IVideoRepresentation;
     /**
      * Returns `true` if this Representation can be played (that is: not
      * undecipherable and with a supported codec).

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

@@ -16,6 +16,8 @@
 import { isCodecSupported } from "../compat";
 import log from "../log";
 import areArraysOfNumbersEqual from "../utils/are_arrays_of_numbers_equal";
+import idGenerator from "../utils/id_generator";
+var generateRepresentationUniqueId = idGenerator();
 /**
  * Normalized Representation structure.
  * @class Representation
@@ -26,6 +28,7 @@ var Representation = /** @class */ (function () {
      */
     function Representation(args, opts) {
         this.id = args.id;
+        this.uniqueId = generateRepresentationUniqueId();
         this.bitrate = args.bitrate;
         this.codec = args.codecs;
         if (args.height !== undefined) {
@@ -48,10 +51,17 @@ var Representation = /** @class */ (function () {
         }
         this.cdnMetadata = args.cdnMetadata;
         this.index = args.index;
-        this.isSupported = opts.type === "audio" ||
-            opts.type === "video" ?
-            isCodecSupported(this.getMimeTypeString()) :
-            true; // TODO for other types
+        if (opts.type === "audio" || opts.type === "video") {
+            var mimeTypeStr = this.getMimeTypeString();
+            var isSupported = isCodecSupported(mimeTypeStr);
+            if (!isSupported) {
+                log.info("Unsupported Representation", mimeTypeStr, this.id, this.bitrate);
+            }
+            this.isSupported = isSupported;
+        }
+        else {
+            this.isSupported = true; // TODO for other types
+        }
     }
     /**
      * Returns "mime-type string" which includes both the mime-type and the codec,
@@ -218,6 +228,24 @@ var Representation = /** @class */ (function () {
             values: data });
         return true;
     };
+    /**
+     * Format Representation as an `IAudioRepresentation`.
+     * @returns {Object}
+     */
+    Representation.prototype.toAudioRepresentation = function () {
+        var _a = this, id = _a.id, bitrate = _a.bitrate, codec = _a.codec, isSupported = _a.isSupported, decipherable = _a.decipherable;
+        return { id: id, bitrate: bitrate, codec: codec, isCodecSupported: isSupported,
+            seemsDecipherable: decipherable };
+    };
+    /**
+     * Format Representation as an `IVideoRepresentation`.
+     * @returns {Object}
+     */
+    Representation.prototype.toVideoRepresentation = function () {
+        var _a = this, id = _a.id, bitrate = _a.bitrate, frameRate = _a.frameRate, width = _a.width, height = _a.height, codec = _a.codec, hdrInfo = _a.hdrInfo, isSupported = _a.isSupported, decipherable = _a.decipherable;
+        return { id: id, bitrate: bitrate, frameRate: frameRate, width: width, height: height, codec: codec, hdrInfo: hdrInfo, isCodecSupported: isSupported,
+            seemsDecipherable: decipherable };
+    };
     /**
      * Returns `true` if this Representation can be played (that is: not
      * undecipherable and with a supported codec).

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

@@ -22,9 +22,7 @@ import isNullOrUndefined from "../utils/is_null_or_undefined";
  */
 export function areSameContent(content1, content2) {
     return (content1.segment.id === content2.segment.id &&
-        content1.representation.id === content2.representation.id &&
-        content1.adaptation.id === content2.adaptation.id &&
-        content1.period.id === content2.period.id);
+        content1.representation.uniqueId === content2.representation.uniqueId);
 }
 /**
  * Get string describing a given ISegment, useful for log functions.

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

@@ -159,22 +159,13 @@ function getAdaptationSetSwitchingIDs(adaptation) {
  * @returns {Array.<Object>}
  */
 export default function parseAdaptationSets(adaptationsIR, context) {
-    var _a;
-    var _b, _c, _d, _e, _f, _g, _h, _j;
+    var _a, _b, _c, _d, _e, _f;
     var parsedAdaptations = { video: [],
         audio: [],
         text: [] };
     var trickModeAdaptations = [];
     var adaptationSwitchingInfos = {};
     var parsedAdaptationsIDs = [];
-    /**
-     * 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 lastMainVideoAdapIdx = -1;
     for (var adaptationIdx = 0; adaptationIdx < adaptationsIR.length; adaptationIdx++) {
         var adaptation = adaptationsIR[adaptationIdx];
         var adaptationChildren = adaptation.children;
@@ -183,8 +174,8 @@ export default function parseAdaptationSets(adaptationsIR, context) {
             roles.some(function (role) { return role.value === "main"; }) &&
             roles.some(function (role) { return role.schemeIdUri === "urn:mpeg:dash:role:2011"; });
         var representationsIR = adaptation.children.representations;
-        var availabilityTimeComplete = (_b = adaptation.attributes.availabilityTimeComplete) !== null && _b !== void 0 ? _b : context.availabilityTimeComplete;
-        var availabilityTimeOffset = ((_c = adaptation.attributes.availabilityTimeOffset) !== null && _c !== void 0 ? _c : 0) +
+        var availabilityTimeComplete = (_a = adaptation.attributes.availabilityTimeComplete) !== null && _a !== void 0 ? _a : context.availabilityTimeComplete;
+        var availabilityTimeOffset = ((_b = adaptation.attributes.availabilityTimeOffset) !== null && _b !== void 0 ? _b : 0) +
             context.availabilityTimeOffset;
         var adaptationMimeType = adaptation.attributes.mimeType;
         var adaptationCodecs = adaptation.attributes.codecs;
@@ -198,9 +189,8 @@ export default function parseAdaptationSets(adaptationsIR, context) {
         if (type === undefined) {
             continue;
         }
-        var priority = (_d = adaptation.attributes.selectionPriority) !== null && _d !== void 0 ? _d : 1;
+        var priority = (_c = adaptation.attributes.selectionPriority) !== null && _c !== void 0 ? _c : 1;
         var originalID = adaptation.attributes.id;
-        var newID = void 0;
         var adaptationSetSwitchingIDs = getAdaptationSetSwitchingIDs(adaptation);
         var parentSegmentTemplates = [];
         if (context.segmentTemplate !== undefined) {
@@ -228,134 +218,112 @@ export default function parseAdaptationSets(adaptationsIR, context) {
             arrayFind(essentialProperties, function (scheme) {
                 return scheme.schemeIdUri === "http://dashif.org/guidelines/trickmode";
             }) : undefined;
-        var trickModeAttachedAdaptationIds = (_e = trickModeProperty === null || trickModeProperty === void 0 ? void 0 : trickModeProperty.value) === null || _e === void 0 ? void 0 : _e.split(" ");
+        var trickModeAttachedAdaptationIds = (_d = trickModeProperty === null || trickModeProperty === void 0 ? void 0 : trickModeProperty.value) === null || _d === void 0 ? void 0 : _d.split(" ");
         var isTrickModeTrack = trickModeAttachedAdaptationIds !== undefined;
-        if (type === "video" &&
-            isMainAdaptation &&
-            lastMainVideoAdapIdx >= 0 &&
-            parsedAdaptations.video.length > lastMainVideoAdapIdx &&
-            !isTrickModeTrack) {
-            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;
+        var accessibilities = adaptationChildren.accessibilities;
+        var isDub = void 0;
+        if (roles !== undefined &&
+            roles.some(function (role) { return role.value === "dub"; })) {
+            isDub = true;
+        }
+        var isClosedCaption = void 0;
+        if (type !== "text") {
+            isClosedCaption = false;
         }
         else {
-            var accessibilities = adaptationChildren.accessibilities;
-            var isDub = void 0;
-            if (roles !== undefined &&
-                roles.some(function (role) { return role.value === "dub"; })) {
-                isDub = true;
-            }
-            var isClosedCaption = void 0;
-            if (type !== "text") {
-                isClosedCaption = false;
-            }
-            else {
-                isClosedCaption = isCaptionning(accessibilities, roles);
-            }
-            var isForcedSubtitle = void 0;
-            if (type === "text" &&
-                roles !== undefined &&
-                roles.some(function (role) { return role.value === "forced-subtitle" ||
-                    role.value === "forced_subtitle"; })) {
-                isForcedSubtitle = true;
-            }
-            var isAudioDescription = void 0;
-            if (type !== "audio") {
-                isAudioDescription = false;
-            }
-            else if (accessibilities !== undefined) {
-                isAudioDescription = accessibilities.some(isVisuallyImpaired);
-            }
-            var isSignInterpreted = void 0;
-            if (type !== "video") {
-                isSignInterpreted = false;
-            }
-            else if (accessibilities !== undefined) {
-                isSignInterpreted = accessibilities.some(hasSignLanguageInterpretation);
-            }
-            var adaptationID = getAdaptationID(adaptation, { isAudioDescription: isAudioDescription, isForcedSubtitle: isForcedSubtitle, isClosedCaption: isClosedCaption, isSignInterpreted: isSignInterpreted, isTrickModeTrack: isTrickModeTrack, type: type });
-            // Avoid duplicate IDs
-            while (arrayIncludes(parsedAdaptationsIDs, adaptationID)) {
-                adaptationID += "-dup";
-            }
-            newID = adaptationID;
-            parsedAdaptationsIDs.push(adaptationID);
-            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) {
-                parsedAdaptationSet.language = adaptation.attributes.language;
-            }
-            if (isClosedCaption != null) {
-                parsedAdaptationSet.closedCaption = isClosedCaption;
-            }
-            if (isAudioDescription != null) {
-                parsedAdaptationSet.audioDescription = isAudioDescription;
-            }
-            if (isDub === true) {
-                parsedAdaptationSet.isDub = true;
-            }
-            if (isForcedSubtitle !== undefined) {
-                parsedAdaptationSet.forcedSubtitles = isForcedSubtitle;
-            }
-            if (isSignInterpreted === true) {
-                parsedAdaptationSet.isSignInterpreted = true;
-            }
-            if (label !== undefined) {
-                parsedAdaptationSet.label = label;
-            }
-            if (trickModeAttachedAdaptationIds !== undefined) {
-                trickModeAdaptations.push({ adaptation: parsedAdaptationSet, trickModeAttachedAdaptationIds: trickModeAttachedAdaptationIds });
-            }
-            else {
-                // 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 !== undefined &&
-                        switchingInfos.newID !== newID &&
-                        arrayIncludes(switchingInfos.adaptationSetSwitchingIDs, originalID)) {
-                        mergedIntoIdx = arrayFindIndex(parsedAdaptations[type], function (a) { return a[0].id === id; });
-                        var mergedInto = parsedAdaptations[type][mergedIntoIdx];
-                        if (mergedInto !== undefined &&
-                            mergedInto[0].audioDescription ===
-                                parsedAdaptationSet.audioDescription &&
-                            mergedInto[0].closedCaption ===
-                                parsedAdaptationSet.closedCaption &&
-                            mergedInto[0].language === parsedAdaptationSet.language) {
-                            log.info("DASH Parser: merging \"switchable\" AdaptationSets", originalID, id);
-                            (_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),
-                            };
-                        }
-                    }
-                };
-                for (var _i = 0, adaptationSetSwitchingIDs_1 = adaptationSetSwitchingIDs; _i < adaptationSetSwitchingIDs_1.length; _i++) {
-                    var id = adaptationSetSwitchingIDs_1[_i];
-                    _loop_1(id);
-                }
-                if (mergedIntoIdx < 0) {
-                    parsedAdaptations[type].push([parsedAdaptationSet,
-                        { priority: priority, isMainAdaptation: isMainAdaptation, indexInMpd: adaptationIdx }]);
-                    if (type === "video" && isMainAdaptation) {
-                        lastMainVideoAdapIdx = parsedAdaptations.video.length - 1;
+            isClosedCaption = isCaptionning(accessibilities, roles);
+        }
+        var isForcedSubtitle = void 0;
+        if (type === "text" &&
+            roles !== undefined &&
+            roles.some(function (role) { return role.value === "forced-subtitle" ||
+                role.value === "forced_subtitle"; })) {
+            isForcedSubtitle = true;
+        }
+        var isAudioDescription = void 0;
+        if (type !== "audio") {
+            isAudioDescription = false;
+        }
+        else if (accessibilities !== undefined) {
+            isAudioDescription = accessibilities.some(isVisuallyImpaired);
+        }
+        var isSignInterpreted = void 0;
+        if (type !== "video") {
+            isSignInterpreted = false;
+        }
+        else if (accessibilities !== undefined) {
+            isSignInterpreted = accessibilities.some(hasSignLanguageInterpretation);
+        }
+        var adaptationID = getAdaptationID(adaptation, { isAudioDescription: isAudioDescription, isForcedSubtitle: isForcedSubtitle, isClosedCaption: isClosedCaption, isSignInterpreted: isSignInterpreted, isTrickModeTrack: isTrickModeTrack, type: type });
+        // Avoid duplicate IDs
+        while (arrayIncludes(parsedAdaptationsIDs, adaptationID)) {
+            adaptationID += "-dup";
+        }
+        var newID = adaptationID;
+        parsedAdaptationsIDs.push(adaptationID);
+        reprCtxt.unsafelyBaseOnPreviousAdaptation = (_f = (_e = context
+            .unsafelyBaseOnPreviousPeriod) === null || _e === void 0 ? void 0 : _e.getAdaptation(adaptationID)) !== null && _f !== void 0 ? _f : null;
+        var representations = parseRepresentations(representationsIR, adaptation, reprCtxt);
+        var parsedAdaptationSet = { id: adaptationID, representations: representations, type: type, isTrickModeTrack: isTrickModeTrack };
+        if (adaptation.attributes.language != null) {
+            parsedAdaptationSet.language = adaptation.attributes.language;
+        }
+        if (isClosedCaption != null) {
+            parsedAdaptationSet.closedCaption = isClosedCaption;
+        }
+        if (isAudioDescription != null) {
+            parsedAdaptationSet.audioDescription = isAudioDescription;
+        }
+        if (isDub === true) {
+            parsedAdaptationSet.isDub = true;
+        }
+        if (isForcedSubtitle !== undefined) {
+            parsedAdaptationSet.forcedSubtitles = isForcedSubtitle;
+        }
+        if (isSignInterpreted === true) {
+            parsedAdaptationSet.isSignInterpreted = true;
+        }
+        if (label !== undefined) {
+            parsedAdaptationSet.label = label;
+        }
+        if (trickModeAttachedAdaptationIds !== undefined) {
+            trickModeAdaptations.push({ adaptation: parsedAdaptationSet, trickModeAttachedAdaptationIds: trickModeAttachedAdaptationIds });
+        }
+        else {
+            // look if we have to merge this into another Adaptation
+            var mergedIntoIdx = -1;
+            var _loop_1 = function (id) {
+                var _g;
+                var switchingInfos = adaptationSwitchingInfos[id];
+                if (switchingInfos !== undefined &&
+                    switchingInfos.newID !== newID &&
+                    arrayIncludes(switchingInfos.adaptationSetSwitchingIDs, originalID)) {
+                    mergedIntoIdx = arrayFindIndex(parsedAdaptations[type], function (a) { return a[0].id === id; });
+                    var mergedInto = parsedAdaptations[type][mergedIntoIdx];
+                    if (mergedInto !== undefined &&
+                        mergedInto[0].audioDescription ===
+                            parsedAdaptationSet.audioDescription &&
+                        mergedInto[0].closedCaption ===
+                            parsedAdaptationSet.closedCaption &&
+                        mergedInto[0].language === parsedAdaptationSet.language) {
+                        log.info("DASH Parser: merging \"switchable\" AdaptationSets", originalID, id);
+                        (_g = mergedInto[0].representations).push.apply(_g, parsedAdaptationSet.representations);
+                        mergedInto[1] = {
+                            priority: Math.max(priority, mergedInto[1].priority),
+                            isMainAdaptation: isMainAdaptation ||
+                                mergedInto[1].isMainAdaptation,
+                            indexInMpd: Math.min(adaptationIdx, mergedInto[1].indexInMpd),
+                        };
                     }
                 }
+            };
+            for (var _i = 0, adaptationSetSwitchingIDs_1 = adaptationSetSwitchingIDs; _i < adaptationSetSwitchingIDs_1.length; _i++) {
+                var id = adaptationSetSwitchingIDs_1[_i];
+                _loop_1(id);
+            }
+            if (mergedIntoIdx < 0) {
+                parsedAdaptations[type].push([parsedAdaptationSet,
+                    { priority: priority, isMainAdaptation: isMainAdaptation, indexInMpd: adaptationIdx }]);
             }
         }
         if (originalID != null && adaptationSwitchingInfos[originalID] == null) {

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

@@ -13,6 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 import log from "../../../../log";
 import arrayFind from "../../../../utils/array_find";
 import objectAssign from "../../../../utils/object_assign";
@@ -45,11 +54,8 @@ function combineInbandEventStreams(representation, adaptation) {
  * @returns {Object | undefined}
  */
 function getHDRInformation(_a) {
-    var adaptationProfiles = _a.adaptationProfiles, manifestProfiles = _a.manifestProfiles, codecs = _a.codecs;
+    var adaptationProfiles = _a.adaptationProfiles, essentialProperties = _a.essentialProperties, supplementalProperties = _a.supplementalProperties, manifestProfiles = _a.manifestProfiles, codecs = _a.codecs;
     var profiles = (adaptationProfiles !== null && adaptationProfiles !== void 0 ? adaptationProfiles : "") + (manifestProfiles !== null && manifestProfiles !== void 0 ? manifestProfiles : "");
-    if (codecs === undefined) {
-        return undefined;
-    }
     if (profiles.indexOf("http://dashif.org/guidelines/dash-if-uhd#hevc-hdr-pq10") !== -1) {
         if (codecs === "hvc1.2.4.L153.B0" ||
             codecs === "hev1.2.4.L153.B0") {
@@ -58,7 +64,18 @@ function getHDRInformation(_a) {
                 colorSpace: "rec2020" };
         }
     }
-    if (/^vp(08|09|10)/.exec(codecs)) {
+    var transferCharacteristicScheme = arrayFind(__spreadArray(__spreadArray([], (essentialProperties !== null && essentialProperties !== void 0 ? essentialProperties : []), true), (supplementalProperties !== null && supplementalProperties !== void 0 ? supplementalProperties : []), true), function (p) { return p.schemeIdUri === "urn:mpeg:mpegB:cicp:TransferCharacteristics"; });
+    if (transferCharacteristicScheme !== undefined) {
+        switch (transferCharacteristicScheme.value) {
+            case "15":
+                return undefined; // SDR
+            case "16":
+                return { eotf: "pq" };
+            case "18":
+                return { eotf: "hlg" };
+        }
+    }
+    if (codecs !== undefined && /^vp(08|09|10)/.exec(codecs)) {
         return getWEBMHDRInformation(codecs);
     }
 }
@@ -218,6 +235,9 @@ export default function parseRepresentations(representationsIR, adaptation, cont
         }
         parsedRepresentation.hdrInfo =
             getHDRInformation({ adaptationProfiles: adaptation.attributes.profiles,
+                supplementalProperties: adaptation.children
+                    .supplementalProperties,
+                essentialProperties: adaptation.children.essentialProperties,
                 manifestProfiles: context.manifestProfiles, codecs: codecs });
         parsedRepresentations.push(parsedRepresentation);
     };

package/dist/_esm5.processed/parsers/manifest/dash/js-parser/parse_from_document.d.ts

@@ -17,7 +17,7 @@ import { IMPDParserArguments } from "../common";
 import { IDashParserResponse } from "../parsers_types";
 /**
  * Parse MPD through the JS parser, on a `Document` instance.
- * @param {Document} manifest - Original manifest as returned by the server
+ * @param {Document} document - Original manifest as returned by the server
  * @param {Object} args - Various parsing options and information.
  * @returns {Object} - Response returned by the DASH-JS parser.
  */

package/dist/_esm5.processed/parsers/manifest/dash/js-parser/parse_from_document.js

@@ -20,7 +20,7 @@ import { createMPDIntermediateRepresentation, } from "./node_parsers/MPD";
 import { createPeriodIntermediateRepresentation, } from "./node_parsers/Period";
 /**
  * Parse MPD through the JS parser, on a `Document` instance.
- * @param {Document} manifest - Original manifest as returned by the server
+ * @param {Document} document - Original manifest as returned by the server
  * @param {Object} args - Various parsing options and information.
  * @returns {Object} - Response returned by the DASH-JS parser.
  */