rx-player 4.0.0 → 4.1.0-dev.2024031100

package/dist/commonjs/core/stream/adaptation/adaptation_stream.js

@@ -66,7 +66,7 @@ var get_representations_switch_strategy_1 = require("./get_representations_switc
  *
  * It will rely on the IRepresentationEstimator to choose at any time the
  * best Representation for this Adaptation and then run the logic to download
- * and push the corresponding segments in the SegmentBuffer.
+ * and push the corresponding segments in the SegmentSink.
  *
  * @param {Object} args - Various arguments allowing the `AdaptationStream` to
  * determine which Representation to choose and which segments to load from it.
@@ -91,7 +91,7 @@ var get_representations_switch_strategy_1 = require("./get_representations_switc
  * doing.
  */
 function AdaptationStream(_a, callbacks, parentCancelSignal) {
-    var playbackObserver = _a.playbackObserver, content = _a.content, options = _a.options, representationEstimator = _a.representationEstimator, segmentBuffer = _a.segmentBuffer, segmentFetcherCreator = _a.segmentFetcherCreator, wantedBufferAhead = _a.wantedBufferAhead, maxVideoBufferSize = _a.maxVideoBufferSize;
+    var playbackObserver = _a.playbackObserver, content = _a.content, options = _a.options, representationEstimator = _a.representationEstimator, segmentSink = _a.segmentSink, segmentFetcherCreator = _a.segmentFetcherCreator, wantedBufferAhead = _a.wantedBufferAhead, maxVideoBufferSize = _a.maxVideoBufferSize;
     var manifest = content.manifest, period = content.period, adaptation = content.adaptation;
     /** Allows to cancel everything the `AdaptationStream` is doing. */
     var adapStreamCanceller = new task_canceller_1.default();
@@ -113,21 +113,24 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
     /** Stores the last emitted bitrate. */
     var previouslyEmittedBitrate;
     var initialRepIds = content.representations.getValue().representationIds;
-    var initialRepresentations = content.adaptation.representations.filter(function (r) { return (0, array_includes_1.default)(initialRepIds, r.id) &&
-        r.decipherable !== false &&
-        r.isSupported !== false; });
+    var initialRepresentations = content.adaptation.representations.filter(function (r) {
+        return (0, array_includes_1.default)(initialRepIds, r.id) &&
+            r.decipherable !== false &&
+            r.isSupported !== false;
+    });
     /** Emit the list of Representation for the adaptive logic. */
     var representationsList = new reference_1.default(initialRepresentations, adapStreamCanceller.signal);
     // Start-up Adaptive logic
     var _b = representationEstimator({ manifest: manifest, period: period, adaptation: adaptation }, currentRepresentation, representationsList, playbackObserver, adapStreamCanceller.signal), estimateRef = _b.estimates, abrCallbacks = _b.callbacks;
     /** Allows a `RepresentationStream` to easily fetch media segments. */
-    var segmentFetcher = segmentFetcherCreator
-        .createSegmentFetcher(adaptation.type, 
+    var segmentFetcher = segmentFetcherCreator.createSegmentFetcher(adaptation.type, 
     /* eslint-disable @typescript-eslint/unbound-method */
-    { onRequestBegin: abrCallbacks.requestBegin,
+    {
+        onRequestBegin: abrCallbacks.requestBegin,
         onRequestEnd: abrCallbacks.requestEnd,
         onProgress: abrCallbacks.requestProgress,
-        onMetrics: abrCallbacks.metrics });
+        onMetrics: abrCallbacks.metrics,
+    });
     /* eslint-enable @typescript-eslint/unbound-method */
     /** Used to determine when "fast-switching" is possible. */
     var fastSwitchThreshold = new reference_1.default(0);
@@ -154,7 +157,9 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
             cancelCurrentStreams.cancel();
         }
         var newRepIds = content.representations.getValue().representationIds;
-        var newRepresentations = content.adaptation.representations.filter(function (r) { return (0, array_includes_1.default)(newRepIds, r.id); });
+        var newRepresentations = content.adaptation.representations.filter(function (r) {
+            return (0, array_includes_1.default)(newRepIds, r.id);
+        });
         representationsList.setValueIfChanged(newRepresentations);
         cancelCurrentStreams = new task_canceller_1.default();
         cancelCurrentStreams.linkToSignal(adapStreamCanceller.signal);
@@ -186,7 +191,7 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
             return __generator(this, function (_e) {
                 switch (_e.label) {
                     case 0:
-                        switchStrat = (0, get_representations_switch_strategy_1.default)(period, adaptation, choice, segmentBuffer, playbackObserver);
+                        switchStrat = (0, get_representations_switch_strategy_1.default)(period, adaptation, choice, segmentSink, playbackObserver);
                         _a = switchStrat.type;
                         switch (_a) {
                             case "continue": return [3 /*break*/, 1];
@@ -208,7 +213,12 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
                                 }
                                 var DELTA_POSITION_AFTER_RELOAD = config_1.default.getCurrent().DELTA_POSITION_AFTER_RELOAD;
                                 var timeOffset = DELTA_POSITION_AFTER_RELOAD.bitrateSwitch;
-                                return callbacks.waitingMediaSourceReload({ bufferType: adaptation.type, period: period, timeOffset: timeOffset, stayInPeriod: true });
+                                return callbacks.waitingMediaSourceReload({
+                                    bufferType: adaptation.type,
+                                    period: period,
+                                    timeOffset: timeOffset,
+                                    stayInPeriod: true,
+                                });
                             }, { includeLastObservation: true, clearSignal: fnCancelSignal });
                         })];
                     case 3:
@@ -218,7 +228,7 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
                     case 4:
                         if (!!_c.done) return [3 /*break*/, 7];
                         range = _c.value;
-                        return [4 /*yield*/, segmentBuffer.removeBuffer(range.start, range.end)];
+                        return [4 /*yield*/, segmentSink.removeBuffer(range.start, range.end)];
                     case 5:
                         _e.sent();
                         if (fnCancelSignal.isCancelled()) {
@@ -297,8 +307,16 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
                 log_1.default.info("Stream: slow Representation switch", adaptation.type);
                 return terminateCurrentStream.setValue({ urgent: false });
             }
-        }, { clearSignal: repStreamTerminatingCanceller.signal, emitCurrentValue: true });
-        var repInfo = { type: adaptation.type, adaptation: adaptation, period: period, representation: representation };
+        }, {
+            clearSignal: repStreamTerminatingCanceller.signal,
+            emitCurrentValue: true,
+        });
+        var repInfo = {
+            type: adaptation.type,
+            adaptation: adaptation,
+            period: period,
+            representation: representation,
+        };
         currentRepresentation.setValue(representation);
         if (adapStreamCanceller.isUsed()) {
             return; // previous callback has stopped everything by side-effect
@@ -349,9 +367,7 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
         var bufferGoal = (0, reference_1.createMappedReference)(wantedBufferAhead, function (prev) {
             return prev * getBufferGoalRatio(representation);
         }, bufferGoalCanceller.signal);
-        var maxBufferSize = adaptation.type === "video" ?
-            maxVideoBufferSize :
-            new reference_1.default(Infinity);
+        var maxBufferSize = adaptation.type === "video" ? maxVideoBufferSize : new reference_1.default(Infinity);
         log_1.default.info("Stream: changing representation", adaptation.type, representation.id, representation.bitrate);
         var updatedCallbacks = (0, object_assign_1.default)({}, representationStreamCallbacks, {
             error: function (err) {
@@ -374,9 +390,11 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
                     bufferGoalRatioMap.set(representation.id, newBufferGoalRatio);
                     // We wait 4 seconds to let the situation evolve by itself before
                     // retrying loading segments with a lower buffer goal
-                    (0, cancellable_sleep_1.default)(4000, adapStreamCanceller.signal).then(function () {
+                    (0, cancellable_sleep_1.default)(4000, adapStreamCanceller.signal)
+                        .then(function () {
                         return createRepresentationStream(representation, terminateCurrentStream, representationStreamCallbacks, fnCancelSignal);
-                    }).catch(noop_1.default);
+                    })
+                        .catch(noop_1.default);
                 }
             },
             terminating: function () {
@@ -384,8 +402,19 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
                 representationStreamCallbacks.terminating();
             },
         });
