rx-player 3.28.1-dev.2022083000 → 3.29.0-dev.2022090500

package/dist/rx-player.js

@@ -1395,7 +1395,7 @@ __webpack_require__.d(__webpack_exports__, {
   "it": function() { return /* binding */ getVideoVisibilityRef; },
   "O0": function() { return /* binding */ getVideoWidthRef; },
   "Oh": function() { return /* binding */ onEncrypted$; },
-  "C1": function() { return /* binding */ onEnded$; },
+  "M4": function() { return /* binding */ onEnded; },
   "Q1": function() { return /* binding */ onFullscreenChange$; },
   "GV": function() { return /* binding */ onKeyAdded$; },
   "Xe": function() { return /* binding */ onKeyError$; },
@@ -1403,8 +1403,8 @@ __webpack_require__.d(__webpack_exports__, {
   "eX": function() { return /* binding */ onKeyStatusesChange$; },
   "K4": function() { return /* binding */ onLoadedMetadata$; },
   "gg": function() { return /* binding */ onRemoveSourceBuffers$; },
-  "ik": function() { return /* binding */ onSeeked$; },
-  "d5": function() { return /* binding */ onSeeking$; },
+  "bQ": function() { return /* binding */ onSeeked; },
+  "Q$": function() { return /* binding */ onSeeking; },
   "UG": function() { return /* binding */ onSourceClose$; },
   "ep": function() { return /* binding */ onSourceEnded$; },
   "ym": function() { return /* binding */ onSourceOpen$; },
@@ -1412,7 +1412,7 @@ __webpack_require__.d(__webpack_exports__, {
   "_E": function() { return /* binding */ onUpdate$; }
 });
 
-// UNUSED EXPORTS: addEventListener, onTimeUpdate$
+// UNUSED EXPORTS: addEventListener, onEnded$, onSeeked$, onSeeking$, onTimeUpdate$
 
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/fromEvent.js
 var fromEvent = __webpack_require__(2401);
@@ -1521,6 +1521,53 @@ function eventPrefixed(eventNames, prefixes) {
     }));
   }, []);
 }
+/**
+ * Returns a function allowing to add event listeners for particular event(s)
+ * optionally automatically adding browser prefixes if needed.
+ * @param {Array.<string>} eventNames - The event(s) to listen to. If multiple
+ * events are set, the event listener will be triggered when any of them emits.
+ * @returns {Function} - Returns function allowing to easily add a callback to
+ * be triggered when that event is emitted on a given event target.
+ */
+
+
+function createCompatibleEventListener(eventNames) {
+  var mem;
+  var prefixedEvents = eventPrefixed(eventNames);
+  return function (element, listener, cancelSignal) {
+    if (cancelSignal.isCancelled) {
+      return;
+    } // if the element is a HTMLElement we can detect
+    // the supported event, and memoize it in `mem`
+
+
+    if (element instanceof HTMLElement) {
+      if (typeof mem === "undefined") {
+        mem = findSupportedEvent(element, prefixedEvents);
+      }
+
+      if ((0,is_non_empty_string/* default */.Z)(mem)) {
+        element.addEventListener(mem, listener);
+        cancelSignal.register(function () {
+          if (mem !== undefined) {
+            element.removeEventListener(mem, listener);
+          }
+        });
+      } else {
+        if (false) {}
+
+        return;
+      }
+    }
+
+    prefixedEvents.forEach(function (eventName) {
+      element.addEventListener(eventName, listener);
+      cancelSignal.register(function () {
+        element.removeEventListener(eventName, listener);
+      });
+    });
+  };
+}
 /**
  * @param {Array.<string>} eventNames
  * @param {Array.<string>|undefined} prefixes
@@ -1649,7 +1696,8 @@ function getVideoWidthFromPIPWindow(mediaElement, pipWindow) {
 }
 /**
  * Emit when video enters and leaves Picture-In-Picture mode.
- * @param {HTMLMediaElement} mediaElement
+ * @param {HTMLMediaElement} elt
+ * @param {Object} stopListening
  * @returns {Observable}
  */
 
@@ -1911,6 +1959,24 @@ var onKeyError$ = compatibleListener(["keyerror", "error"]);
  */
 
 var onKeyStatusesChange$ = compatibleListener(["keystatuseschange"]);
+/**
+ * @param {HTMLMediaElement} mediaElement
+ * @returns {Observable}
+ */
+
+var onSeeking = createCompatibleEventListener(["seeking"]);
+/**
+ * @param {HTMLMediaElement} mediaElement
+ * @returns {Observable}
+ */
+
+var onSeeked = createCompatibleEventListener(["seeked"]);
+/**
+ * @param {HTMLMediaElement} mediaElement
+ * @returns {Observable}
+ */
+
+var onEnded = createCompatibleEventListener(["ended"]);
 /**
  * Utilitary function allowing to add an event listener and remove it
  * automatically once the given `CancellationSignal` emits.
@@ -2492,7 +2558,7 @@ var DEFAULT_CONFIG = {
    * small enough so this (arguably rare) situation won't lead to too much
    * waiting time.
    */
-  FORCE_DISCONTINUITY_SEEK_DELAY: 2000,
+  FORCE_DISCONTINUITY_SEEK_DELAY: 3000,
 
   /**
    * Ratio used to know if an already loaded segment should be re-buffered.
@@ -8178,8 +8244,8 @@ var empty = __webpack_require__(1545);
 var of = __webpack_require__(2817);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js
 var takeUntil = __webpack_require__(3505);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js
-var concat = __webpack_require__(6362);
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js + 1 modules
+var concat = __webpack_require__(2034);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/tap.js
 var tap = __webpack_require__(2006);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/ignoreElements.js
@@ -10563,8 +10629,8 @@ var shareReplay = __webpack_require__(8515);
 var mergeMap = __webpack_require__(7877);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/startWith.js
 var startWith = __webpack_require__(6108);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js
-var concat = __webpack_require__(6362);
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js + 1 modules
+var concat = __webpack_require__(2034);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/defer.js
 var defer = __webpack_require__(9917);
 // EXTERNAL MODULE: ./src/utils/cast_to_observable.ts
@@ -11016,7 +11082,7 @@ function initializeDirectfileContent(_ref) {
    * events when it cannot, as well as "unstalled" events when it get out of one.
    */
 
-  var stallAvoider$ = (0,stall_avoider/* default */.Z)(playbackObserver, null, empty/* EMPTY */.E, empty/* EMPTY */.E);
+  var stallAvoider$ = (0,stall_avoider/* default */.Z)(playbackObserver, null, speed, empty/* EMPTY */.E, empty/* EMPTY */.E);
   /**
    * Emit a "loaded" events once the initial play has been performed and the
    * media can begin playback.
@@ -11319,13 +11385,14 @@ var EPSILON = 1 / 60;
  * encountered and exited.
  * @param {object} playbackObserver - emit the current playback conditions.
  * @param {Object} manifest - The Manifest of the currently-played content.
+ * @param {Object} speed - The last speed set by the user
+ * @param {Observable} lockedStream$
  * @param {Observable} discontinuityUpdate$ - Observable emitting encountered
  * discontinuities for loaded Period and buffer types.
- * @param {Function} setCurrentTime
  * @returns {Observable}
  */
 
