rx-player 3.26.1 → 3.26.2

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

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { map } from "rxjs/operators";
+import { map, } from "rxjs";
 import EVENTS from "./events_generators";
 /**
- * Regularly ask to reload the MediaSource on each `clock$` tick.
+ * Regularly ask to reload the MediaSource on each playback observation
+ * performed by the playback observer.
  *
  * If and only if the Period currently played corresponds to `Period`, applies
  * an offset to the reloaded position corresponding to `deltaPos`.
@@ -26,7 +27,7 @@ import EVENTS from "./events_generators";
  *
  * @param {Object} period - The Period linked to the Adaptation or
  * Representation that you want to switch to.
- * @param {Observable} clock$ - Observable emitting playback conditions.
+ * @param {Observable} playbackObserver - emit playback conditions.
  * Has to emit last playback conditions immediately on subscribe.
  * @param {number} deltaPos - If the concerned Period is playing at the time
  * this function is called, we will add this value, in seconds, to the current
@@ -35,13 +36,13 @@ import EVENTS from "./events_generators";
  * a switch.
  * @returns {Observable}
  */
-export default function reloadAfterSwitch(period, bufferType, clock$, deltaPos) {
-    return clock$.pipe(map(function (tick) {
+export default function reloadAfterSwitch(period, bufferType, playbackObserver, deltaPos) {
+    return playbackObserver.observe(true).pipe(map(function (observation) {
         var _a;
-        var currentTime = tick.getCurrentTime();
+        var currentTime = playbackObserver.getCurrentTime();
         var pos = currentTime + deltaPos;
         // Bind to Period start and end
         var reloadAt = Math.min(Math.max(period.start, pos), (_a = period.end) !== null && _a !== void 0 ? _a : Infinity);
-        return EVENTS.waitingMediaSourceReload(bufferType, period, reloadAt, !tick.isPaused);
+        return EVENTS.waitingMediaSourceReload(bufferType, period, reloadAt, !observation.isPaused);
     }));
 }

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

@@ -17,17 +17,19 @@
  * This file allows any Stream to push data to a SegmentBuffer.
  */
 import { Observable } from "rxjs";
+import { IReadOnlyPlaybackObserver } from "../../api";
 import { IPushChunkInfos, SegmentBuffer } from "../../segment_buffers";
 /**
  * Append a segment to the given segmentBuffer.
  * If it leads to a QuotaExceededError, try to run our custom range
  * _garbage collector_ then retry.
  *
- * @param {Observable} clock$
+ * @param {Observable} playbackObserver
  * @param {Object} segmentBuffer
  * @param {Object} dataInfos
  * @returns {Observable}
  */
-export default function appendSegmentToBuffer<T>(clock$: Observable<{
+export default function appendSegmentToBuffer<T>(playbackObserver: IReadOnlyPlaybackObserver<{
     position: number;
+    wantedTimeOffset: number;
 }>, segmentBuffer: SegmentBuffer, dataInfos: IPushChunkInfos<T>): Observable<unknown>;

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

@@ -16,8 +16,7 @@
 /**
  * This file allows any Stream to push data to a SegmentBuffer.
  */
-import { concat as observableConcat, } from "rxjs";
-import { catchError, ignoreElements, } from "rxjs/operators";
+import { catchError, concat as observableConcat, mergeMap, ignoreElements, } from "rxjs";
 import { MediaError } from "../../../errors";
 import forceGarbageCollection from "./force_garbage_collection";
 /**
@@ -25,12 +24,12 @@ import forceGarbageCollection from "./force_garbage_collection";
  * If it leads to a QuotaExceededError, try to run our custom range
  * _garbage collector_ then retry.
  *
- * @param {Observable} clock$
+ * @param {Observable} playbackObserver
  * @param {Object} segmentBuffer
  * @param {Object} dataInfos
  * @returns {Observable}
  */
-export default function appendSegmentToBuffer(clock$, segmentBuffer, dataInfos) {
+export default function appendSegmentToBuffer(playbackObserver, segmentBuffer, dataInfos) {
     var append$ = segmentBuffer.pushChunk(dataInfos);
     return append$.pipe(catchError(function (appendError) {
         if (!(appendError instanceof Error) || appendError.name !== "QuotaExceededError") {
@@ -39,10 +38,13 @@ export default function appendSegmentToBuffer(clock$, segmentBuffer, dataInfos)
                 "An unknown error happened when pushing content";
             throw new MediaError("BUFFER_APPEND_ERROR", reason);
         }
-        return observableConcat(forceGarbageCollection(clock$, segmentBuffer).pipe(ignoreElements()), append$).pipe(catchError(function (forcedGCError) {
-            var reason = forcedGCError instanceof Error ? forcedGCError.toString() :
-                "Could not clean the buffer";
-            throw new MediaError("BUFFER_FULL_ERROR", reason);
+        return playbackObserver.observe(true).pipe(mergeMap(function (observation) {
+            var currentPos = observation.position + observation.wantedTimeOffset;
+            return observableConcat(forceGarbageCollection(currentPos, segmentBuffer).pipe(ignoreElements()), append$).pipe(catchError(function (forcedGCError) {
+                var reason = forcedGCError instanceof Error ? forcedGCError.toString() :
+                    "Could not clean the buffer";
+                throw new MediaError("BUFFER_FULL_ERROR", reason);
+            }));
         }));
     }));
 }

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

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { BehaviorSubject, Observable } from "rxjs";
+import { Observable } from "rxjs";
 import { ICustomError } from "../../../errors";
 import Manifest, { Adaptation, ISegment, Period, Representation } from "../../../manifest";
-import { ISegmentParserParsedInitSegment, ISegmentParserParsedSegment } from "../../../transports";
+import { ISegmentParserParsedInitChunk, ISegmentParserParsedMediaChunk } from "../../../transports";
+import { IReadOnlySharedReference } from "../../../utils/reference";
 import { IPrioritizedSegmentFetcher } from "../../fetchers";
 import { IQueuedSegment } from "../types";
 /**
@@ -38,7 +39,7 @@ export default class DownloadingQueue<T> {
      * Segments whose request are still pending are still in that queue. Segments
      * are only removed from it once their request has succeeded.
      */
-    private _downloadQueue$;
+    private _downloadQueue;
     /**
      * Pending request for the initialization segment.
      * `null` if no request is pending for it.
@@ -65,8 +66,7 @@ export default class DownloadingQueue<T> {
      *
      * @param {Object} content - The context of the Representation you want to
      * load segments for.
-     * @param {BehaviorSubject} downloadQueue$ - Emit the queue of segments you
-     * want to load.
+     * @param {Object} downloadQueue - Queue of segments you want to load.
      * @param {Object} segmentFetcher - Interface to facilitate the download of
      * segments.
      * @param {boolean} hasInitSegment - Declare that an initialization segment
@@ -82,7 +82,7 @@ export default class DownloadingQueue<T> {
      * that it should not wait for an initialization segment before parsing a
      * media segment.
      */
-    constructor(content: IDownloadingQueueContext, downloadQueue$: BehaviorSubject<IDownloadQueueItem>, segmentFetcher: IPrioritizedSegmentFetcher<T>, hasInitSegment: boolean);
+    constructor(content: IDownloadingQueueContext, downloadQueue: IReadOnlySharedReference<IDownloadQueueItem>, segmentFetcher: IPrioritizedSegmentFetcher<T>, hasInitSegment: boolean);
     /**
      * Returns the initialization segment currently being requested.
      * Returns `null` if no initialization segment request is pending.
@@ -128,7 +128,7 @@ export declare type IDownloadingQueueEvent<T> = IParsedInitSegmentEvent<T> | IPa
  * In that case, an `IParsedInitSegmentEvent` will always be sent before any
  * `IParsedSegmentEvent` event is sent.
  */
-export declare type IParsedInitSegmentEvent<T> = ISegmentParserParsedInitSegment<T> & {
+export declare type IParsedInitSegmentEvent<T> = ISegmentParserParsedInitChunk<T> & {
     segment: ISegment;
     type: "parsed-init";
 };
@@ -147,7 +147,7 @@ export declare type IParsedInitSegmentEvent<T> = ISegmentParserParsedInitSegment
  * You will know that all `IParsedSegmentEvent` have been loaded for a given
  * segment once you received the `IEndOfSegmentEvent` for that segment.
  */
-export declare type IParsedSegmentEvent<T> = ISegmentParserParsedSegment<T> & {
+export declare type IParsedSegmentEvent<T> = ISegmentParserParsedMediaChunk<T> & {
     segment: ISegment;
     type: "parsed-media";
 };
@@ -178,7 +178,7 @@ export interface IEndOfQueueEvent {
     value: null;
 }
 /**
- * Structure of the object that has to be emitted through the `downloadQueue$`
+ * Structure of the object that has to be emitted through the `downloadQueue`
  * Observable, to signal which segments are currently needed.
  */
 export interface IDownloadQueueItem {

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

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { concat as observableConcat, defer as observableDefer, of as observableOf, merge as observableMerge, EMPTY, ReplaySubject, } from "rxjs";
-import { filter, finalize, map, mergeMap, share, switchMap, take, } from "rxjs/operators";
+import { concat as observableConcat, defer as observableDefer, EMPTY, filter, finalize, map, merge as observableMerge, mergeMap, of as observableOf, ReplaySubject, share, switchMap, take, } from "rxjs";
 import log from "../../../log";
 import assert from "../../../utils/assert";
 import assertUnreachable from "../../../utils/assert_unreachable";
@@ -29,8 +28,7 @@ var DownloadingQueue = /** @class */ (function () {
      *
      * @param {Object} content - The context of the Representation you want to
      * load segments for.
-     * @param {BehaviorSubject} downloadQueue$ - Emit the queue of segments you
-     * want to load.
+     * @param {Object} downloadQueue - Queue of segments you want to load.
      * @param {Object} segmentFetcher - Interface to facilitate the download of
      * segments.
      * @param {boolean} hasInitSegment - Declare that an initialization segment
@@ -46,10 +44,10 @@ var DownloadingQueue = /** @class */ (function () {
      * that it should not wait for an initialization segment before parsing a
      * media segment.
      */
-    function DownloadingQueue(content, downloadQueue$, segmentFetcher, hasInitSegment) {
+    function DownloadingQueue(content, downloadQueue, segmentFetcher, hasInitSegment) {
         this._content = content;
         this._currentObs$ = null;
-        this._downloadQueue$ = downloadQueue$;
+        this._downloadQueue = downloadQueue;
         this._initSegmentRequest = null;
         this._mediaSegmentRequest = null;
         this._segmentFetcher = segmentFetcher;
@@ -90,7 +88,7 @@ var DownloadingQueue = /** @class */ (function () {
             return this._currentObs$;
         }
         var obs = observableDefer(function () {
-            var mediaQueue$ = _this._downloadQueue$.pipe(filter(function (_a) {
+            var mediaQueue$ = _this._downloadQueue.asObservable().pipe(filter(function (_a) {
                 var segmentQueue = _a.segmentQueue;
                 // First, the first elements of the segmentQueue might be already
                 // loaded but awaiting the initialization segment to be parsed.
@@ -122,7 +120,7 @@ var DownloadingQueue = /** @class */ (function () {
                 return segmentQueue.length > 0 ? _this._requestMediaSegments() :
                     EMPTY;
             }));
-            var initSegmentPush$ = _this._downloadQueue$.pipe(filter(function (next) {
+            var initSegmentPush$ = _this._downloadQueue.asObservable().pipe(filter(function (next) {
                 var initSegmentRequest = _this._initSegmentRequest;
                 if (next.initSegment !== null && initSegmentRequest !== null) {
                     if (next.initSegment.priority !== initSegmentRequest.priority) {
@@ -150,7 +148,7 @@ var DownloadingQueue = /** @class */ (function () {
      */
     DownloadingQueue.prototype._requestMediaSegments = function () {
         var _this = this;
-        var segmentQueue = this._downloadQueue$.getValue().segmentQueue;
+        var segmentQueue = this._downloadQueue.getValue().segmentQueue;
         var currentNeededSegment = segmentQueue[0];
         var recursivelyRequestSegments = function (startingSegment) {
             if (startingSegment === undefined) {
@@ -164,7 +162,7 @@ var DownloadingQueue = /** @class */ (function () {
             return request$
                 .pipe(mergeMap(function (evt) {
                 switch (evt.type) {
-                    case "warning":
+                    case "retry":
                         return observableOf({ type: "retry",
                             value: { segment: segment, error: evt.value } });
                     case "interrupted":
@@ -172,7 +170,7 @@ var DownloadingQueue = /** @class */ (function () {
                         return EMPTY;
                     case "ended":
                         _this._mediaSegmentRequest = null;
-                        var lastQueue = _this._downloadQueue$.getValue().segmentQueue;
+                        var lastQueue = _this._downloadQueue.getValue().segmentQueue;
                         if (lastQueue.length === 0) {
                             return observableOf({ type: "end-of-queue",
                                 value: null });
@@ -222,7 +220,7 @@ var DownloadingQueue = /** @class */ (function () {
         return request$
             .pipe(mergeMap(function (evt) {
             switch (evt.type) {
-                case "warning":
+                case "retry":
                     return observableOf({ type: "retry",
                         value: { segment: segment, error: evt.value } });
                 case "interrupted":

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

@@ -25,6 +25,4 @@ import { SegmentBuffer } from "../../segment_buffers";
  * @param {Object} bufferingQueue
  * @returns {Observable}
  */
-export default function forceGarbageCollection(timings$: Observable<{
-    position: number;
-}>, bufferingQueue: SegmentBuffer): Observable<unknown>;
+export default function forceGarbageCollection(currentPosition: number, bufferingQueue: SegmentBuffer): Observable<unknown>;

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

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { from as observableFrom, } from "rxjs";
-import { concatAll, mergeMap, take, } from "rxjs/operators";
+import { concatAll, defer as observableDefer, from as observableFrom, } from "rxjs";
 import config from "../../../config";
 import log from "../../../log";
 import { getInnerAndOuterTimeRanges } from "../../../utils/ranges";
@@ -30,22 +29,21 @@ var GC_GAP_BEEFY = config.BUFFER_GC_GAPS.BEEFY;
  * @param {Object} bufferingQueue
  * @returns {Observable}
  */
-export default function forceGarbageCollection(timings$, bufferingQueue) {
-    // wait for next timing event
-    return timings$.pipe(take(1), mergeMap(function (timing) {
+export default function forceGarbageCollection(currentPosition, bufferingQueue) {
+    return observableDefer(function () {
         log.warn("Stream: Running garbage collector");
         var buffered = bufferingQueue.getBufferedRanges();
-        var cleanedupRanges = selectGCedRanges(timing.position, buffered, GC_GAP_CALM);
+        var cleanedupRanges = selectGCedRanges(currentPosition, buffered, GC_GAP_CALM);
         // more aggressive GC if we could not find any range to clean
         if (cleanedupRanges.length === 0) {
-            cleanedupRanges = selectGCedRanges(timing.position, buffered, GC_GAP_BEEFY);
+            cleanedupRanges = selectGCedRanges(currentPosition, buffered, GC_GAP_BEEFY);
         }
         log.debug("Stream: GC cleaning", cleanedupRanges);
         return observableFrom(cleanedupRanges.map(function (_a) {
             var start = _a.start, end = _a.end;
             return bufferingQueue.removeBuffer(start, end);
         })).pipe(concatAll());
-    }));
+    });
 }
 /**
  * Buffer garbage collector algorithm.

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

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import Manifest, { Adaptation, Period, Representation } from "../../../manifest";
+import { IReadOnlyPlaybackObserver } from "../../api";
 import { SegmentBuffer } from "../../segment_buffers";
 import { IBufferDiscontinuity, IQueuedSegment } from "../types";
 /** Analysis of the current buffer's status. */
@@ -50,7 +51,7 @@ export interface IBufferStatus {
  * be filled by any segment, even in the future.
  *
  * @param {Object} content
- * @param {Object} tick
+ * @param {Object} playbackInfo
  * @param {number|undefined} fastSwitchThreshold
  * @param {number} bufferGoal
  * @param {Object} segmentBuffer
@@ -61,9 +62,4 @@ export default function getBufferStatus(content: {
     manifest: Manifest;
     period: Period;
     representation: Representation;
-}, tick: {
-    position: number;
-    wantedTimeOffset: number;
-    liveGap?: number;
-    getCurrentTime(): number;
-}, fastSwitchThreshold: number | undefined, bufferGoal: number, segmentBuffer: SegmentBuffer): IBufferStatus;
+}, wantedStartPosition: number, playbackObserver: IReadOnlyPlaybackObserver<unknown>, fastSwitchThreshold: number | undefined, bufferGoal: number, segmentBuffer: SegmentBuffer): IBufferStatus;

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

@@ -27,17 +27,16 @@ var MINIMUM_SEGMENT_SIZE = config.MINIMUM_SEGMENT_SIZE;
  * be filled by any segment, even in the future.
  *
  * @param {Object} content
- * @param {Object} tick
+ * @param {Object} playbackInfo
  * @param {number|undefined} fastSwitchThreshold
  * @param {number} bufferGoal
  * @param {Object} segmentBuffer
  * @returns {Object}
  */
-export default function getBufferStatus(content, tick, fastSwitchThreshold, bufferGoal, segmentBuffer) {
+export default function getBufferStatus(content, wantedStartPosition, playbackObserver, fastSwitchThreshold, bufferGoal, segmentBuffer) {
     var _a;
     var period = content.period, representation = content.representation;
     segmentBuffer.synchronizeInventory();
-    var wantedStartPosition = tick.position + tick.wantedTimeOffset;
     var wantedEndPosition = wantedStartPosition + bufferGoal;
     var neededRange = { start: Math.max(wantedStartPosition, period.start),
         end: Math.min(wantedEndPosition, (_a = period.end) !== null && _a !== void 0 ? _a : Infinity) };
@@ -53,11 +52,12 @@ export default function getBufferStatus(content, tick, fastSwitchThreshold, buff
     /** Data on every segments buffered around `neededRange`. */
     var bufferedSegments = getPlayableBufferedSegments({ start: Math.max(neededRange.start - 0.5, 0),
         end: neededRange.end + 0.5 }, segmentBuffer.getInventory());
+    var currentPlaybackTime = playbackObserver.getCurrentTime();
     /** Callback allowing to retrieve a segment's history in the buffer. */
     var getBufferedHistory = segmentBuffer.getSegmentHistory.bind(segmentBuffer);
     /** List of segments we will need to download. */
-    var neededSegments = getNeededSegments({ content: content, bufferedSegments: bufferedSegments, currentPlaybackTime: tick.getCurrentTime(), fastSwitchThreshold: fastSwitchThreshold, getBufferedHistory: getBufferedHistory, neededRange: neededRange, segmentsBeingPushed: segmentsBeingPushed })
-        .map(function (segment) { return ({ priority: getSegmentPriority(segment.time, tick), segment: segment }); });
+    var neededSegments = getNeededSegments({ content: content, bufferedSegments: bufferedSegments, currentPlaybackTime: currentPlaybackTime, fastSwitchThreshold: fastSwitchThreshold, getBufferedHistory: getBufferedHistory, neededRange: neededRange, segmentsBeingPushed: segmentsBeingPushed })
+        .map(function (segment) { return ({ priority: getSegmentPriority(segment.time, wantedStartPosition), segment: segment }); });
     /**
      * `true` if the current `RepresentationStream` has loaded all the
      * needed segments for this Representation until the end of the Period.
@@ -141,10 +141,9 @@ function getPlayableBufferedSegments(neededRange, segmentInventory) {
             var inventorySegment = eltInventory.infos.segment;
             var eltInventoryStart = inventorySegment.time /
                 inventorySegment.timescale;
-            var eltInventoryEnd = inventorySegment.duration == null ?
+            var eltInventoryEnd = !inventorySegment.complete ?
                 eltInventory.end :
-                eltInventoryStart + inventorySegment.duration /
-                    inventorySegment.timescale;
+                eltInventoryStart + inventorySegment.duration / inventorySegment.timescale;
             if ((eltInventoryEnd > minEnd && eltInventoryStart < maxStart) ||
                 (eltInventory.end > minEnd && eltInventory.start < maxStart)) {
                 overlappingChunks.unshift(eltInventory);

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

@@ -80,7 +80,7 @@ export default function getNeededSegments(_a) {
         if (segment.isInit) {
             return true; // never skip initialization segments
         }
-        if (duration < MINIMUM_SEGMENT_SIZE) {
+        if (segment.complete && duration < MINIMUM_SEGMENT_SIZE) {
             return false; // too small, don't download
         }
         // Check if the same segment from another Representation is not already

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

@@ -14,18 +14,15 @@
  * limitations under the License.
  */
 /**
- * Calculate the priority number for a given time, in function of the distance
- * with the current time.
+ * Calculate the priority number for a given segment start time, in function of
+ * the distance with the wanted starting timestamp.
  *
  * The lower is this number, the higher should be the priority of the request.
  *
- * Note that a `timeWanted` given behind the current time will always have the
+ * Note that a `segmentTime` given behind the current time will always have the
  * highest priority.
- * @param {number} timeWanted
- * @param {Object} clockTick
+ * @param {number} segmentTime
+ * @param {Object} wantedStartTimestamp
  * @returns {number}
  */
-export default function getSegmentPriority(timeWanted: number, clockTick: {
-    position: number;
-    wantedTimeOffset: number;
-}): number;
+export default function getSegmentPriority(segmentTime: number, wantedStartTimestamp: number): number;

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

@@ -16,20 +16,19 @@
 import config from "../../../config";
 var SEGMENT_PRIORITIES_STEPS = config.SEGMENT_PRIORITIES_STEPS;
 /**
- * Calculate the priority number for a given time, in function of the distance
- * with the current time.
+ * Calculate the priority number for a given segment start time, in function of
+ * the distance with the wanted starting timestamp.
  *
  * The lower is this number, the higher should be the priority of the request.
  *
- * Note that a `timeWanted` given behind the current time will always have the
+ * Note that a `segmentTime` given behind the current time will always have the
  * highest priority.
- * @param {number} timeWanted
- * @param {Object} clockTick
+ * @param {number} segmentTime
+ * @param {Object} wantedStartTimestamp
  * @returns {number}
  */
-export default function getSegmentPriority(timeWanted, clockTick) {
-    var currentTime = clockTick.position + clockTick.wantedTimeOffset;
-    var distance = timeWanted - currentTime;
+export default function getSegmentPriority(segmentTime, wantedStartTimestamp) {
+    var distance = segmentTime - wantedStartTimestamp;
     for (var priority = 0; priority < SEGMENT_PRIORITIES_STEPS.length; priority++) {
         if (distance < SEGMENT_PRIORITIES_STEPS[priority]) {
             return priority;

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

@@ -13,6 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import RepresentationStream, { IRepresentationStreamArguments, IRepresentationStreamClockTick, ITerminationOrder } from "./representation_stream";
+import RepresentationStream, { IRepresentationStreamArguments, IRepresentationStreamPlaybackObservation, ITerminationOrder } from "./representation_stream";
 export default RepresentationStream;
-export { IRepresentationStreamArguments, IRepresentationStreamClockTick, ITerminationOrder, };
+export { IRepresentationStreamArguments, IRepresentationStreamPlaybackObservation, ITerminationOrder, };

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

@@ -15,6 +15,7 @@
  */
 import { Observable } from "rxjs";
 import Manifest, { Adaptation, ISegment, Period, Representation } from "../../../manifest";
+import { IReadOnlyPlaybackObserver } from "../../api";
 import { SegmentBuffer } from "../../segment_buffers";
 import { IStreamEventAddedSegment } from "../types";
 /**
@@ -25,9 +26,10 @@ import { IStreamEventAddedSegment } from "../types";
  * @param {Object} args
  * @returns {Observable}
  */
-export default function pushInitSegment<T>({ clock$, content, segment, segmentData, segmentBuffer }: {
-    clock$: Observable<{
+export default function pushInitSegment<T>({ playbackObserver, content, segment, segmentData, segmentBuffer }: {
+    playbackObserver: IReadOnlyPlaybackObserver<{
         position: number;
+        wantedTimeOffset: number;
     }>;
     content: {
         adaptation: Adaptation;

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

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defer as observableDefer, EMPTY, } from "rxjs";
-import { map } from "rxjs/operators";
+import { defer as observableDefer, EMPTY, map, } from "rxjs";
 import EVENTS from "../events_generators";
 import appendSegmentToBuffer from "./append_segment_to_buffer";
 /**
@@ -26,7 +25,7 @@ import appendSegmentToBuffer from "./append_segment_to_buffer";
  * @returns {Observable}
  */
 export default function pushInitSegment(_a) {
-    var clock$ = _a.clock$, content = _a.content, segment = _a.segment, segmentData = _a.segmentData, segmentBuffer = _a.segmentBuffer;
+    var playbackObserver = _a.playbackObserver, content = _a.content, segment = _a.segment, segmentData = _a.segmentData, segmentBuffer = _a.segmentBuffer;
     return observableDefer(function () {
         if (segmentData === null) {
             return EMPTY;
@@ -36,8 +35,7 @@ export default function pushInitSegment(_a) {
             chunk: null,
             timestampOffset: 0,
             appendWindow: [undefined, undefined], codec: codec };
-        return appendSegmentToBuffer(clock$, segmentBuffer, { data: data, inventoryInfos: null })
-            .pipe(map(function () {
+        return appendSegmentToBuffer(playbackObserver, segmentBuffer, { data: data, inventoryInfos: null }).pipe(map(function () {
             var buffered = segmentBuffer.getBufferedRanges();
             return EVENTS.addedSegment(content, segment, buffered, segmentData);
         }));

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

@@ -15,7 +15,8 @@
  */
 import { Observable } from "rxjs";
 import Manifest, { Adaptation, ISegment, Period, Representation } from "../../../manifest";
-import { ISegmentParserParsedSegment } from "../../../transports";
+import { ISegmentParserParsedMediaChunk } from "../../../transports";
+import { IReadOnlyPlaybackObserver } from "../../api";
 import { SegmentBuffer } from "../../segment_buffers";
 import { IStreamEventAddedSegment } from "../types";
 /**
@@ -26,9 +27,10 @@ import { IStreamEventAddedSegment } from "../types";
  * @param {Object} args
  * @returns {Observable}
  */
-export default function pushMediaSegment<T>({ clock$, content, initSegmentData, parsedSegment, segment, segmentBuffer }: {
-    clock$: Observable<{
+export default function pushMediaSegment<T>({ playbackObserver, content, initSegmentData, parsedSegment, segment, segmentBuffer }: {
+    playbackObserver: IReadOnlyPlaybackObserver<{
         position: number;
+        wantedTimeOffset: number;
     }>;
     content: {
         adaptation: Adaptation;
@@ -37,7 +39,7 @@ export default function pushMediaSegment<T>({ clock$, content, initSegmentData,
         representation: Representation;
     };
     initSegmentData: T | null;
-    parsedSegment: ISegmentParserParsedSegment<T>;
+    parsedSegment: ISegmentParserParsedMediaChunk<T>;
     segment: ISegment;
     segmentBuffer: SegmentBuffer;
 }): Observable<IStreamEventAddedSegment<T>>;

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

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defer as observableDefer, EMPTY, } from "rxjs";
-import { map } from "rxjs/operators";
+import { defer as observableDefer, EMPTY, map, } from "rxjs";
 import config from "../../../config";
 import objectAssign from "../../../utils/object_assign";
 import EVENTS from "../events_generators";
@@ -29,7 +28,7 @@ var APPEND_WINDOW_SECURITIES = config.APPEND_WINDOW_SECURITIES;
  * @returns {Observable}
  */
 export default function pushMediaSegment(_a) {
-    var clock$ = _a.clock$, content = _a.content, initSegmentData = _a.initSegmentData, parsedSegment = _a.parsedSegment, segment = _a.segment, segmentBuffer = _a.segmentBuffer;
+    var playbackObserver = _a.playbackObserver, content = _a.content, initSegmentData = _a.initSegmentData, parsedSegment = _a.parsedSegment, segment = _a.segment, segmentBuffer = _a.segmentBuffer;
     return observableDefer(function () {
         var _a, _b;
         if (parsedSegment.chunkData === null) {
@@ -63,8 +62,7 @@ export default function pushMediaSegment(_a) {
         }
         var inventoryInfos = objectAssign({ segment: segment, start: estimatedStart,
             end: estimatedEnd }, content);
-        return appendSegmentToBuffer(clock$, segmentBuffer, { data: data, inventoryInfos: inventoryInfos })
-            .pipe(map(function () {
+        return appendSegmentToBuffer(playbackObserver, segmentBuffer, { data: data, inventoryInfos: inventoryInfos }).pipe(map(function () {
             var buffered = segmentBuffer.getBufferedRanges();
             return EVENTS.addedSegment(content, segment, buffered, chunkData);
         }));

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

@@ -15,18 +15,17 @@
  */
 import { Observable } from "rxjs";
 import Manifest, { Adaptation, Period, Representation } from "../../../manifest";
+import { IReadOnlyPlaybackObserver } from "../../api";
 import { IPrioritizedSegmentFetcher } from "../../fetchers";
 import { SegmentBuffer } from "../../segment_buffers";
 import { IRepresentationStreamEvent } from "../types";
-/** Object emitted by the Stream's clock$ at each tick. */
-export interface IRepresentationStreamClockTick {
-    /** The position, in seconds, the media element was in at the time of the tick. */
-    position: number;
+/** Object that should be emitted by the given `IReadOnlyPlaybackObserver`. */
+export interface IRepresentationStreamPlaybackObservation {
     /**
-     * Gap between the current position and the edge of a live content.
-     * Not set for non-live contents.
+     * The position, in seconds, the media element was in at the time of the
+     * playback observation.
      */
-    liveGap?: number;
+    position: number;
     /**
      * Offset in seconds to add to the time to obtain the position we
      * actually want to download from.
@@ -35,8 +34,6 @@ export interface IRepresentationStreamClockTick {
      * starting position different from `0`.
      */
     wantedTimeOffset: number;
-    /** Fetch the precize position currently in the HTMLMediaElement. */
-    getCurrentTime(): number;
 }
 /** Item emitted by the `terminate$` Observable given to a RepresentationStream. */
 export interface ITerminationOrder {
@@ -44,8 +41,6 @@ export interface ITerminationOrder {
 }
 /** Arguments to give to the RepresentationStream. */
 export interface IRepresentationStreamArguments<TSegmentDataType> {
-    /** Periodically emits the current playback conditions. */
-    clock$: Observable<IRepresentationStreamClockTick>;
     /** The context of the Representation you want to load. */
     content: {
         adaptation: Adaptation;
@@ -68,6 +63,8 @@ export interface IRepresentationStreamArguments<TSegmentDataType> {
      * Observable once the corresponding segments have been pushed).
      */
     terminate$: Observable<ITerminationOrder>;
+    /** Periodically emits the current playback conditions. */
+    playbackObserver: IReadOnlyPlaybackObserver<IRepresentationStreamPlaybackObservation>;
     /** Supplementary arguments which configure the RepresentationStream's behavior. */
     options: IRepresentationStreamOptions;
 }
@@ -125,4 +122,4 @@ export interface IRepresentationStreamOptions {
  * @param {Object} args
  * @returns {Observable}
  */
-export default function RepresentationStream<TSegmentDataType>({ clock$, content, segmentBuffer, segmentFetcher, terminate$, options, }: IRepresentationStreamArguments<TSegmentDataType>): Observable<IRepresentationStreamEvent>;
+export default function RepresentationStream<TSegmentDataType>({ content, options, playbackObserver, segmentBuffer, segmentFetcher, terminate$, }: IRepresentationStreamArguments<TSegmentDataType>): Observable<IRepresentationStreamEvent>;