-        (0, representation_1.default)({ playbackObserver: playbackObserver, content: { representation: representation, adaptation: adaptation, period: period, manifest: manifest }, segmentBuffer: segmentBuffer, segmentFetcher: segmentFetcher, terminate: terminateCurrentStream,
-            options: { bufferGoal: bufferGoal, maxBufferSize: maxBufferSize, drmSystemId: options.drmSystemId, fastSwitchThreshold: fastSwitchThreshold } }, updatedCallbacks, fnCancelSignal);
+        (0, representation_1.default)({
+            playbackObserver: playbackObserver,
+            content: { representation: representation, adaptation: adaptation, period: period, manifest: manifest },
+            segmentSink: segmentSink,
+            segmentFetcher: segmentFetcher,
+            terminate: terminateCurrentStream,
+            options: {
+                bufferGoal: bufferGoal,
+                maxBufferSize: maxBufferSize,
+                drmSystemId: options.drmSystemId,
+                fastSwitchThreshold: fastSwitchThreshold,
+            },
+        }, updatedCallbacks, fnCancelSignal);
         // reload if the Representation disappears from the Manifest
         manifest.addEventListener("manifestUpdate", function (updates) {
             var e_2, _a, e_3, _b, e_4, _c;
@@ -451,8 +480,7 @@ function AdaptationStream(_a, callbacks, parentCancelSignal) {
      */
     function getBufferGoalRatio(representation) {
         var oldBufferGoalRatio = bufferGoalRatioMap.get(representation.id);
-        var bufferGoalRatio = oldBufferGoalRatio !== undefined ? oldBufferGoalRatio :
-            1;
+        var bufferGoalRatio = oldBufferGoalRatio !== undefined ? oldBufferGoalRatio : 1;
         if (oldBufferGoalRatio === undefined) {
             bufferGoalRatioMap.set(representation.id, bufferGoalRatio);
         }

package/dist/commonjs/core/stream/adaptation/get_representations_switch_strategy.d.ts

@@ -13,41 +13,41 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Adaptation, Period } from "../../../manifest";
-import { IReadOnlyPlaybackObserver } from "../../api";
-import { SegmentBuffer } from "../../segment_buffers";
-import { IRepresentationsChoice, IRepresentationStreamPlaybackObservation } from "../representation";
-export default function getRepresentationsSwitchingStrategy(period: Period, adaptation: Adaptation, settings: IRepresentationsChoice, segmentBuffer: SegmentBuffer, playbackObserver: IReadOnlyPlaybackObserver<IRepresentationStreamPlaybackObservation>): IRepresentationSwitchStrategy;
+import type { IAdaptation, IPeriod } from "../../../manifest";
+import type { IReadOnlyPlaybackObserver } from "../../../playback_observer";
+import type { SegmentSink } from "../../segment_sinks";
+import type { IRepresentationsChoice, IRepresentationStreamPlaybackObservation } from "../representation";
+export default function getRepresentationsSwitchingStrategy(period: IPeriod, adaptation: IAdaptation, settings: IRepresentationsChoice, segmentSink: SegmentSink, playbackObserver: IReadOnlyPlaybackObserver<IRepresentationStreamPlaybackObservation>): IRepresentationSwitchStrategy;
 export type IRepresentationSwitchStrategy = 
 /** Do nothing special. */
 {
     type: "continue";
     value: undefined;
-} | 
+}
 /**
  * Clean the given ranges of time from the buffer, preferably avoiding time
  * around the current position to continue playback smoothly.
  */
-{
+ | {
     type: "clean-buffer";
     value: Array<{
         start: number;
         end: number;
     }>;
-} | 
+}
 /**
  * Clean the given ranges of time from the buffer and try to flush the buffer
  * so that it is taken in account directly.
  */
-{
+ | {
     type: "flush-buffer";
     value: Array<{
         start: number;
         end: number;
     }>;
-} | 
+}
 /** Reload completely the media buffers. */
-{
+ | {
     type: "needs-reload";
     value: undefined;
 };

package/dist/commonjs/core/stream/adaptation/get_representations_switch_strategy.js

@@ -29,22 +29,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var config_1 = require("../../../config");
 var array_includes_1 = require("../../../utils/array_includes");
 var ranges_1 = require("../../../utils/ranges");
-var segment_buffers_1 = require("../../segment_buffers");
-function getRepresentationsSwitchingStrategy(period, adaptation, settings, segmentBuffer, playbackObserver) {
+var segment_sinks_1 = require("../../segment_sinks");
+function getRepresentationsSwitchingStrategy(period, adaptation, settings, segmentSink, playbackObserver) {
     var e_1, _a, e_2, _b;
-    var _c, _d;
+    var _c, _d, _e, _f;
     if (settings.switchingMode === "lazy") {
         return { type: "continue", value: undefined };
     }
-    var inventory = segmentBuffer.getLastKnownInventory();
+    var inventory = segmentSink.getLastKnownInventory();
     var unwantedRange = [];
     try {
         for (var inventory_1 = __values(inventory), inventory_1_1 = inventory_1.next(); !inventory_1_1.done; inventory_1_1 = inventory_1.next()) {
             var elt = inventory_1_1.value;
-            if (elt.infos.period.id === period.id && (elt.infos.adaptation.id !== adaptation.id ||
-                !(0, array_includes_1.default)(settings.representationIds, elt.infos.representation.id))) {
-                (0, ranges_1.insertInto)(unwantedRange, { start: (_c = elt.bufferedStart) !== null && _c !== void 0 ? _c : elt.start,
-                    end: (_d = elt.bufferedEnd) !== null && _d !== void 0 ? _d : elt.end });
+            if (elt.infos.period.id === period.id &&
+                (elt.infos.adaptation.id !== adaptation.id ||
+                    !(0, array_includes_1.default)(settings.representationIds, elt.infos.representation.id))) {
+                (0, ranges_1.insertInto)(unwantedRange, {
+                    start: (_c = elt.bufferedStart) !== null && _c !== void 0 ? _c : elt.start,
+                    end: (_d = elt.bufferedEnd) !== null && _d !== void 0 ? _d : elt.end,
+                });
             }
         }
     }
@@ -55,14 +58,15 @@ function getRepresentationsSwitchingStrategy(period, adaptation, settings, segme
         }
         finally { if (e_1) throw e_1.error; }
     }
-    var pendingOperations = segmentBuffer.getPendingOperations();
+    var pendingOperations = segmentSink.getPendingOperations();
     try {
         for (var pendingOperations_1 = __values(pendingOperations), pendingOperations_1_1 = pendingOperations_1.next(); !pendingOperations_1_1.done; pendingOperations_1_1 = pendingOperations_1.next()) {
             var operation = pendingOperations_1_1.value;
-            if (operation.type === segment_buffers_1.SegmentBufferOperation.Push) {
+            if (operation.type === segment_sinks_1.SegmentSinkOperation.Push) {
                 var info = operation.value.inventoryInfos;
-                if (info.period.id === period.id && (info.adaptation.id !== adaptation.id ||
-                    !(0, array_includes_1.default)(settings.representationIds, info.representation.id))) {
+                if (info.period.id === period.id &&
+                    (info.adaptation.id !== adaptation.id ||
+                        !(0, array_includes_1.default)(settings.representationIds, info.representation.id))) {
                     var start = info.segment.time;
                     var end = start + info.segment.duration;
                     (0, ranges_1.insertInto)(unwantedRange, { start: start, end: end });
@@ -93,56 +97,51 @@ function getRepresentationsSwitchingStrategy(period, adaptation, settings, segme
     // First, we don't want to accidentally remove some segments from the previous
     // Period (which overlap a little with this one)
     /** Last segment before one for the current period. */
-    var lastSegmentBefore = (0, segment_buffers_1.getLastSegmentBeforePeriod)(inventory, period);
+    var lastSegmentBefore = (0, segment_sinks_1.getLastSegmentBeforePeriod)(inventory, period);
     if (lastSegmentBefore !== null &&
         (lastSegmentBefore.bufferedEnd === undefined ||
-            period.start - lastSegmentBefore.bufferedEnd < 1)) // Close to Period's start
-     {
+            period.start - lastSegmentBefore.bufferedEnd < 1)) {
+        // Close to Period's start
         // Exclude data close to the period's start to avoid cleaning
         // to much
-        rangesToExclude.push({ start: 0,
-            end: period.start + 1 });
+        rangesToExclude.push({ start: 0, end: period.start + 1 });
     }
     if (!shouldFlush) {
         // exclude data around current position to avoid decoding issues
         var ADAP_REP_SWITCH_BUFFER_PADDINGS = config_1.default.getCurrent().ADAP_REP_SWITCH_BUFFER_PADDINGS;
         var bufferType = adaptation.type;
         /** Ranges that won't be cleaned from the current buffer. */
-        var paddingBefore = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].before;
-        if (paddingBefore == null) {
-            paddingBefore = 0;
-        }
-        var paddingAfter = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].after;
-        if (paddingAfter == null) {
-            paddingAfter = 0;
-        }
+        var paddingBefore = (_e = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].before) !== null && _e !== void 0 ? _e : 0;
+        var paddingAfter = (_f = ADAP_REP_SWITCH_BUFFER_PADDINGS[bufferType].after) !== null && _f !== void 0 ? _f : 0;
         var currentTime = playbackObserver.getCurrentTime();
         if (currentTime === undefined) {
             // TODO current position might be old. A better solution should be found.
             var lastObservation = playbackObserver.getReference().getValue();
             currentTime = lastObservation.position.getPolled();
         }
-        rangesToExclude.push({ start: currentTime - paddingBefore,
-            end: currentTime + paddingAfter });
+        rangesToExclude.push({
+            start: currentTime - paddingBefore,
+            end: currentTime + paddingAfter,
+        });
     }
     // Now remove possible small range from the end if there is a segment from the
     // next Period
     if (period.end !== undefined) {
         /** first segment after for the current period. */
-        var firstSegmentAfter = (0, segment_buffers_1.getFirstSegmentAfterPeriod)(inventory, period);
+        var firstSegmentAfter = (0, segment_sinks_1.getFirstSegmentAfterPeriod)(inventory, period);
         if (firstSegmentAfter !== null &&
             (firstSegmentAfter.bufferedStart === undefined ||
                 // Close to Period's end
-                (firstSegmentAfter.bufferedStart - period.end) < 1)) {
-            rangesToExclude.push({ start: period.end - 1,
-                end: Number.MAX_VALUE });
+                firstSegmentAfter.bufferedStart - period.end < 1)) {
+            rangesToExclude.push({ start: period.end - 1, end: Number.MAX_VALUE });
         }
     }
     var toRemove = (0, ranges_1.excludeFromRanges)(unwantedRange, rangesToExclude);
     if (toRemove.length === 0) {
         return { type: "continue", value: undefined };
     }
-    return shouldFlush ? { type: "flush-buffer", value: toRemove } :
-        { type: "clean-buffer", value: toRemove };
+    return shouldFlush
+        ? { type: "flush-buffer", value: toRemove }
+        : { type: "clean-buffer", value: toRemove };
 }
 exports.default = getRepresentationsSwitchingStrategy;

package/dist/commonjs/core/stream/adaptation/types.d.ts

@@ -1,11 +1,11 @@
-import Manifest, { Adaptation, Period, Representation } from "../../../manifest";
-import { IAudioTrackSwitchingMode, IVideoTrackSwitchingMode } from "../../../public_types";
-import { IReadOnlySharedReference } from "../../../utils/reference";
-import { IRepresentationEstimator } from "../../adaptive";
-import { IReadOnlyPlaybackObserver } from "../../api";
-import { SegmentFetcherCreator } from "../../fetchers";
-import { IBufferType, SegmentBuffer } from "../../segment_buffers";
-import { IRepresentationsChoice, IRepresentationStreamCallbacks, IRepresentationStreamPlaybackObservation } from "../representation";
+import type { IManifest, IAdaptation, IPeriod, IRepresentation } from "../../../manifest";
+import type { IReadOnlyPlaybackObserver } from "../../../playback_observer";
+import type { IAudioTrackSwitchingMode, IVideoTrackSwitchingMode } from "../../../public_types";
+import type { IReadOnlySharedReference } from "../../../utils/reference";
+import type { IRepresentationEstimator } from "../../adaptive";
+import type { SegmentFetcherCreator } from "../../fetchers";
+import type { IBufferType, SegmentSink } from "../../segment_sinks";
+import type { IRepresentationsChoice, IRepresentationStreamCallbacks, IRepresentationStreamPlaybackObservation } from "../representation";
 /** Callbacks called by the `AdaptationStream` on various events. */
 export interface IAdaptationStreamCallbacks extends Omit<IRepresentationStreamCallbacks, "terminating" | "addedSegment"> {
     /** Called as new bitrate estimates are done. */
@@ -47,14 +47,14 @@ export interface IRepresentationChangePayload {
     /** The type of buffer linked to that `RepresentationStream`. */
     type: IBufferType;
     /** The `Period` linked to the `RepresentationStream` we're creating. */
-    period: Period;
+    period: IPeriod;
     /** The `Adaptation` linked to the `RepresentationStream` we're creating. */
-    adaptation: Adaptation;
+    adaptation: IAdaptation;
     /**
      * The `Representation` linked to the `RepresentationStream` we're creating.
      * `null` when we're choosing no Representation at all.
      */
-    representation: Representation | null;
+    representation: IRepresentation | null;
 }
 /** Payload for the `waitingMediaSourceReload` callback. */
 export interface IWaitingMediaSourceReloadPayload {
@@ -64,7 +64,7 @@ export interface IWaitingMediaSourceReloadPayload {
      * The MediaSource will only be reloaded if that Period becomes the current
      * one.
      */
-    period: Period;
+    period: IPeriod;
     /** Buffer type concerned. */
     bufferType: IBufferType;
     /**
@@ -99,7 +99,7 @@ export interface INeedsBufferFlushPayload {
 /** Regular playback information needed by the AdaptationStream. */
 export interface IAdaptationStreamPlaybackObservation extends IRepresentationStreamPlaybackObservation {
     /**
-     * For the current SegmentBuffer, difference in seconds between the next position
+     * For the current SegmentSink, difference in seconds between the next position
      * where no segment data is available and the current position.
      */
     bufferGap: number;
@@ -114,21 +114,21 @@ export interface IAdaptationStreamArguments {
     playbackObserver: IReadOnlyPlaybackObserver<IAdaptationStreamPlaybackObservation>;
     /** Content you want to create this Stream for. */
     content: {
-        manifest: Manifest;
-        period: Period;
-        adaptation: Adaptation;
+        manifest: IManifest;
+        period: IPeriod;
+        adaptation: IAdaptation;
         representations: IReadOnlySharedReference<IRepresentationsChoice>;
     };
     options: IAdaptationStreamOptions;
     /** Estimate the right Representation to play. */
     representationEstimator: IRepresentationEstimator;
     /** SourceBuffer wrapper - needed to push media segments. */
-    segmentBuffer: SegmentBuffer;
+    segmentSink: SegmentSink;
     /** Module used to fetch the wanted media segments. */
     segmentFetcherCreator: SegmentFetcherCreator;
     /**
      * "Buffer goal" wanted, or the ideal amount of time ahead of the current
-     * position in the current SegmentBuffer. When this amount has been reached
+     * position in the current SegmentSink. When this amount has been reached
      * this AdaptationStream won't try to download new segments.
      */
     wantedBufferAhead: IReadOnlySharedReference<number>;

package/dist/commonjs/core/stream/index.d.ts

@@ -16,6 +16,6 @@
 import StreamOrchestrator, { INeedsMediaSourceReloadPayload, IStreamOrchestratorOptions, IStreamOrchestratorPlaybackObservation, IStreamOrchestratorCallbacks } from "./orchestrator";
 import { IPausedPlaybackObservation } from "./period";
 export { IRepresentationsChoice, IInbandEvent, IStreamStatusPayload, } from "./representation";
-export { IAdaptationChoice, ITrackSwitchingMode, IWaitingMediaSourceReloadPayload, } from "./adaptation";
+export { IAdaptationChoice, INeedsBufferFlushPayload, ITrackSwitchingMode, IWaitingMediaSourceReloadPayload, } from "./adaptation";
 export default StreamOrchestrator;
 export { IPausedPlaybackObservation, INeedsMediaSourceReloadPayload, IStreamOrchestratorPlaybackObservation, IStreamOrchestratorOptions, IStreamOrchestratorCallbacks, };

package/dist/commonjs/core/stream/orchestrator/get_time_ranges_for_content.d.ts

@@ -13,17 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IAdaptationMetadata, IPeriodMetadata, IRepresentationMetadata } from "../../../manifest";
-import { IRange } from "../../../utils/ranges";
-import { SegmentBuffer } from "../../segment_buffers";
+import type { IAdaptationMetadata, IPeriodMetadata, IRepresentationMetadata } from "../../../manifest";
+import type { IRange } from "../../../utils/ranges";
+import type { SegmentSink } from "../../segment_sinks";
 /**
  * Returns the buffered ranges which hold the given content.
  * Returns the whole buffered ranges if some of it is unknown.
- * @param {Object} segmentBuffer
+ * @param {Object} segmentSink
  * @param {Array.<Object>} contents
  * @returns {Array.<Object>}
  */
-export default function getTimeRangesForContent(segmentBuffer: SegmentBuffer, contents: Array<{
+export default function getTimeRangesForContent(segmentSink: SegmentSink, contents: Array<{
     adaptation: IAdaptationMetadata;
     period: IPeriodMetadata;
     representation: IRepresentationMetadata;

package/dist/commonjs/core/stream/orchestrator/get_time_ranges_for_content.js

@@ -19,22 +19,22 @@ var log_1 = require("../../../log");
 /**
  * Returns the buffered ranges which hold the given content.
  * Returns the whole buffered ranges if some of it is unknown.
- * @param {Object} segmentBuffer
+ * @param {Object} segmentSink
  * @param {Array.<Object>} contents
  * @returns {Array.<Object>}
  */
-function getTimeRangesForContent(segmentBuffer, contents) {
+function getTimeRangesForContent(segmentSink, contents) {
     if (contents.length === 0) {
         return [];
     }
     var accumulator = [];
-    var inventory = segmentBuffer.getLastKnownInventory();
+    var inventory = segmentSink.getLastKnownInventory();
     var _loop_1 = function (i) {
         var chunk = inventory[i];
         var hasContent = contents.some(function (content) {
-            return chunk.infos.period.id === content.period.id &&
+            return (chunk.infos.period.id === content.period.id &&
                 chunk.infos.adaptation.id === content.adaptation.id &&
-                chunk.infos.representation.id === content.representation.id;
+                chunk.infos.representation.id === content.representation.id);
         });
         if (hasContent) {
             var bufferedStart = chunk.bufferedStart, bufferedEnd = chunk.bufferedEnd;

package/dist/commonjs/core/stream/orchestrator/stream_orchestrator.d.ts

@@ -13,21 +13,22 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Manifest, { Period } from "../../../manifest";
-import { IReadOnlySharedReference } from "../../../utils/reference";
-import { CancellationSignal } from "../../../utils/task_canceller";
-import { IRepresentationEstimator } from "../../adaptive";
-import type { IReadOnlyPlaybackObserver } from "../../api";
-import { SegmentFetcherCreator } from "../../fetchers";
-import SegmentBuffersStore, { IBufferType } from "../../segment_buffers";
-import { IPeriodStreamCallbacks, IPeriodStreamOptions, IPeriodStreamPlaybackObservation } from "../period";
+import type { IManifest, IPeriod } from "../../../manifest";
+import type { IReadOnlyPlaybackObserver } from "../../../playback_observer";
+import type { IReadOnlySharedReference } from "../../../utils/reference";
+import type { CancellationSignal } from "../../../utils/task_canceller";
+import type { IRepresentationEstimator } from "../../adaptive";
+import type { SegmentFetcherCreator } from "../../fetchers";
+import type { IBufferType } from "../../segment_sinks";
+import type SegmentSinksStore from "../../segment_sinks";
+import type { IPeriodStreamCallbacks, IPeriodStreamOptions, IPeriodStreamPlaybackObservation } from "../period";
 /**
  * Create and manage the various "Streams" needed for the content to
  * play:
  *
- *   - Create or dispose SegmentBuffers depending on the chosen Adaptations.
+ *   - Create or dispose SegmentSinks depending on the chosen Adaptations.
  *
- *   - Push the right segments to those SegmentBuffers depending on the user's
+ *   - Push the right segments to those SegmentSinks depending on the user's
  *     preferences, the current position, the bandwidth, the decryption
  *     conditions...
  *
@@ -40,8 +41,8 @@ import { IPeriodStreamCallbacks, IPeriodStreamOptions, IPeriodStreamPlaybackObse
  * @param {Object} playbackObserver - Emit position information
  * @param {Object} representationEstimator - Emit bitrate estimates and best
  * Representation to play.
- * @param {Object} segmentBuffersStore - Will be used to lazily create
- * SegmentBuffer instances associated with the current content.
+ * @param {Object} segmentSinksStore - Will be used to lazily create
+ * SegmentSink instances associated with the current content.
  * @param {Object} segmentFetcherCreator - Allow to download segments.
  * @param {Object} options
  * @param {Object} callbacks - The `StreamOrchestrator` relies on a system of
@@ -64,9 +65,9 @@ import { IPeriodStreamCallbacks, IPeriodStreamOptions, IPeriodStreamPlaybackObse
  * doing.
  */
 export default function StreamOrchestrator(content: {
-    manifest: Manifest;
-    initialPeriod: Period;
-}, playbackObserver: IReadOnlyPlaybackObserver<IStreamOrchestratorPlaybackObservation>, representationEstimator: IRepresentationEstimator, segmentBuffersStore: SegmentBuffersStore, segmentFetcherCreator: SegmentFetcherCreator, options: IStreamOrchestratorOptions, callbacks: IStreamOrchestratorCallbacks, orchestratorCancelSignal: CancellationSignal): void;
+    manifest: IManifest;
+    initialPeriod: IPeriod;
+}, playbackObserver: IReadOnlyPlaybackObserver<IStreamOrchestratorPlaybackObservation>, representationEstimator: IRepresentationEstimator, segmentSinksStore: SegmentSinksStore, segmentFetcherCreator: SegmentFetcherCreator, options: IStreamOrchestratorOptions, callbacks: IStreamOrchestratorCallbacks, orchestratorCancelSignal: CancellationSignal): void;
 export type IStreamOrchestratorPlaybackObservation = IPeriodStreamPlaybackObservation;
 /** Options tweaking the behavior of the StreamOrchestrator. */
 export type IStreamOrchestratorOptions = IPeriodStreamOptions & {
@@ -114,7 +115,7 @@ export interface IStreamOrchestratorCallbacks extends Omit<IPeriodStreamCallback
      */
     lockedStream(payload: ILockedStreamPayload): void;
     /**
-     * Called after the SegmentBuffer have been "cleaned" to remove from it
+     * Called after the SegmentSink have been "cleaned" to remove from it
      * every non-decipherable segments - usually following an update of the
      * decipherability status of some `Representation`(s).
      *
@@ -135,14 +136,14 @@ export interface IPeriodStreamClearedPayload {
      */
     type: IBufferType;
     /** The `Manifest` linked to the `PeriodStream` we just cleared. */
-    manifest: Manifest;
+    manifest: IManifest;
     /**
      * The `Period` linked to the `PeriodStream` we just removed.
      *
      * The combination of this and `Period` should give you enough information
      * about which `PeriodStream` has been removed.
      */
-    period: Period;
+    period: IPeriod;
 }
 /** Payload for the `needsMediaSourceReload` callback. */
 export interface INeedsMediaSourceReloadPayload {
@@ -168,7 +169,7 @@ export interface INeedsMediaSourceReloadPayload {
 /** Payload for the `lockedStream` callback. */
 export interface ILockedStreamPayload {
     /** Period concerned. */
-    period: Period;
+    period: IPeriod;
     /** Buffer type concerned. */
     bufferType: IBufferType;
 }