rx-player 3.30.0-dev.2023020100 → 3.30.0-dev.2023022200

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

@@ -159,8 +159,7 @@ 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: [],
@@ -168,14 +167,6 @@ export default function parseAdaptationSets(adaptationsIR, context) {
     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;
@@ -184,8 +175,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;
@@ -199,9 +190,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) {
@@ -230,134 +220,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/public_types.d.ts

@@ -206,6 +206,7 @@ export interface IAdaptation {
     normalizedLanguage?: string | undefined;
     isAudioDescription?: boolean | undefined;
     isClosedCaption?: boolean | undefined;
+    isSignInterpreted?: boolean | undefined;
     isTrickModeTrack?: boolean | undefined;
     representations: IRepresentation[];
     getAvailableBitrates(): number[];

package/dist/_esm5.processed/transports/dash/add_segment_integrity_checks_to_loader.js

@@ -37,10 +37,9 @@ import inferSegmentContainer from "../utils/infer_segment_container";
 export default function addSegmentIntegrityChecks(segmentLoader) {
     return function (url, content, loaderOptions, initialCancelSignal, callbacks) {
         return new Promise(function (resolve, reject) {
-            var requestCanceller = new TaskCanceller({ cancelOn: initialCancelSignal });
-            // Reject the `CancellationError` when `requestCanceller`'s signal emits
-            // `stopRejectingOnCancel` here is a function allowing to stop this mechanism
-            var stopRejectingOnCancel = requestCanceller.signal.register(reject);
+            var requestCanceller = new TaskCanceller();
+            var unlinkCanceller = requestCanceller.linkToSignal(initialCancelSignal);
+            requestCanceller.signal.register(reject);
             segmentLoader(url, content, loaderOptions, requestCanceller.signal, __assign(__assign({}, callbacks), { onNewChunk: function (data) {
                     try {
                         trowOnIntegrityError(data);
@@ -48,17 +47,18 @@ export default function addSegmentIntegrityChecks(segmentLoader) {
                     }
                     catch (err) {
                         // Do not reject with a `CancellationError` after cancelling the request
-                        stopRejectingOnCancel();
+                        cleanUpCancellers();
                         // Cancel the request
                         requestCanceller.cancel();
                         // Reject with thrown error
                         reject(err);
                     }
-                } })).then(function (info) {
-                if (requestCanceller.isUsed) {
+                } }))
+                .finally(function () { return cleanUpCancellers(); })
+                .then(function (info) {
+                if (requestCanceller.isUsed()) {
                     return;
                 }
-                stopRejectingOnCancel();
                 if (info.resultType === "segment-loaded") {
                     try {
                         trowOnIntegrityError(info.resultData.responseData);
@@ -69,10 +69,11 @@ export default function addSegmentIntegrityChecks(segmentLoader) {
                     }
                 }
                 resolve(info);
-            }, function (error) {
-                stopRejectingOnCancel();
-                reject(error);
-            });
+            }, reject);
+            function cleanUpCancellers() {
+                requestCanceller.signal.deregister(reject);
+                unlinkCanceller();
+            }
         });
         /**
          * If the data's seems to be corrupted, throws an `INTEGRITY_ERROR` error.

package/dist/_esm5.processed/transports/dash/low_latency_segment_loader.js

@@ -47,14 +47,14 @@ export default function lowLatencySegmentLoader(url, content, options, callbacks
         partialChunk = res[1];
         for (var i = 0; i < completeChunks.length; i++) {
             callbacks.onNewChunk(completeChunks[i]);
-            if (cancelSignal.isCancelled) {
+            if (cancelSignal.isCancelled()) {
                 return;
             }
         }
         callbacks.onProgress({ duration: info.duration,
             size: info.size,
             totalSize: info.totalSize });
-        if (cancelSignal.isCancelled) {
+        if (cancelSignal.isCancelled()) {
             return;
         }
     }

package/dist/_esm5.processed/transports/dash/manifest_parser.js

@@ -97,7 +97,7 @@ export default function generateManifestParser(options) {
                 if (parserResponse.value.warnings.length > 0) {
                     onWarnings(parserResponse.value.warnings);
                 }
-                if (cancelSignal.isCancelled) {
+                if (cancelSignal.isCancelled()) {
                     return Promise.reject(cancelSignal.cancellationError);
                 }
                 var manifest = new Manifest(parserResponse.value.parsed, options);

package/dist/_esm5.processed/transports/dash/segment_loader.js

@@ -91,7 +91,7 @@ export default function generateSegmentLoader(_a) {
              * @param {Object} _args
              */
             var resolve = function (_args) {
-                if (hasFinished || cancelSignal.isCancelled) {
+                if (hasFinished || cancelSignal.isCancelled()) {
                     return;
                 }
                 hasFinished = true;
@@ -107,7 +107,7 @@ export default function generateSegmentLoader(_a) {
              */
             var reject = function (err) {
                 var _a, _b, _c;
-                if (hasFinished || cancelSignal.isCancelled) {
+                if (hasFinished || cancelSignal.isCancelled()) {
                     return;
                 }
                 hasFinished = true;
@@ -120,7 +120,7 @@ export default function generateSegmentLoader(_a) {
                 rej(emittedErr);
             };
             var progress = function (_args) {
-                if (hasFinished || cancelSignal.isCancelled) {
+                if (hasFinished || cancelSignal.isCancelled()) {
                     return;
                 }
                 callbacks.onProgress({ duration: _args.duration,
@@ -132,7 +132,7 @@ export default function generateSegmentLoader(_a) {
              * the "regular" implementation
              */
             var fallback = function () {
-                if (hasFinished || cancelSignal.isCancelled) {
+                if (hasFinished || cancelSignal.isCancelled()) {
                     return;
                 }
                 hasFinished = true;

package/dist/_esm5.processed/transports/local/segment_loader.js

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { CustomLoaderError } from "../../errors";
+import createCancellablePromise from "../../utils/create_cancellable_promise";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 /**
  * @param {Function} customSegmentLoader
@@ -21,7 +22,7 @@ import isNullOrUndefined from "../../utils/is_null_or_undefined";
  * @returns {Promise}
  */
 function loadInitSegment(customSegmentLoader, cancelSignal) {
-    return new Promise(function (res, rej) {
+    return createCancellablePromise(cancelSignal, function (res, rej) {
         /** `true` when the custom segmentLoader should not be active anymore. */
         var hasFinished = false;
         /**
@@ -29,11 +30,10 @@ function loadInitSegment(customSegmentLoader, cancelSignal) {
          * @param {Object} _args
          */
         var resolve = function (_args) {
-            if (hasFinished || cancelSignal.isCancelled) {
+            if (hasFinished || cancelSignal.isCancelled()) {
                 return;
             }
             hasFinished = true;
-            cancelSignal.deregister(abortLoader);
             res({ resultType: "segment-loaded",
                 resultData: { responseData: _args.data,
                     size: _args.size,
@@ -44,20 +44,15 @@ function loadInitSegment(customSegmentLoader, cancelSignal) {
          * @param {*} err - The corresponding error encountered
          */
         var reject = function (err) {
-            if (hasFinished || cancelSignal.isCancelled) {
+            if (hasFinished || cancelSignal.isCancelled()) {
                 return;
             }
             hasFinished = true;
-            cancelSignal.deregister(abortLoader);
             rej(err);
         };
         var abort = customSegmentLoader({ resolve: resolve, reject: reject });
-        cancelSignal.register(abortLoader);
-        /**
-         * The logic to run when this loader is cancelled while pending.
-         * @param {Error} err
-         */
-        function abortLoader(err) {
+        /** The logic to run when this loader is cancelled while pending. */
+        return function () {
             if (hasFinished) {
                 return;
             }
@@ -65,8 +60,7 @@ function loadInitSegment(customSegmentLoader, cancelSignal) {
             if (typeof abort === "function") {
                 abort();
             }
-            rej(err);
-        }
+        };
     });
 }
 /**
@@ -76,7 +70,7 @@ function loadInitSegment(customSegmentLoader, cancelSignal) {
  * @returns {Promise.<Object>}
  */
 function loadSegment(segment, customSegmentLoader, cancelSignal) {
-    return new Promise(function (res, rej) {
+    return createCancellablePromise(cancelSignal, function (res, rej) {
         /** `true` when the custom segmentLoader should not be active anymore. */
         var hasFinished = false;
         /**
@@ -84,11 +78,10 @@ function loadSegment(segment, customSegmentLoader, cancelSignal) {
          * @param {Object} _args
          */
         var resolve = function (_args) {
-            if (hasFinished || cancelSignal.isCancelled) {
+            if (hasFinished || cancelSignal.isCancelled()) {
                 return;
             }
             hasFinished = true;
-            cancelSignal.deregister(abortLoader);
             res({ resultType: "segment-loaded",
                 resultData: { responseData: _args.data,
                     size: _args.size,
@@ -100,11 +93,10 @@ function loadSegment(segment, customSegmentLoader, cancelSignal) {
          */
         var reject = function (err) {
             var _a, _b, _c;
-            if (hasFinished || cancelSignal.isCancelled) {
+            if (hasFinished || cancelSignal.isCancelled()) {
                 return;
             }
             hasFinished = true;
-            cancelSignal.deregister(abortLoader);
             // Format error and send it
             var castedErr = err;
             var message = (_a = castedErr === null || castedErr === void 0 ? void 0 : castedErr.message) !== null && _a !== void 0 ? _a : "Unknown error when fetching a local segment through a " +
@@ -113,12 +105,8 @@ function loadSegment(segment, customSegmentLoader, cancelSignal) {
             rej(emittedErr);
         };
         var abort = customSegmentLoader(segment, { resolve: resolve, reject: reject });
-        cancelSignal.register(abortLoader);
-        /**
-         * The logic to run when this loader is cancelled while pending.
-         * @param {Error} err
-         */
-        function abortLoader(err) {
+        /** The logic to run when this loader is cancelled while pending. */
+        return function () {
             if (hasFinished) {
                 return;
             }
@@ -126,8 +114,7 @@ function loadSegment(segment, customSegmentLoader, cancelSignal) {
             if (typeof abort === "function") {
                 abort();
             }
-            rej(err);
-        }
+        };
     });
 }
 /**

package/dist/_esm5.processed/transports/smooth/segment_loader.js

@@ -119,7 +119,7 @@ var generateSegmentLoader = function (_a) {
                  * @param {Object} args
                  */
                 var resolve = function (_args) {
-                    if (hasFinished || cancelSignal.isCancelled) {
+                    if (hasFinished || cancelSignal.isCancelled()) {
                         return;
                     }
                     hasFinished = true;
@@ -145,7 +145,7 @@ var generateSegmentLoader = function (_a) {
                  */
                 var reject = function (err) {
                     var _a, _b, _c;
-                    if (hasFinished || cancelSignal.isCancelled) {
+                    if (hasFinished || cancelSignal.isCancelled()) {
                         return;
                     }
                     hasFinished = true;
@@ -158,7 +158,7 @@ var generateSegmentLoader = function (_a) {
                     rej(emittedErr);
                 };
                 var progress = function (_args) {
-                    if (hasFinished || cancelSignal.isCancelled) {
+                    if (hasFinished || cancelSignal.isCancelled()) {
                         return;
                     }
                     callbacks.onProgress({ duration: _args.duration,
@@ -166,7 +166,7 @@ var generateSegmentLoader = function (_a) {
                         totalSize: _args.totalSize });
                 };
                 var fallback = function () {
-                    if (hasFinished || cancelSignal.isCancelled) {
+                    if (hasFinished || cancelSignal.isCancelled()) {
                         return;
                     }
                     hasFinished = true;