rx-player 3.26.2 → 3.27.0-dev.20220317

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

@@ -18,7 +18,6 @@ import { SegmentBufferOperation, } from "../../segment_buffers";
 import checkForDiscontinuity from "./check_for_discontinuity";
 import getNeededSegments from "./get_needed_segments";
 import getSegmentPriority from "./get_segment_priority";
-var MINIMUM_SEGMENT_SIZE = config.MINIMUM_SEGMENT_SIZE;
 /**
  * Checks on the current buffered data for the given type and Period
  * and returns what should be done to fill the buffer according to the buffer
@@ -33,7 +32,7 @@ var MINIMUM_SEGMENT_SIZE = config.MINIMUM_SEGMENT_SIZE;
  * @param {Object} segmentBuffer
  * @returns {Object}
  */
-export default function getBufferStatus(content, wantedStartPosition, playbackObserver, fastSwitchThreshold, bufferGoal, segmentBuffer) {
+export default function getBufferStatus(content, wantedStartPosition, playbackObserver, fastSwitchThreshold, bufferGoal, maxBufferSize, segmentBuffer) {
     var _a;
     var period = content.period, representation = content.representation;
     segmentBuffer.synchronizeInventory();
@@ -56,8 +55,11 @@ export default function getBufferStatus(content, wantedStartPosition, playbackOb
     /** Callback allowing to retrieve a segment's history in the buffer. */
     var getBufferedHistory = segmentBuffer.getSegmentHistory.bind(segmentBuffer);
     /** List of segments we will need to download. */
-    var neededSegments = getNeededSegments({ content: content, bufferedSegments: bufferedSegments, currentPlaybackTime: currentPlaybackTime, fastSwitchThreshold: fastSwitchThreshold, getBufferedHistory: getBufferedHistory, neededRange: neededRange, segmentsBeingPushed: segmentsBeingPushed })
-        .map(function (segment) { return ({ priority: getSegmentPriority(segment.time, wantedStartPosition), segment: segment }); });
+    var _b = getNeededSegments({ content: content, bufferedSegments: bufferedSegments, currentPlaybackTime: currentPlaybackTime, fastSwitchThreshold: fastSwitchThreshold, getBufferedHistory: getBufferedHistory, neededRange: neededRange, segmentsBeingPushed: segmentsBeingPushed, maxBufferSize: maxBufferSize }), neededSegments = _b.neededSegments, isBufferFull = _b.isBufferFull;
+    var prioritizedNeededSegments = neededSegments.map(function (segment) { return ({
+        priority: getSegmentPriority(segment.time, wantedStartPosition),
+        segment: segment,
+    }); });
     /**
      * `true` if the current `RepresentationStream` has loaded all the
      * needed segments for this Representation until the end of the Period.
@@ -66,7 +68,7 @@ export default function getBufferStatus(content, wantedStartPosition, playbackOb
     var lastPosition = representation.index.getLastPosition();
     if (!representation.index.isInitialized() ||
         period.end === undefined ||
-        neededSegments.length > 0) {
+        prioritizedNeededSegments.length > 0) {
         hasFinishedLoading = false;
     }
     else {
@@ -110,14 +112,14 @@ export default function getBufferStatus(content, wantedStartPosition, playbackOb
         if (segmentsBeingPushed.length > 0) {
             nextSegmentStart = Math.min.apply(Math, segmentsBeingPushed.map(function (info) { return info.segment.time; }));
         }
-        if (neededSegments.length > 0) {
+        if (prioritizedNeededSegments.length > 0) {
             nextSegmentStart = nextSegmentStart !== null ?
-                Math.min(nextSegmentStart, neededSegments[0].segment.time) :
-                neededSegments[0].segment.time;
+                Math.min(nextSegmentStart, prioritizedNeededSegments[0].segment.time) :
+                prioritizedNeededSegments[0].segment.time;
         }
         imminentDiscontinuity = checkForDiscontinuity(content, neededRange, nextSegmentStart, hasFinishedLoading, bufferedSegments);
     }
-    return { imminentDiscontinuity: imminentDiscontinuity, hasFinishedLoading: hasFinishedLoading, neededSegments: neededSegments, shouldRefreshManifest: shouldRefreshManifest };
+    return { imminentDiscontinuity: imminentDiscontinuity, hasFinishedLoading: hasFinishedLoading, neededSegments: prioritizedNeededSegments, isBufferFull: isBufferFull, shouldRefreshManifest: shouldRefreshManifest };
 }
 /**
  * From the given SegmentInventory, filters the "playable" (in a supported codec
@@ -128,6 +130,7 @@ export default function getBufferStatus(content, wantedStartPosition, playbackOb
  * @returns {Array.<Object>}
  */
 function getPlayableBufferedSegments(neededRange, segmentInventory) {
+    var MINIMUM_SEGMENT_SIZE = config.getCurrent().MINIMUM_SEGMENT_SIZE;
     var segmentRoundingError = Math.max(1 / 60, MINIMUM_SEGMENT_SIZE);
     var minEnd = neededRange.start + segmentRoundingError;
     var maxStart = neededRange.end - segmentRoundingError;

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

@@ -14,17 +14,18 @@
  * limitations under the License.
  */
 import Manifest, { Adaptation, ISegment, Period, Representation } from "../../../manifest";
-import { IBufferedChunk } from "../../segment_buffers";
+import { IBufferedChunk, IEndOfSegmentInfos } from "../../segment_buffers";
 import { IBufferedHistoryEntry, IChunkContext } from "../../segment_buffers/inventory";
+interface IContentContext {
+    adaptation: Adaptation;
+    manifest: Manifest;
+    period: Period;
+    representation: Representation;
+}
 /** Arguments for `getNeededSegments`. */
 export interface IGetNeededSegmentsArguments {
     /** The content we want to load segments for */
-    content: {
-        adaptation: Adaptation;
-        manifest: Manifest;
-        period: Period;
-        representation: Representation;
-    };
+    content: IContentContext;
     /**
      * The current playing position.
      * Important to avoid asking for segments on the same exact position, which
@@ -46,12 +47,7 @@ export interface IGetNeededSegmentsArguments {
         end: number;
     };
     /** The list of segments that are already in the process of being pushed. */
-    segmentsBeingPushed: Array<{
-        adaptation: Adaptation;
-        period: Period;
-        representation: Representation;
-        segment: ISegment;
-    }>;
+    segmentsBeingPushed: IEndOfSegmentInfos[];
     /**
      * Information on the segments already in the buffer, in chronological order.
      *
@@ -62,8 +58,16 @@ export interface IGetNeededSegmentsArguments {
      * re-requested.
      */
     bufferedSegments: IBufferedChunk[];
+    /**
+     * maxBufferSize is the maximum memory in kilobytes that the buffer should take
+     */
+    maxBufferSize: number;
     getBufferedHistory: (context: IChunkContext) => IBufferedHistoryEntry[];
 }
+interface INeededSegments {
+    neededSegments: ISegment[];
+    isBufferFull: boolean;
+}
 /**
  * Return the list of segments that can currently be downloaded to fill holes
  * in the buffer in the given range, including already-pushed segments currently
@@ -74,4 +78,5 @@ export interface IGetNeededSegmentsArguments {
  * @param {Object} args
  * @returns {Array.<Object>}
  */
-export default function getNeededSegments({ bufferedSegments, content, currentPlaybackTime, fastSwitchThreshold, getBufferedHistory, neededRange, segmentsBeingPushed, }: IGetNeededSegmentsArguments): ISegment[];
+export default function getNeededSegments({ bufferedSegments, content, currentPlaybackTime, fastSwitchThreshold, getBufferedHistory, neededRange, segmentsBeingPushed, maxBufferSize, }: IGetNeededSegmentsArguments): INeededSegments;
+export {};

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

@@ -18,12 +18,6 @@ import config from "../../../config";
 import log from "../../../log";
 import { areSameContent, } from "../../../manifest";
 import objectAssign from "../../../utils/object_assign";
-var CONTENT_REPLACEMENT_PADDING = config.CONTENT_REPLACEMENT_PADDING, BITRATE_REBUFFERING_RATIO = config.BITRATE_REBUFFERING_RATIO, MAX_TIME_MISSING_FROM_COMPLETE_SEGMENT = config.MAX_TIME_MISSING_FROM_COMPLETE_SEGMENT, MINIMUM_SEGMENT_SIZE = config.MINIMUM_SEGMENT_SIZE;
-/**
- * Epsilon compensating for rounding errors when comparing the start and end
- * time of multiple segments.
- */
-var ROUNDING_ERROR = Math.min(1 / 60, MINIMUM_SEGMENT_SIZE);
 /**
  * Return the list of segments that can currently be downloaded to fill holes
  * in the buffer in the given range, including already-pushed segments currently
@@ -35,8 +29,11 @@ var ROUNDING_ERROR = Math.min(1 / 60, MINIMUM_SEGMENT_SIZE);
  * @returns {Array.<Object>}
  */
 export default function getNeededSegments(_a) {
-    var bufferedSegments = _a.bufferedSegments, content = _a.content, currentPlaybackTime = _a.currentPlaybackTime, fastSwitchThreshold = _a.fastSwitchThreshold, getBufferedHistory = _a.getBufferedHistory, neededRange = _a.neededRange, segmentsBeingPushed = _a.segmentsBeingPushed;
+    var bufferedSegments = _a.bufferedSegments, content = _a.content, currentPlaybackTime = _a.currentPlaybackTime, fastSwitchThreshold = _a.fastSwitchThreshold, getBufferedHistory = _a.getBufferedHistory, neededRange = _a.neededRange, segmentsBeingPushed = _a.segmentsBeingPushed, maxBufferSize = _a.maxBufferSize;
     var representation = content.representation;
+    var availableBufferSize = getAvailableBufferSize(bufferedSegments, segmentsBeingPushed, maxBufferSize);
+    // Current buffer length in seconds
+    var bufferLength = getBufferLength(bufferedSegments, segmentsBeingPushed);
     var availableSegmentsForRange = representation.index
         .getSegments(neededRange.start, neededRange.end - neededRange.start);
     // Remove from `bufferedSegments` any segments we would prefer to replace:
@@ -57,7 +54,7 @@ export default function getNeededSegments(_a) {
             }
             log.debug("Stream: skipping segment gc-ed at the start", currentSeg);
         }
-        if (doesEndSeemGarbageCollected(currentSeg, nextSeg, neededRange.start)) {
+        if (doesEndSeemGarbageCollected(currentSeg, nextSeg, neededRange.end)) {
             lazySegmentHistory = lazySegmentHistory !== null && lazySegmentHistory !== void 0 ? lazySegmentHistory : getBufferedHistory(currentSeg.infos);
             if (shouldReloadSegmentGCedAtTheEnd(lazySegmentHistory, currentSeg.bufferedEnd)) {
                 return false;
@@ -66,7 +63,15 @@ export default function getNeededSegments(_a) {
         }
         return true;
     });
-    var segmentsToDownload = availableSegmentsForRange.filter(function (segment) {
+    var _b = config.getCurrent(), MINIMUM_SEGMENT_SIZE = _b.MINIMUM_SEGMENT_SIZE, MIN_BUFFER_LENGTH = _b.MIN_BUFFER_LENGTH, MIN_BUFFER_DISTANCE_BEFORE_CLEAN_UP = _b.MIN_BUFFER_DISTANCE_BEFORE_CLEAN_UP;
+    var isMemorySaturated = false;
+    /**
+     * Epsilon compensating for rounding errors when comparing the start and end
+     * time of multiple segments.
+     */
+    var ROUNDING_ERROR = Math.min(1 / 60, MINIMUM_SEGMENT_SIZE);
+    var isBufferFull = false;
+    var neededSegments = availableSegmentsForRange.filter(function (segment) {
         var contentObject = objectAssign({ segment: segment }, content);
         // First, check that the segment is not already being pushed
         if (segmentsBeingPushed.length > 0) {
@@ -80,6 +85,19 @@ export default function getNeededSegments(_a) {
         if (segment.isInit) {
             return true; // never skip initialization segments
         }
+        if (isMemorySaturated) {
+            // If we are so saturated in memory
+            // That we cannot download atleast till
+            // NeededRange.Start ( current position ) + a CONST
+            // Then the buffer is full
+            if (time < neededRange.start + MIN_BUFFER_DISTANCE_BEFORE_CLEAN_UP) {
+                isBufferFull = true;
+            }
+        }
+        if (isMemorySaturated &&
+            bufferLength > MIN_BUFFER_LENGTH) {
+            return false;
+        }
         if (segment.complete && duration < MINIMUM_SEGMENT_SIZE) {
             return false; // too small, don't download
         }
@@ -130,9 +148,57 @@ export default function getNeededSegments(_a) {
                     getLastContiguousSegment(segmentsToKeep, i).end < end - ROUNDING_ERROR;
             }
         }
+        var estimatedSegmentSize = (duration * content.representation.bitrate) / 8000;
+        if (availableBufferSize - estimatedSegmentSize < 0 &&
+            bufferLength > MIN_BUFFER_LENGTH) {
+            isMemorySaturated = true;
+            return false;
+        }
+        availableBufferSize -= estimatedSegmentSize;
+        bufferLength += duration;
         return true;
     });
-    return segmentsToDownload;
+    return { neededSegments: neededSegments, isBufferFull: isBufferFull };
+}
+/**
+ * Compute the estimated available buffer size in memory in kilobytes
+ * @param bufferedSegments
+ * @param segmentsBeingPushed
+ * @param maxVideoBufferSize
+ * @returns availableBufferSize in kilobytes
+ */
+function getAvailableBufferSize(bufferedSegments, segmentsBeingPushed, maxVideoBufferSize) {
+    var availableBufferSize = maxVideoBufferSize;
+    availableBufferSize -= segmentsBeingPushed.reduce(function (size, segment) {
+        var bitrate = segment.representation.bitrate;
+        // Not taking into account the fact that the segment
+        // can still be generated and the duration not fully exact
+        var duration = segment.segment.duration;
+        return size + ((bitrate / 8000) * duration);
+    }, 0);
+    return bufferedSegments.reduce(function (size, chunk) {
+        if (chunk.chunkSize !== undefined) {
+            return size - (chunk.chunkSize / 8000);
+        }
+        else {
+            return size;
+        }
+    }, availableBufferSize);
+}
+/**
+ * Compute the length of the buffer in seconds
+ * @param bufferedSegments
+ * @param segmentsBeingPushed
+ * @returns bufferLength in seconds
+ */
+function getBufferLength(bufferedSegments, segmentsBeingPushed) {
+    var bufferLength = bufferedSegments.reduce(function (length, segment) {
+        return length + (segment.end - segment.start);
+    }, 0);
+    var bufferBeingPushed = segmentsBeingPushed.reduce(function (length, segment) {
+        return length + segment.segment.duration;
+    }, 0);
+    return bufferLength + bufferBeingPushed;
 }
 /**
  * From the given array of buffered chunks (`bufferedSegments`) returns the last
@@ -143,6 +209,12 @@ export default function getNeededSegments(_a) {
  */
 function getLastContiguousSegment(bufferedSegments, startIndex) {
     var j = startIndex + 1;
+    var MINIMUM_SEGMENT_SIZE = config.getCurrent().MINIMUM_SEGMENT_SIZE;
+    /**
+     * Epsilon compensating for rounding errors when comparing the start and end
+     * time of multiple segments.
+     */
+    var ROUNDING_ERROR = Math.min(1 / 60, MINIMUM_SEGMENT_SIZE);
     // go through all contiguous segments and take the last one
     while (j < bufferedSegments.length - 1 &&
         (bufferedSegments[j - 1].end + ROUNDING_ERROR) >
@@ -162,6 +234,7 @@ function getLastContiguousSegment(bufferedSegments, startIndex) {
  * @returns {boolean}
  */
 function shouldContentBeReplaced(oldContent, currentContent, currentPlaybackTime, fastSwitchThreshold) {
+    var CONTENT_REPLACEMENT_PADDING = config.getCurrent().CONTENT_REPLACEMENT_PADDING;
     if (oldContent.period.id !== currentContent.period.id) {
         return false; // keep segments from another Period by default.
     }
@@ -186,6 +259,7 @@ function shouldContentBeReplaced(oldContent, currentContent, currentPlaybackTime
  */
 function canFastSwitch(oldSegmentRepresentation, newSegmentRepresentation, fastSwitchThreshold) {
     var oldContentBitrate = oldSegmentRepresentation.bitrate;
+    var BITRATE_REBUFFERING_RATIO = config.getCurrent().BITRATE_REBUFFERING_RATIO;
     if (fastSwitchThreshold === undefined) {
         // only re-load comparatively-poor bitrates for the same Adaptation.
         var bitrateCeil = oldContentBitrate * BITRATE_REBUFFERING_RATIO;
@@ -207,6 +281,7 @@ function canFastSwitch(oldSegmentRepresentation, newSegmentRepresentation, fastS
  * that time, we will return `false`.
  */
 function doesStartSeemGarbageCollected(currentSeg, prevSeg, maximumStartTime) {
+    var MAX_TIME_MISSING_FROM_COMPLETE_SEGMENT = config.getCurrent().MAX_TIME_MISSING_FROM_COMPLETE_SEGMENT;
     if (currentSeg.bufferedStart === undefined) {
         log.warn("Stream: Start of a segment unknown. " +
             "Assuming it is garbage collected by default.", currentSeg);
@@ -237,6 +312,7 @@ function doesStartSeemGarbageCollected(currentSeg, prevSeg, maximumStartTime) {
  * that time, we will return `false`.
  */
 function doesEndSeemGarbageCollected(currentSeg, nextSeg, minimumEndTime) {
+    var MAX_TIME_MISSING_FROM_COMPLETE_SEGMENT = config.getCurrent().MAX_TIME_MISSING_FROM_COMPLETE_SEGMENT;
     if (currentSeg.bufferedEnd === undefined) {
         log.warn("Stream: End of a segment unknown. " +
             "Assuming it is garbage collected by default.", currentSeg);

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 {