-function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUpdate$) {
+function StallAvoider(playbackObserver, manifest, speed, lockedStream$, discontinuityUpdate$) {
   var initialDiscontinuitiesStore = [];
   /**
    * Emit every known audio and video buffer discontinuities in chronological
@@ -11374,11 +11441,9 @@ function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUp
     var lockedStreamEvt = _ref2[0],
         observation = _ref2[1];
 
-    var _a; // TODO(PaulB) also skip when the user's wanted speed is set to `0`, as we
-    // might not want to seek in that case?
-
+    var _a;
 
-    if (!observation.rebuffering || observation.paused || lockedStreamEvt.bufferType !== "audio" && lockedStreamEvt.bufferType !== "video") {
+    if (!observation.rebuffering || observation.paused || speed.getValue() <= 0 || lockedStreamEvt.bufferType !== "audio" && lockedStreamEvt.bufferType !== "video") {
       return;
     }
 
@@ -11400,6 +11465,9 @@ function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUp
   var stall$ = playbackObserver.getReference().asObservable().pipe((0,withLatestFrom/* withLatestFrom */.M)(discontinuitiesStore$), (0,map/* map */.U)(function (_ref3) {
     var observation = _ref3[0],
         discontinuitiesStore = _ref3[1];
+
+    var _a;
+
     var buffered = observation.buffered,
         position = observation.position,
         readyState = observation.readyState,
@@ -11413,19 +11481,28 @@ function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUp
         UNFREEZING_SEEK_DELAY = _config$getCurrent.UNFREEZING_SEEK_DELAY,
         UNFREEZING_DELTA_POSITION = _config$getCurrent.UNFREEZING_DELTA_POSITION;
 
-    if (freezing !== null) {
+    if (!observation.seeking && is_seeking_approximate && ignoredStallTimeStamp === null && lastSeekingPosition !== null && observation.position < lastSeekingPosition) {
+      log/* default.debug */.Z.debug("Init: the device appeared to have seeked back by itself.");
       var now = performance.now();
+      ignoredStallTimeStamp = now;
+    }
+
+    lastSeekingPosition = observation.seeking ? Math.max((_a = observation.pendingInternalSeek) !== null && _a !== void 0 ? _a : 0, observation.position) : null;
+
+    if (freezing !== null) {
+      var _now = performance.now();
+
       var referenceTimestamp = prevFreezingState === null ? freezing.timestamp : prevFreezingState.attemptTimestamp;
 
-      if (now - referenceTimestamp > UNFREEZING_SEEK_DELAY) {
+      if (_now - referenceTimestamp > UNFREEZING_SEEK_DELAY) {
         log/* default.warn */.Z.warn("Init: trying to seek to un-freeze player");
         playbackObserver.setCurrentTime(playbackObserver.getCurrentTime() + UNFREEZING_DELTA_POSITION);
         prevFreezingState = {
-          attemptTimestamp: now
+          attemptTimestamp: _now
         };
       }
 
-      if (now - freezing.timestamp > FREEZING_STALLED_DELAY) {
+      if (_now - freezing.timestamp > FREEZING_STALLED_DELAY) {
         return {
           type: "stalled",
           value: "freezing"
@@ -11442,7 +11519,7 @@ function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUp
         var reason;
 
         if (observation.seeking) {
-          reason = observation.internalSeeking ? "internal-seek" : "seeking";
+          reason = observation.pendingInternalSeek !== null ? "internal-seek" : "seeking";
         } else {
           reason = "not-ready";
         }
@@ -11461,31 +11538,20 @@ function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUp
     // internally by the player to when its due to a regular user seek.
 
 
-    var stalledReason = rebuffering.reason === "seeking" && observation.internalSeeking ? "internal-seek" : rebuffering.reason;
-
-    if (observation.seeking) {
-      lastSeekingPosition = observation.position;
-    } else if (lastSeekingPosition !== null) {
-      var _now = performance.now();
-
-      if (ignoredStallTimeStamp === null) {
-        ignoredStallTimeStamp = _now;
-      }
+    var stalledReason = rebuffering.reason === "seeking" && observation.pendingInternalSeek !== null ? "internal-seek" : rebuffering.reason;
 
-      if (is_seeking_approximate && observation.position < lastSeekingPosition) {
-        log/* default.debug */.Z.debug("Init: the device appeared to have seeked back by itself.");
+    if (ignoredStallTimeStamp !== null) {
+      var _now2 = performance.now();
 
-        if (_now - ignoredStallTimeStamp < FORCE_DISCONTINUITY_SEEK_DELAY) {
-          return {
-            type: "stalled",
-            value: stalledReason
-          };
-        } else {
-          log/* default.warn */.Z.warn("Init: ignored stall for too long, checking discontinuity", _now - ignoredStallTimeStamp);
-        }
+      if (_now2 - ignoredStallTimeStamp < FORCE_DISCONTINUITY_SEEK_DELAY) {
+        log/* default.debug */.Z.debug("Init: letting the device get out of a stall by itself");
+        return {
+          type: "stalled",
+          value: stalledReason
+        };
+      } else {
+        log/* default.warn */.Z.warn("Init: ignored stall for too long, checking discontinuity", _now2 - ignoredStallTimeStamp);
       }
-
-      lastSeekingPosition = null;
     }
 
     ignoredStallTimeStamp = null;
@@ -11501,7 +11567,7 @@ function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUp
 
     var stalledPosition = rebuffering.position;
 
-    if (stalledPosition !== null) {
+    if (stalledPosition !== null && speed.getValue() > 0) {
       var skippableDiscontinuity = findSeekableDiscontinuity(discontinuitiesStore, manifest, stalledPosition);
 
       if (skippableDiscontinuity !== null) {
@@ -11527,7 +11593,7 @@ function StallAvoider(playbackObserver, manifest, lockedStream$, discontinuityUp
 
     var nextBufferRangeGap = (0,ranges/* getNextRangeGap */.XS)(buffered, freezePosition);
 
-    if (nextBufferRangeGap < BUFFER_DISCONTINUITY_THRESHOLD) {
+    if (speed.getValue() > 0 && nextBufferRangeGap < BUFFER_DISCONTINUITY_THRESHOLD) {
       var seekTo = freezePosition + nextBufferRangeGap + EPSILON;
 
       if (playbackObserver.getCurrentTime() < seekTo) {
@@ -11844,10 +11910,6 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js
 var inheritsLoose = __webpack_require__(4578);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/defer.js
-var defer = __webpack_require__(9917);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/of.js
-var of = __webpack_require__(2817);
 // EXTERNAL MODULE: ./src/log.ts + 1 modules
 var log = __webpack_require__(3887);
 // EXTERNAL MODULE: ./src/core/segment_buffers/implementations/types.ts + 3 modules
@@ -11875,7 +11937,6 @@ var manual_time_ranges = __webpack_require__(4309);
 
 
 
-
 /**
  * Image SegmentBuffer implementation.
  * @class ImageSegmentBuffer
@@ -11895,65 +11956,65 @@ var ImageSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
   }
   /**
    * @param {Object} data
+   * @returns {Promise}
    */
 
 
   var _proto = ImageSegmentBuffer.prototype;
 
   _proto.pushChunk = function pushChunk(infos) {
-    var _this2 = this;
-
-    return (0,defer/* defer */.P)(function () {
-      var _a, _b;
+    var _a, _b;
 
-      log/* default.debug */.Z.debug("ISB: appending new data.");
+    log/* default.debug */.Z.debug("ISB: appending new data.");
 
-      if (infos.data.chunk === null) {
-        return (0,of.of)(undefined);
-      }
+    if (infos.data.chunk === null) {
+      return Promise.resolve();
+    }
 
-      var _infos$data = infos.data,
-          appendWindow = _infos$data.appendWindow,
-          chunk = _infos$data.chunk; // The following check is ugly. I don't care, the image buffer is there
-      // due to an ugly deprecated API that will soon disappear
+    var _infos$data = infos.data,
+        appendWindow = _infos$data.appendWindow,
+        chunk = _infos$data.chunk; // The following check is ugly. I don't care, the image buffer is there
+    // due to an ugly deprecated API that will soon disappear
 
-      var start = chunk.start,
-          end = chunk.end,
-          timescale = chunk.timescale;
-      var appendWindowStart = (_a = appendWindow[0]) !== null && _a !== void 0 ? _a : 0;
-      var appendWindowEnd = (_b = appendWindow[1]) !== null && _b !== void 0 ? _b : Infinity;
-      var timescaledStart = start / timescale;
-      var timescaledEnd = end / timescale;
-      var startTime = Math.max(appendWindowStart, timescaledStart);
-      var endTime = Math.min(appendWindowEnd, timescaledEnd);
+    var start = chunk.start,
+        end = chunk.end,
+        timescale = chunk.timescale;
+    var appendWindowStart = (_a = appendWindow[0]) !== null && _a !== void 0 ? _a : 0;
+    var appendWindowEnd = (_b = appendWindow[1]) !== null && _b !== void 0 ? _b : Infinity;
+    var timescaledStart = start / timescale;
+    var timescaledEnd = end / timescale;
+    var startTime = Math.max(appendWindowStart, timescaledStart);
+    var endTime = Math.min(appendWindowEnd, timescaledEnd);
 
-      _this2._buffered.insert(startTime, endTime);
+    try {
+      this._buffered.insert(startTime, endTime);
 
       if (infos.inventoryInfos !== null) {
-        _this2._segmentInventory.insertChunk(infos.inventoryInfos);
+        this._segmentInventory.insertChunk(infos.inventoryInfos);
       }
+    } catch (err) {
+      return Promise.reject(err);
+    }
 
-      return (0,of.of)(undefined);
-    });
+    return Promise.resolve();
   }
   /**
    * @param {Number} from
    * @param {Number} to
+   * @returns {Promise}
    */
   ;
 
   _proto.removeBuffer = function removeBuffer(start, end) {
-    return (0,defer/* defer */.P)(function () {
-      log/* default.info */.Z.info("ISB: ignored image data remove order", start, end); // Logic removed as it caused more problems than it resolved:
-      // Image thumbnails are always downloaded as a single BIF file, meaning that
-      // any removing might necessitate to re-load the whole file in the future
-      // which seems pointless.
-      // In any case, image handling through the regular RxPlayer APIs has been
-      // completely deprecated now for several reasons, and should disappear in
-      // the next major version.
-
-      return (0,of.of)(undefined);
-    });
+    log/* default.info */.Z.info("ISB: ignored image data remove order", start, end); // Logic removed as it caused more problems than it resolved:
+    // Image thumbnails are always downloaded as a single BIF file, meaning that
+    // any removing might necessitate to re-load the whole file in the future
+    // which seems pointless.
+    // In any case, image handling through the regular RxPlayer APIs has been
+    // completely deprecated now for several reasons, and should disappear in
+    // the next major version.
+
+    return Promise.resolve();
   }
   /**
    * Indicate that every chunks from a Segment has been given to pushChunk so
@@ -11962,18 +12023,14 @@ var ImageSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
    * The returned Observable will emit and complete successively once the whole
    * segment has been pushed and this indication is acknowledged.
    * @param {Object} infos
-   * @returns {Observable}
+   * @returns {Promise}
    */
   ;
 
   _proto.endOfSegment = function endOfSegment(_infos) {
-    var _this3 = this;
+    this._segmentInventory.completeSegment(_infos, this._buffered);
 
-    return (0,defer/* defer */.P)(function () {
-      _this3._segmentInventory.completeSegment(_infos, _this3._buffered);
-
-      return (0,of.of)(undefined);
-    });
+    return Promise.resolve();
   }
   /**
    * Returns the currently buffered data, in a TimeRanges object.
@@ -12028,34 +12085,12 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js
 var inheritsLoose = __webpack_require__(4578);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/merge.js
-var merge = __webpack_require__(3071);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/interval.js
-var observable_interval = __webpack_require__(6697);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/startWith.js
-var startWith = __webpack_require__(6108);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/switchMap.js
-var switchMap = __webpack_require__(4978);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js
-var concat = __webpack_require__(6362);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/map.js
-var map = __webpack_require__(9127);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/takeUntil.js
-var takeUntil = __webpack_require__(3505);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/of.js
-var of = __webpack_require__(2817);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/Subject.js + 1 modules
-var Subject = __webpack_require__(6716);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/defer.js
-var defer = __webpack_require__(9917);
 // EXTERNAL MODULE: ./src/compat/event_listeners.ts + 1 modules
 var event_listeners = __webpack_require__(1381);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/Observable.js + 1 modules
-var Observable = __webpack_require__(1480);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/distinctUntilChanged.js
-var distinctUntilChanged = __webpack_require__(3741);
 // EXTERNAL MODULE: ./src/log.ts + 1 modules
 var log = __webpack_require__(3887);
+// EXTERNAL MODULE: ./src/utils/reference.ts
+var reference = __webpack_require__(5095);
 // EXTERNAL MODULE: ./src/compat/is_node.ts
 var is_node = __webpack_require__(2203);
 ;// CONCATENATED MODULE: ./src/compat/on_height_width_change.ts
@@ -12087,8 +12122,8 @@ var _ResizeObserver = is_node/* default */.Z ? undefined : window.ResizeObserver
 /* eslint-enable @typescript-eslint/no-unsafe-assignment */
 
 /**
- * Emit the current height and width of the given `element` on subscribtion
- * and each time it changes.
+ * Emit the current height and width of the given `element` each time it
+ * changes.
  *
  * On some browsers, we might not be able to rely on a native API to know when
  * it changes, the `interval` argument allow us to provide us an inverval in
@@ -12099,55 +12134,69 @@ var _ResizeObserver = is_node/* default */.Z ? undefined : window.ResizeObserver
  */
 
 
-function onHeightWidthChange(element, interval) {
-  return (0,defer/* defer */.P)(function () {
-    if (_ResizeObserver !== undefined) {
-      var lastHeight = -1;
-      var lastWidth = -1;
-      return new Observable/* Observable */.y(function (obs) {
-        var resizeObserver = new _ResizeObserver(function (entries) {
-          if (entries.length === 0) {
-            log/* default.error */.Z.error("Compat: Resized but no observed element.");
-            return;
-          }
+function onHeightWidthChange(element, interval, cancellationSignal) {
+  var _element$getBoundingC = element.getBoundingClientRect(),
+      initHeight = _element$getBoundingC.height,
+      initWidth = _element$getBoundingC.width;
 
-          var entry = entries[0];
-          var _entry$contentRect = entry.contentRect,
-              height = _entry$contentRect.height,
-              width = _entry$contentRect.width;
-
-          if (height !== lastHeight || width !== lastWidth) {
-            lastHeight = height;
-            lastWidth = width;
-            obs.next({
-              height: height,
-              width: width
-            });
-          }
-        });
-        resizeObserver.observe(element);
-        return function () {
-          resizeObserver.disconnect();
-        };
-      });
-    }
+  var ref = (0,reference/* default */.ZP)({
+    height: initHeight,
+    width: initWidth
+  });
+  var lastHeight = initHeight;
+  var lastWidth = initWidth;
 
-    return (0,observable_interval/* interval */.F)(interval).pipe((0,startWith/* startWith */.O)(null), (0,map/* map */.U)(function () {
-      var _element$getBoundingC = element.getBoundingClientRect(),
-          height = _element$getBoundingC.height,
-          width = _element$getBoundingC.width;
+  if (_ResizeObserver !== undefined) {
+    var resizeObserver = new _ResizeObserver(function (entries) {
+      if (entries.length === 0) {
+        log/* default.error */.Z.error("Compat: Resized but no observed element.");
+        return;
+      }
 
-      return {
-        height: height,
-        width: width
-      };
-    }), (0,distinctUntilChanged/* distinctUntilChanged */.x)(function (o, n) {
-      return o.height === n.height && o.width === n.width;
-    }));
-  });
+      var entry = entries[0];
+      var _entry$contentRect = entry.contentRect,
+          height = _entry$contentRect.height,
+          width = _entry$contentRect.width;
+
+      if (height !== lastHeight || width !== lastWidth) {
+        lastHeight = height;
+        lastWidth = width;
+        ref.setValue({
+          height: height,
+          width: width
+        });
+      }
+    });
+    resizeObserver.observe(element);
+    cancellationSignal.register(function () {
+      resizeObserver.disconnect();
+    });
+  } else {
+    var intervalId = setInterval(function () {
+      var _element$getBoundingC2 = element.getBoundingClientRect(),
+          height = _element$getBoundingC2.height,
+          width = _element$getBoundingC2.width;
+
+      if (height !== lastHeight || width !== lastWidth) {
+        lastHeight = height;
+        lastWidth = width;
+        ref.setValue({
+          height: height,
+          width: width
+        });
+      }
+    }, interval);
+    cancellationSignal.register(function () {
+      clearInterval(intervalId);
+    });
+  }
+
+  return ref;
 }
 // EXTERNAL MODULE: ./src/config.ts + 2 modules
 var config = __webpack_require__(6872);
+// EXTERNAL MODULE: ./src/utils/task_canceller.ts
+var task_canceller = __webpack_require__(288);
 // EXTERNAL MODULE: ./src/core/segment_buffers/implementations/types.ts + 3 modules
 var types = __webpack_require__(9612);
 // EXTERNAL MODULE: ./src/core/segment_buffers/implementations/utils/manual_time_ranges.ts
@@ -12796,37 +12845,14 @@ function updateProportionalElements(currentHeight, currentWidth, resolution, tex
 
 
 
-var onEnded$ = event_listeners/* onEnded$ */.C1,
-    onSeeked$ = event_listeners/* onSeeked$ */.ik,
-    onSeeking$ = event_listeners/* onSeeking$ */.d5;
-/**
- * Generate the interval at which TextTrack HTML Cues should be refreshed.
- * @param {HTMLMediaElement} videoElement
- * @returns {Observable}
- */
-
-function generateRefreshInterval(videoElement) {
-  var seeking$ = onSeeking$(videoElement);
-  var seeked$ = onSeeked$(videoElement);
-  var ended$ = onEnded$(videoElement);
-
-  var _config$getCurrent = config/* default.getCurrent */.Z.getCurrent(),
-      MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL = _config$getCurrent.MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL;
-
-  var manualRefresh$ = (0,merge/* merge */.T)(seeked$, ended$);
-  var autoRefresh$ = (0,observable_interval/* interval */.F)(MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL).pipe((0,startWith/* startWith */.O)(null));
-  return manualRefresh$.pipe((0,startWith/* startWith */.O)(null), (0,switchMap/* switchMap */.w)(function () {
-    return (0,concat/* concat */.z)(autoRefresh$.pipe((0,map/* map */.U)(function () {
-      return true;
-    }), (0,takeUntil/* takeUntil */.R)(seeking$)), (0,of.of)(false));
-  }));
-}
+var onEnded = event_listeners/* onEnded */.M4,
+    onSeeked = event_listeners/* onSeeked */.bQ,
+    onSeeking = event_listeners/* onSeeking */.Q$;
 /**
  * @param {Element} element
  * @param {Element} child
  */
 
-
 function safelyRemoveChild(element, child) {
   try {
     element.removeChild(child);
@@ -12883,88 +12909,55 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
     _this._buffered = new manual_time_ranges/* default */.Z();
     _this._videoElement = videoElement;
     _this._textTrackElement = textTrackElement;
-    _this._clearSizeUpdates$ = new Subject/* Subject */.x();
-    _this._destroy$ = new Subject/* Subject */.x();
+    _this._sizeUpdateCanceller = new task_canceller/* default */.ZP();
+    _this._canceller = new task_canceller/* default */.ZP();
     _this._buffer = new TextTrackCuesStore();
-    _this._currentCues = []; // update text tracks
-
-    generateRefreshInterval(_this._videoElement).pipe((0,takeUntil/* takeUntil */.R)(_this._destroy$)).subscribe(function (shouldDisplay) {
-      if (!shouldDisplay) {
-        _this._disableCurrentCues();
-
-        return;
-      }
+    _this._currentCues = [];
 
-      var _config$getCurrent2 = config/* default.getCurrent */.Z.getCurrent(),
-          MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL = _config$getCurrent2.MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL; // to spread the time error, we divide the regular chosen interval.
-
-
-      var time = Math.max(_this._videoElement.currentTime + MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL / 1000 / 2, 0);
-
-      var cues = _this._buffer.get(time);
+    _this.autoRefreshSubtitles(_this._canceller.signal);
 
-      if (cues.length === 0) {
-        _this._disableCurrentCues();
-      } else {
-        _this._displayCues(cues);
-      }
-    });
     return _this;
   }
   /**
    * Push segment on Subscription.
    * @param {Object} infos
-   * @returns {Observable}
+   * @returns {Promise}
    */
 
 
   var _proto = HTMLTextSegmentBuffer.prototype;
 
   _proto.pushChunk = function pushChunk(infos) {
-    var _this2 = this;
-
-    return (0,defer/* defer */.P)(function () {
-      _this2.pushChunkSync(infos);
+    try {
+      this.pushChunkSync(infos);
+    } catch (err) {
+      return Promise.reject(err);
+    }
 
-      return (0,of.of)(undefined);
-    });
+    return Promise.resolve();
   }
   /**
    * Remove buffered data.
    * @param {number} start - start position, in seconds
    * @param {number} end - end position, in seconds
-   * @returns {Observable}
+   * @returns {Promise}
    */
   ;
 
   _proto.removeBuffer = function removeBuffer(start, end) {
-    var _this3 = this;
-
-    return (0,defer/* defer */.P)(function () {
-      _this3.removeBufferSync(start, end);
-
-      return (0,of.of)(undefined);
-    });
+    this.removeBufferSync(start, end);
+    return Promise.resolve();
   }
   /**
-   * Indicate that every chunks from a Segment has been given to pushChunk so
-   * far.
-   * This will update our internal Segment inventory accordingly.
-   * The returned Observable will emit and complete successively once the whole
-   * segment has been pushed and this indication is acknowledged.
    * @param {Object} infos
-   * @returns {Observable}
+   * @returns {Promise}
    */
   ;
 
-  _proto.endOfSegment = function endOfSegment(_infos) {
-    var _this4 = this;
-
-    return (0,defer/* defer */.P)(function () {
-      _this4._segmentInventory.completeSegment(_infos, _this4._buffered);
+  _proto.endOfSegment = function endOfSegment(infos) {
+    this._segmentInventory.completeSegment(infos, this._buffered);
 
-      return (0,of.of)(undefined);
-    });
+    return Promise.resolve();
   }
   /**
    * Returns the currently buffered data, in a TimeRanges object.
@@ -12985,9 +12978,7 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
 
     this._buffered.remove(0, Infinity);
 
-    this._destroy$.next();
-
-    this._destroy$.complete();
+    this._canceller.cancel();
   }
   /**
    * Push the text track contained in `data` to the HTMLTextSegmentBuffer
@@ -13001,7 +12992,7 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
    *
    * /!\ This method won't add any data to the linked inventory.
    * Please use the `pushChunk` method for most use-cases.
-   * @param {Object} data
+   * @param {Object} infos
    * @returns {boolean}
    */
   ;
@@ -13122,7 +13113,7 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
   ;
 
   _proto._disableCurrentCues = function _disableCurrentCues() {
-    this._clearSizeUpdates$.next();
+    this._sizeUpdateCanceller.cancel();
 
     if (this._currentCues.length > 0) {
       for (var i = 0; i < this._currentCues.length; i++) {
@@ -13134,7 +13125,7 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
   }
   /**
    * Display a new Cue. If one was already present, it will be replaced.
-   * @param {HTMLElement} element
+   * @param {HTMLElement} elements
    */
   ;
 
@@ -13149,7 +13140,7 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
     // TODO More intelligent handling
 
 
-    this._clearSizeUpdates$.next();
+    this._sizeUpdateCanceller.cancel();
 
     for (var i = 0; i < this._currentCues.length; i++) {
       safelyRemoveChild(this._textTrackElement, this._currentCues[i].element);
@@ -13174,11 +13165,16 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
     });
 
     if (proportionalCues.length > 0) {
-      var _config$getCurrent3 = config/* default.getCurrent */.Z.getCurrent(),
-          TEXT_TRACK_SIZE_CHECKS_INTERVAL = _config$getCurrent3.TEXT_TRACK_SIZE_CHECKS_INTERVAL; // update propertionally-sized elements periodically
+      this._sizeUpdateCanceller = new task_canceller/* default */.ZP({
+        cancelOn: this._canceller.signal
+      });
+
+      var _config$getCurrent = config/* default.getCurrent */.Z.getCurrent(),
+          TEXT_TRACK_SIZE_CHECKS_INTERVAL = _config$getCurrent.TEXT_TRACK_SIZE_CHECKS_INTERVAL; // update propertionally-sized elements periodically
 
 
-      onHeightWidthChange(this._textTrackElement, TEXT_TRACK_SIZE_CHECKS_INTERVAL).pipe((0,takeUntil/* takeUntil */.R)(this._clearSizeUpdates$), (0,takeUntil/* takeUntil */.R)(this._destroy$)).subscribe(function (_ref) {
+      var heightWidthRef = onHeightWidthChange(this._textTrackElement, TEXT_TRACK_SIZE_CHECKS_INTERVAL, this._sizeUpdateCanceller.signal);
+      heightWidthRef.onUpdate(function (_ref) {
         var height = _ref.height,
             width = _ref.width;
 
@@ -13188,8 +13184,85 @@ var HTMLTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
               _element = _proportionalCues$_i.element;
           updateProportionalElements(height, width, _resolution, _element);
         }
+      }, {
+        clearSignal: this._sizeUpdateCanceller.signal,
+        emitCurrentValue: true
       });
     }
+  }
+  /**
+   * Auto-refresh the display of subtitles according to the media element's
+   * position and events.
+   * @param {Object} cancellationSignal
+   */
+  ;
+
+  _proto.autoRefreshSubtitles = function autoRefreshSubtitles(cancellationSignal) {
+    var _this2 = this;
+
+    var autoRefreshCanceller = null;
+
+    var _config$getCurrent2 = config/* default.getCurrent */.Z.getCurrent(),
+        MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL = _config$getCurrent2.MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL;
+
+    var startAutoRefresh = function startAutoRefresh() {
+      stopAutoRefresh();
+      autoRefreshCanceller = new task_canceller/* default */.ZP({
+        cancelOn: cancellationSignal
+      });
+      var intervalId = setInterval(function () {
+        return _this2.refreshSubtitles();
+      }, MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL);
+      autoRefreshCanceller.signal.register(function () {
+        clearInterval(intervalId);
+      });
+
+      _this2.refreshSubtitles();
+    };
+
+    onSeeking(this._videoElement, function () {
+      stopAutoRefresh();
+
+      _this2._disableCurrentCues();
+    }, cancellationSignal);
+    onSeeked(this._videoElement, startAutoRefresh, cancellationSignal);
+    onEnded(this._videoElement, startAutoRefresh, cancellationSignal);
+
+    function stopAutoRefresh() {
+      if (autoRefreshCanceller !== null) {
+        autoRefreshCanceller.cancel();
+        autoRefreshCanceller = null;
+      }
+    }
+  }
+  /**
+   * Refresh current subtitles according to the current media element's
+   * position.
+   */
+  ;
+
+  _proto.refreshSubtitles = function refreshSubtitles() {
+    var videoElt = this._videoElement;
+
+    var _config$getCurrent3 = config/* default.getCurrent */.Z.getCurrent(),
+        MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL = _config$getCurrent3.MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL;
+
+    var time;
+
+    if (videoElt.paused || videoElt.playbackRate <= 0) {
+      time = videoElt.currentTime;
+    } else {
+      // to spread the time error, we divide the regular chosen interval.
+      time = Math.max(this._videoElement.currentTime + MAXIMUM_HTML_TEXT_TRACK_UPDATE_INTERVAL / 1000 / 2, 0);
+    }
+
+    var cues = this._buffer.get(time);
+
+    if (cues.length === 0) {
+      this._disableCurrentCues();
+    } else {
+      this._displayCues(cues);
+    }
   };
 
   return HTMLTextSegmentBuffer;
@@ -13263,10 +13336,6 @@ __webpack_require__.d(__webpack_exports__, {
 
 // EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/inheritsLoose.js
 var inheritsLoose = __webpack_require__(4578);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/defer.js
-var defer = __webpack_require__(9917);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/of.js
-var of = __webpack_require__(2817);
 // EXTERNAL MODULE: ./src/compat/browser_detection.ts
 var browser_detection = __webpack_require__(3666);
 ;// CONCATENATED MODULE: ./src/compat/add_text_track.ts
@@ -13468,7 +13537,6 @@ function parseTextTrackToCues(type, data, timestampOffset, language) {
 
 
 
-
 /**
  * Implementation of an SegmentBuffer for "native" text tracks.
  * "Native" text tracks rely on a `<track>` HTMLElement and its associated
@@ -13502,36 +13570,35 @@ var NativeTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
   }
   /**
    * @param {Object} infos
-   * @returns {Observable}
+   * @returns {Promise}
    */
 
 
   var _proto = NativeTextSegmentBuffer.prototype;
 
   _proto.pushChunk = function pushChunk(infos) {
-    var _this2 = this;
+    var _a, _b;
 
-    return (0,defer/* defer */.P)(function () {
-      var _a, _b;
+    log/* default.debug */.Z.debug("NTSB: Appending new native text tracks");
 
-      log/* default.debug */.Z.debug("NTSB: Appending new native text tracks");
+    if (infos.data.chunk === null) {
+      return Promise.resolve();
+    }
 
-      if (infos.data.chunk === null) {
-        return (0,of.of)(undefined);
-      }
+    var _infos$data = infos.data,
+        timestampOffset = _infos$data.timestampOffset,
+        appendWindow = _infos$data.appendWindow,
+        chunk = _infos$data.chunk;
+    assertChunkIsTextTrackSegmentData(chunk);
+    var startTime = chunk.start,
+        endTime = chunk.end,
+        dataString = chunk.data,
+        type = chunk.type,
+        language = chunk.language;
+    var appendWindowStart = (_a = appendWindow[0]) !== null && _a !== void 0 ? _a : 0;
+    var appendWindowEnd = (_b = appendWindow[1]) !== null && _b !== void 0 ? _b : Infinity;
 
-      var _infos$data = infos.data,
-          timestampOffset = _infos$data.timestampOffset,
-          appendWindow = _infos$data.appendWindow,
-          chunk = _infos$data.chunk;
-      assertChunkIsTextTrackSegmentData(chunk);
-      var startTime = chunk.start,
-          endTime = chunk.end,
-          dataString = chunk.data,
-          type = chunk.type,
-          language = chunk.language;
-      var appendWindowStart = (_a = appendWindow[0]) !== null && _a !== void 0 ? _a : 0;
-      var appendWindowEnd = (_b = appendWindow[1]) !== null && _b !== void 0 ? _b : Infinity;
+    try {
       var cues = parseTextTrackToCues(type, dataString, timestampOffset, language);
 
       if (appendWindowStart !== 0 && appendWindowEnd !== Infinity) {
@@ -13573,7 +13640,7 @@ var NativeTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
       } else {
         if (cues.length <= 0) {
           log/* default.warn */.Z.warn("NTSB: Current text tracks have no cues nor start time. Aborting");
-          return (0,of.of)(undefined);
+          return Promise.resolve();
         }
 
         log/* default.warn */.Z.warn("NTSB: No start time given. Guessing from cues.");
@@ -13587,7 +13654,7 @@ var NativeTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
       } else {
         if (cues.length <= 0) {
           log/* default.warn */.Z.warn("NTSB: Current text tracks have no cues nor end time. Aborting");
-          return (0,of.of)(undefined);
+          return Promise.resolve();
         }
 
         log/* default.warn */.Z.warn("NTSB: No end time given. Guessing from cues.");
@@ -13596,7 +13663,7 @@ var NativeTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
 
       if (end <= start) {
         log/* default.warn */.Z.warn("NTSB: Invalid text track appended: ", "the start time is inferior or equal to the end time.");
-        return (0,of.of)(undefined);
+        return Promise.resolve();
       }
 
       if (cues.length > 0) {
@@ -13605,64 +13672,53 @@ var NativeTextSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
         // IE/Edge.
         // TODO Move to compat
 
-        var currentCues = _this2._track.cues;
+        var currentCues = this._track.cues;
 
         if (currentCues !== null && currentCues.length > 0) {
           if (firstCue.startTime < currentCues[currentCues.length - 1].startTime) {
-            _this2._removeData(firstCue.startTime, +Infinity);
+            this._removeData(firstCue.startTime, +Infinity);
           }
         }
 
         for (var _i = 0; _i < cues.length; _i++) {
-          _this2._track.addCue(cues[_i]);
+          this._track.addCue(cues[_i]);
         }
       }
 
-      _this2._buffered.insert(start, end);
+      this._buffered.insert(start, end);
 
       if (infos.inventoryInfos !== null) {
-        _this2._segmentInventory.insertChunk(infos.inventoryInfos);
+        this._segmentInventory.insertChunk(infos.inventoryInfos);
       }
+    } catch (err) {
+      return Promise.reject(err);
+    }
 
-      return (0,of.of)(undefined);
-    });
+    return Promise.resolve();
   }
   /**
    * Remove buffered data.
    * @param {number} start - start position, in seconds
    * @param {number} end - end position, in seconds
-   * @returns {Observable}
+   * @returns {Promise}
    */
   ;
 
   _proto.removeBuffer = function removeBuffer(start, end) {
-    var _this3 = this;
+    this._removeData(start, end);
 
-    return (0,defer/* defer */.P)(function () {
-      _this3._removeData(start, end);
-
-      return (0,of.of)(undefined);
-    });
+    return Promise.resolve();
   }
   /**
-   * Indicate that every chunks from a Segment has been given to pushChunk so
-   * far.
-   * This will update our internal Segment inventory accordingly.
-   * The returned Observable will emit and complete successively once the whole
-   * segment has been pushed and this indication is acknowledged.
    * @param {Object} infos
-   * @returns {Observable}
+   * @returns {Promise}
    */
   ;
 
   _proto.endOfSegment = function endOfSegment(_infos) {
-    var _this4 = this;
-
-    return (0,defer/* defer */.P)(function () {
-      _this4._segmentInventory.completeSegment(_infos, _this4._buffered);
+    this._segmentInventory.completeSegment(_infos, this._buffered);
 
-      return (0,of.of)(undefined);
-    });
+    return Promise.resolve();
   }
   /**
    * Returns the currently buffered data, in a TimeRanges object.
@@ -15340,9 +15396,10 @@ var CustomLoaderError = /*#__PURE__*/function (_Error) {
   (0,_babel_runtime_helpers_inheritsLoose__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .Z)(CustomLoaderError, _Error);
 
   /**
+   * @param {string} message
+   * @param {boolean} canRetry
+   * @param {boolean} isOfflineError
    * @param {XMLHttpRequest} xhr
-   * @param {string} url
-   * @param {string} type
    */
   function CustomLoaderError(message, canRetry, isOfflineError, xhr) {
     var _this;
@@ -31849,12 +31906,13 @@ var take_first_set = __webpack_require__(5278);
  * Loads an image segment.
  * @param {string|null} url
  * @param {Object} content
+ * @param {Object} options
  * @param {Object} cancelSignal
  * @param {Object} callbacks
  * @returns {Promise}
  */
 
-function imageLoader(_x, _x2, _x3, _x4) {
+function imageLoader(_x, _x2, _x3, _x4, _x5) {
   return _imageLoader.apply(this, arguments);
 }
 /**
@@ -31865,7 +31923,7 @@ function imageLoader(_x, _x2, _x3, _x4) {
  */
 
 function _imageLoader() {
-  _imageLoader = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/regenerator_default().mark(function _callee(url, content, cancelSignal, callbacks) {
+  _imageLoader = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/regenerator_default().mark(function _callee(url, content, options, cancelSignal, callbacks) {
     var segment, data;
     return regenerator_default().wrap(function _callee$(_context) {
       while (1) {
@@ -31888,6 +31946,7 @@ function _imageLoader() {
             return (0,request/* default */.ZP)({
               url: url,
               responseType: "arraybuffer",
+              timeout: options.timeout,
               onProgress: callbacks.onProgress,
               cancelSignal: cancelSignal
             });
@@ -31968,6 +32027,8 @@ function imageParser(loadedSegment, content) {
     appendWindow: [period.start, period.end]
   };
 }
+// EXTERNAL MODULE: ./src/config.ts + 2 modules
+var config = __webpack_require__(6872);
 // EXTERNAL MODULE: ./src/errors/format_error.ts
 var format_error = __webpack_require__(8750);
 // EXTERNAL MODULE: ./src/log.ts + 1 modules
@@ -32001,6 +32062,7 @@ var string_parsing = __webpack_require__(3635);
 
 
 
+
 function generateManifestParser(options) {
   var aggressiveMode = options.aggressiveMode,
       referenceDateTime = options.referenceDateTime;
@@ -32098,13 +32160,16 @@ function generateManifestParser(options) {
       var value = parserResponse.value;
       var externalResources = value.urls.map(function (resourceUrl) {
         return scheduleRequest(function () {
+          var defaultTimeout = config/* default.getCurrent */.Z.getCurrent().DEFAULT_REQUEST_TIMEOUT;
           return value.format === "string" ? (0,request/* default */.ZP)({
             url: resourceUrl,
             responseType: "text",
+            timeout: defaultTimeout,
             cancelSignal: cancelSignal
           }) : (0,request/* default */.ZP)({
             url: resourceUrl,
             responseType: "arraybuffer",
+            timeout: defaultTimeout,
             cancelSignal: cancelSignal
           });
         }).then(function (res) {
@@ -32278,8 +32343,6 @@ function doesXmlSeemsUtf8Encoded(xmlData) {
 }
 // EXTERNAL MODULE: ./src/errors/custom_loader_error.ts
 var custom_loader_error = __webpack_require__(7839);
-// EXTERNAL MODULE: ./src/config.ts + 2 modules
-var config = __webpack_require__(6872);
 // EXTERNAL MODULE: ./src/errors/request_error.ts
 var request_error = __webpack_require__(9105);
 // EXTERNAL MODULE: ./src/errors/error_codes.ts
@@ -32309,7 +32372,6 @@ var is_null_or_undefined = __webpack_require__(1946);
 
 
 
-
 var _Headers = typeof Headers === "function" ? Headers : null;
 
 var _AbortController = typeof AbortController === "function" ? AbortController : null;
@@ -32350,11 +32412,15 @@ function fetchRequest(options) {
     abortController.abort();
   }
 
-  var requestTimeout = (0,is_null_or_undefined/* default */.Z)(options.timeout) ? config/* default.getCurrent */.Z.getCurrent().DEFAULT_REQUEST_TIMEOUT : options.timeout;
-  var timeout = window.setTimeout(function () {
-    timeouted = true;
-    abortFetch();
-  }, requestTimeout);
+  var timeout;
+
+  if (options.timeout !== undefined) {
+    timeout = window.setTimeout(function () {
+      timeouted = true;
+      abortFetch();
+    }, options.timeout);
+  }
+
   var deregisterCancelLstnr = options.cancelSignal.register(function abortRequest(err) {
     cancellation = err;
     abortFetch();
@@ -32563,7 +32629,7 @@ var check_isobmff_integrity = __webpack_require__(4460);
  */
 
 function addSegmentIntegrityChecks(segmentLoader) {
-  return function (url, content, initialCancelSignal, callbacks) {
+  return function (url, content, loaderOptions, initialCancelSignal, callbacks) {
     return new Promise(function (resolve, reject) {
       var requestCanceller = new task_canceller/* default */.ZP({
         cancelOn: initialCancelSignal
@@ -32571,7 +32637,7 @@ function addSegmentIntegrityChecks(segmentLoader) {
       // `stopRejectingOnCancel` here is a function allowing to stop this mechanism
 
       var stopRejectingOnCancel = requestCanceller.signal.register(reject);
-      segmentLoader(url, content, requestCanceller.signal, Object.assign(Object.assign({}, callbacks), {
+      segmentLoader(url, content, loaderOptions, requestCanceller.signal, Object.assign(Object.assign({}, callbacks), {
         onNewChunk: function onNewChunk(data) {
           try {
             trowOnIntegrityError(data);
@@ -32646,16 +32712,18 @@ var byte_parsing = __webpack_require__(6968);
  * Perform a request for an initialization segment, agnostic to the container.
  * @param {string} url
  * @param {Object} segment
+ * @param {Object} options
  * @param {CancellationSignal} cancelSignal
  * @param {Object} callbacks
  * @returns {Promise}
  */
 
-function initSegmentLoader(url, segment, cancelSignal, callbacks) {
+function initSegmentLoader(url, segment, options, cancelSignal, callbacks) {
   if (segment.range === undefined) {
     return (0,request/* default */.ZP)({
       url: url,
       responseType: "arraybuffer",
+      timeout: options.timeout,
       cancelSignal: cancelSignal,
       onProgress: callbacks.onProgress
     }).then(function (data) {
@@ -32673,6 +32741,7 @@ function initSegmentLoader(url, segment, cancelSignal, callbacks) {
         Range: (0,byte_range/* default */.Z)(segment.range)
       },
       responseType: "arraybuffer",
+      timeout: options.timeout,
       cancelSignal: cancelSignal,
       onProgress: callbacks.onProgress
     }).then(function (data) {
@@ -32691,6 +32760,7 @@ function initSegmentLoader(url, segment, cancelSignal, callbacks) {
         Range: (0,byte_range/* default */.Z)([segment.range[0], segment.indexRange[1]])
       },
       responseType: "arraybuffer",
+      timeout: options.timeout,
       cancelSignal: cancelSignal,
       onProgress: callbacks.onProgress
     }).then(function (data) {
@@ -32707,6 +32777,7 @@ function initSegmentLoader(url, segment, cancelSignal, callbacks) {
       Range: (0,byte_range/* default */.Z)(segment.range)
     },
     responseType: "arraybuffer",
+    timeout: options.timeout,
     cancelSignal: cancelSignal,
     onProgress: callbacks.onProgress
   });
@@ -32716,6 +32787,7 @@ function initSegmentLoader(url, segment, cancelSignal, callbacks) {
       Range: (0,byte_range/* default */.Z)(segment.indexRange)
     },
     responseType: "arraybuffer",
+    timeout: options.timeout,
     cancelSignal: cancelSignal,
     onProgress: callbacks.onProgress
   });
@@ -32842,12 +32914,13 @@ function extractCompleteChunks(buffer) {
  *
  * @param {string} url - URL of the segment to download.
  * @param {Object} content - Context of the segment needed.
+ * @param {Object} options
  * @param {Object} callbacks
  * @param {CancellationSignal} cancelSignal
  * @returns {Promise}
  */
 
-function lowLatencySegmentLoader(url, content, callbacks, cancelSignal) {
+function lowLatencySegmentLoader(url, content, options, callbacks, cancelSignal) {
   var segment = content.segment;
   var headers = segment.range !== undefined ? {
     Range: (0,byte_range/* default */.Z)(segment.range)
@@ -32888,6 +32961,7 @@ function lowLatencySegmentLoader(url, content, callbacks, cancelSignal) {
     url: url,
     headers: headers,
     onData: onData,
+    timeout: options.timeout,
     cancelSignal: cancelSignal
   }).then(function (res) {
     return {
@@ -32925,21 +32999,22 @@ function lowLatencySegmentLoader(url, content, callbacks, cancelSignal) {
  * @param {string} url
  * @param {Object} content
  * @param {boolean} lowLatencyMode
+ * @param {Object} options
  * @param {Object} callbacks
  * @param {Object} cancelSignal
  * @returns {Promise}
  */
 
-function regularSegmentLoader(url, content, lowLatencyMode, callbacks, cancelSignal) {
+function regularSegmentLoader(url, content, lowLatencyMode, options, callbacks, cancelSignal) {
   if (content.segment.isInit) {
-    return initSegmentLoader(url, content.segment, cancelSignal, callbacks);
+    return initSegmentLoader(url, content.segment, options, cancelSignal, callbacks);
   }
 
   var containerType = inferSegmentContainer(content.adaptation.type, content.representation);
 
   if (lowLatencyMode && (containerType === "mp4" || containerType === undefined)) {
     if (fetchIsSupported()) {
-      return lowLatencySegmentLoader(url, content, callbacks, cancelSignal);
+      return lowLatencySegmentLoader(url, content, options, callbacks, cancelSignal);
     } else {
       (0,warn_once/* default */.Z)("DASH: Your browser does not have the fetch API. You will have " + "a higher chance of rebuffering when playing close to the live edge");
     }
@@ -32952,6 +33027,7 @@ function regularSegmentLoader(url, content, lowLatencyMode, callbacks, cancelSig
     headers: segment.range !== undefined ? {
       Range: (0,byte_range/* default */.Z)(segment.range)
     } : undefined,
+    timeout: options.timeout,
     cancelSignal: cancelSignal,
     onProgress: callbacks.onProgress
   }).then(function (data) {
@@ -32976,7 +33052,7 @@ function generateSegmentLoader(_ref) {
    * @returns {Observable}
    */
 
-  function segmentLoader(url, content, cancelSignal, callbacks) {
+  function segmentLoader(url, content, options, cancelSignal, callbacks) {
     if (url == null) {
       return Promise.resolve({
         resultType: "segment-created",
@@ -32985,7 +33061,7 @@ function generateSegmentLoader(_ref) {
     }
 
     if (lowLatencyMode || customSegmentLoader === undefined) {
-      return regularSegmentLoader(url, content, lowLatencyMode, callbacks, cancelSignal);
+      return regularSegmentLoader(url, content, lowLatencyMode, options, callbacks, cancelSignal);
     }
 
     var args = {
@@ -32995,6 +33071,7 @@ function generateSegmentLoader(_ref) {
       representation: content.representation,
       segment: content.segment,
       transport: "dash",
+      timeout: options.timeout,
       url: url
     };
     return new Promise(function (res, rej) {
@@ -33002,7 +33079,7 @@ function generateSegmentLoader(_ref) {
       var hasFinished = false;
       /**
        * Callback triggered when the custom segment loader has a response.
-       * @param {Object} args
+       * @param {Object} _args
        */
 
       var resolve = function resolve(_args) {
@@ -33067,7 +33144,7 @@ function generateSegmentLoader(_ref) {
 
         hasFinished = true;
         cancelSignal.deregister(abortCustomLoader);
-        regularSegmentLoader(url, content, lowLatencyMode, callbacks, cancelSignal).then(res, rej);
+        regularSegmentLoader(url, content, lowLatencyMode, options, callbacks, cancelSignal).then(res, rej);
       };
 
       var customCallbacks = {
@@ -33801,12 +33878,13 @@ function generateTextTrackLoader(_ref) {
   /**
    * @param {string|null} url
    * @param {Object} content
+   * @param {Object} options
    * @param {Object} cancelSignal
    * @param {Object} callbacks
    * @returns {Promise}
    */
 
-  function textTrackLoader(url, content, cancelSignal, callbacks) {
+  function textTrackLoader(url, content, options, cancelSignal, callbacks) {
     var adaptation = content.adaptation,
         representation = content.representation,
         segment = content.segment;
@@ -33820,7 +33898,7 @@ function generateTextTrackLoader(_ref) {
     }
 
     if (segment.isInit) {
-      return initSegmentLoader(url, segment, cancelSignal, callbacks);
+      return initSegmentLoader(url, segment, options, cancelSignal, callbacks);
     }
 
     var containerType = inferSegmentContainer(adaptation.type, representation);
@@ -33828,7 +33906,7 @@ function generateTextTrackLoader(_ref) {
 
     if (lowLatencyMode && seemsToBeMP4) {
       if (fetchIsSupported()) {
-        return lowLatencySegmentLoader(url, content, callbacks, cancelSignal);
+        return lowLatencySegmentLoader(url, content, options, callbacks, cancelSignal);
       } else {
         (0,warn_once/* default */.Z)("DASH: Your browser does not have the fetch API. You will have " + "a higher chance of rebuffering when playing close to the live edge");
       }
@@ -33841,6 +33919,7 @@ function generateTextTrackLoader(_ref) {
         headers: Array.isArray(range) ? {
           Range: (0,byte_range/* default */.Z)(range)
         } : null,
+        timeout: options.timeout,
         onProgress: callbacks.onProgress,
         cancelSignal: cancelSignal
       }).then(function (data) {
@@ -33857,6 +33936,7 @@ function generateTextTrackLoader(_ref) {
       headers: Array.isArray(range) ? {
         Range: (0,byte_range/* default */.Z)(range)
       } : null,
+      timeout: options.timeout,
       onProgress: callbacks.onProgress,
       cancelSignal: cancelSignal
     }).then(function (data) {
@@ -37287,13 +37367,14 @@ function isMP4EmbeddedTrack(representation) {
  * Segment loader triggered if there was no custom-defined one in the API.
  * @param {string} url
  * @param {Object} content
+ * @param {Object} loaderOptions
  * @param {Object} callbacks
  * @param {Object} cancelSignal
  * @param {boolean} checkMediaSegmentIntegrity
  * @returns {Promise}
  */
 
-function regularSegmentLoader(url, content, callbacks, cancelSignal, checkMediaSegmentIntegrity) {
+function regularSegmentLoader(url, content, callbacks, loaderOptions, cancelSignal, checkMediaSegmentIntegrity) {
   var headers;
   var range = content.segment.range;
 
@@ -37307,6 +37388,7 @@ function regularSegmentLoader(url, content, callbacks, cancelSignal, checkMediaS
     url: url,
     responseType: "arraybuffer",
     headers: headers,
+    timeout: loaderOptions.timeout,
     cancelSignal: cancelSignal,
     onProgress: callbacks.onProgress
   }).then(function (data) {
@@ -37338,7 +37420,7 @@ function regularSegmentLoader(url, content, callbacks, cancelSignal, checkMediaS
 var generateSegmentLoader = function generateSegmentLoader(_ref) {
   var checkMediaSegmentIntegrity = _ref.checkMediaSegmentIntegrity,
       customSegmentLoader = _ref.customSegmentLoader;
-  return function (url, content, cancelSignal, callbacks) {
+  return function (url, content, loaderOptions, cancelSignal, callbacks) {
     var segment = content.segment,
         manifest = content.manifest,
         period = content.period,
@@ -37413,11 +37495,12 @@ var generateSegmentLoader = function generateSegmentLoader(_ref) {
         representation: representation,
         segment: segment,
         transport: "smooth",
+        timeout: loaderOptions.timeout,
         url: url
       };
 
       if (typeof customSegmentLoader !== "function") {
-        return regularSegmentLoader(url, content, callbacks, cancelSignal, checkMediaSegmentIntegrity);
+        return regularSegmentLoader(url, content, callbacks, loaderOptions, cancelSignal, checkMediaSegmentIntegrity);
       }
 
       return new Promise(function (res, rej) {
@@ -37500,7 +37583,7 @@ var generateSegmentLoader = function generateSegmentLoader(_ref) {
 
           hasFinished = true;
           cancelSignal.deregister(abortCustomLoader);
-          regularSegmentLoader(url, content, callbacks, cancelSignal, checkMediaSegmentIntegrity).then(res, rej);
+          regularSegmentLoader(url, content, callbacks, loaderOptions, cancelSignal, checkMediaSegmentIntegrity).then(res, rej);
         };
 
         var customCallbacks = {
@@ -37592,11 +37675,11 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
   }
 }
 
-/* harmony default export */ function pipelines(options) {
-  var smoothManifestParser = smooth(options);
-  var segmentLoader = segment_loader(options);
+/* harmony default export */ function pipelines(transportOptions) {
+  var smoothManifestParser = smooth(transportOptions);
+  var segmentLoader = segment_loader(transportOptions);
   var manifestLoaderOptions = {
-    customManifestLoader: options.manifestLoader
+    customManifestLoader: transportOptions.manifestLoader
   };
   var manifestLoader = (0,generate_manifest_loader/* default */.Z)(manifestLoaderOptions, "text");
   var manifestPipeline = {
@@ -37643,9 +37726,9 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
 
       var parserResult = smoothManifestParser(documentData, url, manifestReceivedTime);
       var manifest = new src_manifest/* default */.ZP(parserResult, {
-        representationFilter: options.representationFilter,
-        supplementaryImageTracks: options.supplementaryImageTracks,
-        supplementaryTextTracks: options.supplementaryTextTracks
+        representationFilter: transportOptions.representationFilter,
+        supplementaryImageTracks: transportOptions.supplementaryImageTracks,
+        supplementaryTextTracks: transportOptions.supplementaryTextTracks
       });
       return {
         manifest: manifest,
@@ -37663,12 +37746,13 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
      * Load a Smooth audio/video segment.
      * @param {string|null} url
      * @param {Object} content
+     * @param {Object} loaderOptions
      * @param {Object} cancelSignal
      * @param {Object} callbacks
      * @returns {Promise}
      */
-    loadSegment: function loadSegment(url, content, cancelSignal, callbacks) {
-      return segmentLoader(url, content, cancelSignal, callbacks);
+    loadSegment: function loadSegment(url, content, loaderOptions, cancelSignal, callbacks) {
+      return segmentLoader(url, content, loaderOptions, cancelSignal, callbacks);
     },
     parseSegment: function parseSegment(loadedSegment, content, initTimescale) {
       var _a, _b;
@@ -37743,7 +37827,7 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
     }
   };
   var textTrackPipeline = {
-    loadSegment: function loadSegment(url, content, cancelSignal, callbacks) {
+    loadSegment: function loadSegment(url, content, loaderOptions, cancelSignal, callbacks) {
       var segment = content.segment,
           representation = content.representation;
 
@@ -37760,6 +37844,7 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
         return (0,request/* default */.ZP)({
           url: url,
           responseType: "text",
+          timeout: loaderOptions.timeout,
           cancelSignal: cancelSignal,
           onProgress: callbacks.onProgress
         }).then(function (data) {
@@ -37772,10 +37857,11 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
         return (0,request/* default */.ZP)({
           url: url,
           responseType: "arraybuffer",
+          timeout: loaderOptions.timeout,
           cancelSignal: cancelSignal,
           onProgress: callbacks.onProgress
         }).then(function (data) {
-          if (options.checkMediaSegmentIntegrity !== true) {
+          if (transportOptions.checkMediaSegmentIntegrity !== true) {
             return {
               resultType: "segment-loaded",
               resultData: data
@@ -37946,7 +38032,7 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
     }
   };
   var imageTrackPipeline = {
-    loadSegment: function loadSegment(url, content, cancelSignal, callbacks) {
+    loadSegment: function loadSegment(url, content, loaderOptions, cancelSignal, callbacks) {
       return (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/regenerator_default().mark(function _callee() {
         var data;
         return regenerator_default().wrap(function _callee$(_context) {
@@ -37968,6 +38054,7 @@ function addNextSegments(adaptation, nextSegments, dlSegment) {
                 return (0,request/* default */.ZP)({
                   url: url,
                   responseType: "arraybuffer",
+                  timeout: loaderOptions.timeout,
                   onProgress: callbacks.onProgress,
                   cancelSignal: cancelSignal
                 });
@@ -38291,7 +38378,7 @@ var custom_loader_error = __webpack_require__(7839);
  */
 
 function callCustomManifestLoader(customManifestLoader, fallbackManifestLoader) {
-  return function (url, cancelSignal) {
+  return function (url, loaderOptions, cancelSignal) {
     return new Promise(function (res, rej) {
       var timeAPIsDelta = Date.now() - performance.now();
       /** `true` when the custom segmentLoader should not be active anymore. */
@@ -38354,7 +38441,7 @@ function callCustomManifestLoader(customManifestLoader, fallbackManifestLoader)
 
         hasFinished = true;
         cancelSignal.deregister(abortCustomLoader);
-        fallbackManifestLoader(url, cancelSignal).then(res, rej);
+        fallbackManifestLoader(url, loaderOptions, cancelSignal).then(res, rej);
       };
 
       var callbacks = {
@@ -38362,7 +38449,9 @@ function callCustomManifestLoader(customManifestLoader, fallbackManifestLoader)
         resolve: resolve,
         fallback: fallback
       };
-      var abort = customManifestLoader(url, callbacks);
+      var abort = customManifestLoader(url, callbacks, {
+        timeout: loaderOptions.timeout
+      });
       cancelSignal.register(abortCustomLoader);
       /**
        * The logic to run when the custom loader is cancelled while pending.
@@ -38406,12 +38495,12 @@ function callCustomManifestLoader(customManifestLoader, fallbackManifestLoader)
 
 /**
  * Manifest loader triggered if there was no custom-defined one in the API.
- * @param {string} url
- * @returns {Observable}
+ * @param {string} preferredType
+ * @returns {Function}
  */
 
 function generateRegularManifestLoader(preferredType) {
-  return function regularManifestLoader(url, cancelSignal) {
+  return function regularManifestLoader(url, loaderOptions, cancelSignal) {
     if (url === undefined) {
       throw new Error("Cannot perform HTTP(s) request. URL not known");
     } // What follows could be written in a single line, but TypeScript wouldn't
@@ -38424,6 +38513,7 @@ function generateRegularManifestLoader(preferredType) {
         return (0,request/* default */.ZP)({
           url: url,
           responseType: "arraybuffer",
+          timeout: loaderOptions.timeout,
           cancelSignal: cancelSignal
         });
 
@@ -38431,6 +38521,7 @@ function generateRegularManifestLoader(preferredType) {
         return (0,request/* default */.ZP)({
           url: url,
           responseType: "text",
+          timeout: loaderOptions.timeout,
           cancelSignal: cancelSignal
         });
 
@@ -38438,6 +38529,7 @@ function generateRegularManifestLoader(preferredType) {
         return (0,request/* default */.ZP)({
           url: url,
           responseType: "document",
+          timeout: loaderOptions.timeout,
           cancelSignal: cancelSignal
         });
 
@@ -41474,8 +41566,6 @@ __webpack_require__.d(__webpack_exports__, {
 
 // UNUSED EXPORTS: fetchIsSupported, fetchRequest, xhr
 
-// EXTERNAL MODULE: ./src/config.ts + 2 modules
-var config = __webpack_require__(6872);
 // EXTERNAL MODULE: ./src/errors/request_error.ts
 var request_error = __webpack_require__(9105);
 // EXTERNAL MODULE: ./src/utils/is_non_empty_string.ts
@@ -41501,17 +41591,13 @@ var is_null_or_undefined = __webpack_require__(1946);
 
 
 
-
 var DEFAULT_RESPONSE_TYPE = "json";
 function request(options) {
-  var _config$getCurrent = config/* default.getCurrent */.Z.getCurrent(),
-      DEFAULT_REQUEST_TIMEOUT = _config$getCurrent.DEFAULT_REQUEST_TIMEOUT;
-
   var requestOptions = {
     url: options.url,
     headers: options.headers,
     responseType: (0,is_null_or_undefined/* default */.Z)(options.responseType) ? DEFAULT_RESPONSE_TYPE : options.responseType,
-    timeout: (0,is_null_or_undefined/* default */.Z)(options.timeout) ? DEFAULT_REQUEST_TIMEOUT : options.timeout
+    timeout: options.timeout
   };
   return new Promise(function (resolve, reject) {
     var onProgress = options.onProgress,
@@ -41522,9 +41608,20 @@ function request(options) {
         timeout = requestOptions.timeout;
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
+    var timeoutId;
 
-    if (timeout >= 0) {
-      xhr.timeout = timeout;
+    if (timeout !== undefined) {
+      xhr.timeout = timeout; // We've seen on some browser (mainly on some LG TVs), that `xhr.timeout`
+      // was either not supported or did not function properly despite the
+      // browser being recent enough to support it.
+      // That's why we also start a manual timeout. We do this a little later
+      // than the "native one" performed on the xhr assuming that the latter
+      // is more precise, it might also be more efficient.
+
+      timeoutId = window.setTimeout(function () {
+        clearCancellingProcess();
+        reject(new request_error/* default */.Z(url, xhr.status, "TIMEOUT", xhr));
+      }, timeout + 3000);
     }
 
     xhr.responseType = responseType;
@@ -41549,6 +41646,8 @@ function request(options) {
 
     if (cancelSignal !== undefined) {
       deregisterCancellationListener = cancelSignal.register(function abortRequest(err) {
+        clearCancellingProcess();
+
         if (!(0,is_null_or_undefined/* default */.Z)(xhr) && xhr.readyState !== 4) {
           xhr.abort();
         }
@@ -41562,18 +41661,12 @@ function request(options) {
     }
 
     xhr.onerror = function onXHRError() {
-      if (deregisterCancellationListener !== null) {
-        deregisterCancellationListener();
-      }
-
+      clearCancellingProcess();
       reject(new request_error/* default */.Z(url, xhr.status, "ERROR_EVENT", xhr));
     };
 
     xhr.ontimeout = function onXHRTimeout() {
-      if (deregisterCancellationListener !== null) {
-        deregisterCancellationListener();
-      }
-
+      clearCancellingProcess();
       reject(new request_error/* default */.Z(url, xhr.status, "TIMEOUT", xhr));
     };
 
@@ -41593,9 +41686,7 @@ function request(options) {
 
     xhr.onload = function onXHRLoad(event) {
       if (xhr.readyState === 4) {
-        if (deregisterCancellationListener !== null) {
-          deregisterCancellationListener();
-        }
+        clearCancellingProcess();
 
         if (xhr.status >= 200 && xhr.status < 300) {
           var receivedTime = performance.now();
@@ -41638,6 +41729,19 @@ function request(options) {
     };
 
     xhr.send();
+    /**
+     * Clear resources and timers created to handle cancellation and timeouts.
+     */
+
+    function clearCancellingProcess() {
+      if (timeoutId !== undefined) {
+        clearTimeout(timeoutId);
+      }
+
+      if (deregisterCancellationListener !== null) {
+        deregisterCancellationListener();
+      }
+    }
   });
 }
 /**
@@ -42680,8 +42784,7 @@ var CancellationSignal = /*#__PURE__*/function () {
   return CancellationSignal;
 }();
 /**
- * Error created when a task is cancelled through the TaskCanceller.
- *
+ * Error created when a task is cancelled.
  * @class CancellationError
  * @extends Error
  */
@@ -43647,16 +43750,29 @@ var config = {
 
 /***/ }),
 
-/***/ 6362:
+/***/ 2034:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "z": function() { return /* binding */ concat; }
-/* harmony export */ });
-/* harmony import */ var _operators_concatAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(9834);
-/* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2457);
-/* harmony import */ var _from__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(3102);
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  "z": function() { return /* binding */ concat; }
+});
+
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/mergeAll.js
+var mergeAll = __webpack_require__(4367);
+;// CONCATENATED MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/concatAll.js
+
+function concatAll() {
+    return (0,mergeAll/* mergeAll */.J)(1);
+}
+//# sourceMappingURL=concatAll.js.map
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/util/args.js
+var util_args = __webpack_require__(2457);
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/from.js + 8 modules
+var from = __webpack_require__(3102);
+;// CONCATENATED MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js
 
 
 
@@ -43665,7 +43781,7 @@ function concat() {
     for (var _i = 0; _i < arguments.length; _i++) {
         args[_i] = arguments[_i];
     }
-    return (0,_operators_concatAll__WEBPACK_IMPORTED_MODULE_0__/* .concatAll */ .u)()((0,_from__WEBPACK_IMPORTED_MODULE_1__/* .from */ .D)(args, (0,_util_args__WEBPACK_IMPORTED_MODULE_2__/* .popScheduler */ .yG)(args)));
+    return concatAll()((0,from/* from */.D)(args, (0,util_args/* popScheduler */.yG)(args)));
 }
 //# sourceMappingURL=concat.js.map
 
@@ -44152,29 +44268,6 @@ function process(asyncIterable, subscriber) {
 
 /***/ }),
 
-/***/ 6697:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "F": function() { return /* binding */ interval; }
-/* harmony export */ });
-/* harmony import */ var _scheduler_async__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7991);
-/* harmony import */ var _timer__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6625);
-
-
-function interval(period, scheduler) {
-    if (period === void 0) { period = 0; }
-    if (scheduler === void 0) { scheduler = _scheduler_async__WEBPACK_IMPORTED_MODULE_0__/* .asyncScheduler */ .z; }
-    if (period < 0) {
-        period = 0;
-    }
-    return (0,_timer__WEBPACK_IMPORTED_MODULE_1__/* .timer */ .H)(period, period, scheduler);
-}
-//# sourceMappingURL=interval.js.map
-
-/***/ }),
-
 /***/ 3071:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -44413,22 +44506,6 @@ function catchError(selector) {
 
 /***/ }),
 
-/***/ 9834:
-/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
-
-"use strict";
-/* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "u": function() { return /* binding */ concatAll; }
-/* harmony export */ });
-/* harmony import */ var _mergeAll__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(4367);
-
-function concatAll() {
-    return (0,_mergeAll__WEBPACK_IMPORTED_MODULE_0__/* .mergeAll */ .J)(1);
-}
-//# sourceMappingURL=concatAll.js.map
-
-/***/ }),
-
 /***/ 3741:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -44839,7 +44916,7 @@ function shareReplay(configOrBufferSize, windowTime, scheduler) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   "O": function() { return /* binding */ startWith; }
 /* harmony export */ });
-/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(6362);
+/* harmony import */ var _observable_concat__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(2034);
 /* harmony import */ var _util_args__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2457);
 /* harmony import */ var _util_lift__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(6798);
 
@@ -46933,8 +47010,8 @@ function maybeSchedule(scheduler, execute, subscription) {
 //# sourceMappingURL=combineLatest.js.map
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/startWith.js
 var startWith = __webpack_require__(6108);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js
-var concat = __webpack_require__(6362);
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/concat.js + 1 modules
+var concat = __webpack_require__(2034);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/switchMap.js
 var switchMap = __webpack_require__(4978);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/merge.js
@@ -47833,6 +47910,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 
 
 
+
 /**
  * Class allowing to facilitate the task of loading and parsing a Manifest.
  * @class ManifestFetcher
@@ -47888,6 +47966,7 @@ var ManifestFetcher = /*#__PURE__*/function () {
     var _this = this;
 
     return new Observable/* Observable */.y(function (obs) {
+      var settings = _this._settings;
       var pipelines = _this._pipelines;
       var requestUrl = url !== null && url !== void 0 ? url : _this._manifestUrl;
       /** `true` if the loading pipeline is already completely executed. */
@@ -47951,16 +48030,23 @@ var ManifestFetcher = /*#__PURE__*/function () {
        * Call the loader part of the pipeline, retrying if it fails according
        * to the current settings.
        * Returns the Promise of the last attempt.
-       * @param {string | undefined}  resolverUrl
+       * @param {string | undefined} manifestUrl
        * @returns {Promise}
        */
 
 
       function callLoaderWithRetries(manifestUrl) {
         var loadManifest = pipelines.loadManifest;
+        var requestTimeout = (0,is_null_or_undefined/* default */.Z)(settings.requestTimeout) ? config/* default.getCurrent */.Z.getCurrent().DEFAULT_REQUEST_TIMEOUT : settings.requestTimeout;
+
+        if (requestTimeout < 0) {
+          requestTimeout = undefined;
+        }
 
         var callLoader = function callLoader() {
-          return loadManifest(manifestUrl, canceller.signal);
+          return loadManifest(manifestUrl, {
+            timeout: requestTimeout
+          }, canceller.signal);
         };
 
         return tryRequestPromiseWithBackoff(callLoader, backoffSettings, canceller.signal);
@@ -48934,11 +49020,15 @@ var generateRequestID = (0,id_generator/* default */.Z)();
  */
 
 function segment_fetcher_createSegmentFetcher(bufferType, pipeline, callbacks, options) {
+  var requestOptions = {
+    timeout: options.requestTimeout < 0 ? undefined : options.requestTimeout
+  };
   /**
    * Cache audio and video initialization segments.
    * This allows to avoid doing too many requests for what are usually very
    * small files.
    */
+
   var cache = (0,array_includes/* default */.Z)(["audio", "video"], bufferType) ? new initialization_segment_cache() : undefined;
   var loadSegment = pipeline.loadSegment,
       parseSegment = pipeline.parseSegment;
@@ -49136,7 +49226,7 @@ function segment_fetcher_createSegmentFetcher(bufferType, pipeline, callbacks, o
        */
 
       function callLoaderWithUrl(url, cancellationSignal) {
-        return loadSegment(url, content, cancellationSignal, loaderCallbacks);
+        return loadSegment(url, content, requestOptions, cancellationSignal, loaderCallbacks);
       }
       /**
        * Generate function allowing to parse a loaded segment.
@@ -49222,10 +49312,12 @@ function segment_fetcher_createSegmentFetcher(bufferType, pipeline, callbacks, o
 function getSegmentFetcherOptions(bufferType, _ref) {
   var maxRetryRegular = _ref.maxRetryRegular,
       maxRetryOffline = _ref.maxRetryOffline,
-      lowLatencyMode = _ref.lowLatencyMode;
+      lowLatencyMode = _ref.lowLatencyMode,
+      requestTimeout = _ref.requestTimeout;
 
   var _config$getCurrent = config/* default.getCurrent */.Z.getCurrent(),
       DEFAULT_MAX_REQUESTS_RETRY_ON_ERROR = _config$getCurrent.DEFAULT_MAX_REQUESTS_RETRY_ON_ERROR,
+      DEFAULT_REQUEST_TIMEOUT = _config$getCurrent.DEFAULT_REQUEST_TIMEOUT,
       DEFAULT_MAX_REQUESTS_RETRY_ON_OFFLINE = _config$getCurrent.DEFAULT_MAX_REQUESTS_RETRY_ON_OFFLINE,
       INITIAL_BACKOFF_DELAY_BASE = _config$getCurrent.INITIAL_BACKOFF_DELAY_BASE,
       MAX_BACKOFF_DELAY_BASE = _config$getCurrent.MAX_BACKOFF_DELAY_BASE;
@@ -49234,7 +49326,8 @@ function getSegmentFetcherOptions(bufferType, _ref) {
     maxRetryRegular: bufferType === "image" ? 0 : maxRetryRegular !== null && maxRetryRegular !== void 0 ? maxRetryRegular : DEFAULT_MAX_REQUESTS_RETRY_ON_ERROR,
     maxRetryOffline: maxRetryOffline !== null && maxRetryOffline !== void 0 ? maxRetryOffline : DEFAULT_MAX_REQUESTS_RETRY_ON_OFFLINE,
     baseDelay: lowLatencyMode ? INITIAL_BACKOFF_DELAY_BASE.LOW_LATENCY : INITIAL_BACKOFF_DELAY_BASE.REGULAR,
-    maxDelay: lowLatencyMode ? MAX_BACKOFF_DELAY_BASE.LOW_LATENCY : MAX_BACKOFF_DELAY_BASE.REGULAR
+    maxDelay: lowLatencyMode ? MAX_BACKOFF_DELAY_BASE.LOW_LATENCY : MAX_BACKOFF_DELAY_BASE.REGULAR,
+    requestTimeout: (0,is_null_or_undefined/* default */.Z)(requestTimeout) ? DEFAULT_REQUEST_TIMEOUT : requestTimeout
   };
 }
 ;// CONCATENATED MODULE: ./src/core/fetchers/segment/segment_fetcher_creator.ts
@@ -51588,12 +51681,8 @@ function getInitialTime(manifest, lowLatencyMode, startAt) {
 var link_drm_and_content = __webpack_require__(9607);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/throwError.js
 var throwError = __webpack_require__(3610);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/interval.js
-var interval = __webpack_require__(6697);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/tap.js
-var tap = __webpack_require__(2006);
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/fromEvent.js
-var fromEvent = __webpack_require__(2401);
+// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/esm/assertThisInitialized.js
+var assertThisInitialized = __webpack_require__(7326);
 ;// CONCATENATED MODULE: ./src/compat/change_source_buffer_type.ts
 /**
  * Copyright 2015 CANAL+ Group
@@ -51645,6 +51734,7 @@ var types = __webpack_require__(9612);
 ;// CONCATENATED MODULE: ./src/core/segment_buffers/implementations/audio_video/audio_video_segment_buffer.ts
 
 
+
 /**
  * Copyright 2015 CANAL+ Group
  *
@@ -51671,6 +51761,7 @@ var types = __webpack_require__(9612);
 
 
 
+
 /**
  * Allows to push and remove new segments to a SourceBuffer in a FIFO queue (not
  * doing so can lead to browser Errors) while keeping an inventory of what has
@@ -51689,14 +51780,14 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
    * @constructor
    * @param {string} bufferType
    * @param {string} codec
-   * @param {SourceBuffer} sourceBuffer
+   * @param {MediaSource} mediaSource
    */
   function AudioVideoSegmentBuffer(bufferType, codec, mediaSource) {
     var _this;
 
     _this = _SegmentBuffer.call(this) || this;
     var sourceBuffer = mediaSource.addSourceBuffer(codec);
-    _this._destroy$ = new Subject/* Subject */.x();
+    _this._canceller = new task_canceller/* default */.ZP();
     _this.bufferType = bufferType;
     _this._mediaSource = mediaSource;
     _this._sourceBuffer = sourceBuffer;
@@ -51705,8 +51796,9 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
     _this._lastInitSegment = null;
     _this.codec = codec;
 
-    var _config$getCurrent = config/* default.getCurrent */.Z.getCurrent(),
-        SOURCE_BUFFER_FLUSHING_INTERVAL = _config$getCurrent.SOURCE_BUFFER_FLUSHING_INTERVAL; // Some browsers (happened with firefox 66) sometimes "forget" to send us
+    var onError = _this._onPendingTaskError.bind((0,assertThisInitialized/* default */.Z)(_this));
+
+    var reCheck = _this._flush.bind((0,assertThisInitialized/* default */.Z)(_this)); // Some browsers (happened with firefox 66) sometimes "forget" to send us
     // `update` or `updateend` events.
     // In that case, we're completely unable to continue the queue here and
     // stay locked in a waiting state.
@@ -51714,15 +51806,23 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
     // SourceBuffer is currently updating.
 
 
-    (0,interval/* interval */.F)(SOURCE_BUFFER_FLUSHING_INTERVAL).pipe((0,tap/* tap */.b)(function () {
-      return _this._flush();
-    }), (0,takeUntil/* takeUntil */.R)(_this._destroy$)).subscribe();
-    (0,fromEvent/* fromEvent */.R)(_this._sourceBuffer, "error").pipe((0,tap/* tap */.b)(function (err) {
-      return _this._onPendingTaskError(err);
-    }), (0,takeUntil/* takeUntil */.R)(_this._destroy$)).subscribe();
-    (0,fromEvent/* fromEvent */.R)(_this._sourceBuffer, "updateend").pipe((0,tap/* tap */.b)(function () {
-      return _this._flush();
-    }), (0,takeUntil/* takeUntil */.R)(_this._destroy$)).subscribe();
+    var _config$getCurrent = config/* default.getCurrent */.Z.getCurrent(),
+        SOURCE_BUFFER_FLUSHING_INTERVAL = _config$getCurrent.SOURCE_BUFFER_FLUSHING_INTERVAL;
+
+    var intervalId = setInterval(reCheck, SOURCE_BUFFER_FLUSHING_INTERVAL);
+
+    _this._sourceBuffer.addEventListener("error", onError);
+
+    _this._sourceBuffer.addEventListener("updateend", reCheck);
+
+    _this._canceller.signal.register(function () {
+      clearInterval(intervalId);
+
+      _this._sourceBuffer.removeEventListener("error", onError);
+
+      _this._sourceBuffer.removeEventListener("updateend", reCheck);
+    });
+
     return _this;
   }
   /**
@@ -51749,29 +51849,31 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
    * `data.chunk` argument to null.
    *
    * @param {Object} infos
-   * @returns {Observable}
+   * @param {Object} cancellationSignal
+   * @returns {Promise}
    */
 
 
   var _proto = AudioVideoSegmentBuffer.prototype;
 
-  _proto.pushChunk = function pushChunk(infos) {
+  _proto.pushChunk = function pushChunk(infos, cancellationSignal) {
     assertPushedDataIsBufferSource(infos);
     log/* default.debug */.Z.debug("AVSB: receiving order to push data to the SourceBuffer", this.bufferType, (0,utils/* getLoggableSegmentId */.K)(infos.inventoryInfos));
     return this._addToQueue({
       type: types/* SegmentBufferOperation.Push */.f.Push,
       value: infos
-    });
+    }, cancellationSignal);
   }
   /**
    * Remove buffered data (added to the same FIFO queue than `pushChunk`).
    * @param {number} start - start position, in seconds
    * @param {number} end - end position, in seconds
-   * @returns {Observable}
+   * @param {Object} cancellationSignal
+   * @returns {Promise}
    */
   ;
 
-  _proto.removeBuffer = function removeBuffer(start, end) {
+  _proto.removeBuffer = function removeBuffer(start, end, cancellationSignal) {
     log/* default.debug */.Z.debug("AVSB: receiving order to remove data from the SourceBuffer", this.bufferType, start, end);
     return this._addToQueue({
       type: types/* SegmentBufferOperation.Remove */.f.Remove,
@@ -51779,25 +51881,25 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
         start: start,
         end: end
       }
-    });
+    }, cancellationSignal);
   }
   /**
    * Indicate that every chunks from a Segment has been given to pushChunk so
    * far.
    * This will update our internal Segment inventory accordingly.
-   * The returned Observable will emit and complete successively once the whole
-   * segment has been pushed and this indication is acknowledged.
+   * The returned Promise will resolve once the whole segment has been pushed
+   * and this indication is acknowledged.
    * @param {Object} infos
-   * @returns {Observable}
+   * @returns {Promise}
    */
   ;
 
-  _proto.endOfSegment = function endOfSegment(infos) {
+  _proto.endOfSegment = function endOfSegment(infos, cancellationSignal) {
     log/* default.debug */.Z.debug("AVSB: receiving order for validating end of segment", this.bufferType, (0,utils/* getLoggableSegmentId */.K)(infos));
     return this._addToQueue({
       type: types/* SegmentBufferOperation.EndOfSegment */.f.EndOfSegment,
       value: infos
-    });
+    }, cancellationSignal);
   }
   /**
    * Returns the currently buffered data, in a TimeRanges object.
@@ -51854,12 +51956,10 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
   ;
 
   _proto.dispose = function dispose() {
-    this._destroy$.next();
-
-    this._destroy$.complete();
+    this._canceller.cancel();
 
     if (this._pendingTask !== null) {
-      this._pendingTask.subject.complete();
+      this._pendingTask.reject(new task_canceller/* CancellationError */.FU());
 
       this._pendingTask = null;
     }
@@ -51868,7 +51968,7 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
       var nextElement = this._queue.shift();
 
       if (nextElement !== undefined) {
-        nextElement.subject.complete();
+        nextElement.reject(new task_canceller/* CancellationError */.FU());
       }
     }
 
@@ -51882,7 +51982,7 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
   }
   /**
    * Called when an error arised that made the current task fail.
-   * @param {Event} error
+   * @param {Event} err
    */
   ;
 
@@ -51892,7 +51992,7 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
     if (this._pendingTask !== null) {
       var error = err instanceof Error ? err : new Error("An unknown error occured when doing operations " + "on the SourceBuffer");
 
-      this._pendingTask.subject.error(error);
+      this._pendingTask.reject(error);
     }
   }
   /**
@@ -51903,40 +52003,46 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
    * Cancel queued operation on unsubscription.
    * @private
    * @param {Object} operation
-   * @returns {Observable}
+   * @param {Object} cancellationSignal
+   * @returns {Promise}
    */
   ;
 
-  _proto._addToQueue = function _addToQueue(operation) {
+  _proto._addToQueue = function _addToQueue(operation, cancellationSignal) {
     var _this2 = this;
 
-    return new Observable/* Observable */.y(function (obs) {
+    return new Promise(function (resolve, reject) {
+      if (cancellationSignal.cancellationError !== null) {
+        return reject(cancellationSignal.cancellationError);
+      }
+
       var shouldRestartQueue = _this2._queue.length === 0 && _this2._pendingTask === null;
-      var subject = new Subject/* Subject */.x();
       var queueItem = (0,object_assign/* default */.Z)({
-        subject: subject
+        resolve: resolve,
+        reject: reject
       }, operation);
 
       _this2._queue.push(queueItem);
 
-      var subscription = subject.subscribe(obs);
-
-      if (shouldRestartQueue) {
-        _this2._flush();
-      }
-
-      return function () {
-        subscription.unsubscribe(); // Remove the corresponding element from the AudioVideoSegmentBuffer's
+      cancellationSignal.register(function (error) {
+        // Remove the corresponding element from the AudioVideoSegmentBuffer's
         // queue.
         // If the operation was a pending task, it should still continue to not
         // let the AudioVideoSegmentBuffer in a weird state.
-
         var index = _this2._queue.indexOf(queueItem);
 
         if (index >= 0) {
           _this2._queue.splice(index, 1);
         }
-      };
+
+        queueItem.resolve = noop/* default */.Z;
+        queueItem.reject = noop/* default */.Z;
+        reject(error);
+      });
+
+      if (shouldRestartQueue) {
+        _this2._flush();
+      }
     });
   }
   /**
@@ -51976,10 +52082,9 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
             (0,assert_unreachable/* default */.Z)(task);
         }
 
-        var subject = task.subject;
+        var resolve = task.resolve;
         this._pendingTask = null;
-        subject.next();
-        subject.complete();
+        resolve();
 
         this._flush(); // Go to next item in queue
 
@@ -52008,7 +52113,7 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
           var error = e instanceof Error ? e : new Error("An unknown error occured when preparing a push operation");
           this._lastInitSegment = null; // initialize init segment as a security
 
-          nextItem.subject.error(error);
+          nextItem.reject(error);
           return;
         }
 
@@ -52069,7 +52174,7 @@ var AudioVideoSegmentBuffer = /*#__PURE__*/function (_SegmentBuffer) {
    *
    * This method allows to "prepare" that push operation so that all is left is
    * to push the returned segment data one after the other (from first to last).
-   * @param {Object} item
+   * @param {Object} data
    * @returns {Object}
    */
   ;
@@ -52230,7 +52335,6 @@ function assertPushedDataIsBufferSource(pushedData) {
 
 
 
-
 var POSSIBLE_BUFFER_TYPES = ["audio", "video", "text", "image"];
 /**
  * Allows to easily create and dispose SegmentBuffers, which are interfaces to
@@ -52248,7 +52352,7 @@ var POSSIBLE_BUFFER_TYPES = ["audio", "video", "text", "image"];
  * To be able to use a SegmentBuffer linked to a native media buffer, you
  * will first need to create it, but also wait until the other one is either
  * created or explicitely disabled through the `disableSegmentBuffer` method.
- * The Observable returned by `waitForUsableBuffers` will emit when
+ * The Promise returned by `waitForUsableBuffers` will emit when
  * that is the case.
  *
  * @class SegmentBuffersStore
@@ -52352,7 +52456,7 @@ var SegmentBuffersStore = /*#__PURE__*/function () {
    * content need to all be created (by creating SegmentBuffers linked to them)
    * before any one can be used.
    *
-   * This function will return an Observable emitting when any and all native
+   * This function will return a Promise resolving when any and all native
    * SourceBuffers can be used.
    *
    * From https://w3c.github.io/media-source/#methods
@@ -52360,23 +52464,35 @@ var SegmentBuffersStore = /*#__PURE__*/function () {
    *   exception if the media element has reached the HAVE_METADATA
    *   readyState. This can occur if the user agent's media engine
    *   does not support adding more tracks during playback.
-   * @return {Observable}
+   * @param {Object} cancelWaitSignal
+   * @return {Promise}
    */
   ;
 
-  _proto.waitForUsableBuffers = function waitForUsableBuffers() {
+  _proto.waitForUsableBuffers = function waitForUsableBuffers(cancelWaitSignal) {
     var _this = this;
 
     if (this._areNativeBuffersUsable()) {
-      return (0,of.of)(undefined);
+      return Promise.resolve();
     }
 
-    return new Observable/* Observable */.y(function (obs) {
-      _this._onNativeBufferAddedOrDisabled.push(function () {
+    return new Promise(function (res, rej) {
+      var onAddedOrDisabled = function onAddedOrDisabled() {
         if (_this._areNativeBuffersUsable()) {
-          obs.next(undefined);
-          obs.complete();
+          res();
         }
+      };
+
+      _this._onNativeBufferAddedOrDisabled.push(onAddedOrDisabled);
+
+      cancelWaitSignal.register(function (error) {
+        var indexOf = _this._onNativeBufferAddedOrDisabled.indexOf(onAddedOrDisabled);
+
+        if (indexOf >= 0) {
+          _this._onNativeBufferAddedOrDisabled.splice(indexOf, 1);
+        }
+
+        rej(error);
       });
     });
   }
@@ -52625,6 +52741,76 @@ function exhaustMap(project, resultSelector) {
     });
 }
 //# sourceMappingURL=exhaustMap.js.map
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/tap.js
+var tap = __webpack_require__(2006);
+;// CONCATENATED MODULE: ./src/utils/rx-from_cancellable_promise.ts
+/**
+ * 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.
+ */
+
+/**
+ * Transform a Promise that can be cancelled (through the usage of a
+ * `TaskCanceller`) to an Observable, while keeping the cancellation logic
+ * between both in sync.
+ *
+ * @example
+ * ```js
+ * const canceller = new TaskCanceller();
+ * fromCancellablePromise(
+ *   canceller,
+ *   () => doSomeCancellableTasks(canceller.signal)
+ * ).subscribe(
+ *   (i) => console.log("Emitted: ", i);
+ *   (e) => console.log("Error: ", e);
+ *   () => console.log("Complete.")
+ * );
+ * ```
+ * @param {Object} canceller
+ * @param {Function} fn
+ * @returns {Observable}
+ */
+
+function fromCancellablePromise(canceller, fn) {
+  return new Observable/* Observable */.y(function (obs) {
+    var isUnsubscribedFrom = false;
+    var isComplete = false;
+    fn().then(function (i) {
+      if (isUnsubscribedFrom) {
+        return;
+      }
+
+      isComplete = true;
+      obs.next(i);
+      obs.complete();
+    }, function (err) {
+      isComplete = true;
+
+      if (isUnsubscribedFrom) {
+        return;
+      }
+
+      obs.error(err);
+    });
+    return function () {
+      if (!isComplete) {
+        isUnsubscribedFrom = true;
+        canceller.cancel();
+      }
+    };
+  });
+}
 // EXTERNAL MODULE: ./node_modules/next-tick/index.js
 var next_tick = __webpack_require__(7473);
 var next_tick_default = /*#__PURE__*/__webpack_require__.n(next_tick);
@@ -52982,9 +53168,10 @@ var WeakMapMemory = /*#__PURE__*/function () {
 }();
 
 
-// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/operators/concatAll.js
-var concatAll = __webpack_require__(9834);
 ;// CONCATENATED MODULE: ./src/core/segment_buffers/garbage_collector.ts
+
+
+
 /**
  * Copyright 2015 CANAL+ Group
  *
@@ -53002,27 +53189,48 @@ var concatAll = __webpack_require__(9834);
  */
 
 
-
 /**
  * Perform cleaning of the buffer according to the values set by the user
- * each time `currentTime$` emits and each times the
+ * each time `playbackObserver` emits and each times the
  * maxBufferBehind/maxBufferAhead values change.
  *
+ * Abort this operation when the `cancellationSignal` emits.
+ *
  * @param {Object} opt
+ * @param {Object} cancellationSignal
  * @returns {Observable}
  */
 
-function BufferGarbageCollector(_ref) {
+function BufferGarbageCollector(_ref, cancellationSignal) {
   var segmentBuffer = _ref.segmentBuffer,
-      currentTime$ = _ref.currentTime$,
-      maxBufferBehind$ = _ref.maxBufferBehind$,
-      maxBufferAhead$ = _ref.maxBufferAhead$;
-  return combineLatest([currentTime$, maxBufferBehind$, maxBufferAhead$]).pipe((0,mergeMap/* mergeMap */.z)(function (_ref2) {
-    var currentTime = _ref2[0],
-        maxBufferBehind = _ref2[1],
-        maxBufferAhead = _ref2[2];
-    return clearBuffer(segmentBuffer, currentTime, maxBufferBehind, maxBufferAhead);
-  }));
+      playbackObserver = _ref.playbackObserver,
+      maxBufferBehind = _ref.maxBufferBehind,
+      maxBufferAhead = _ref.maxBufferAhead;
+  var lastPosition;
+  playbackObserver.listen(function (o) {
+    var _a;
+
+    lastPosition = (_a = o.position.pending) !== null && _a !== void 0 ? _a : o.position.last;
+    clean();
+  }, {
+    includeLastObservation: true,
+    clearSignal: cancellationSignal
+  });
+
+  function clean() {
+    clearBuffer(segmentBuffer, lastPosition, maxBufferBehind.getValue(), maxBufferAhead.getValue(), cancellationSignal)["catch"](function (e) {
+      var errMsg = e instanceof Error ? e.message : "Unknown error";
+      log/* default.error */.Z.error("Could not run BufferGarbageCollector:", errMsg);
+    });
+  }
+
+  maxBufferBehind.onUpdate(clean, {
+    clearSignal: cancellationSignal
+  });
+  maxBufferAhead.onUpdate(clean, {
+    clearSignal: cancellationSignal
+  });
+  clean();
 }
 /**
  * Remove buffer from the browser's memory based on the user's
@@ -53038,96 +53246,133 @@ function BufferGarbageCollector(_ref) {
  * @param {Number} position - The current position
  * @param {Number} maxBufferBehind
  * @param {Number} maxBufferAhead
- * @returns {Observable}
+ * @returns {Promise}
  */
 
-function clearBuffer(segmentBuffer, position, maxBufferBehind, maxBufferAhead) {
-  if (!isFinite(maxBufferBehind) && !isFinite(maxBufferAhead)) {
-    return empty/* EMPTY */.E;
-  }
+function clearBuffer(_x, _x2, _x3, _x4, _x5) {
+  return _clearBuffer.apply(this, arguments);
+}
 
-  var cleanedupRanges = [];
+function _clearBuffer() {
+  _clearBuffer = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/regenerator_default().mark(function _callee(segmentBuffer, position, maxBufferBehind, maxBufferAhead, cancellationSignal) {
+    var cleanedupRanges, _getInnerAndOuterTime, innerRange, outerRanges, collectBufferBehind, collectBufferAhead, _i, _cleanedupRanges, range;
 
-  var _getInnerAndOuterTime = (0,ranges/* getInnerAndOuterTimeRanges */.F_)(segmentBuffer.getBufferedRanges(), position),
-      innerRange = _getInnerAndOuterTime.innerRange,
-      outerRanges = _getInnerAndOuterTime.outerRanges;
+    return regenerator_default().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (!(!isFinite(maxBufferBehind) && !isFinite(maxBufferAhead))) {
+              _context.next = 2;
+              break;
+            }
 
-  var collectBufferBehind = function collectBufferBehind() {
-    if (!isFinite(maxBufferBehind)) {
-      return;
-    } // begin from the oldest
+            return _context.abrupt("return", Promise.resolve());
 
+          case 2:
+            cleanedupRanges = [];
+            _getInnerAndOuterTime = (0,ranges/* getInnerAndOuterTimeRanges */.F_)(segmentBuffer.getBufferedRanges(), position), innerRange = _getInnerAndOuterTime.innerRange, outerRanges = _getInnerAndOuterTime.outerRanges;
 
-    for (var i = 0; i < outerRanges.length; i++) {
-      var outerRange = outerRanges[i];
+            collectBufferBehind = function collectBufferBehind() {
+              if (!isFinite(maxBufferBehind)) {
+                return;
+              } // begin from the oldest
 
-      if (position - maxBufferBehind >= outerRange.end) {
-        cleanedupRanges.push(outerRange);
-      } else if (position >= outerRange.end && position - maxBufferBehind > outerRange.start && position - maxBufferBehind < outerRange.end) {
-        cleanedupRanges.push({
-          start: outerRange.start,
-          end: position - maxBufferBehind
-        });
-      }
-    }
 
-    if (innerRange != null) {
-      if (position - maxBufferBehind > innerRange.start) {
-        cleanedupRanges.push({
-          start: innerRange.start,
-          end: position - maxBufferBehind
-        });
-      }
-    }
-  };
+              for (var i = 0; i < outerRanges.length; i++) {
+                var outerRange = outerRanges[i];
 
-  var collectBufferAhead = function collectBufferAhead() {
-    if (!isFinite(maxBufferAhead)) {
-      return;
-    } // begin from the oldest
+                if (position - maxBufferBehind >= outerRange.end) {
+                  cleanedupRanges.push(outerRange);
+                } else if (position >= outerRange.end && position - maxBufferBehind > outerRange.start && position - maxBufferBehind < outerRange.end) {
+                  cleanedupRanges.push({
+                    start: outerRange.start,
+                    end: position - maxBufferBehind
+                  });
+                }
+              }
 
+              if (innerRange != null) {
+                if (position - maxBufferBehind > innerRange.start) {
+                  cleanedupRanges.push({
+                    start: innerRange.start,
+                    end: position - maxBufferBehind
+                  });
+                }
+              }
+            };
 
-    for (var i = 0; i < outerRanges.length; i++) {
-      var outerRange = outerRanges[i];
+            collectBufferAhead = function collectBufferAhead() {
+              if (!isFinite(maxBufferAhead)) {
+                return;
+              } // begin from the oldest
 
-      if (position + maxBufferAhead <= outerRange.start) {
-        cleanedupRanges.push(outerRange);
-      } else if (position <= outerRange.start && position + maxBufferAhead < outerRange.end && position + maxBufferAhead > outerRange.start) {
-        cleanedupRanges.push({
-          start: position + maxBufferAhead,
-          end: outerRange.end
-        });
-      }
-    }
 
-    if (innerRange != null) {
-      if (position + maxBufferAhead < innerRange.end) {
-        cleanedupRanges.push({
-          start: position + maxBufferAhead,
-          end: innerRange.end
-        });
-      }
-    }
-  };
+              for (var i = 0; i < outerRanges.length; i++) {
+                var outerRange = outerRanges[i];
 
-  collectBufferBehind();
-  collectBufferAhead();
-  var clean$ = (0,from/* from */.D)(cleanedupRanges.map(function (range) {
-    log/* default.debug */.Z.debug("GC: cleaning range from SegmentBuffer", range.start, range.end);
+                if (position + maxBufferAhead <= outerRange.start) {
+                  cleanedupRanges.push(outerRange);
+                } else if (position <= outerRange.start && position + maxBufferAhead < outerRange.end && position + maxBufferAhead > outerRange.start) {
+                  cleanedupRanges.push({
+                    start: position + maxBufferAhead,
+                    end: outerRange.end
+                  });
+                }
+              }
 
-    if (range.start >= range.end) {
-      return (0,of.of)(null);
-    }
+              if (innerRange != null) {
+                if (position + maxBufferAhead < innerRange.end) {
+                  cleanedupRanges.push({
+                    start: position + maxBufferAhead,
+                    end: innerRange.end
+                  });
+                }
+              }
+            };
 
-    return segmentBuffer.removeBuffer(range.start, range.end);
-  })).pipe((0,concatAll/* concatAll */.u)(), // 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.
+            collectBufferBehind();
+            collectBufferAhead();
+            _i = 0, _cleanedupRanges = cleanedupRanges;
 
-  /* eslint-disable-next-line @typescript-eslint/no-unsafe-argument */
-  (0,ignoreElements/* ignoreElements */.l)());
-  return clean$;
+          case 9:
+            if (!(_i < _cleanedupRanges.length)) {
+              _context.next = 20;
+              break;
+            }
+
+            range = _cleanedupRanges[_i];
+
+            if (!(range.start < range.end)) {
+              _context.next = 17;
+              break;
+            }
+
+            log/* default.debug */.Z.debug("GC: cleaning range from SegmentBuffer", range.start, range.end);
+
+            if (!(cancellationSignal.cancellationError !== null)) {
+              _context.next = 15;
+              break;
+            }
+
+            throw cancellationSignal.cancellationError;
+
+          case 15:
+            _context.next = 17;
+            return segmentBuffer.removeBuffer(range.start, range.end, cancellationSignal);
+
+          case 17:
+            _i++;
+            _context.next = 9;
+            break;
+
+          case 20:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _clearBuffer.apply(this, arguments);
 }
 // EXTERNAL MODULE: ./src/core/stream/events_generators.ts
 var stream_events_generators = __webpack_require__(8567);
@@ -54430,7 +54675,8 @@ function getSegmentPriority(segmentTime, wantedStartTimestamp) {
 function getBufferStatus(content, initialWantedTime, playbackObserver, fastSwitchThreshold, bufferGoal, maxBufferSize, segmentBuffer) {
   segmentBuffer.synchronizeInventory();
   var representation = content.representation;
-  var neededRange = getRangeOfNeededSegments(content, initialWantedTime, bufferGoal);
+  var askedStart = playbackObserver.getIsPaused() || playbackObserver.getPlaybackRate() <= 0 ? initialWantedTime - 0.1 : initialWantedTime;
+  var neededRange = getRangeOfNeededSegments(content, askedStart, bufferGoal);
   var shouldRefreshManifest = representation.index.shouldRefresh(neededRange.start, neededRange.end);
   /**
    * Every segment awaiting an "EndOfSegment" operation, which indicates that a
@@ -54470,7 +54716,7 @@ function getBufferStatus(content, initialWantedTime, playbackObserver, fastSwitc
 
   var prioritizedNeededSegments = segmentsToLoad.map(function (segment) {
     return {
-      priority: getSegmentPriority(segment.time, initialWantedTime),
+      priority: getSegmentPriority(segment.time, askedStart),
       segment: segment
     };
   });
@@ -54538,7 +54784,7 @@ function getRangeOfNeededSegments(content, initialWantedTime, bufferGoal) {
   if (!(0,is_null_or_undefined/* default */.Z)(lastIndexPosition) && initialWantedTime >= lastIndexPosition && representationIndex.isInitialized() && representationIndex.isFinished() && isPeriodTheCurrentAndLastOne(manifest, period, initialWantedTime)) {
     wantedStartPosition = lastIndexPosition - 1;
   } else {
-    wantedStartPosition = initialWantedTime;
+    wantedStartPosition = initialWantedTime - 0.1;
   }
 
   var wantedEndPosition = wantedStartPosition + bufferGoal;
@@ -54620,6 +54866,15 @@ function getPlayableBufferedSegments(neededRange, segmentInventory) {
   return overlappingChunks;
 }
 ;// CONCATENATED MODULE: ./src/core/stream/representation/force_garbage_collection.ts
+
+
+
+function force_garbage_collection_createForOfIteratorHelperLoose(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (it) return (it = it.call(o)).next.bind(it); if (Array.isArray(o) || (it = force_garbage_collection_unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; return function () { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function force_garbage_collection_unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return force_garbage_collection_arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return force_garbage_collection_arrayLikeToArray(o, minLen); }
+
+function force_garbage_collection_arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 /**
  * Copyright 2015 CANAL+ Group
  *
@@ -54638,44 +54893,20 @@ function getPlayableBufferedSegments(neededRange, segmentInventory) {
 
 
 
-
 /**
  * Run the garbage collector.
  *
  * Try to clean up buffered ranges from a low gcGap at first.
  * If it does not succeed to clean up space, use a higher gcCap.
  *
- * @param {Observable} timings$
+ * @param {number} currentPosition
  * @param {Object} bufferingQueue
- * @returns {Observable}
+ * @param {Object} cancellationSignal
+ * @returns {Promise}
  */
 
-function forceGarbageCollection(currentPosition, bufferingQueue) {
-  return (0,defer/* defer */.P)(function () {
-    var GC_GAP_CALM = config/* default.getCurrent */.Z.getCurrent().BUFFER_GC_GAPS.CALM;
-    var GC_GAP_BEEFY = config/* default.getCurrent */.Z.getCurrent().BUFFER_GC_GAPS.BEEFY;
-    log/* default.warn */.Z.warn("Stream: Running garbage collector");
-    var buffered = bufferingQueue.getBufferedRanges();
-    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(currentPosition, buffered, GC_GAP_BEEFY);
-    }
-
-    if (log/* default.hasLevel */.Z.hasLevel("DEBUG")) {
-      log/* default.debug */.Z.debug("Stream: GC cleaning", cleanedupRanges.map(function (_ref) {
-        var start = _ref.start,
-            end = _ref.end;
-        return "start: " + start + " - end " + end;
-      }).join(", "));
-    }
-
-    return (0,from/* from */.D)(cleanedupRanges.map(function (_ref2) {
-      var start = _ref2.start,
-          end = _ref2.end;
-      return start >= end ? (0,of.of)(null) : bufferingQueue.removeBuffer(start, end);
-    })).pipe((0,concatAll/* concatAll */.u)());
-  });
+function forceGarbageCollection(_x, _x2, _x3) {
+  return _forceGarbageCollection.apply(this, arguments);
 }
 /**
  * Buffer garbage collector algorithm.
@@ -54691,6 +54922,68 @@ function forceGarbageCollection(currentPosition, bufferingQueue) {
  * @returns {Array.<Object>} - Ranges selected for clean up
  */
 
+function _forceGarbageCollection() {
+  _forceGarbageCollection = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/regenerator_default().mark(function _callee(currentPosition, bufferingQueue, cancellationSignal) {
+    var GC_GAP_CALM, GC_GAP_BEEFY, buffered, cleanedupRanges, _iterator, _step, range, start, end;
+
+    return regenerator_default().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            GC_GAP_CALM = config/* default.getCurrent */.Z.getCurrent().BUFFER_GC_GAPS.CALM;
+            GC_GAP_BEEFY = config/* default.getCurrent */.Z.getCurrent().BUFFER_GC_GAPS.BEEFY;
+            log/* default.warn */.Z.warn("Stream: Running garbage collector");
+            buffered = bufferingQueue.getBufferedRanges();
+            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(currentPosition, buffered, GC_GAP_BEEFY);
+            }
+
+            if (log/* default.hasLevel */.Z.hasLevel("DEBUG")) {
+              log/* default.debug */.Z.debug("Stream: GC cleaning", cleanedupRanges.map(function (_ref2) {
+                var start = _ref2.start,
+                    end = _ref2.end;
+                return "start: " + start + " - end " + end;
+              }).join(", "));
+            }
+
+            _iterator = force_garbage_collection_createForOfIteratorHelperLoose(cleanedupRanges);
+
+          case 8:
+            if ((_step = _iterator()).done) {
+              _context.next = 16;
+              break;
+            }
+
+            range = _step.value;
+            start = range.start, end = range.end;
+
+            if (!(start < end)) {
+              _context.next = 14;
+              break;
+            }
+
+            _context.next = 14;
+            return bufferingQueue.removeBuffer(start, end, cancellationSignal);
+
+          case 14:
+            _context.next = 8;
+            break;
+
+          case 16:
+            return _context.abrupt("return");
+
+          case 17:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _forceGarbageCollection.apply(this, arguments);
+}
+
 function selectGCedRanges(position, buffered, gcGap) {
   var _getInnerAndOuterTime = (0,ranges/* getInnerAndOuterTimeRanges */.F_)(buffered, position),
       innerRange = _getInnerAndOuterTime.innerRange,
@@ -54712,9 +55005,9 @@ function selectGCedRanges(position, buffered, gcGap) {
 
   if (innerRange !== null) {
     if (log/* default.hasLevel */.Z.hasLevel("DEBUG")) {
-      log/* default.debug */.Z.debug("Stream: GC removing part of inner range", cleanedupRanges.map(function (_ref3) {
-        var start = _ref3.start,
-            end = _ref3.end;
+      log/* default.debug */.Z.debug("Stream: GC removing part of inner range", cleanedupRanges.map(function (_ref) {
+        var start = _ref.start,
+            end = _ref.end;
         return "start: " + start + " - end " + end;
       }).join(", "));
     }
@@ -54737,6 +55030,9 @@ function selectGCedRanges(position, buffered, gcGap) {
   return cleanedupRanges;
 }
 ;// CONCATENATED MODULE: ./src/core/stream/representation/append_segment_to_buffer.ts
+
+
+
 /**
  * Copyright 2015 CANAL+ Group
  *
@@ -54758,36 +55054,78 @@ function selectGCedRanges(position, buffered, gcGap) {
  */
 
 
-
 /**
  * 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} playbackObserver
  * @param {Object} segmentBuffer
  * @param {Object} dataInfos
- * @returns {Observable}
+ * @param {Object} cancellationSignal
+ * @returns {Promise}
  */
 
-function appendSegmentToBuffer(playbackObserver, segmentBuffer, dataInfos) {
-  var append$ = segmentBuffer.pushChunk(dataInfos);
-  return append$.pipe((0,catchError/* catchError */.K)(function (appendError) {
-    if (!(appendError instanceof Error) || appendError.name !== "QuotaExceededError") {
-      var reason = appendError instanceof Error ? appendError.toString() : "An unknown error happened when pushing content";
-      throw new media_error/* default */.Z("BUFFER_APPEND_ERROR", reason);
-    }
+function appendSegmentToBuffer(_x, _x2, _x3, _x4) {
+  return _appendSegmentToBuffer.apply(this, arguments);
+}
 
-    return playbackObserver.getReference().asObservable().pipe((0,take/* take */.q)(1), (0,mergeMap/* mergeMap */.z)(function (observation) {
-      var _a;
+function _appendSegmentToBuffer() {
+  _appendSegmentToBuffer = (0,asyncToGenerator/* default */.Z)( /*#__PURE__*/regenerator_default().mark(function _callee(playbackObserver, segmentBuffer, dataInfos, cancellationSignal) {
+    var _a, reason, _playbackObserver$get, position, currentPos, _reason;
 
-      var currentPos = (_a = observation.position.pending) !== null && _a !== void 0 ? _a : observation.position.last;
-      return (0,concat/* concat */.z)(forceGarbageCollection(currentPos, segmentBuffer).pipe((0,ignoreElements/* ignoreElements */.l)()), append$).pipe((0,catchError/* catchError */.K)(function (forcedGCError) {
-        var reason = forcedGCError instanceof Error ? forcedGCError.toString() : "Could not clean the buffer";
-        throw new media_error/* default */.Z("BUFFER_FULL_ERROR", reason);
-      }));
-    }));
+    return regenerator_default().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return segmentBuffer.pushChunk(dataInfos, cancellationSignal);
+
+          case 3:
+            _context.next = 23;
+            break;
+
+          case 5:
+            _context.prev = 5;
+            _context.t0 = _context["catch"](0);
+
+            if (!(!(_context.t0 instanceof Error) || _context.t0.name !== "QuotaExceededError")) {
+              _context.next = 10;
+              break;
+            }
+
+            reason = _context.t0 instanceof Error ? _context.t0.toString() : "An unknown error happened when pushing content";
+            throw new media_error/* default */.Z("BUFFER_APPEND_ERROR", reason);
+
+          case 10:
+            _playbackObserver$get = playbackObserver.getReference().getValue(), position = _playbackObserver$get.position;
+            currentPos = (_a = position.pending) !== null && _a !== void 0 ? _a : position.last;
+            _context.prev = 12;
+            _context.next = 15;
+            return forceGarbageCollection(currentPos, segmentBuffer, cancellationSignal);
+
+          case 15:
+            _context.next = 17;
+            return segmentBuffer.pushChunk(dataInfos, cancellationSignal);
+
+          case 17:
+            _context.next = 23;
+            break;
+
+          case 19:
+            _context.prev = 19;
+            _context.t1 = _context["catch"](12);
+            _reason = _context.t1 instanceof Error ? _context.t1.toString() : "Could not clean the buffer";
+            throw new media_error/* default */.Z("BUFFER_FULL_ERROR", _reason);
+
+          case 23:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 5], [12, 19]]);
   }));
+  return _appendSegmentToBuffer.apply(this, arguments);
 }
 ;// CONCATENATED MODULE: ./src/core/stream/representation/push_init_segment.ts
 /**
@@ -54808,6 +55146,8 @@ function appendSegmentToBuffer(playbackObserver, segmentBuffer, dataInfos) {
 
 
 
+
+
 /**
  * Push the initialization segment to the SegmentBuffer.
  * The Observable returned:
@@ -54836,9 +55176,12 @@ function pushInitSegment(_ref) {
       appendWindow: [undefined, undefined],
       codec: codec
     };
-    return appendSegmentToBuffer(playbackObserver, segmentBuffer, {
-      data: data,
-      inventoryInfos: null
+    var canceller = new task_canceller/* default */.ZP();
+    return fromCancellablePromise(canceller, function () {
+      return appendSegmentToBuffer(playbackObserver, segmentBuffer, {
+        data: data,
+        inventoryInfos: null
+      }, canceller.signal);
     }).pipe((0,map/* map */.U)(function () {
       var buffered = segmentBuffer.getBufferedRanges();
       return stream_events_generators/* default.addedSegment */.Z.addedSegment(content, segment, buffered, segmentData);
@@ -54866,6 +55209,8 @@ function pushInitSegment(_ref) {
 
 
 
+
+
 /**
  * Push a given media segment (non-init segment) to a SegmentBuffer.
  * The Observable returned:
@@ -54928,9 +55273,12 @@ function pushMediaSegment(_ref) {
       start: estimatedStart,
       end: estimatedEnd
     }, content);
-    return appendSegmentToBuffer(playbackObserver, segmentBuffer, {
-      data: data,
-      inventoryInfos: inventoryInfos
+    var canceller = new task_canceller/* default */.ZP();
+    return fromCancellablePromise(canceller, function () {
+      return appendSegmentToBuffer(playbackObserver, segmentBuffer, {
+        data: data,
+        inventoryInfos: inventoryInfos
+      }, canceller.signal);
     }).pipe((0,map/* map */.U)(function () {
       var buffered = segmentBuffer.getBufferedRanges();
       return stream_events_generators/* default.addedSegment */.Z.addedSegment(content, segment, buffered, chunkData);
@@ -54975,6 +55323,8 @@ function pushMediaSegment(_ref) {
 
 
 
+
+
 /**
  * Build up buffer for a single Representation.
  *
@@ -55149,8 +55499,11 @@ function RepresentationStream(_ref) {
       var gcedPosition = Math.max(0, initialWantedTime - UPTO_CURRENT_POSITION_CLEANUP);
 
       if (gcedPosition > 0) {
-        bufferRemoval = segmentBuffer.removeBuffer(0, gcedPosition) // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-        .pipe((0,ignoreElements/* ignoreElements */.l)());
+        var removalCanceller = new task_canceller/* default */.ZP();
+        bufferRemoval = fromCancellablePromise(removalCanceller, function () {
+          return segmentBuffer.removeBuffer(0, gcedPosition, removalCanceller.signal);
+        } // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        ).pipe((0,ignoreElements/* ignoreElements */.l)());
       }
     }
 
@@ -55191,9 +55544,12 @@ function RepresentationStream(_ref) {
       case "end-of-segment":
         {
           var segment = evt.value.segment;
-          return segmentBuffer.endOfSegment((0,object_assign/* default */.Z)({
-            segment: segment
-          }, content)) // NOTE As of now (RxJS 7.4.0), RxJS defines `ignoreElements` default
+          var endOfSegmentCanceller = new task_canceller/* default */.ZP();
+          return fromCancellablePromise(endOfSegmentCanceller, function () {
+            return segmentBuffer.endOfSegment((0,object_assign/* default */.Z)({
+              segment: segment
+            }, content), endOfSegmentCanceller.signal);
+          }) // 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.
@@ -56102,6 +56458,8 @@ function getFirstSegmentAfterPeriod(inventory, period) {
 
 
 
+
+
 /**
  * Create single PeriodStream Observable:
  *   - Lazily create (or reuse) a SegmentBuffer for the given type.
@@ -56154,13 +56512,16 @@ function PeriodStream(_ref) {
           return reloadAfterSwitch(period, bufferType, playbackObserver, 0);
         }
 
-        if (period.end === undefined) {
-          cleanBuffer$ = segmentBufferStatus.value.removeBuffer(period.start, Infinity);
-        } else if (period.end <= period.start) {
-          cleanBuffer$ = (0,of.of)(null);
-        } else {
-          cleanBuffer$ = segmentBufferStatus.value.removeBuffer(period.start, period.end);
-        }
+        var canceller = new task_canceller/* default */.ZP();
+        cleanBuffer$ = fromCancellablePromise(canceller, function () {
+          if (period.end === undefined) {
+            return segmentBufferStatus.value.removeBuffer(period.start, Infinity, canceller.signal);
+          } else if (period.end <= period.start) {
+            return Promise.resolve();
+          } else {
+            return segmentBufferStatus.value.removeBuffer(period.start, period.end, canceller.signal);
+          }
+        });
       } else {
         if (segmentBufferStatus.type === "uninitialized") {
           segmentBuffersStore.disableSegmentBuffer(bufferType);
@@ -56198,11 +56559,17 @@ function PeriodStream(_ref) {
       var cleanBuffer$ = strategy.type === "clean-buffer" || strategy.type === "flush-buffer" ? concat/* concat.apply */.z.apply(void 0, strategy.value.map(function (_ref2) {
         var start = _ref2.start,
             end = _ref2.end;
-        return segmentBuffer.removeBuffer(start, end);
+        var canceller = new task_canceller/* default */.ZP();
+        return fromCancellablePromise(canceller, function () {
+          return segmentBuffer.removeBuffer(start, end, canceller.signal);
+        });
       })).pipe((0,ignoreElements/* ignoreElements */.l)()) : empty/* EMPTY */.E;
       var bufferGarbageCollector$ = garbageCollectors.get(segmentBuffer);
       var adaptationStream$ = createAdaptationStream(adaptation, segmentBuffer);
-      return segmentBuffersStore.waitForUsableBuffers().pipe((0,mergeMap/* mergeMap */.z)(function () {
+      var cancelWait = new task_canceller/* default */.ZP();
+      return fromCancellablePromise(cancelWait, function () {
+        return segmentBuffersStore.waitForUsableBuffers(cancelWait.signal);
+      }).pipe((0,mergeMap/* mergeMap */.z)(function () {
         return (0,concat/* concat */.z)(cleanBuffer$, needsBufferFlush$, (0,merge/* merge */.T)(adaptationStream$, bufferGarbageCollector$));
       }));
     });
@@ -56656,6 +57023,9 @@ function getBlacklistedRanges(segmentBuffer, contents) {
 
 
 
+
+
+
 /**
  * Create and manage the various Stream Observables needed for the content to
  * play:
@@ -56700,19 +57070,21 @@ function StreamOrchestrator(content, playbackObserver, representationEstimator,
     var bufferType = segmentBuffer.bufferType;
     var defaultMaxBehind = MAXIMUM_MAX_BUFFER_BEHIND[bufferType] != null ? MAXIMUM_MAX_BUFFER_BEHIND[bufferType] : Infinity;
     var defaultMaxAhead = MAXIMUM_MAX_BUFFER_AHEAD[bufferType] != null ? MAXIMUM_MAX_BUFFER_AHEAD[bufferType] : Infinity;
-    return BufferGarbageCollector({
-      segmentBuffer: segmentBuffer,
-      currentTime$: playbackObserver.getReference().asObservable().pipe((0,map/* map */.U)(function (o) {
-        var _a;
-
-        return (_a = o.position.pending) !== null && _a !== void 0 ? _a : o.position.last;
-      })),
-      maxBufferBehind$: maxBufferBehind.asObservable().pipe((0,map/* map */.U)(function (val) {
-        return Math.min(val, defaultMaxBehind);
-      })),
-      maxBufferAhead$: maxBufferAhead.asObservable().pipe((0,map/* map */.U)(function (val) {
-        return Math.min(val, defaultMaxAhead);
-      }))
+    return new Observable/* Observable */.y(function () {
+      var canceller = new task_canceller/* default */.ZP();
+      BufferGarbageCollector({
+        segmentBuffer: segmentBuffer,
+        playbackObserver: playbackObserver,
+        maxBufferBehind: (0,reference/* createMappedReference */.lR)(maxBufferBehind, function (val) {
+          return Math.min(val, defaultMaxBehind);
+        }, canceller.signal),
+        maxBufferAhead: (0,reference/* createMappedReference */.lR)(maxBufferAhead, function (val) {
+          return Math.min(val, defaultMaxAhead);
+        }, canceller.signal)
+      }, canceller.signal);
+      return function () {
+        canceller.cancel();
+      };
     });
   }); // Every PeriodStreams for every possible types
 
@@ -56878,7 +57250,15 @@ function StreamOrchestrator(content, playbackObserver, representationEstimator,
       return concat/* concat.apply */.z.apply(void 0, rangesToClean.map(function (_ref3) {
         var start = _ref3.start,
             end = _ref3.end;
-        return start >= end ? empty/* EMPTY */.E : segmentBuffer.removeBuffer(start, end).pipe((0,ignoreElements/* ignoreElements */.l)());
+
+        if (start >= end) {
+          return empty/* EMPTY */.E;
+        }
+
+        var canceller = new task_canceller/* default */.ZP();
+        return fromCancellablePromise(canceller, function () {
+          return segmentBuffer.removeBuffer(start, end, canceller.signal);
+        }).pipe((0,ignoreElements/* ignoreElements */.l)());
       }).concat([// Schedule micro task before checking the last playback observation
       // to reduce the risk of race conditions where the next observation
       // was going to be emitted synchronously.
@@ -57631,6 +58011,22 @@ function maintainEndOfStream(mediaSource) {
 var initial_seek_and_play = __webpack_require__(7920);
 // EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/timer.js
 var timer = __webpack_require__(6625);
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/fromEvent.js
+var fromEvent = __webpack_require__(2401);
+// EXTERNAL MODULE: ./node_modules/rxjs/dist/esm5/internal/scheduler/async.js
+var scheduler_async = __webpack_require__(7991);
+;// CONCATENATED MODULE: ./node_modules/rxjs/dist/esm5/internal/observable/interval.js
+
+
+function interval(period, scheduler) {
+    if (period === void 0) { period = 0; }
+    if (scheduler === void 0) { scheduler = scheduler_async/* asyncScheduler */.z; }
+    if (period < 0) {
+        period = 0;
+    }
+    return (0,timer/* timer */.H)(period, period, scheduler);
+}
+//# sourceMappingURL=interval.js.map
 ;// CONCATENATED MODULE: ./src/core/init/media_duration_updater.ts
 /**
  * Copyright 2015 CANAL+ Group
@@ -57845,7 +58241,7 @@ function areSourceBuffersUpdating$(sourceBuffers) {
       return true;
     })), (0,fromEvent/* fromEvent */.R)(sourceBuffer, "update").pipe((0,map/* map */.U)(function () {
       return false;
-    })), (0,interval/* interval */.F)(500).pipe((0,map/* map */.U)(function () {
+    })), interval(500).pipe((0,map/* map */.U)(function () {
       return sourceBuffer.updating;
     }))).pipe((0,startWith/* startWith */.O)(sourceBuffer.updating), (0,distinctUntilChanged/* distinctUntilChanged */.x)()));
   };
@@ -58140,7 +58536,7 @@ function streamEventsEmitter(manifest, mediaElement, observation$) {
     var _config$getCurrent = config/* default.getCurrent */.Z.getCurrent(),
         STREAM_EVENT_EMITTER_POLL_INTERVAL = _config$getCurrent.STREAM_EVENT_EMITTER_POLL_INTERVAL;
 
-    return combineLatest([(0,interval/* interval */.F)(STREAM_EVENT_EMITTER_POLL_INTERVAL).pipe((0,startWith/* startWith */.O)(null)), observation$]).pipe((0,map/* map */.U)(function (_ref) {
+    return combineLatest([interval(STREAM_EVENT_EMITTER_POLL_INTERVAL).pipe((0,startWith/* startWith */.O)(null)), observation$]).pipe((0,map/* map */.U)(function (_ref) {
       var _ = _ref[0],
           observation = _ref[1];
       var seeking = observation.seeking;
@@ -58340,7 +58736,7 @@ function createMediaSourceLoader(_ref) {
      * events when it cannot, as well as "unstalled" events when it get out of one.
      */
 
-    var stallAvoider$ = (0,stall_avoider/* default */.Z)(playbackObserver, manifest, lockedStream$, discontinuityUpdate$);
+    var stallAvoider$ = (0,stall_avoider/* default */.Z)(playbackObserver, manifest, speed, lockedStream$, discontinuityUpdate$);
     /**
      * Emit a "loaded" events once the initial play has been performed and the
      * media can begin playback.
@@ -59641,7 +60037,7 @@ var PlaybackObserver = /*#__PURE__*/function () {
    * @param {Object} options
    */
   function PlaybackObserver(mediaElement, options) {
-    this._internalSeekingEventsIncomingCounter = 0;
+    this._internalSeeksIncoming = [];
     this._mediaElement = mediaElement;
     this._withMediaSource = options.withMediaSource;
     this._lowLatencyMode = options.lowLatencyMode;
@@ -59675,6 +60071,15 @@ var PlaybackObserver = /*#__PURE__*/function () {
   _proto.getCurrentTime = function getCurrentTime() {
     return this._mediaElement.currentTime;
   }
+  /**
+   * Returns the current playback rate advertised by the `HTMLMediaElement`.
+   * @returns {number}
+   */
+  ;
+
+  _proto.getPlaybackRate = function getPlaybackRate() {
+    return this._mediaElement.playbackRate;
+  }
   /**
    * Returns the current `paused` status advertised by the `HTMLMediaElement`.
    *
@@ -59700,7 +60105,8 @@ var PlaybackObserver = /*#__PURE__*/function () {
   ;
 
   _proto.setCurrentTime = function setCurrentTime(time) {
-    this._internalSeekingEventsIncomingCounter += 1;
+    this._internalSeeksIncoming.push(time);
+
     this._mediaElement.currentTime = time;
   }
   /**
@@ -59792,18 +60198,26 @@ var PlaybackObserver = /*#__PURE__*/function () {
 
     var getCurrentObservation = function getCurrentObservation(event) {
       var tmpEvt = event;
+      var startedInternalSeekTime;
 
-      if (tmpEvt === "seeking" && _this._internalSeekingEventsIncomingCounter > 0) {
+      if (tmpEvt === "seeking" && _this._internalSeeksIncoming.length > 0) {
         tmpEvt = "internal-seeking";
-        _this._internalSeekingEventsIncomingCounter -= 1;
+        startedInternalSeekTime = _this._internalSeeksIncoming.shift();
       }
 
       var _lastObservation = lastObservation !== null && lastObservation !== void 0 ? lastObservation : _this._generateInitialObservation();
 
       var mediaTimings = getMediaInfos(_this._mediaElement, tmpEvt);
-      var internalSeeking = mediaTimings.seeking && ( // We've just received the event for internally seeking
-      tmpEvt === "internal-seeking" || // or We're still waiting on the previous internal-seek
-      _lastObservation.internalSeeking && tmpEvt !== "seeking");
+      var pendingInternalSeek = null;
+
+      if (mediaTimings.seeking) {
+        if (typeof startedInternalSeekTime === "number") {
+          pendingInternalSeek = startedInternalSeekTime;
+        } else if (_lastObservation.pendingInternalSeek !== null && event !== "seeking") {
+          pendingInternalSeek = _lastObservation.pendingInternalSeek;
+        }
+      }
+
       var rebufferingStatus = getRebufferingStatus(_lastObservation, mediaTimings, {
         lowLatencyMode: _this._lowLatencyMode,
         withMediaSource: _this._withMediaSource
@@ -59812,11 +60226,11 @@ var PlaybackObserver = /*#__PURE__*/function () {
       var timings = (0,object_assign/* default */.Z)({}, {
         rebuffering: rebufferingStatus,
         freezing: freezingStatus,
-        internalSeeking: internalSeeking
+        pendingInternalSeek: pendingInternalSeek
       }, mediaTimings);
 
       if (log/* default.hasLevel */.Z.hasLevel("DEBUG")) {
-        log/* default.debug */.Z.debug("API: current media element state tick", "event", timings.event, "position", timings.position, "seeking", timings.seeking, "internalSeeking", timings.internalSeeking, "rebuffering", timings.rebuffering !== null, "freezing", timings.freezing !== null, "ended", timings.ended, "paused", timings.paused, "playbackRate", timings.playbackRate, "readyState", timings.readyState);
+        log/* default.debug */.Z.debug("API: current media element state tick", "event", timings.event, "position", timings.position, "seeking", timings.seeking, "internalSeek", timings.pendingInternalSeek, "rebuffering", timings.rebuffering !== null, "freezing", timings.freezing !== null, "ended", timings.ended, "paused", timings.paused, "playbackRate", timings.playbackRate, "readyState", timings.readyState);
       }
 
       return timings;
@@ -59874,7 +60288,7 @@ var PlaybackObserver = /*#__PURE__*/function () {
     return (0,object_assign/* default */.Z)(getMediaInfos(this._mediaElement, "init"), {
       rebuffering: null,
       freezing: null,
-      internalSeeking: false
+      pendingInternalSeek: null
     });
   };
 
@@ -60180,6 +60594,9 @@ function generateReadOnlyObserver(src, transform, cancellationSignal) {
     getReadyState: function getReadyState() {
       return src.getReadyState();
     },
+    getPlaybackRate: function getPlaybackRate() {
+      return src.getPlaybackRate();
+    },
     getIsPaused: function getIsPaused() {
       return src.getIsPaused();
     },
@@ -61627,7 +62044,7 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
     videoElement.preload = "auto";
     _this.version =
     /* PLAYER_VERSION */
-    "3.28.1-dev.2022083000";
+    "3.29.0-dev.2022090500";
     _this.log = log/* default */.Z;
     _this.state = "STOPPED";
     _this.videoElement = videoElement;
@@ -61966,20 +62383,24 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
       var transportPipelines = transportFn(transportOptions);
       var offlineRetry = networkConfig.offlineRetry,
           segmentRetry = networkConfig.segmentRetry,
-          manifestRetry = networkConfig.manifestRetry;
+          manifestRetry = networkConfig.manifestRetry,
+          manifestRequestTimeout = networkConfig.manifestRequestTimeout,
+          segmentRequestTimeout = networkConfig.segmentRequestTimeout;
       /** Interface used to load and refresh the Manifest. */
 
       var manifestFetcher = new fetchers_manifest(url, transportPipelines, {
         lowLatencyMode: lowLatencyMode,
         maxRetryRegular: manifestRetry,
-        maxRetryOffline: offlineRetry
+        maxRetryOffline: offlineRetry,
+        requestTimeout: manifestRequestTimeout
       });
       /** Interface used to download segments. */
 
       var segmentFetcherCreator = new segment(transportPipelines, {
         lowLatencyMode: lowLatencyMode,
         maxRetryOffline: offlineRetry,
-        maxRetryRegular: segmentRetry
+        maxRetryRegular: segmentRetry,
+        requestTimeout: segmentRequestTimeout
       });
       /** Observable emitting the initial Manifest */
 
@@ -62242,14 +62663,14 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
       _this2.trigger(evt, null);
     }); // Handle state updates
 
-    playerState$.pipe((0,takeUntil/* takeUntil */.R)(stoppedContent$)).subscribe(function (x) {
-      return _this2._priv_setPlayerState(x);
-    });
-    var endedEvent$ = observation$.pipe((0,filter/* filter */.h)(function (o) {
-      return o.event === "ended";
-    }));
-    (this._priv_stopAtEnd ? endedEvent$ : empty/* EMPTY */.E).pipe((0,takeUntil/* takeUntil */.R)(stoppedContent$)).subscribe(function () {
-      currentContentCanceller.cancel();
+    playerState$.pipe((0,takeUntil/* takeUntil */.R)(stoppedContent$)).subscribe(function (newState) {
+      _this2._priv_setPlayerState(newState); // Previous call could have performed all kind of side-effects, thus,
+      // we re-check the current state associated to the RxPlayer
+
+
+      if (_this2.state === "ENDED" && _this2._priv_stopAtEnd) {
+        currentContentCanceller.cancel();
+      }
     }); // Link playback events to the corresponding callbacks
 
     playback$.subscribe({
@@ -64448,7 +64869,7 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
 
 Player.version =
 /* PLAYER_VERSION */
-"3.28.1-dev.2022083000";
+"3.29.0-dev.2022090500";
 /* harmony default export */ var public_api = (Player);
 ;// CONCATENATED MODULE: ./src/core/api/index.ts
 /**