rx-player 3.33.4 → 3.33.5-dev.2025040100

package/dist/_esm5.processed/core/stream/representation/representation_stream.js

@@ -71,23 +71,16 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
     var period = content.period, adaptation = content.adaptation, representation = content.representation;
     var bufferGoal = options.bufferGoal, maxBufferSize = options.maxBufferSize, drmSystemId = options.drmSystemId, fastSwitchThreshold = options.fastSwitchThreshold;
     var bufferType = adaptation.type;
-    /** `TaskCanceller` stopping ALL operations performed by the `RepresentationStream` */
-    var globalCanceller = new TaskCanceller();
-    globalCanceller.linkToSignal(parentCancelSignal);
-    /**
-     * `TaskCanceller` allowing to only stop segment loading and checking operations.
-     * This allows to stop only tasks linked to network resource usage, which is
-     * often a limited resource, while still letting buffer operations to finish.
-     */
-    var segmentsLoadingCanceller = new TaskCanceller();
-    segmentsLoadingCanceller.linkToSignal(globalCanceller.signal);
+    /** `TaskCanceller` stopping operations performed by the `RepresentationStream` */
+    var canceller = new TaskCanceller();
+    canceller.linkToSignal(parentCancelSignal);
     /** Saved initialization segment state for this representation. */
     var initSegmentState = {
         segment: representation.index.getInitSegment(),
         uniqueId: null,
         isLoaded: false,
     };
