rx-player 3.26.1 → 3.26.2

package/dist/_esm5.processed/core/segment_buffers/garbage_collector.js

@@ -13,21 +13,20 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { combineLatest as observableCombineLatest, EMPTY, from as observableFrom, } from "rxjs";
-import { concatAll, ignoreElements, mergeMap, } from "rxjs/operators";
+import { combineLatest as observableCombineLatest, concatAll, EMPTY, from as observableFrom, ignoreElements, mergeMap, } from "rxjs";
 import log from "../../log";
 import { getInnerAndOuterTimeRanges } from "../../utils/ranges";
 /**
  * Perform cleaning of the buffer according to the values set by the user
- * at each clock tick and each times the maxBufferBehind/maxBufferAhead values
- * change.
+ * each time `currentTime$` emits and each times the
+ * maxBufferBehind/maxBufferAhead values change.
  *
  * @param {Object} opt
  * @returns {Observable}
  */
 export default function BufferGarbageCollector(_a) {
-    var segmentBuffer = _a.segmentBuffer, clock$ = _a.clock$, maxBufferBehind$ = _a.maxBufferBehind$, maxBufferAhead$ = _a.maxBufferAhead$;
-    return observableCombineLatest([clock$, maxBufferBehind$, maxBufferAhead$]).pipe(mergeMap(function (_a) {
+    var segmentBuffer = _a.segmentBuffer, currentTime$ = _a.currentTime$, maxBufferBehind$ = _a.maxBufferBehind$, maxBufferAhead$ = _a.maxBufferAhead$;
+    return observableCombineLatest([currentTime$, maxBufferBehind$, maxBufferAhead$]).pipe(mergeMap(function (_a) {
         var currentTime = _a[0], maxBufferBehind = _a[1], maxBufferAhead = _a[2];
         return clearBuffer(segmentBuffer, currentTime, maxBufferBehind, maxBufferAhead);
     }));
@@ -107,6 +106,12 @@ function clearBuffer(segmentBuffer, position, maxBufferBehind, maxBufferAhead) {
     var clean$ = observableFrom(cleanedupRanges.map(function (range) {
         log.debug("GC: cleaning range from SegmentBuffer", range);
         return segmentBuffer.removeBuffer(range.start, range.end);
-    })).pipe(concatAll(), ignoreElements());
+    })).pipe(concatAll(), 
+    // NOTE As of now (RxJS 7.4.0), RxJS defines `ignoreElements` default
+    // first type parameter as `any` instead of the perfectly fine `unknown`,
+    // leading to linter issues, as it forbids the usage of `any`.
+    // This is why we're disabling the eslint rule.
+    /* eslint-disable-next-line @typescript-eslint/no-unsafe-argument */
+    ignoreElements());
     return clean$;
 }

package/dist/_esm5.processed/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.js

@@ -28,11 +28,11 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { fromEvent, interval, Observable, Subject, } from "rxjs";
-import { takeUntil, tap, } from "rxjs/operators";
+import { fromEvent, interval, Observable, Subject, takeUntil, tap, } from "rxjs";
 import { tryToChangeSourceBufferType, } from "../../../../compat";
 import config from "../../../../config";
 import log from "../../../../log";
+import { getLoggableSegmentId } from "../../../../manifest";
 import areArraysOfNumbersEqual from "../../../../utils/are_arrays_of_numbers_equal";
 import assertUnreachable from "../../../../utils/assert_unreachable";
 import { toUint8Array } from "../../../../utils/byte_parsing";
@@ -108,7 +108,7 @@ var AudioVideoSegmentBuffer = /** @class */ (function (_super) {
      */
     AudioVideoSegmentBuffer.prototype.pushChunk = function (infos) {
         assertPushedDataIsBufferSource(infos);
-        log.debug("AVSB: receiving order to push data to the SourceBuffer", this.bufferType, infos);
+        log.debug("AVSB: receiving order to push data to the SourceBuffer", this.bufferType, getLoggableSegmentId(infos.inventoryInfos));
         return this._addToQueue({ type: SegmentBufferOperation.Push,
             value: infos });
     };
@@ -133,7 +133,7 @@ var AudioVideoSegmentBuffer = /** @class */ (function (_super) {
      * @returns {Observable}
      */
     AudioVideoSegmentBuffer.prototype.endOfSegment = function (infos) {
-        log.debug("AVSB: receiving order for validating end of segment", this.bufferType, infos.segment);
+        log.debug("AVSB: receiving order for validating end of segment", this.bufferType, getLoggableSegmentId(infos));
         return this._addToQueue({ type: SegmentBufferOperation.EndOfSegment,
             value: infos });
     };
@@ -192,7 +192,7 @@ var AudioVideoSegmentBuffer = /** @class */ (function (_super) {
                 this._sourceBuffer.abort();
             }
             catch (e) {
-                log.warn("AVSB: Failed to abort a " + this.bufferType + " SourceBuffer:", e);
+                log.warn("AVSB: Failed to abort a ".concat(this.bufferType, " SourceBuffer:"), e);
             }
         }
     };
@@ -312,7 +312,7 @@ var AudioVideoSegmentBuffer = /** @class */ (function (_super) {
             switch (this._pendingTask.type) {
                 case SegmentBufferOperation.EndOfSegment:
                     // nothing to do, we will just acknowledge the segment.
-                    log.debug("AVSB: Acknowledging complete segment", this._pendingTask.value);
+                    log.debug("AVSB: Acknowledging complete segment", getLoggableSegmentId(this._pendingTask.value));
                     this._flush();
                     return;
                 case SegmentBufferOperation.Push:
@@ -321,6 +321,7 @@ var AudioVideoSegmentBuffer = /** @class */ (function (_super) {
                         this._flush();
                         return;
                     }
+                    log.debug("AVSB: pushing segment", this.bufferType, getLoggableSegmentId(this._pendingTask.inventoryData));
                     this._sourceBuffer.appendBuffer(segmentData);
                     break;
                 case SegmentBufferOperation.Remove:
@@ -434,7 +435,7 @@ export default AudioVideoSegmentBuffer;
  * @param {Object} pushedData
  */
 function assertPushedDataIsBufferSource(pushedData) {
-    if (!false) {
+    if (0 /* CURRENT_ENV */ === 0 /* PRODUCTION */) {
         return;
     }
     var _a = pushedData.data, chunk = _a.chunk, initSegment = _a.initSegment;

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

@@ -28,8 +28,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { concat as observableConcat, defer as observableDefer, interval as observableInterval, merge as observableMerge, of as observableOf, Subject, } from "rxjs";
-import { mapTo, startWith, switchMapTo, takeUntil, } from "rxjs/operators";
+import { concat as observableConcat, defer as observableDefer, interval as observableInterval, map, merge as observableMerge, of as observableOf, startWith, Subject, switchMap, takeUntil, } from "rxjs";
 import { events, onHeightWidthChange, } from "../../../../../compat";
 import config from "../../../../../config";
 import log from "../../../../../log";
@@ -41,18 +40,18 @@ import updateProportionalElements from "./update_proportional_elements";
 var onEnded$ = events.onEnded$, onSeeked$ = events.onSeeked$, onSeeking$ = events.onSeeking$;
 var MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL = config.MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL, TEXT_TRACK_SIZE_CHECKS_INTERVAL = config.TEXT_TRACK_SIZE_CHECKS_INTERVAL;
 /**
- * Generate the clock at which TextTrack HTML Cues should be refreshed.
+ * Generate the interval at which TextTrack HTML Cues should be refreshed.
  * @param {HTMLMediaElement} videoElement
  * @returns {Observable}
  */
-function generateClock(videoElement) {
+function generateRefreshInterval(videoElement) {
     var seeking$ = onSeeking$(videoElement);
     var seeked$ = onSeeked$(videoElement);
     var ended$ = onEnded$(videoElement);
     var manualRefresh$ = observableMerge(seeked$, ended$);
     var autoRefresh$ = observableInterval(MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL)
         .pipe(startWith(null));
-    return manualRefresh$.pipe(startWith(null), switchMapTo(observableConcat(autoRefresh$.pipe(mapTo(true), takeUntil(seeking$)), observableOf(false))));
+    return manualRefresh$.pipe(startWith(null), switchMap(function () { return observableConcat(autoRefresh$.pipe(map(function () { return true; }), takeUntil(seeking$)), observableOf(false)); }));
 }
 /**
  * @param {Element} element
@@ -107,7 +106,7 @@ var HTMLTextSegmentBuffer = /** @class */ (function (_super) {
         _this._buffer = new TextTrackCuesStore();
         _this._currentCues = [];
         // update text tracks
-        generateClock(_this._videoElement)
+        generateRefreshInterval(_this._videoElement)
             .pipe(takeUntil(_this._destroy$))
             .subscribe(function (shouldDisplay) {
             if (!shouldDisplay) {
@@ -338,7 +337,7 @@ export default HTMLTextSegmentBuffer;
  * @param {Object} chunk
  */
 function assertChunkIsTextTrackSegmentData(chunk) {
-    if (!false) {
+    if (0 /* CURRENT_ENV */ === 0 /* PRODUCTION */) {
         return;
     }
     if (typeof chunk !== "object" ||
@@ -348,9 +347,9 @@ function assertChunkIsTextTrackSegmentData(chunk) {
         (chunk.language !== undefined &&
             typeof chunk.language !== "string") ||
         (chunk.start !== undefined &&
-            typeof chunk.start !== "string") ||
+            typeof chunk.start !== "number") ||
         (chunk.end !== undefined &&
-            typeof chunk.end !== "string")) {
+            typeof chunk.end !== "number")) {
         throw new Error("Invalid format given to a NativeTextSegmentBuffer");
     }
 }
@@ -363,7 +362,7 @@ function assertChunkIsTextTrackSegmentData(chunk) {
  * It doesn't correspond at all to real code that will be called. This is just
  * a hack to tell TypeScript to perform that check.
  */
-if (false) {
+if (0 /* CURRENT_ENV */ === 1 /* DEV */) {
     /* eslint-disable @typescript-eslint/no-unused-vars */
     /* eslint-disable @typescript-eslint/ban-ts-comment */
     // @ts-ignore

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

@@ -68,7 +68,7 @@ var TextTrackCuesStore = /** @class */ (function () {
      * @param {Number} to
      */
     TextTrackCuesStore.prototype.remove = function (from, _to) {
-        if (false) {
+        if (0 /* CURRENT_ENV */ === 1 /* DEV */) {
             assert(from >= 0);
             assert(_to >= 0);
             assert(_to > from);

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

@@ -230,7 +230,7 @@ export default NativeTextSegmentBuffer;
  * @param {Object} chunk
  */
 function assertChunkIsTextTrackSegmentData(chunk) {
-    if (!false) {
+    if (0 /* CURRENT_ENV */ === 0 /* PRODUCTION */) {
         return;
     }
     if (typeof chunk !== "object" ||
@@ -240,9 +240,9 @@ function assertChunkIsTextTrackSegmentData(chunk) {
         (chunk.language !== undefined &&
             typeof chunk.language !== "string") ||
         (chunk.start !== undefined &&
-            typeof chunk.start !== "string") ||
+            typeof chunk.start !== "number") ||
         (chunk.end !== undefined &&
-            typeof chunk.end !== "string")) {
+            typeof chunk.end !== "number")) {
         throw new Error("Invalid format given to a NativeTextSegmentBuffer");
     }
 }
@@ -255,7 +255,7 @@ function assertChunkIsTextTrackSegmentData(chunk) {
  * It doesn't correspond at all to real code that will be called. This is just
  * a hack to tell TypeScript to perform that check.
  */
-if (false) {
+if (0 /* CURRENT_ENV */ === 1 /* DEV */) {
     /* eslint-disable @typescript-eslint/no-unused-vars */
     /* eslint-disable @typescript-eslint/ban-ts-comment */
     // @ts-ignore

package/dist/_esm5.processed/core/segment_buffers/implementations/utils/manual_time_ranges.js

@@ -26,7 +26,7 @@ var ManualTimeRanges = /** @class */ (function () {
         this.length = 0;
     }
     ManualTimeRanges.prototype.insert = function (start, end) {
-        if (false) {
+        if (0 /* CURRENT_ENV */ === 1 /* DEV */) {
             assert(start >= 0, "invalid start time");
             assert(end - start > 0, "invalid end time");
         }
@@ -34,7 +34,7 @@ var ManualTimeRanges = /** @class */ (function () {
         this.length = this._ranges.length;
     };
     ManualTimeRanges.prototype.remove = function (start, end) {
-        if (false) {
+        if (0 /* CURRENT_ENV */ === 1 /* DEV */) {
             assert(start >= 0, "invalid start time");
             assert(end - start > 0, "invalid end time");
         }

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

@@ -79,11 +79,11 @@ var BufferedHistory = /** @class */ (function () {
             }
         }
         if (firstKeptIndex > 0) {
-            this._history.splice(firstKeptIndex);
+            this._history = this._history.splice(firstKeptIndex);
         }
         if (this._history.length > this._maxHistoryLength) {
             var toRemove = this._history.length - this._maxHistoryLength;
-            this._history.splice(toRemove);
+            this._history = this._history.splice(toRemove);
         }
     };
     return BufferedHistory;

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

@@ -32,16 +32,7 @@ export interface IBufferedChunk {
      * synchronization for that chunk this value could be more or less precize.
      */
     bufferedStart: number | undefined;
-    /**
-     * Supposed end, in seconds, the chunk is expected to end at.
-     *
-     * If the current `chunk` is part of a "partially pushed" segment (see
-     * `partiallyPushed`), the definition of this property is flexible in the way
-     * that it can correspond either to the end of the chunk or to the end of the
-     * whole segment the chunk is linked to.
-     * As such, this property should not be relied on until the segment has been
-     * fully-pushed.
-     */
+    /** Supposed end, in seconds, the chunk is expected to end at. */
     end: number;
     /**
      * If `true` the `end` property is an estimate the `SegmentInventory` has
@@ -65,8 +56,6 @@ export interface IBufferedChunk {
     infos: IChunkContext;
     /**
      * If `true`, this chunk is only a partial chunk of a whole segment.
-     * In this condition, the `start` and `end` properties may be ignored, as it
-     * is unclear if they refer to the chunk or to the whole segment.
      *
      * Inversely, if `false`, this chunk is a whole segment whose inner chunks
      * have all been fully pushed.

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

@@ -92,7 +92,7 @@ var SegmentInventory = /** @class */ (function () {
                     end: takeFirstSet(lastDeletedSegment.bufferedEnd, lastDeletedSegment.end),
                     precizeEnd: lastDeletedSegment.precizeEnd,
                 };
-                log.debug("SI: " + numberOfSegmentToDelete + " segments GCed.", bufferType);
+                log.debug("SI: ".concat(numberOfSegmentToDelete, " segments GCed."), bufferType);
                 inventory.splice(indexBefore, numberOfSegmentToDelete);
                 inventoryIndex = indexBefore;
             }
@@ -150,7 +150,7 @@ var SegmentInventory = /** @class */ (function () {
             inventory.splice(inventoryIndex, inventory.length - inventoryIndex);
         }
         if (bufferType !== undefined && log.getLevel() === "DEBUG") {
-            log.debug("SI: current " + bufferType + " inventory timeline:\n" +
+            log.debug("SI: current ".concat(bufferType, " inventory timeline:\n") +
                 prettyPrintInventory(this._inventory));
         }
     };
@@ -765,17 +765,17 @@ function prettyPrintInventory(inventory) {
                 currentLetter = encounteredPeriod[representationId];
             }
             if (lastChunk === null) {
-                str += chunk.bufferedStart.toFixed(2) + "|" + currentLetter + "|";
+                str += "".concat(chunk.bufferedStart.toFixed(2), "|").concat(currentLetter, "|");
             }
             else if (lastLetter === currentLetter) {
                 if (lastChunk.bufferedEnd + roundingError < chunk.bufferedStart) {
-                    str += lastChunk.bufferedEnd.toFixed(2) + " ~ " +
-                        (chunk.bufferedStart.toFixed(2) + "|" + currentLetter + "|");
+                    str += "".concat(lastChunk.bufferedEnd.toFixed(2), " ~ ") +
+                        "".concat(chunk.bufferedStart.toFixed(2), "|").concat(currentLetter, "|");
                 }
             }
             else {
-                str += lastChunk.bufferedEnd.toFixed(2) + " ~ " +
-                    (chunk.bufferedStart.toFixed(2) + "|" + currentLetter + "|");
+                str += "".concat(lastChunk.bufferedEnd.toFixed(2), " ~ ") +
+                    "".concat(chunk.bufferedStart.toFixed(2), "|").concat(currentLetter, "|");
             }
             lastChunk = chunk;
             lastLetter = currentLetter;
@@ -786,9 +786,9 @@ function prettyPrintInventory(inventory) {
     }
     letters.forEach(function (letterInfo) {
         var _a;
-        str += "\n[" + letterInfo.letter + "] " +
-            ("P: " + letterInfo.periodId + " || R: " + letterInfo.representationId) +
-            ("(" + ((_a = letterInfo.bitrate) !== null && _a !== void 0 ? _a : "unknown bitrate") + ")");
+        str += "\n[".concat(letterInfo.letter, "] ") +
+            "P: ".concat(letterInfo.periodId, " || R: ").concat(letterInfo.representationId) +
+            "(".concat((_a = letterInfo.bitrate) !== null && _a !== void 0 ? _a : "unknown bitrate", ")");
     });
     return str;
 }

package/dist/_esm5.processed/core/segment_buffers/segment_buffers_store.js

@@ -160,7 +160,7 @@ var SegmentBuffersStore = /** @class */ (function () {
     SegmentBuffersStore.prototype.disableSegmentBuffer = function (bufferType) {
         var currentValue = this._initializedSegmentBuffers[bufferType];
         if (currentValue === null) {
-            log.warn("SBS: The " + bufferType + " SegmentBuffer was already disabled.");
+            log.warn("SBS: The ".concat(bufferType, " SegmentBuffer was already disabled."));
             return;
         }
         if (currentValue !== undefined) {

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

@@ -22,15 +22,17 @@
  * ABRManager, and orchestrates a RepresentationStream, which will download and
  * push segments corresponding to a chosen Representation.
  */
-import { BehaviorSubject, Observable } from "rxjs";
+import { Observable } from "rxjs";
 import Manifest, { Adaptation, Period } from "../../../manifest";
+import { IReadOnlySharedReference } from "../../../utils/reference";
 import ABRManager from "../../abr";
+import { IReadOnlyPlaybackObserver } from "../../api";
 import { SegmentFetcherCreator } from "../../fetchers";
 import { SegmentBuffer } from "../../segment_buffers";
-import { IRepresentationStreamClockTick } from "../representation";
+import { IRepresentationStreamPlaybackObservation } from "../representation";
 import { IAdaptationStreamEvent } from "../types";
-/** `Clock tick` information needed by the AdaptationStream. */
-export interface IAdaptationStreamClockTick extends IRepresentationStreamClockTick {
+/** Regular playback information needed by the AdaptationStream. */
+export interface IAdaptationStreamPlaybackObservation extends IRepresentationStreamPlaybackObservation {
     /**
      * For the current SegmentBuffer, difference in seconds between the next position
      * where no segment data is available and the current position.
@@ -38,12 +40,15 @@ export interface IAdaptationStreamClockTick extends IRepresentationStreamClockTi
     bufferGap: number;
     /** `duration` property of the HTMLMediaElement on which the content plays. */
     duration: number;
-    /** Allows to fetch the current position at any time. */
-    getCurrentTime: () => number;
     /** If true, the player has been put on pause. */
     isPaused: boolean;
     /** Last "playback rate" asked by the user. */
     speed: number;
+    /**
+     * Only set for live contents.
+     * Difference between the live edge and the current position, in seconds.
+     */
+    liveGap: number | undefined;
 }
 /** Arguments given when creating a new `AdaptationStream`. */
 export interface IAdaptationStreamArguments {
@@ -52,11 +57,8 @@ export interface IAdaptationStreamArguments {
      * conditions like the current network bandwidth.
      */
     abrManager: ABRManager;
-    /**
-     * Regularly emit playback conditions.
-     * The main AdaptationStream logic will be triggered on each `tick`.
-     */
-    clock$: Observable<IAdaptationStreamClockTick>;
+    /** Regularly emit playback conditions. */
+    playbackObserver: IReadOnlyPlaybackObserver<IAdaptationStreamPlaybackObservation>;
     /** Content you want to create this Stream for. */
     content: {
         manifest: Manifest;
@@ -73,7 +75,7 @@ export interface IAdaptationStreamArguments {
      * position in the current SegmentBuffer. When this amount has been reached
      * this AdaptationStream won't try to download new segments.
      */
-    wantedBufferAhead$: BehaviorSubject<number>;
+    wantedBufferAhead: IReadOnlySharedReference<number>;
 }
 /**
  * Various specific stream "options" which tweak the behavior of the
@@ -130,4 +132,4 @@ export interface IAdaptationStreamOptions {
  * @param {Object} args
  * @returns {Observable}
  */
-export default function AdaptationStream({ abrManager, clock$, content, options, segmentBuffer, segmentFetcherCreator, wantedBufferAhead$, }: IAdaptationStreamArguments): Observable<IAdaptationStreamEvent>;
+export default function AdaptationStream({ abrManager, playbackObserver, content, options, segmentBuffer, segmentFetcherCreator, wantedBufferAhead, }: IAdaptationStreamArguments): Observable<IAdaptationStreamEvent>;

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

@@ -22,12 +22,12 @@
  * ABRManager, and orchestrates a RepresentationStream, which will download and
  * push segments corresponding to a chosen Representation.
  */
-import { BehaviorSubject, concat as observableConcat, defer as observableDefer, EMPTY, merge as observableMerge, of as observableOf, } from "rxjs";
-import { catchError, distinctUntilChanged, exhaustMap, filter, map, mergeMap, share, take, tap, } from "rxjs/operators";
+import { catchError, concat as observableConcat, defer as observableDefer, distinctUntilChanged, EMPTY, exhaustMap, filter, map, merge as observableMerge, mergeMap, of as observableOf, share, take, tap, } from "rxjs";
 import config from "../../../config";
 import { formatError } from "../../../errors";
 import log from "../../../log";
 import deferSubscriptions from "../../../utils/defer_subscriptions";
+import { createSharedReference, } from "../../../utils/reference";
 import EVENTS from "../events_generators";
 import reloadAfterSwitch from "../reload_after_switch";
 import RepresentationStream from "../representation";
@@ -48,7 +48,7 @@ var DELTA_POSITION_AFTER_RELOAD = config.DELTA_POSITION_AFTER_RELOAD;
  * @returns {Observable}
  */
 export default function AdaptationStream(_a) {
-    var abrManager = _a.abrManager, clock$ = _a.clock$, 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;
     var directManualBitrateSwitching = options.manualBitrateSwitchingMode === "direct";
     var manifest = content.manifest, period = content.period, adaptation = content.adaptation;
     /**
@@ -60,25 +60,39 @@ export default function AdaptationStream(_a) {
      * https://developers.google.com/web/updates/2017/10/quotaexceedederror
      */
     var bufferGoalRatioMap = {};
-    var _b = createRepresentationEstimator(content, abrManager, clock$), estimator$ = _b.estimator$, requestFeedback$ = _b.requestFeedback$, streamFeedback$ = _b.streamFeedback$;
+    var _b = createRepresentationEstimator(content, abrManager, playbackObserver.observe(true)), estimator$ = _b.estimator$, abrFeedbacks$ = _b.abrFeedbacks$;
     /** Allows the `RepresentationStream` to easily fetch media segments. */
-    var segmentFetcher = segmentFetcherCreator.createSegmentFetcher(adaptation.type, requestFeedback$);
+    var segmentFetcher = segmentFetcherCreator
+        .createSegmentFetcher(adaptation.type, {
+        onRequestBegin: function (value) {
+            abrFeedbacks$.next({ type: "requestBegin", value: value });
+        },
+        onRequestEnd: function (value) {
+            abrFeedbacks$.next({ type: "requestEnd", value: value });
+        },
+        onProgress: function (value) {
+            abrFeedbacks$.next({ type: "progress", value: value });
+        },
+        onMetrics: function (value) {
+            abrFeedbacks$.next({ type: "metrics", value: value });
+        },
+    });
     /**
-     * Emits each time an estimate is made through the `abrEstimate$` Observable,
-     * starting with the last one.
+     * Stores the last estimate emitted through the `abrEstimate$` Observable,
+     * starting with `null`.
      * This allows to easily rely on that value in inner Observables which might also
      * need the last already-considered value.
      */
-    var lastEstimate$ = new BehaviorSubject(null);
+    var lastEstimate = createSharedReference(null);
     /** Emits abr estimates on Subscription. */
-    var abrEstimate$ = estimator$.pipe(tap(function (estimate) { lastEstimate$.next(estimate); }), deferSubscriptions(), share());
+    var abrEstimate$ = estimator$.pipe(tap(function (estimate) { lastEstimate.setValue(estimate); }), deferSubscriptions(), share());
     /** Emit at each bitrate estimate done by the ABRManager. */
     var bitrateEstimate$ = abrEstimate$.pipe(filter(function (_a) {
         var bitrate = _a.bitrate;
         return bitrate != null;
     }), distinctUntilChanged(function (old, current) { return old.bitrate === current.bitrate; }), map(function (_a) {
         var bitrate = _a.bitrate;
-        log.debug("Stream: new " + adaptation.type + " bitrate estimate", bitrate);
+        log.debug("Stream: new ".concat(adaptation.type, " bitrate estimate"), bitrate);
         return EVENTS.bitrateEstimationChange(adaptation.type, bitrate);
     }));
     /** Recursively create `RepresentationStream`s according to the last estimate. */
@@ -106,13 +120,13 @@ export default function AdaptationStream(_a) {
         if (directManualBitrateSwitching &&
             fromEstimate.manual &&
             !isFirstEstimate) {
-            return reloadAfterSwitch(period, adaptation.type, clock$, DELTA_POSITION_AFTER_RELOAD.bitrateSwitch);
+            return reloadAfterSwitch(period, adaptation.type, playbackObserver, DELTA_POSITION_AFTER_RELOAD.bitrateSwitch);
         }
         /**
          * Emit when the current RepresentationStream should be terminated to make
          * place for a new one (e.g. when switching quality).
          */
-        var terminateCurrentStream$ = lastEstimate$.pipe(filter(function (newEstimate) { return newEstimate === null ||
+        var terminateCurrentStream$ = lastEstimate.asObservable().pipe(filter(function (newEstimate) { return newEstimate === null ||
             newEstimate.representation.id !== representation.id ||
             (newEstimate.manual && !fromEstimate.manual); }), take(1), map(function (newEstimate) {
             if (newEstimate === null) {
@@ -141,21 +155,21 @@ export default function AdaptationStream(_a) {
          */
         var fastSwitchThreshold$ = !options.enableFastSwitching ?
             observableOf(0) : // Do not fast-switch anything
-            lastEstimate$.pipe(map(function (estimate) { return estimate === null ? undefined :
+            lastEstimate.asObservable().pipe(map(function (estimate) { return estimate === null ? undefined :
                 estimate.knownStableBitrate; }), distinctUntilChanged());
         var representationChange$ = observableOf(EVENTS.representationChange(adaptation.type, period, representation));
         return observableConcat(representationChange$, createRepresentationStream(representation, terminateCurrentStream$, fastSwitchThreshold$)).pipe(tap(function (evt) {
             if (evt.type === "representationChange" ||
                 evt.type === "added-segment") {
-                return streamFeedback$.next(evt);
+                return abrFeedbacks$.next(evt);
             }
         }), mergeMap(function (evt) {
             if (evt.type === "stream-terminating") {
-                var lastEstimate = lastEstimate$.getValue();
-                if (lastEstimate === null) {
+                var estimate = lastEstimate.getValue();
+                if (estimate === null) {
                     return EMPTY;
                 }
-                return recursivelyCreateRepresentationStreams(lastEstimate, false);
+                return recursivelyCreateRepresentationStreams(estimate, false);
             }
             return observableOf(evt);
         }));
@@ -172,9 +186,9 @@ export default function AdaptationStream(_a) {
             var bufferGoalRatio = oldBufferGoalRatio != null ? oldBufferGoalRatio :
                 1;
             bufferGoalRatioMap[representation.id] = bufferGoalRatio;
-            var bufferGoal$ = wantedBufferAhead$.pipe(map(function (wba) { return wba * bufferGoalRatio; }));
-            log.info("Stream: changing representation", adaptation.type, representation);
-            return RepresentationStream({ clock$: clock$, content: { representation: representation, adaptation: adaptation, period: period, manifest: manifest }, segmentBuffer: segmentBuffer, segmentFetcher: segmentFetcher, terminate$: terminateCurrentStream$,
+            var bufferGoal$ = wantedBufferAhead.asObservable().pipe(map(function (wba) { return wba * bufferGoalRatio; }));
+            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$ } })
                 .pipe(catchError(function (err) {
                 var formattedError = formatError(err, {
@@ -182,10 +196,9 @@ export default function AdaptationStream(_a) {
                     defaultReason: "Unknown `RepresentationStream` error",
                 });
                 if (formattedError.code === "BUFFER_FULL_ERROR") {
-                    var wantedBufferAhead = wantedBufferAhead$.getValue();
+                    var wba = wantedBufferAhead.getValue();
                     var lastBufferGoalRatio = bufferGoalRatio;
-                    if (lastBufferGoalRatio <= 0.25 ||
-                        wantedBufferAhead * lastBufferGoalRatio <= 2) {
+                    if (lastBufferGoalRatio <= 0.25 || wba * lastBufferGoalRatio <= 2) {
                         throw formattedError;
                     }
                     bufferGoalRatioMap[representation.id] = lastBufferGoalRatio - 0.25;

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

@@ -15,36 +15,28 @@
  */
 import { Observable, Subject } from "rxjs";
 import Manifest, { Adaptation } from "../../../manifest";
-import ABRManager, { IABREstimate, IABRManagerClockTick, IABRMetricsEvent, IABRRequestBeginEvent, IABRRequestEndEvent, IABRRequestProgressEvent } from "../../abr";
-import { IRepresentationChangeEvent, IStreamEventAddedSegment } from "../types";
+import ABRManager, { IABREstimate, IABRManagerPlaybackObservation, IABRStreamEvents } from "../../abr";
 /**
  * Create an "estimator$" Observable which will emit which Representation (from
  * the given `Adaptation`) is the best fit (see `IABREstimate` type definition)
  * corresponding to the current network and playback conditions.
  *
- * This function also returns two subjects that should be used to add feedback
- * helping the estimator to make its choices:
+ * This function also returns a subject that should be used to add feedback
+ * helping the estimator to make its choices.
  *
- *   - `requestFeedback$`: Subject through which information about new requests
- *     and network metrics should be emitted.
- *
- *   - `streamFeedback$`: Subject through which stream-related events should be
- *      emitted.
- *
- * You can look at the types defined for both of those Subjects to have more
- * information on what data is expected. The idea is to provide as much data as
- * possible so the estimation is as adapted as possible.
+ * You can look at the types defined for this Subject to have more information
+ * on what data is expected. The idea is to provide as much data as possible so
+ * the estimation is as adapted as possible.
  *
  * @param {Object} content
  * @param {Object} abrManager
- * @param {Observable} clock$
+ * @param {Observable} observation$
  * @returns {Object}
  */
 export default function createRepresentationEstimator({ manifest, adaptation }: {
     manifest: Manifest;
     adaptation: Adaptation;
-}, abrManager: ABRManager, clock$: Observable<IABRManagerClockTick>): {
+}, abrManager: ABRManager, observation$: Observable<IABRManagerPlaybackObservation>): {
     estimator$: Observable<IABREstimate>;
-    streamFeedback$: Subject<IStreamEventAddedSegment<unknown> | IRepresentationChangeEvent>;
-    requestFeedback$: Subject<IABRMetricsEvent | IABRRequestBeginEvent | IABRRequestProgressEvent | IABRRequestEndEvent>;
+    abrFeedbacks$: Subject<IABRStreamEvents>;
 };