rx-player 3.29.0-dev.2022103101 → 3.29.0-dev.2022111000

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## v3.29.0-dev.2022103100 (2022-10-31)
+## v3.29.0 (XXXX-XX-XX)
 
 ### Features
 
@@ -22,7 +22,7 @@
   - Compat/DRM: Fix infinite loading on WebOS (LG TVs) 2021 and 2022 when loading more than once an encrypted content by resetting decryption capabilities each time [#1175]
   - Compat: To work around an issue on WebOS (LG TVs), also specify a request timeout manually through a `setTimeout` call when XMLHttpRequests are created for Manifest and segment requests [#1152]
   - Compat/Directfile: Fix an issue on Tizen (Samsung TVs) where playing directfile contents could randomly lead to not having audio [#1170]
-  - Compat: Fix issue with Tizen (Samsung TVs) where starting playback on a discontinuity could lead to infinite rebuffering [#1140]
+  - Compat: Fix issue with Tizen (Samsung TVs) where starting playback on a discontinuity could lead to infinite rebuffering [#1140, #1176]
   - Compat/Directfile: For `"directfile"` contents, also consider `AudioTrack` with a `description` (without an "s") as audio-description audio tracks to work-around what seems to be a Safari typo [#1160]
   - DRM: When using persistent licenses, create new MediaKeySession when `load` resolves with `false`, instead of relying the same, to fix issues with such persistent sessions if the browser cleaned it up [#1139]
   - Only call "MediaSource.endOfStream" once, the most visible side-effect should have been repeated logs [#1163]

package/VERSION

@@ -1 +1 @@
-3.29.0-dev.2022103101
+3.29.0-dev.2022111000

package/dist/_esm5.processed/compat/browser_detection.js

@@ -37,9 +37,9 @@ var isTizen = !isNode &&
 var isWebOs = !isNode &&
     /Web0S/.test(navigator.userAgent);
 var isWebOs2021 = !isNode &&
-    /WebOS.TV-2021/.test(navigator.userAgent);
+    /(W|w)eb(O|0)S.TV-2021/.test(navigator.userAgent);
 var isWebOs2022 = !isNode &&
-    /WebOS.TV-2022/.test(navigator.userAgent);
+    /(W|w)eb(O|0)S.TV-2022/.test(navigator.userAgent);
 /** `true` on Safari on a PC platform (i.e. not iPhone / iPad etc.) */
 var isSafariDesktop = !isNode && (Object.prototype.toString.call(window.HTMLElement).indexOf("Constructor") >= 0 ||
     ((_b = (_a = window.safari) === null || _a === void 0 ? void 0 : _a.pushNotification) === null || _b === void 0 ? void 0 : _b.toString()) ===

package/dist/_esm5.processed/core/api/playback_observer.d.ts

@@ -116,6 +116,11 @@ export default class PlaybackObserver {
      * @param {number} time
      */
     setCurrentTime(time: number): void;
+    /**
+     * Update the playback rate of the `HTMLMediaElement`.
+     * @param {number} playbackRate
+     */
+    setPlaybackRate(playbackRate: number): void;
     /**
      * Returns the current `readyState` advertised by the `HTMLMediaElement`.
      * @returns {number}

package/dist/_esm5.processed/core/api/playback_observer.js

@@ -117,6 +117,13 @@ var PlaybackObserver = /** @class */ (function () {
         this._internalSeeksIncoming.push(time);
         this._mediaElement.currentTime = time;
     };
+    /**
+     * Update the playback rate of the `HTMLMediaElement`.
+     * @param {number} playbackRate
+     */
+    PlaybackObserver.prototype.setPlaybackRate = function (playbackRate) {
+        this._mediaElement.playbackRate = playbackRate;
+    };
     /**
      * Returns the current `readyState` advertised by the `HTMLMediaElement`.
      * @returns {number}

package/dist/_esm5.processed/core/api/public_api.js

@@ -87,7 +87,7 @@ var Player = /** @class */ (function (_super) {
         // Workaround to support Firefox autoplay on FF 42.
         // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
         videoElement.preload = "auto";
-        _this.version = /* PLAYER_VERSION */ "3.29.0-dev.2022103101";
+        _this.version = /* PLAYER_VERSION */ "3.29.0-dev.2022111000";
         _this.log = log;
         _this.state = "STOPPED";
         _this.videoElement = videoElement;
@@ -2312,5 +2312,5 @@ var Player = /** @class */ (function (_super) {
     };
     return Player;
 }(EventEmitter));
-Player.version = /* PLAYER_VERSION */ "3.29.0-dev.2022103101";
+Player.version = /* PLAYER_VERSION */ "3.29.0-dev.2022111000";
 export default Player;

package/dist/_esm5.processed/core/init/initialize_directfile.js

@@ -24,9 +24,8 @@ import deferSubscriptions from "../../utils/defer_subscriptions";
 import emitLoadedEvent from "./emit_loaded_event";
 import initialSeekAndPlay from "./initial_seek_and_play";
 import linkDrmAndContent from "./link_drm_and_content";
-import StallAvoider from "./stall_avoider";
+import RebufferingController from "./rebuffering_controller";
 import throwOnMediaError from "./throw_on_media_error";
-import updatePlaybackRate from "./update_playback_rate";
 // 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`.
@@ -100,15 +99,11 @@ export default function initializeDirectfileContent(_a) {
     // through a throwing Observable.
     var mediaError$ = throwOnMediaError(mediaElement);
     var observation$ = playbackObserver.getReference().asObservable();
-    // Set the speed set by the user on the media element while pausing a
-    // little longer while the buffer is empty.
-    var playbackRate$ = updatePlaybackRate(mediaElement, speed, observation$)
-        .pipe(ignoreElements());
     /**
      * Observable trying to avoid various stalling situations, emitting "stalled"
      * events when it cannot, as well as "unstalled" events when it get out of one.
      */
-    var stallAvoider$ = StallAvoider(playbackObserver, null, speed, EMPTY, EMPTY);
+    var rebuffer$ = RebufferingController(playbackObserver, null, speed, EMPTY, EMPTY);
     /**
      * Emit a "loaded" events once the initial play has been performed and the
      * media can begin playback.
@@ -121,5 +116,5 @@ export default function initializeDirectfileContent(_a) {
         }
         return emitLoadedEvent(observation$, mediaElement, null, true);
     }));
-    return observableMerge(loadingEvts$, drmEvents$.pipe(ignoreElements()), mediaError$, playbackRate$, stallAvoider$);
+    return observableMerge(loadingEvts$, drmEvents$.pipe(ignoreElements()), mediaError$, rebuffer$);
 }

package/dist/_esm5.processed/core/init/load_on_media_source.js

@@ -25,9 +25,8 @@ import emitLoadedEvent from "./emit_loaded_event";
 import { maintainEndOfStream } from "./end_of_stream";
 import initialSeekAndPlay from "./initial_seek_and_play";
 import MediaDurationUpdater from "./media_duration_updater";
-import StallAvoider from "./stall_avoider";
+import RebufferingController from "./rebuffering_controller";
 import streamEventsEmitter from "./stream_events_emitter";
-import updatePlaybackRate from "./update_playback_rate";
 /**
  * Returns a function allowing to load or reload the content in arguments into
  * a single or multiple MediaSources.
@@ -101,18 +100,11 @@ export default function createMediaSourceLoader(_a) {
                     return observableOf(evt);
             }
         }));
-        /**
-         * On subscription, keep the playback speed synchronized to the speed set by
-         * the user on the media element and force a speed of `0` when the buffer is
-         * empty, so it can build back buffer.
-         */
-        var playbackRate$ = updatePlaybackRate(mediaElement, speed, observation$)
-            .pipe(ignoreElements());
         /**
          * Observable trying to avoid various stalling situations, emitting "stalled"
          * events when it cannot, as well as "unstalled" events when it get out of one.
          */
-        var stallAvoider$ = StallAvoider(playbackObserver, manifest, speed, lockedStream$, discontinuityUpdate$);
+        var rebuffer$ = RebufferingController(playbackObserver, manifest, speed, lockedStream$, discontinuityUpdate$);
         /**
          * Emit a "loaded" events once the initial play has been performed and the
          * media can begin playback.
@@ -123,7 +115,7 @@ export default function createMediaSourceLoader(_a) {
                 observableOf(evt) :
                 emitLoadedEvent(observation$, mediaElement, segmentBuffersStore, false);
         }));
-        return observableMerge(loadingEvts$, playbackRate$, stallAvoider$, streams$, contentTimeObserver, streamEvents$).pipe(finalize(function () {
+        return observableMerge(loadingEvts$, rebuffer$, streams$, contentTimeObserver, streamEvents$).pipe(finalize(function () {
             mediaDurationUpdater.stop();
             // clean-up every created SegmentBuffers
             segmentBuffersStore.disposeAll();

package/dist/_esm5.processed/core/init/{stall_avoider.d.ts → rebuffering_controller.d.ts}

@@ -63,7 +63,10 @@ export interface IDiscontinuityTimeInfo {
     end: number | null;
 }
 /**
- * Monitor situations where playback is stalled and try to get out of those.
+ * Monitor playback, trying to avoid stalling situation.
+ * If stopping the player to build buffer is needed, temporarily set the
+ * playback rate (i.e. speed) at `0` until enough buffer is available again.
+ *
  * Emit "stalled" then "unstalled" respectively when an unavoidable stall is
  * encountered and exited.
  * @param {object} playbackObserver - emit the current playback conditions.
@@ -75,4 +78,4 @@ export interface IDiscontinuityTimeInfo {
  * discontinuities for loaded Period and buffer types.
  * @returns {Observable}
  */
-export default function StallAvoider(playbackObserver: PlaybackObserver, manifest: Manifest | null, speed: IReadOnlySharedReference<number>, lockedStream$: Observable<ILockedStreamEvent>, discontinuityUpdate$: Observable<IDiscontinuityEvent>): Observable<IStalledEvent | IUnstalledEvent | IWarningEvent>;
+export default function RebufferingController(playbackObserver: PlaybackObserver, manifest: Manifest | null, speed: IReadOnlySharedReference<number>, lockedStream$: Observable<ILockedStreamEvent>, discontinuityUpdate$: Observable<IDiscontinuityEvent>): Observable<IStalledEvent | IUnstalledEvent | IWarningEvent>;

package/dist/_esm5.processed/core/init/{stall_avoider.js → rebuffering_controller.js}

@@ -13,12 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ignoreElements, map, merge as observableMerge, scan, tap, withLatestFrom, } from "rxjs";
+import { finalize, ignoreElements, map, merge as observableMerge, scan, tap, withLatestFrom, } from "rxjs";
 import isSeekingApproximate from "../../compat/is_seeking_approximate";
 import config from "../../config";
 import { MediaError } from "../../errors";
 import log from "../../log";
 import { getNextRangeGap } from "../../utils/ranges";
+import TaskCanceller from "../../utils/task_canceller";
 import EVENTS from "../stream/events_generators";
 /**
  * Work-around rounding errors with floating points by setting an acceptable,
@@ -26,7 +27,10 @@ import EVENTS from "../stream/events_generators";
  */
 var EPSILON = 1 / 60;
 /**
- * Monitor situations where playback is stalled and try to get out of those.
+ * Monitor playback, trying to avoid stalling situation.
+ * If stopping the player to build buffer is needed, temporarily set the
+ * playback rate (i.e. speed) at `0` until enough buffer is available again.
+ *
  * Emit "stalled" then "unstalled" respectively when an unavoidable stall is
  * encountered and exited.
  * @param {object} playbackObserver - emit the current playback conditions.
@@ -38,7 +42,7 @@ var EPSILON = 1 / 60;
  * discontinuities for loaded Period and buffer types.
  * @returns {Observable}
  */
-export default function StallAvoider(playbackObserver, manifest, speed, lockedStream$, discontinuityUpdate$) {
+export default function RebufferingController(playbackObserver, manifest, speed, lockedStream$, discontinuityUpdate$) {
     var initialDiscontinuitiesStore = [];
     /**
      * Emit every known audio and video buffer discontinuities in chronological
@@ -103,6 +107,7 @@ export default function StallAvoider(playbackObserver, manifest, speed, lockedSt
     // This is why we're disabling the eslint rule.
     /* eslint-disable-next-line @typescript-eslint/no-unsafe-argument */
     ignoreElements());
+    var playbackRateUpdater = new PlaybackRateUpdater(playbackObserver, speed);
     var stall$ = playbackObserver.getReference().asObservable().pipe(withLatestFrom(discontinuitiesStore$), map(function (_a) {
         var _b;
         var observation = _a[0], discontinuitiesStore = _a[1];
@@ -131,6 +136,12 @@ export default function StallAvoider(playbackObserver, manifest, speed, lockedSt
                 prevFreezingState = { attemptTimestamp: now };
             }
             if (now - freezing.timestamp > FREEZING_STALLED_DELAY) {
+                if (rebuffering === null || ignoredStallTimeStamp !== null) {
+                    playbackRateUpdater.stopRebuffering();
+                }
+                else {
+                    playbackRateUpdater.startRebuffering();
+                }
                 return { type: "stalled",
                     value: "freezing" };
             }
@@ -139,6 +150,7 @@ export default function StallAvoider(playbackObserver, manifest, speed, lockedSt
             prevFreezingState = null;
         }
         if (rebuffering === null) {
+            playbackRateUpdater.stopRebuffering();
             if (readyState === 1) {
                 // With a readyState set to 1, we should still not be able to play:
                 // Return that we're stalled
@@ -165,6 +177,7 @@ export default function StallAvoider(playbackObserver, manifest, speed, lockedSt
         if (ignoredStallTimeStamp !== null) {
             var now = performance.now();
             if (now - ignoredStallTimeStamp < FORCE_DISCONTINUITY_SEEK_DELAY) {
+                playbackRateUpdater.stopRebuffering();
                 log.debug("Init: letting the device get out of a stall by itself");
                 return { type: "stalled",
                     value: stalledReason };
@@ -174,6 +187,7 @@ export default function StallAvoider(playbackObserver, manifest, speed, lockedSt
             }
         }
         ignoredStallTimeStamp = null;
+        playbackRateUpdater.startRebuffering();
         if (manifest === null) {
             return { type: "stalled",
                 value: stalledReason };
@@ -231,7 +245,10 @@ export default function StallAvoider(playbackObserver, manifest, speed, lockedSt
         return { type: "stalled",
             value: stalledReason };
     }));
-    return observableMerge(unlock$, stall$);
+    return observableMerge(unlock$, stall$)
+        .pipe(finalize(function () {
+        playbackRateUpdater.dispose();
+    }));
 }
 /**
  * @param {Array.<Object>} discontinuitiesStore
@@ -348,3 +365,75 @@ function generateDiscontinuityError(stalledPosition, seekTo) {
         String(stalledPosition) + ", seeked at position " +
         String(seekTo));
 }
+/**
+ * Manage playback speed, allowing to force a playback rate of `0` when
+ * rebuffering is wanted.
+ *
+ * Only one `PlaybackRateUpdater` should be created per HTMLMediaElement.
+ * Note that the `PlaybackRateUpdater` reacts to playback event and wanted
+ * speed change. You should call its `dispose` method once you don't need it
+ * anymore.
+ * @class PlaybackRateUpdater
+ */
+var PlaybackRateUpdater = /** @class */ (function () {
+    /**
+     * Create a new `PlaybackRateUpdater`.
+     * @param {Object} playbackObserver
+     * @param {Object} speed
+     */
+    function PlaybackRateUpdater(playbackObserver, speed) {
+        this._speedUpdateCanceller = new TaskCanceller();
+        this._isRebuffering = false;
+        this._playbackObserver = playbackObserver;
+        this._isDisposed = false;
+        this._speed = speed;
+        this._updateSpeed();
+    }
+    /**
+     * Force the playback rate to `0`, to start a rebuffering phase.
+     *
+     * You can call `stopRebuffering` when you want the rebuffering phase to end.
+     */
+    PlaybackRateUpdater.prototype.startRebuffering = function () {
+        if (this._isRebuffering || this._isDisposed) {
+            return;
+        }
+        this._isRebuffering = true;
+        this._speedUpdateCanceller.cancel();
+        log.info("Init: Pause playback to build buffer");
+        this._playbackObserver.setPlaybackRate(0);
+    };
+    /**
+     * If in a rebuffering phase (during which the playback rate is forced to
+     * `0`), exit that phase to apply the wanted playback rate instead.
+     *
+     * Do nothing if not in a rebuffering phase.
+     */
+    PlaybackRateUpdater.prototype.stopRebuffering = function () {
+        if (!this._isRebuffering || this._isDisposed) {
+            return;
+        }
+        this._isRebuffering = false;
+        this._speedUpdateCanceller = new TaskCanceller();
+        this._updateSpeed();
+    };
+    /**
+     * The `PlaybackRateUpdater` allocate resources to for example listen to
+     * wanted speed changes and react to it.
+     *
+     * Consequently, you should call the `dispose` method, when you don't want the
+     * `PlaybackRateUpdater` to have an effect anymore.
+     */
+    PlaybackRateUpdater.prototype.dispose = function () {
+        this._speedUpdateCanceller.cancel();
+        this._isDisposed = true;
+    };
+    PlaybackRateUpdater.prototype._updateSpeed = function () {
+        var _this = this;
+        this._speed.onUpdate(function (lastSpeed) {
+            log.info("Init: Resume playback speed", lastSpeed);
+            _this._playbackObserver.setPlaybackRate(lastSpeed);
+        }, { clearSignal: this._speedUpdateCanceller.signal, emitCurrentValue: true });
+    };
+    return PlaybackRateUpdater;
+}());

package/dist/_esm5.processed/core/init/update_playback_rate.d.ts

@@ -1,32 +0,0 @@
-/**
- * Copyright 2015 CANAL+ Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { Observable } from "rxjs";
-import { IReadOnlySharedReference } from "../../utils/reference";
-import { IPlaybackObservation } from "../api";
-export interface IPlaybackRateOptions {
-    pauseWhenRebuffering?: boolean;
-}
-/**
- * Manage playback speed.
- * Set playback rate set by the user, pause playback when the player appear to
- * rebuffering and restore the speed once it appears to exit rebuffering status.
- *
- * @param {HTMLMediaElement} mediaElement
- * @param {Observable} speed - last speed set by the user
- * @param {Observable} observation$ - Current playback conditions
- * @returns {Observable}
- */
-export default function updatePlaybackRate(mediaElement: HTMLMediaElement, speed: IReadOnlySharedReference<number>, observation$: Observable<IPlaybackObservation>): Observable<number>;

package/dist/_esm5.processed/core/init/update_playback_rate.js

@@ -1,46 +1 @@
-/**
- * Copyright 2015 CANAL+ Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import { defer as observableDefer, distinctUntilChanged, map, of as observableOf, startWith, switchMap, tap, } from "rxjs";
-import log from "../../log";
-/**
- * Manage playback speed.
- * Set playback rate set by the user, pause playback when the player appear to
- * rebuffering and restore the speed once it appears to exit rebuffering status.
- *
- * @param {HTMLMediaElement} mediaElement
- * @param {Observable} speed - last speed set by the user
- * @param {Observable} observation$ - Current playback conditions
- * @returns {Observable}
- */
-export default function updatePlaybackRate(mediaElement, speed, observation$) {
-    var forcePause$ = observation$
-        .pipe(map(function (observation) { return observation.rebuffering !== null; }), startWith(false), distinctUntilChanged());
-    return forcePause$
-        .pipe(switchMap(function (shouldForcePause) {
-        if (shouldForcePause) {
-            return observableDefer(function () {
-                log.info("Init: Pause playback to build buffer");
-                mediaElement.playbackRate = 0;
-                return observableOf(0);
-            });
-        }
-        return speed.asObservable()
-            .pipe(tap(function (lastSpeed) {
-            log.info("Init: Resume playback speed", lastSpeed);
-            mediaElement.playbackRate = lastSpeed;
-        }));
-    }));
-}
+"use strict";

package/dist/_esm5.processed/default_config.js

@@ -312,7 +312,7 @@ var DEFAULT_CONFIG = {
      * small enough so this (arguably rare) situation won't lead to too much
      * waiting time.
      */
-    FORCE_DISCONTINUITY_SEEK_DELAY: 3000,
+    FORCE_DISCONTINUITY_SEEK_DELAY: 5000,
     /**
      * Ratio used to know if an already loaded segment should be re-buffered.
      * We re-load the given segment if the current one times that ratio is