-    globalCanceller.signal.register(function () {
+    canceller.signal.register(function () {
         // Free initialization segment if one has been declared
         if (initSegmentState.uniqueId !== null) {
             segmentBuffer.freeInitSegment(initSegmentState.uniqueId);
@@ -97,7 +90,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
     var lastSegmentQueue = new SharedReference({
         initSegment: null,
         segmentQueue: [],
-    }, segmentsLoadingCanceller.signal);
+    }, canceller.signal);
     /** If `true`, the current Representation has a linked initialization segment. */
     var hasInitSegment = initSegmentState.segment !== null;
     if (!hasInitSegment) {
@@ -120,7 +113,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
             encryptionData.every(function (e) { return e.keyIds !== undefined; })) {
             hasSentEncryptionData = true;
             callbacks.encryptionDataEncountered(encryptionData.map(function (d) { return objectAssign({ content: content }, d); }));
-            if (globalCanceller.isUsed()) {
+            if (canceller.isUsed()) {
                 return; // previous callback has stopped everything by side-effect
             }
         }
@@ -128,10 +121,10 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
     /** Will load every segments in `lastSegmentQueue` */
     var downloadingQueue = new DownloadingQueue(content, lastSegmentQueue, segmentFetcher, hasInitSegment);
     downloadingQueue.addEventListener("error", function (err) {
-        if (segmentsLoadingCanceller.signal.isCancelled()) {
+        if (canceller.signal.isCancelled()) {
             return; // ignore post requests-cancellation loading-related errors,
         }
-        globalCanceller.cancel(); // Stop every operations
+        canceller.cancel(); // Stop every operations
         callbacks.error(err);
     });
     downloadingQueue.addEventListener("parsedInitSegment", onParsedChunk);
@@ -139,7 +132,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
     downloadingQueue.addEventListener("emptyQueue", checkStatus);
     downloadingQueue.addEventListener("requestRetry", function (payload) {
         callbacks.warning(payload.error);
-        if (segmentsLoadingCanceller.signal.isCancelled()) {
+        if (canceller.signal.isCancelled()) {
             return; // If the previous callback led to loading operations being stopped, skip
         }
         var retriedSegment = payload.segment;
@@ -153,30 +146,30 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
     });
     downloadingQueue.addEventListener("fullyLoadedSegment", function (segment) {
         segmentBuffer
-            .endOfSegment(objectAssign({ segment: segment }, content), globalCanceller.signal)
+            .endOfSegment(objectAssign({ segment: segment }, content), canceller.signal)
             .catch(onFatalBufferError);
     });
     downloadingQueue.start();
-    segmentsLoadingCanceller.signal.register(function () {
+    canceller.signal.register(function () {
         downloadingQueue.removeEventListener();
         downloadingQueue.stop();
     });
     playbackObserver.listen(checkStatus, {
         includeLastObservation: false,
-        clearSignal: segmentsLoadingCanceller.signal,
+        clearSignal: canceller.signal,
     });
-    content.manifest.addEventListener("manifestUpdate", checkStatus, segmentsLoadingCanceller.signal);
+    content.manifest.addEventListener("manifestUpdate", checkStatus, canceller.signal);
     bufferGoal.onUpdate(checkStatus, {
         emitCurrentValue: false,
-        clearSignal: segmentsLoadingCanceller.signal,
+        clearSignal: canceller.signal,
     });
     maxBufferSize.onUpdate(checkStatus, {
         emitCurrentValue: false,
-        clearSignal: segmentsLoadingCanceller.signal,
+        clearSignal: canceller.signal,
     });
     terminate.onUpdate(checkStatus, {
         emitCurrentValue: false,
-        clearSignal: segmentsLoadingCanceller.signal,
+        clearSignal: canceller.signal,
     });
     checkStatus();
     return;
@@ -187,7 +180,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
      */
     function checkStatus() {
         var _a, _b;
-        if (segmentsLoadingCanceller.isUsed()) {
+        if (canceller.isUsed()) {
             return; // Stop all buffer status checking if load operations are stopped
         }
         var observation = playbackObserver.getReference().getValue();
@@ -232,7 +225,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
             log.debug("Stream: Urgent switch, terminate now.", bufferType);
             lastSegmentQueue.setValue({ initSegment: null, segmentQueue: [] });
             lastSegmentQueue.finish();
-            segmentsLoadingCanceller.cancel();
+            canceller.cancel();
             callbacks.terminating();
             return;
         }
@@ -254,7 +247,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
             if (nextQueue.length === 0 && nextInit === null) {
                 log.debug("Stream: No request left, terminate", bufferType);
                 lastSegmentQueue.finish();
-                segmentsLoadingCanceller.cancel();
+                canceller.cancel();
                 callbacks.terminating();
                 return;
             }
@@ -268,7 +261,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
             hasFinishedLoading: status.hasFinishedLoading,
             neededSegments: status.neededSegments,
         });
-        if (segmentsLoadingCanceller.signal.isCancelled()) {
+        if (canceller.signal.isCancelled()) {
             return; // previous callback has stopped loading operations by side-effect
         }
         var UPTO_CURRENT_POSITION_CLEANUP = config.getCurrent().UPTO_CURRENT_POSITION_CLEANUP;
@@ -276,7 +269,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
             var gcedPosition = Math.max(0, initialWantedTime - UPTO_CURRENT_POSITION_CLEANUP);
             if (gcedPosition > 0) {
                 segmentBuffer
-                    .removeBuffer(0, gcedPosition, globalCanceller.signal)
+                    .removeBuffer(0, gcedPosition, canceller.signal)
                     .catch(onFatalBufferError);
             }
         }
@@ -290,11 +283,6 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
      * @param {Object} evt
      */
     function onParsedChunk(evt) {
-        if (globalCanceller.isUsed()) {
-            // We should not do anything with segments if the `RepresentationStream`
-            // is not running anymore.
-            return;
-        }
         if (evt.segmentType === "init") {
             initSegmentState.isLoaded = true;
             // Now that the initialization segment has been parsed - which may have
@@ -304,9 +292,6 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
                 var allEncryptionData = representation.getAllEncryptionData();
                 if (allEncryptionData.length > 0) {
                     callbacks.encryptionDataEncountered(allEncryptionData.map(function (p) { return objectAssign({ content: content }, p); }));
-                    if (globalCanceller.isUsed()) {
-                        return; // previous callback has stopped everything by side-effect
-                    }
                 }
             }
             if (evt.initializationData !== null) {
@@ -320,7 +305,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
                     segment: evt.segment,
                     segmentData: evt.initializationData,
                     segmentBuffer: segmentBuffer,
-                }, globalCanceller.signal)
+                }, canceller.signal)
                     .then(function (result) {
                     if (result !== null) {
                         callbacks.addedSegment(result);
@@ -340,20 +325,17 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
                 var allEncryptionData = representation.getAllEncryptionData();
                 if (allEncryptionData.length > 0) {
                     callbacks.encryptionDataEncountered(allEncryptionData.map(function (p) { return objectAssign({ content: content }, p); }));
-                    if (globalCanceller.isUsed()) {
-                        return; // previous callback has stopped everything by side-effect
-                    }
                 }
             }
             if (needsManifestRefresh === true) {
                 callbacks.needsManifestRefresh();
-                if (globalCanceller.isUsed()) {
+                if (canceller.isUsed()) {
                     return; // previous callback has stopped everything by side-effect
                 }
             }
             if (inbandEvents !== undefined && inbandEvents.length > 0) {
                 callbacks.inbandEvent(inbandEvents);
-                if (globalCanceller.isUsed()) {
+                if (canceller.isUsed()) {
                     return; // previous callback has stopped everything by side-effect
                 }
             }
@@ -365,7 +347,7 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
                 parsedSegment: evt,
                 segment: evt.segment,
                 segmentBuffer: segmentBuffer,
-            }, globalCanceller.signal)
+            }, canceller.signal)
                 .then(function (result) {
                 if (result !== null) {
                     callbacks.addedSegment(result);
@@ -381,13 +363,13 @@ export default function RepresentationStream(_a, callbacks, parentCancelSignal)
      * @param {*} err
      */
     function onFatalBufferError(err) {
-        if (globalCanceller.isUsed() && err instanceof CancellationError) {
+        if (canceller.isUsed() && err instanceof CancellationError) {
             // The error is linked to cancellation AND we explicitely cancelled buffer
             // operations.
             // We can thus ignore it, it is very unlikely to lead to true buffer issues.
             return;
         }
-        globalCanceller.cancel();
+        canceller.cancel();
         callbacks.error(err);
     }
 }

package/dist/_esm5.processed/core/stream/representation/utils/push_init_segment.js

@@ -64,9 +64,6 @@ export default function pushInitSegment(_a, cancelSignal_1) {
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
-                    if (cancelSignal.cancellationError !== null) {
-                        throw cancelSignal.cancellationError;
-                    }
                     codec = content.representation.getMimeTypeString();
                     data = {
                         initSegmentUniqueId: initSegmentUniqueId,

package/dist/_esm5.processed/core/stream/representation/utils/push_media_segment.js

@@ -69,9 +69,6 @@ export default function pushMediaSegment(_a, cancelSignal_1) {
                     if (parsedSegment.chunkData === null) {
                         return [2 /*return*/, null];
                     }
-                    if (cancelSignal.cancellationError !== null) {
-                        throw cancelSignal.cancellationError;
-                    }
                     chunkData = parsedSegment.chunkData, chunkInfos = parsedSegment.chunkInfos, chunkOffset = parsedSegment.chunkOffset, chunkSize = parsedSegment.chunkSize, appendWindow = parsedSegment.appendWindow;
                     codec = content.representation.getMimeTypeString();
                     APPEND_WINDOW_SECURITIES = config.getCurrent().APPEND_WINDOW_SECURITIES;