rx-player 3.26.2 → 3.27.0-dev.20220317

package/dist/_esm5.processed/core/segment_buffers/implementations/text/html/text_track_cues_store.js

@@ -48,8 +48,8 @@ var TextTrackCuesStore = /** @class */ (function () {
         var ret = [];
         // begins at the end as most of the time the player will ask for the last
         // CuesGroup
-        for (var i = cuesBuffer.length - 1; i >= 0; i--) {
-            var segment = cuesBuffer[i];
+        for (var cueIdx = cuesBuffer.length - 1; cueIdx >= 0; cueIdx--) {
+            var segment = cuesBuffer[cueIdx];
             if (time < segment.end && time >= segment.start) {
                 var cues = segment.cues;
                 for (var j = 0; j < cues.length; j++) {
@@ -75,10 +75,10 @@ var TextTrackCuesStore = /** @class */ (function () {
         }
         var to = Math.max(from, _to);
         var cuesBuffer = this._cuesBuffer;
-        for (var i = 0; i < cuesBuffer.length; i++) {
-            if (cuesBuffer[i].end > from) {
+        for (var cueIdx = 0; cueIdx < cuesBuffer.length; cueIdx++) {
+            if (cuesBuffer[cueIdx].end > from) {
                 // this cuesInfos is concerned by the remove
-                var startCuesInfos = cuesBuffer[i];
+                var startCuesInfos = cuesBuffer[cueIdx];
                 if (startCuesInfos.start >= to) {
                     // our cuesInfos is strictly after this interval, we have nothing to do
                     return;
@@ -93,8 +93,8 @@ var TextTrackCuesStore = /** @class */ (function () {
                     else {
                         // from -> to is in the middle part of startCuesInfos
                         var _a = removeCuesInfosBetween(startCuesInfos, from, to), cuesInfos1 = _a[0], cuesInfos2 = _a[1];
-                        this._cuesBuffer[i] = cuesInfos1;
-                        cuesBuffer.splice(i + 1, 0, cuesInfos2);
+                        this._cuesBuffer[cueIdx] = cuesInfos1;
+                        cuesBuffer.splice(cueIdx + 1, 0, cuesInfos2);
                     }
                     // No cuesInfos can be concerned after this one, we can quit
                     return;
@@ -102,8 +102,8 @@ var TextTrackCuesStore = /** @class */ (function () {
                 // Else remove all part after `from`
                 if (startCuesInfos.start >= from) {
                     // all the segment is concerned
-                    cuesBuffer.splice(i, 1);
-                    i--; // one less element, we have to decrement the loop
+                    cuesBuffer.splice(cueIdx, 1);
+                    cueIdx--; // one less element, we have to decrement the loop
                 }
                 else {
                     // only the end is concerned
@@ -187,8 +187,8 @@ var TextTrackCuesStore = /** @class */ (function () {
                 cuesBuffer.splice(indexOfNextCue, 0, cuesInfosToInsert);
             }
         }
-        for (var i = 0; i < cuesBuffer.length; i++) {
-            var cuesInfos = cuesBuffer[i];
+        for (var cueIdx = 0; cueIdx < cuesBuffer.length; cueIdx++) {
+            var cuesInfos = cuesBuffer[cueIdx];
             if (start < cuesInfos.end) {
                 if (areNearlyEqual(start, cuesInfos.start)) {
                     if (areNearlyEqual(end, cuesInfos.end)) {
@@ -198,7 +198,7 @@ var TextTrackCuesStore = /** @class */ (function () {
                         //   Result:          |AAAAA|
                         // Which means:
                         //   1. replace the current cue with ours
-                        cuesBuffer[i] = cuesInfosToInsert;
+                        cuesBuffer[cueIdx] = cuesInfosToInsert;
                         return;
                     }
                     else if (end < cuesInfos.end) {
@@ -212,7 +212,7 @@ var TextTrackCuesStore = /** @class */ (function () {
                         //   3. add ours before the current one
                         cuesInfos.cues = getCuesAfter(cuesInfos.cues, end);
                         cuesInfos.start = end;
-                        cuesBuffer.splice(i, 0, cuesInfosToInsert);
+                        cuesBuffer.splice(cueIdx, 0, cuesInfosToInsert);
                         return;
                     }
                     // our cue goes beyond the current one:
@@ -222,10 +222,10 @@ var TextTrackCuesStore = /** @class */ (function () {
                     // Here we have to delete any cuesInfos which end before ours end,
                     // and see about the following one.
                     do {
-                        cuesBuffer.splice(i, 1);
-                        cuesInfos = cuesBuffer[i];
+                        cuesBuffer.splice(cueIdx, 1);
+                        cuesInfos = cuesBuffer[cueIdx];
                     } while (cuesInfos !== undefined && end > cuesInfos.end);
-                    onIndexOfNextCueFound(i);
+                    onIndexOfNextCueFound(cueIdx);
                     return;
                 }
                 else if (start < cuesInfos.start) {
@@ -236,7 +236,7 @@ var TextTrackCuesStore = /** @class */ (function () {
                         //   Result:          |AAAAAAA| |BBBB|
                         // Which means:
                         //   - add ours before the current one
-                        cuesBuffer.splice(i, 0, cuesInfosToInsert);
+                        cuesBuffer.splice(cueIdx, 0, cuesInfosToInsert);
                         return;
                     }
                     else if (areNearlyEqual(end, cuesInfos.start)) {
@@ -248,7 +248,7 @@ var TextTrackCuesStore = /** @class */ (function () {
                         //   - update start time of the current one to be sure
                         //   - add ours before the current one
                         cuesInfos.start = end;
-                        cuesBuffer.splice(i, 0, cuesInfosToInsert);
+                        cuesBuffer.splice(cueIdx, 0, cuesInfosToInsert);
                         return;
                     }
                     else if (areNearlyEqual(end, cuesInfos.end)) {
@@ -256,7 +256,7 @@ var TextTrackCuesStore = /** @class */ (function () {
                         //   the current one:    |BBBB|
                         //   Result:          |AAAAAAA|
                         // Replace
-                        cuesBuffer.splice(i, 1, cuesInfosToInsert);
+                        cuesBuffer.splice(cueIdx, 1, cuesInfosToInsert);
                         return;
                     }
                     else if (end < cuesInfos.end) {
@@ -265,17 +265,17 @@ var TextTrackCuesStore = /** @class */ (function () {
                         //   Result:          |AAAAAAABB|
                         cuesInfos.cues = getCuesAfter(cuesInfos.cues, end);
                         cuesInfos.start = end;
-                        cuesBuffer.splice(i, 0, cuesInfosToInsert);
+                        cuesBuffer.splice(cueIdx, 0, cuesInfosToInsert);
                         return;
                     }
                     //   ours:            |AAAAAAA|
                     //   the current one:   |BBB|...
                     //   Result:          |AAAAAAA|...
                     do {
-                        cuesBuffer.splice(i, 1);
-                        cuesInfos = cuesBuffer[i];
+                        cuesBuffer.splice(cueIdx, 1);
+                        cuesInfos = cuesBuffer[cueIdx];
                     } while (cuesInfos !== undefined && end > cuesInfos.end);
-                    onIndexOfNextCueFound(i);
+                    onIndexOfNextCueFound(cueIdx);
                     return;
                 }
                 // else -> start > cuesInfos.start
@@ -285,7 +285,7 @@ var TextTrackCuesStore = /** @class */ (function () {
                     //   Result:          |BBAAAAAA|
                     cuesInfos.cues = getCuesBefore(cuesInfos.cues, start);
                     cuesInfos.end = start;
-                    cuesBuffer.splice(i + 1, 0, cuesInfosToInsert);
+                    cuesBuffer.splice(cueIdx + 1, 0, cuesInfosToInsert);
                     return;
                 }
                 else if (cuesInfos.end > end) {
@@ -293,9 +293,9 @@ var TextTrackCuesStore = /** @class */ (function () {
                     //   the current one: |BBBBBBBBBBB|
                     //   Result:          |BBAAAAAABBB|
                     var _a = removeCuesInfosBetween(cuesInfos, start, end), cuesInfos1 = _a[0], cuesInfos2 = _a[1];
-                    this._cuesBuffer[i] = cuesInfos1;
-                    cuesBuffer.splice(i + 1, 0, cuesInfosToInsert);
-                    cuesBuffer.splice(i + 2, 0, cuesInfos2);
+                    this._cuesBuffer[cueIdx] = cuesInfos1;
+                    cuesBuffer.splice(cueIdx + 1, 0, cuesInfosToInsert);
+                    cuesBuffer.splice(cueIdx + 2, 0, cuesInfos2);
                     return;
                 }
                 else {
@@ -304,12 +304,13 @@ var TextTrackCuesStore = /** @class */ (function () {
                     //   Result:          |BBAAAAAA|...
                     cuesInfos.cues = getCuesBefore(cuesInfos.cues, start);
                     cuesInfos.end = start;
-                    cuesInfos = cuesBuffer[i + 1];
+                    var nextCueIdx = cueIdx + 1;
+                    cuesInfos = cuesBuffer[nextCueIdx];
                     while (cuesInfos !== undefined && end > cuesInfos.end) {
-                        cuesBuffer.splice(i, 1);
-                        cuesInfos = cuesBuffer[i];
+                        cuesBuffer.splice(nextCueIdx, 1);
+                        cuesInfos = cuesBuffer[nextCueIdx];
                     }
-                    onIndexOfNextCueFound(i);
+                    onIndexOfNextCueFound(nextCueIdx);
                     return;
                 }
             }

package/dist/_esm5.processed/core/segment_buffers/implementations/text/native/native_text_segment_buffer.d.ts

@@ -26,7 +26,7 @@ export default class NativeTextSegmentBuffer extends SegmentBuffer {
     readonly bufferType: "text";
     private readonly _videoElement;
     private readonly _track;
-    private readonly _trackElement?;
+    private readonly _trackElement;
     private _buffered;
     /**
      * @param {HTMLMediaElement} videoElement
@@ -74,9 +74,9 @@ export interface INativeTextTracksBufferSegmentData {
      * This is mostly needed for "sami" subtitles, to know which cues can / should
      * be parsed.
      */
-    language?: string;
+    language?: string | undefined;
     /** start time from which the segment apply, in seconds. */
-    start?: number;
+    start?: number | undefined;
     /** end time until which the segment apply, in seconds. */
-    end?: number;
+    end?: number | undefined;
 }

package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.d.ts

@@ -18,6 +18,20 @@ import { IBufferedHistoryEntry } from "./buffered_history";
 import { IChunkContext } from "./types";
 /** Information stored on a single chunk by the SegmentInventory. */
 export interface IBufferedChunk {
+    /**
+     * Complete size of the pushed chunk, in bytes.
+     * Note that this does not always reflect the memory imprint of the segment in
+     * memory:
+     *
+     *   1. It's the size of the original container file. A browser receiving that
+     *      segment might then transform it under another form that may be more or
+     *      less voluminous.
+     *
+     *   2. It's the size of the full chunk. In some scenarios only a sub-part of
+     *      that chunk is actually considered (examples: when using append
+     *      windows, when another chunk overlap that one etc.).
+     */
+    chunkSize: number | undefined;
     /**
      * Last inferred end in the media buffer this chunk ends at, in seconds.
      *
@@ -94,6 +108,8 @@ export interface IInsertedChunkInfos {
     representation: Representation;
     /** The Segment that chunk is linked to. */
     segment: ISegment;
+    /** Estimated size of the full pushed chunk, in bytes. */
+    chunkSize: number | undefined;
     /**
      * Start time, in seconds, this chunk most probably begins from after being
      * pushed.
@@ -153,7 +169,7 @@ export default class SegmentInventory {
      * segment have been inserted, you should call the `completeSegment` method.
      * @param {Object} chunkInformation
      */
-    insertChunk({ period, adaptation, representation, segment, start, end }: IInsertedChunkInfos): void;
+    insertChunk({ period, adaptation, representation, segment, chunkSize, start, end }: IInsertedChunkInfos): void;
     /**
      * Indicate that inserted chunks can now be considered as a complete segment.
      * Take in argument the same content than what was given to `insertChunk` for

package/dist/_esm5.processed/core/segment_buffers/inventory/segment_inventory.js

@@ -18,7 +18,6 @@ import log from "../../../log";
 import { areSameContent, } from "../../../manifest";
 import takeFirstSet from "../../../utils/take_first_set";
 import BufferedHistory from "./buffered_history";
-var BUFFERED_HISTORY_RETENTION_TIME = config.BUFFERED_HISTORY_RETENTION_TIME, BUFFERED_HISTORY_MAXIMUM_ENTRIES = config.BUFFERED_HISTORY_MAXIMUM_ENTRIES, MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE = config.MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE, MAX_MANIFEST_BUFFERED_DURATION_DIFFERENCE = config.MAX_MANIFEST_BUFFERED_DURATION_DIFFERENCE, MINIMUM_SEGMENT_SIZE = config.MINIMUM_SEGMENT_SIZE;
 /**
  * Keep track of every chunk downloaded and currently in the linked media
  * buffer.
@@ -30,6 +29,7 @@ var BUFFERED_HISTORY_RETENTION_TIME = config.BUFFERED_HISTORY_RETENTION_TIME, BU
  */
 var SegmentInventory = /** @class */ (function () {
     function SegmentInventory() {
+        var _a = config.getCurrent(), BUFFERED_HISTORY_RETENTION_TIME = _a.BUFFERED_HISTORY_RETENTION_TIME, BUFFERED_HISTORY_MAXIMUM_ENTRIES = _a.BUFFERED_HISTORY_MAXIMUM_ENTRIES;
         this._inventory = [];
         this._bufferedHistory = new BufferedHistory(BUFFERED_HISTORY_RETENTION_TIME, BUFFERED_HISTORY_MAXIMUM_ENTRIES);
     }
@@ -55,6 +55,7 @@ var SegmentInventory = /** @class */ (function () {
         var inventory = this._inventory;
         var inventoryIndex = 0; // Current index considered.
         var thisSegment = inventory[0]; // Current segmentInfos considered
+        var MINIMUM_SEGMENT_SIZE = config.getCurrent().MINIMUM_SEGMENT_SIZE;
         /** Type of buffer considered, used for logs */
         var bufferType = thisSegment === null || thisSegment === void 0 ? void 0 : thisSegment.infos.adaptation.type;
         var rangesLength = buffered.length;
@@ -162,7 +163,7 @@ var SegmentInventory = /** @class */ (function () {
      * @param {Object} chunkInformation
      */
     SegmentInventory.prototype.insertChunk = function (_a) {
-        var period = _a.period, adaptation = _a.adaptation, representation = _a.representation, segment = _a.segment, start = _a.start, end = _a.end;
+        var period = _a.period, adaptation = _a.adaptation, representation = _a.representation, segment = _a.segment, chunkSize = _a.chunkSize, start = _a.start, end = _a.end;
         if (segment.isInit) {
             return;
         }
@@ -172,8 +173,7 @@ var SegmentInventory = /** @class */ (function () {
             return;
         }
         var inventory = this._inventory;
-        var newSegment = { partiallyPushed: true,
-            splitted: false, start: start, end: end, precizeStart: false,
+        var newSegment = { partiallyPushed: true, chunkSize: chunkSize, splitted: false, start: start, end: end, precizeStart: false,
             precizeEnd: false,
             bufferedStart: undefined,
             bufferedEnd: undefined,
@@ -365,8 +365,15 @@ var SegmentInventory = /** @class */ (function () {
                             //  prevSegment  : |---------|
                             //  newSegment   :    |====|
                             //  ===>         : |--|====|-|
-                            log.debug("SI: Segment pushed is contained in a previous one", bufferType, start, end, segmentI.start, segmentI.end);
+                            log.warn("SI: Segment pushed is contained in a previous one", bufferType, start, end, segmentI.start, segmentI.end);
                             var nextSegment = { partiallyPushed: segmentI.partiallyPushed,
+                                /**
+                                 * Note: this sadly means we're doing as if
+                                 * that chunk is present two times.
+                                 * Thankfully, this scenario should be
+                                 * fairly rare.
+                                 */
+                                chunkSize: segmentI.chunkSize,
                                 splitted: true,
                                 start: newSegment.end,
                                 end: segmentI.end,
@@ -499,9 +506,14 @@ var SegmentInventory = /** @class */ (function () {
                     }
                 }
                 var firstI = i;
+                var segmentSize = inventory[i].chunkSize;
                 i += 1;
                 while (i < inventory.length &&
                     areSameContent(inventory[i].infos, content)) {
+                    var chunkSize = inventory[i].chunkSize;
+                    if (segmentSize !== undefined && chunkSize !== undefined) {
+                        segmentSize += chunkSize;
+                    }
                     i++;
                 }
                 var lastI = i - 1;
@@ -513,6 +525,7 @@ var SegmentInventory = /** @class */ (function () {
                     i -= length_1;
                 }
                 this._inventory[firstI].partiallyPushed = false;
+                this._inventory[firstI].chunkSize = segmentSize;
                 this._inventory[firstI].end = lastEnd;
                 this._inventory[firstI].bufferedEnd = lastBufferedEnd;
                 this._inventory[firstI].splitted = splitted;
@@ -577,6 +590,7 @@ function bufferedStartLooksCoherent(thisSegment) {
     }
     var start = thisSegment.start, end = thisSegment.end;
     var duration = end - start;
+    var _a = config.getCurrent(), MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE = _a.MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE, MAX_MANIFEST_BUFFERED_DURATION_DIFFERENCE = _a.MAX_MANIFEST_BUFFERED_DURATION_DIFFERENCE;
     return Math.abs(start - thisSegment.bufferedStart) <=
         MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE &&
         (thisSegment.bufferedEnd === undefined ||
@@ -597,6 +611,7 @@ function bufferedEndLooksCoherent(thisSegment) {
     }
     var start = thisSegment.start, end = thisSegment.end;
     var duration = end - start;
+    var _a = config.getCurrent(), MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE = _a.MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE, MAX_MANIFEST_BUFFERED_DURATION_DIFFERENCE = _a.MAX_MANIFEST_BUFFERED_DURATION_DIFFERENCE;
     return Math.abs(end - thisSegment.bufferedEnd) <=
         MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE &&
         thisSegment.bufferedStart != null &&
@@ -612,6 +627,7 @@ function bufferedEndLooksCoherent(thisSegment) {
  * @param {Object} lastDeletedSegmentInfos
  */
 function guessBufferedStartFromRangeStart(firstSegmentInRange, rangeStart, lastDeletedSegmentInfos, bufferType) {
+    var MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE = config.getCurrent().MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE;
     if (firstSegmentInRange.bufferedStart !== undefined) {
         if (firstSegmentInRange.bufferedStart < rangeStart) {
             log.debug("SI: Segment partially GCed at the start", bufferType, firstSegmentInRange.bufferedStart, rangeStart);
@@ -664,6 +680,7 @@ function guessBufferedStartFromRangeStart(firstSegmentInRange, rangeStart, lastD
  * @param {Object} infos
  */
 function guessBufferedEndFromRangeEnd(lastSegmentInRange, rangeEnd, bufferType) {
+    var MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE = config.getCurrent().MAX_MANIFEST_BUFFERED_START_END_DIFFERENCE;
     if (lastSegmentInRange.bufferedEnd !== undefined) {
         if (lastSegmentInRange.bufferedEnd > rangeEnd) {
             log.debug("SI: Segment partially GCed at the end", bufferType, lastSegmentInRange.bufferedEnd, rangeEnd);

package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.d.ts

@@ -76,6 +76,7 @@ export interface IAdaptationStreamArguments {
      * this AdaptationStream won't try to download new segments.
      */
     wantedBufferAhead: IReadOnlySharedReference<number>;
+    maxVideoBufferSize: IReadOnlySharedReference<number>;
 }
 /**
  * Various specific stream "options" which tweak the behavior of the
@@ -132,4 +133,4 @@ export interface IAdaptationStreamOptions {
  * @param {Object} args
  * @returns {Observable}
  */
-export default function AdaptationStream({ abrManager, playbackObserver, content, options, segmentBuffer, segmentFetcherCreator, wantedBufferAhead, }: IAdaptationStreamArguments): Observable<IAdaptationStreamEvent>;
+export default function AdaptationStream({ abrManager, playbackObserver, content, options, segmentBuffer, segmentFetcherCreator, wantedBufferAhead, maxVideoBufferSize, }: IAdaptationStreamArguments): Observable<IAdaptationStreamEvent>;

package/dist/_esm5.processed/core/stream/adaptation/adaptation_stream.js

@@ -32,7 +32,6 @@ import EVENTS from "../events_generators";
 import reloadAfterSwitch from "../reload_after_switch";
 import RepresentationStream from "../representation";
 import createRepresentationEstimator from "./create_representation_estimator";
-var DELTA_POSITION_AFTER_RELOAD = config.DELTA_POSITION_AFTER_RELOAD;
 /**
  * Create new AdaptationStream Observable, which task will be to download the
  * media data for a given Adaptation (i.e. "track").
@@ -48,7 +47,7 @@ var DELTA_POSITION_AFTER_RELOAD = config.DELTA_POSITION_AFTER_RELOAD;
  * @returns {Observable}
  */
 export default function AdaptationStream(_a) {
-    var abrManager = _a.abrManager, playbackObserver = _a.playbackObserver, content = _a.content, options = _a.options, segmentBuffer = _a.segmentBuffer, segmentFetcherCreator = _a.segmentFetcherCreator, wantedBufferAhead = _a.wantedBufferAhead;
+    var abrManager = _a.abrManager, playbackObserver = _a.playbackObserver, content = _a.content, options = _a.options, segmentBuffer = _a.segmentBuffer, segmentFetcherCreator = _a.segmentFetcherCreator, wantedBufferAhead = _a.wantedBufferAhead, maxVideoBufferSize = _a.maxVideoBufferSize;
     var directManualBitrateSwitching = options.manualBitrateSwitchingMode === "direct";
     var manifest = content.manifest, period = content.period, adaptation = content.adaptation;
     /**
@@ -120,6 +119,7 @@ export default function AdaptationStream(_a) {
         if (directManualBitrateSwitching &&
             fromEstimate.manual &&
             !isFirstEstimate) {
+            var DELTA_POSITION_AFTER_RELOAD = config.getCurrent().DELTA_POSITION_AFTER_RELOAD;
             return reloadAfterSwitch(period, adaptation.type, playbackObserver, DELTA_POSITION_AFTER_RELOAD.bitrateSwitch);
         }
         /**
@@ -187,9 +187,12 @@ export default function AdaptationStream(_a) {
                 1;
             bufferGoalRatioMap[representation.id] = bufferGoalRatio;
             var bufferGoal$ = wantedBufferAhead.asObservable().pipe(map(function (wba) { return wba * bufferGoalRatio; }));
+            // eslint-disable-next-line max-len
+            var maxBufferSize$ = adaptation.type === "video" ? maxVideoBufferSize.asObservable() :
+                observableOf(Infinity);
             log.info("Stream: changing representation", adaptation.type, representation.id, representation.bitrate);
             return RepresentationStream({ playbackObserver: playbackObserver, content: { representation: representation, adaptation: adaptation, period: period, manifest: manifest }, segmentBuffer: segmentBuffer, segmentFetcher: segmentFetcher, terminate$: terminateCurrentStream$,
-                options: { bufferGoal$: bufferGoal$, drmSystemId: options.drmSystemId, fastSwitchThreshold$: fastSwitchThreshold$ } })
+                options: { bufferGoal$: bufferGoal$, maxBufferSize$: maxBufferSize$, drmSystemId: options.drmSystemId, fastSwitchThreshold$: fastSwitchThreshold$ } })
                 .pipe(catchError(function (err) {
                 var formattedError = formatError(err, {
                     defaultCode: "NONE",

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

@@ -15,8 +15,8 @@
  */
 import { Subject } from "rxjs";
 import { ICustomError } from "../../errors";
-import { Adaptation, ISegment, Period, Representation } from "../../manifest";
-import { IContentProtection } from "../eme";
+import Manifest, { Adaptation, ISegment, Period, Representation } from "../../manifest";
+import { IRepresentationProtectionData } from "../../manifest/representation";
 import { IBufferType } from "../segment_buffers";
 import { IActivePeriodChangedEvent, IAdaptationChangeEvent, IBitrateEstimationChangeEvent, ICompletedStreamEvent, IEncryptionDataEncounteredEvent, IEndOfStreamEvent, ILockedStreamEvent, INeedsBufferFlushEvent, INeedsDecipherabilityFlush, INeedsMediaSourceReload, IPeriodStreamClearedEvent, IPeriodStreamReadyEvent, IRepresentationChangeEvent, IResumeStreamEvent, IStreamEventAddedSegment, IStreamManifestMightBeOutOfSync, IStreamNeedsManifestRefresh, IStreamTerminatingEvent, IStreamWarningEvent, IWaitingMediaSourceReloadInternalEvent } from "./types";
 declare const EVENTS: {
@@ -52,7 +52,12 @@ declare const EVENTS: {
     needsDecipherabilityFlush(position: number, autoPlay: boolean, duration: number): INeedsDecipherabilityFlush;
     periodStreamReady(type: IBufferType, period: Period, adaptation$: Subject<Adaptation | null>): IPeriodStreamReadyEvent;
     periodStreamCleared(type: IBufferType, period: Period): IPeriodStreamClearedEvent;
-    encryptionDataEncountered(initDataInfo: IContentProtection): IEncryptionDataEncounteredEvent;
+    encryptionDataEncountered(reprProtData: IRepresentationProtectionData, content: {
+        manifest: Manifest;
+        period: Period;
+        adaptation: Adaptation;
+        representation: Representation;
+    }): IEncryptionDataEncounteredEvent;
     representationChange(type: IBufferType, period: Period, representation: Representation): IRepresentationChangeEvent;
     streamTerminating(): IStreamTerminatingEvent;
     resumeStream(): IResumeStreamEvent;

package/dist/_esm5.processed/core/stream/events_generators.js

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import objectAssign from "../../utils/object_assign";
 var EVENTS = {
     activePeriodChanged: function (period) {
         return { type: "activePeriodChanged",
@@ -84,9 +85,9 @@ var EVENTS = {
         return { type: "periodStreamCleared",
             value: { type: type, period: period } };
     },
-    encryptionDataEncountered: function (initDataInfo) {
+    encryptionDataEncountered: function (reprProtData, content) {
         return { type: "encryption-data-encountered",
-            value: initDataInfo };
+            value: objectAssign({ content: content }, reprProtData) };
     },
     representationChange: function (type, period, representation) {
         return { type: "representationChange",

package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.d.ts

@@ -26,6 +26,7 @@ export declare type IStreamOrchestratorPlaybackObservation = IPeriodStreamPlayba
 /** Options tweaking the behavior of the StreamOrchestrator. */
 export declare type IStreamOrchestratorOptions = IPeriodStreamOptions & {
     wantedBufferAhead: IReadOnlySharedReference<number>;
+    maxVideoBufferSize: IReadOnlySharedReference<number>;
     maxBufferAhead: IReadOnlySharedReference<number>;
     maxBufferBehind: IReadOnlySharedReference<number>;
 };

package/dist/_esm5.processed/core/stream/orchestrator/stream_orchestrator.js

@@ -37,7 +37,6 @@ import PeriodStream from "../period";
 import ActivePeriodEmitter from "./active_period_emitter";
 import areStreamsComplete from "./are_streams_complete";
 import getBlacklistedRanges from "./get_blacklisted_ranges";
-var MAXIMUM_MAX_BUFFER_AHEAD = config.MAXIMUM_MAX_BUFFER_AHEAD, MAXIMUM_MAX_BUFFER_BEHIND = config.MAXIMUM_MAX_BUFFER_BEHIND;
 /**
  * Create and manage the various Stream Observables needed for the content to
  * play:
@@ -65,7 +64,8 @@ var MAXIMUM_MAX_BUFFER_AHEAD = config.MAXIMUM_MAX_BUFFER_AHEAD, MAXIMUM_MAX_BUFF
  */
 export default function StreamOrchestrator(content, playbackObserver, abrManager, segmentBuffersStore, segmentFetcherCreator, options) {
     var manifest = content.manifest, initialPeriod = content.initialPeriod;
-    var maxBufferAhead = options.maxBufferAhead, maxBufferBehind = options.maxBufferBehind, wantedBufferAhead = options.wantedBufferAhead;
+    var maxBufferAhead = options.maxBufferAhead, maxBufferBehind = options.maxBufferBehind, wantedBufferAhead = options.wantedBufferAhead, maxVideoBufferSize = options.maxVideoBufferSize;
+    var _a = config.getCurrent(), MAXIMUM_MAX_BUFFER_AHEAD = _a.MAXIMUM_MAX_BUFFER_AHEAD, MAXIMUM_MAX_BUFFER_BEHIND = _a.MAXIMUM_MAX_BUFFER_BEHIND;
     // Keep track of a unique BufferGarbageCollector created per
     // SegmentBuffer.
     var garbageCollectors = new WeakMapMemory(function (segmentBuffer) {
@@ -315,7 +315,7 @@ export default function StreamOrchestrator(content, playbackObserver, abrManager
         );
         // Will emit when the current Stream should be destroyed.
         var killCurrentStream$ = observableMerge(endOfCurrentStream$, destroyAll$);
-        var periodStream$ = PeriodStream({ abrManager: abrManager, bufferType: bufferType, content: { manifest: manifest, period: basePeriod }, garbageCollectors: garbageCollectors, segmentFetcherCreator: segmentFetcherCreator, segmentBuffersStore: segmentBuffersStore, options: options, playbackObserver: playbackObserver, wantedBufferAhead: wantedBufferAhead }).pipe(mergeMap(function (evt) {
+        var periodStream$ = PeriodStream({ abrManager: abrManager, bufferType: bufferType, content: { manifest: manifest, period: basePeriod }, garbageCollectors: garbageCollectors, segmentFetcherCreator: segmentFetcherCreator, segmentBuffersStore: segmentBuffersStore, options: options, playbackObserver: playbackObserver, wantedBufferAhead: wantedBufferAhead, maxVideoBufferSize: maxVideoBufferSize }).pipe(mergeMap(function (evt) {
             if (evt.type === "stream-status") {
                 if (evt.value.hasFinishedLoading) {
                     var nextPeriod = manifest.getPeriodAfter(basePeriod);

package/dist/_esm5.processed/core/stream/period/create_empty_adaptation_stream.js

@@ -31,7 +31,8 @@ export default function createEmptyAdaptationStream(playbackObserver, wantedBuff
     var hasFinishedLoading = false;
     var wantedBufferAhead$ = wantedBufferAhead.asObservable();
     var observation$ = playbackObserver.observe(true);
-    return observableCombineLatest([observation$, wantedBufferAhead$]).pipe(mergeMap(function (_a) {
+    return observableCombineLatest([observation$,
+        wantedBufferAhead$]).pipe(mergeMap(function (_a) {
         var observation = _a[0], wba = _a[1];
         var position = observation.position;
         if (period.end !== undefined && position + wba >= period.end) {

package/dist/_esm5.processed/core/stream/period/get_adaptation_switch_strategy.js

@@ -16,7 +16,6 @@
 import config from "../../../config";
 import areCodecsCompatible from "../../../utils/are_codecs_compatible";
 import { convertToRanges, excludeFromRanges, isTimeInRange, isTimeInRanges, keepRangeIntersection, } from "../../../utils/ranges";
-var ADAPTATION_SWITCH_BUFFER_PADDINGS = config.ADAPTATION_SWITCH_BUFFER_PADDINGS;
 /**
  * Find out what to do when switching Adaptation, based on the current
  * situation.
@@ -92,6 +91,7 @@ export default function getAdaptationSwitchStrategy(segmentBuffer, period, adapt
     }
     // Next, exclude data around current position to avoid decoding issues
     var bufferType = adaptation.type;
+    var ADAPTATION_SWITCH_BUFFER_PADDINGS = config.getCurrent().ADAPTATION_SWITCH_BUFFER_PADDINGS;
     /** Ranges that won't be cleaned from the current buffer. */
     var paddingBefore = ADAPTATION_SWITCH_BUFFER_PADDINGS[bufferType].before;
     if (paddingBefore == null) {

package/dist/_esm5.processed/core/stream/period/period_stream.d.ts

@@ -60,6 +60,7 @@ export interface IPeriodStreamArguments {
     playbackObserver: IReadOnlyPlaybackObserver<IPeriodStreamPlaybackObservation>;
     options: IPeriodStreamOptions;
     wantedBufferAhead: IReadOnlySharedReference<number>;
+    maxVideoBufferSize: IReadOnlySharedReference<number>;
 }
 /** Options tweaking the behavior of the PeriodStream. */
 export declare type IPeriodStreamOptions = IAdaptationStreamOptions & {
@@ -89,4 +90,4 @@ export declare type IPeriodStreamOptions = IAdaptationStreamOptions & {
  * @param {Object} args
  * @returns {Observable}
  */
-export default function PeriodStream({ abrManager, bufferType, content, garbageCollectors, playbackObserver, segmentFetcherCreator, segmentBuffersStore, options, wantedBufferAhead, }: IPeriodStreamArguments): Observable<IPeriodStreamEvent>;
+export default function PeriodStream({ abrManager, bufferType, content, garbageCollectors, playbackObserver, segmentFetcherCreator, segmentBuffersStore, options, wantedBufferAhead, maxVideoBufferSize, }: IPeriodStreamArguments): Observable<IPeriodStreamEvent>;

package/dist/_esm5.processed/core/stream/period/period_stream.js

@@ -25,7 +25,6 @@ import EVENTS from "../events_generators";
 import reloadAfterSwitch from "../reload_after_switch";
 import createEmptyStream from "./create_empty_adaptation_stream";
 import getAdaptationSwitchStrategy from "./get_adaptation_switch_strategy";
-var DELTA_POSITION_AFTER_RELOAD = config.DELTA_POSITION_AFTER_RELOAD;
 /**
  * Create single PeriodStream Observable:
  *   - Lazily create (or reuse) a SegmentBuffer for the given type.
@@ -37,7 +36,7 @@ var DELTA_POSITION_AFTER_RELOAD = config.DELTA_POSITION_AFTER_RELOAD;
  * @returns {Observable}
  */
 export default function PeriodStream(_a) {
-    var abrManager = _a.abrManager, bufferType = _a.bufferType, content = _a.content, garbageCollectors = _a.garbageCollectors, playbackObserver = _a.playbackObserver, segmentFetcherCreator = _a.segmentFetcherCreator, segmentBuffersStore = _a.segmentBuffersStore, options = _a.options, wantedBufferAhead = _a.wantedBufferAhead;
+    var abrManager = _a.abrManager, bufferType = _a.bufferType, content = _a.content, garbageCollectors = _a.garbageCollectors, playbackObserver = _a.playbackObserver, segmentFetcherCreator = _a.segmentFetcherCreator, segmentBuffersStore = _a.segmentBuffersStore, options = _a.options, wantedBufferAhead = _a.wantedBufferAhead, maxVideoBufferSize = _a.maxVideoBufferSize;
     var period = content.period;
     // Emits the chosen Adaptation for the current type.
     // `null` when no Adaptation is chosen (e.g. no subtitles)
@@ -50,6 +49,7 @@ export default function PeriodStream(_a) {
          * This value contains this relative position, in seconds.
          * @see reloadAfterSwitch
          */
+        var DELTA_POSITION_AFTER_RELOAD = config.getCurrent().DELTA_POSITION_AFTER_RELOAD;
         var relativePosAfterSwitch = switchNb === 0 ? 0 :
             bufferType === "audio" ? DELTA_POSITION_AFTER_RELOAD.trackSwitch.audio :
                 bufferType === "video" ? DELTA_POSITION_AFTER_RELOAD.trackSwitch.video :
@@ -118,7 +118,7 @@ export default function PeriodStream(_a) {
     function createAdaptationStream(adaptation, segmentBuffer) {
         var manifest = content.manifest;
         var adaptationPlaybackObserver = createAdaptationStreamPlaybackObserver(playbackObserver, segmentBuffer);
-        return AdaptationStream({ abrManager: abrManager, content: { manifest: manifest, period: period, adaptation: adaptation }, options: options, playbackObserver: adaptationPlaybackObserver, segmentBuffer: segmentBuffer, segmentFetcherCreator: segmentFetcherCreator, wantedBufferAhead: wantedBufferAhead }).pipe(catchError(function (error) {
+        return AdaptationStream({ abrManager: abrManager, content: { manifest: manifest, period: period, adaptation: adaptation }, options: options, playbackObserver: adaptationPlaybackObserver, segmentBuffer: segmentBuffer, segmentFetcherCreator: segmentFetcherCreator, wantedBufferAhead: wantedBufferAhead, maxVideoBufferSize: maxVideoBufferSize }).pipe(catchError(function (error) {
             // Stream linked to a non-native media buffer should not impact the
             // stability of the player. ie: if a text buffer sends an error, we want
             // to continue playing without any subtitles

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

@@ -17,8 +17,6 @@ import { concatAll, defer as observableDefer, from as observableFrom, } from "rx
 import config from "../../../config";
 import log from "../../../log";
 import { getInnerAndOuterTimeRanges } from "../../../utils/ranges";
-var GC_GAP_CALM = config.BUFFER_GC_GAPS.CALM;
-var GC_GAP_BEEFY = config.BUFFER_GC_GAPS.BEEFY;
 /**
  * Run the garbage collector.
  *
@@ -31,6 +29,8 @@ var GC_GAP_BEEFY = config.BUFFER_GC_GAPS.BEEFY;
  */
 export default function forceGarbageCollection(currentPosition, bufferingQueue) {
     return observableDefer(function () {
+        var GC_GAP_CALM = config.getCurrent().BUFFER_GC_GAPS.CALM;
+        var GC_GAP_BEEFY = config.getCurrent().BUFFER_GC_GAPS.BEEFY;
         log.warn("Stream: Running garbage collector");
         var buffered = bufferingQueue.getBufferedRanges();
         var cleanedupRanges = selectGCedRanges(currentPosition, buffered, GC_GAP_CALM);
@@ -63,18 +63,17 @@ function selectGCedRanges(position, buffered, gcGap) {
     var cleanedupRanges = [];
     // start by trying to remove all ranges that do not contain the
     // current time and respect the gcGap
-    // respect the gcGap? FIXME?
     for (var i = 0; i < outerRanges.length; i++) {
         var outerRange = outerRanges[i];
-        if (position - gcGap < outerRange.end) {
+        if (position - gcGap > outerRange.end) {
             cleanedupRanges.push(outerRange);
         }
-        else if (position + gcGap > outerRange.start) {
+        else if (position + gcGap < outerRange.start) {
             cleanedupRanges.push(outerRange);
         }
     }
     // try to clean up some space in the current range
-    if (innerRange != null) {
+    if (innerRange !== null) {
         log.debug("Stream: GC removing part of inner range", cleanedupRanges);
         if (position - gcGap > innerRange.start) {
             cleanedupRanges.push({ start: innerRange.start,

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

@@ -42,6 +42,11 @@ export interface IBufferStatus {
      * on which segments should be loaded.
      */
     shouldRefreshManifest: boolean;
+    /**
+     * If 'true', the buffer memory is saturated before being able to download
+     * at least MIN_REQUIRED_BUFFER_AHEAD ( default : 10sec )
+     */
+    isBufferFull: boolean;
 }
 /**
  * Checks on the current buffered data for the given type and Period
@@ -62,4 +67,4 @@ export default function getBufferStatus(content: {
     manifest: Manifest;
     period: Period;
     representation: Representation;
-}, wantedStartPosition: number, playbackObserver: IReadOnlyPlaybackObserver<unknown>, fastSwitchThreshold: number | undefined, bufferGoal: number, segmentBuffer: SegmentBuffer): IBufferStatus;
+}, wantedStartPosition: number, playbackObserver: IReadOnlyPlaybackObserver<unknown>, fastSwitchThreshold: number | undefined, bufferGoal: number, maxBufferSize: number, segmentBuffer: SegmentBuffer): IBufferStatus;