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

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

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import config from "../../../config";
-var SEGMENT_PRIORITIES_STEPS = config.SEGMENT_PRIORITIES_STEPS;
 /**
  * Calculate the priority number for a given segment start time, in function of
  * the distance with the wanted starting timestamp.
@@ -29,6 +28,7 @@ var SEGMENT_PRIORITIES_STEPS = config.SEGMENT_PRIORITIES_STEPS;
  */
 export default function getSegmentPriority(segmentTime, wantedStartTimestamp) {
     var distance = segmentTime - wantedStartTimestamp;
+    var SEGMENT_PRIORITIES_STEPS = config.getCurrent().SEGMENT_PRIORITIES_STEPS;
     for (var priority = 0; priority < SEGMENT_PRIORITIES_STEPS.length; priority++) {
         if (distance < SEGMENT_PRIORITIES_STEPS[priority]) {
             return priority;

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

@@ -18,7 +18,6 @@ import config from "../../../config";
 import objectAssign from "../../../utils/object_assign";
 import EVENTS from "../events_generators";
 import appendSegmentToBuffer from "./append_segment_to_buffer";
-var APPEND_WINDOW_SECURITIES = config.APPEND_WINDOW_SECURITIES;
 /**
  * Push a given media segment (non-init segment) to a SegmentBuffer.
  * The Observable returned:
@@ -34,8 +33,9 @@ export default function pushMediaSegment(_a) {
         if (parsedSegment.chunkData === null) {
             return EMPTY;
         }
-        var chunkData = parsedSegment.chunkData, chunkInfos = parsedSegment.chunkInfos, chunkOffset = parsedSegment.chunkOffset, appendWindow = parsedSegment.appendWindow;
+        var chunkData = parsedSegment.chunkData, chunkInfos = parsedSegment.chunkInfos, chunkOffset = parsedSegment.chunkOffset, chunkSize = parsedSegment.chunkSize, appendWindow = parsedSegment.appendWindow;
         var codec = content.representation.getMimeTypeString();
+        var APPEND_WINDOW_SECURITIES = config.getCurrent().APPEND_WINDOW_SECURITIES;
         // Cutting exactly at the start or end of the appendWindow can lead to
         // cases of infinite rebuffering due to how browser handle such windows.
         // To work-around that, we add a small offset before and after those.
@@ -60,7 +60,7 @@ export default function pushMediaSegment(_a) {
         if (safeAppendWindow[1] !== undefined) {
             estimatedEnd = Math.min(estimatedEnd, safeAppendWindow[1]);
         }
-        var inventoryInfos = objectAssign({ segment: segment, start: estimatedStart,
+        var inventoryInfos = objectAssign({ segment: segment, chunkSize: chunkSize, start: estimatedStart,
             end: estimatedEnd }, content);
         return appendSegmentToBuffer(playbackObserver, segmentBuffer, { data: data, inventoryInfos: inventoryInfos }).pipe(map(function () {
             var buffered = segmentBuffer.getBufferedRanges();

package/dist/_esm5.processed/core/stream/representation/representation_stream.d.ts

@@ -79,6 +79,12 @@ export interface IRepresentationStreamOptions {
      * goes below that size again.
      */
     bufferGoal$: Observable<number>;
+    /**
+     *  The buffer size limit in memory that we can reach.
+     *  Once reached, no segments will be loaded until it
+     *  goes below that size again
+     */
+    maxBufferSize$: Observable<number>;
     /**
      * Hex-encoded DRM "system ID" as found in:
      * https://dashif.org/identifiers/content_protection/

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

@@ -23,6 +23,7 @@
  */
 import nextTick from "next-tick";
 import { combineLatest as observableCombineLatest, concat as observableConcat, defer as observableDefer, EMPTY, ignoreElements, merge as observableMerge, mergeMap, of as observableOf, share, startWith, Subject, take, takeWhile, withLatestFrom, } from "rxjs";
+import config from "../../../config";
 import log from "../../../log";
 import assertUnreachable from "../../../utils/assert_unreachable";
 import objectAssign from "../../../utils/object_assign";
@@ -48,7 +49,7 @@ import pushMediaSegment from "./push_media_segment";
 export default function RepresentationStream(_a) {
     var content = _a.content, options = _a.options, playbackObserver = _a.playbackObserver, segmentBuffer = _a.segmentBuffer, segmentFetcher = _a.segmentFetcher, terminate$ = _a.terminate$;
     var period = content.period, adaptation = content.adaptation, representation = content.representation;
-    var bufferGoal$ = options.bufferGoal$, drmSystemId = options.drmSystemId, fastSwitchThreshold$ = options.fastSwitchThreshold$;
+    var bufferGoal$ = options.bufferGoal$, maxBufferSize$ = options.maxBufferSize$, drmSystemId = options.drmSystemId, fastSwitchThreshold$ = options.fastSwitchThreshold$;
     var bufferType = adaptation.type;
     /** Saved initialization segment state for this representation. */
     var initSegmentState = {
@@ -81,7 +82,7 @@ export default function RepresentationStream(_a) {
         var encryptionData = representation.getEncryptionData(drmSystemId);
         if (encryptionData.length > 0) {
             encryptionEvent$ = observableOf.apply(void 0, encryptionData.map(function (d) {
-                return EVENTS.encryptionDataEncountered(d);
+                return EVENTS.encryptionDataEncountered(d, content);
             }));
             hasSentEncryptionData = true;
         }
@@ -93,12 +94,13 @@ export default function RepresentationStream(_a) {
     var status$ = observableCombineLatest([
         playbackObserver.observe(true),
         bufferGoal$,
+        maxBufferSize$,
         terminate$.pipe(take(1), startWith(null)),
         reCheckNeededSegments$.pipe(startWith(undefined)),
     ]).pipe(withLatestFrom(fastSwitchThreshold$), mergeMap(function (_a) {
-        var _b = _a[0], observation = _b[0], bufferGoal = _b[1], terminate = _b[2], fastSwitchThreshold = _a[1];
+        var _b = _a[0], observation = _b[0], bufferGoal = _b[1], maxBufferSize = _b[2], terminate = _b[3], fastSwitchThreshold = _a[1];
         var wantedStartPosition = observation.position + observation.wantedTimeOffset;
-        var status = getBufferStatus(content, wantedStartPosition, playbackObserver, fastSwitchThreshold, bufferGoal, segmentBuffer);
+        var status = getBufferStatus(content, wantedStartPosition, playbackObserver, fastSwitchThreshold, bufferGoal, maxBufferSize, segmentBuffer);
         var neededSegments = status.neededSegments;
         var neededInitSegment = null;
         // Add initialization segment if required
@@ -160,9 +162,18 @@ export default function RepresentationStream(_a) {
             value: { period: period, position: observation.position, bufferType: bufferType, imminentDiscontinuity: status.imminentDiscontinuity,
                 hasFinishedLoading: status.hasFinishedLoading,
                 neededSegments: status.neededSegments } });
+        var bufferRemoval = EMPTY;
+        var UPTO_CURRENT_POSITION_CLEANUP = config.getCurrent().UPTO_CURRENT_POSITION_CLEANUP;
+        if (status.isBufferFull) {
+            var gcedPosition = Math.max(0, wantedStartPosition - UPTO_CURRENT_POSITION_CLEANUP);
+            bufferRemoval = segmentBuffer
+                .removeBuffer(0, gcedPosition)
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                .pipe(ignoreElements());
+        }
         return status.shouldRefreshManifest ?
-            observableConcat(observableOf(EVENTS.needsManifestRefresh()), bufferStatusEvt) :
-            bufferStatusEvt;
+            observableConcat(observableOf(EVENTS.needsManifestRefresh()), bufferStatusEvt, bufferRemoval) :
+            observableConcat(bufferStatusEvt, bufferRemoval);
     }), takeWhile(function (e) { return e.type !== "stream-terminating"; }, true));
     return observableMerge(status$, queue$, encryptionEvent$).pipe(share());
     /**
@@ -223,7 +234,7 @@ export default function RepresentationStream(_a) {
             var allEncryptionData = representation.getAllEncryptionData();
             var initEncEvt$ = !hasSentEncryptionData &&
                 allEncryptionData.length > 0 ? observableOf.apply(void 0, allEncryptionData.map(function (p) {
-                return EVENTS.encryptionDataEncountered(p);
+                return EVENTS.encryptionDataEncountered(p, content);
             })) :
                 EMPTY;
             var pushEvent$ = pushInitSegment({ playbackObserver: playbackObserver, content: content, segment: evt.segment,
@@ -236,7 +247,7 @@ export default function RepresentationStream(_a) {
             // every protection data together? To check.
             var segmentEncryptionEvent$ = protectionDataUpdate &&
                 !hasSentEncryptionData ? observableOf.apply(void 0, representation.getAllEncryptionData().map(function (p) {
-                return EVENTS.encryptionDataEncountered(p);
+                return EVENTS.encryptionDataEncountered(p, content);
             })) :
                 EMPTY;
             var manifestRefresh$ = needsManifestRefresh === true ?

package/dist/_esm5.processed/core/stream/types.d.ts

@@ -17,7 +17,7 @@ import { Subject } from "rxjs";
 import { ICustomError } from "../../errors";
 import { Adaptation, ISegment, Period, Representation } from "../../manifest";
 import { IEMSG } from "../../parsers/containers/isobmff";
-import { IContentProtection } from "../eme";
+import { IContentProtection } from "../decrypt";
 import { IBufferType } from "../segment_buffers";
 /** Information about a Segment waiting to be loaded by the Stream. */
 export interface IQueuedSegment {