rx-player 3.26.2 → 3.27.0-dev.20220317

package/src/core/api/__tests__/get_player_state.test.ts

@@ -128,7 +128,7 @@ describe("API - getLoadedContentState", () => {
     const fakeProps = {
       ended: false,
       duration: 10,
-      currentTime: 10 - config.FORCED_ENDED_THRESHOLD,
+      currentTime: 10 - config.getCurrent().FORCED_ENDED_THRESHOLD,
     };
     const mediaElement = fakeProps as HTMLMediaElement;
     expect(getLoadedContentState(mediaElement, true, "seeking")).toBe("ENDED");
@@ -144,7 +144,7 @@ describe("API - getLoadedContentState", () => {
     const fakeProps1 = {
       ended: false,
       duration: 10,
-      currentTime: 10 - config.FORCED_ENDED_THRESHOLD,
+      currentTime: 10 - config.getCurrent().FORCED_ENDED_THRESHOLD,
     };
     const mediaElement1 = fakeProps1 as HTMLMediaElement;
     expect(getLoadedContentState(mediaElement1, true, "seeking")).toBe("ENDED");
@@ -159,7 +159,7 @@ describe("API - getLoadedContentState", () => {
     const fakeProps2 = {
       ended: false,
       duration: 10,
-      currentTime: config.FORCED_ENDED_THRESHOLD + 10,
+      currentTime: config.getCurrent().FORCED_ENDED_THRESHOLD + 10,
     };
     const mediaElement2 = fakeProps2 as HTMLMediaElement;
     expect(getLoadedContentState(mediaElement2, true, "seeking")).toBe("ENDED");

package/src/core/api/__tests__/option_utils.test.ts

@@ -46,22 +46,6 @@ const normalizeTextTrackMock = normalizeTextTrack as
   jest.Mock<ReturnType<typeof normalizeTextTrack>>;
 const logWarnMock = log.warn as jest.Mock<ReturnType<typeof log.warn>>;
 
-const {
-  // DEFAULT_AUTO_PLAY,
-  DEFAULT_INITIAL_BITRATES,
-  DEFAULT_LIMIT_VIDEO_WIDTH,
-  // DEFAULT_MANUAL_BITRATE_SWITCHING_MODE,
-  DEFAULT_MIN_BITRATES,
-  DEFAULT_MAX_BITRATES,
-  DEFAULT_MAX_BUFFER_AHEAD,
-  DEFAULT_MAX_BUFFER_BEHIND,
-  // DEFAULT_SHOW_NATIVE_SUBTITLE,
-  // DEFAULT_TEXT_TRACK_MODE,
-  DEFAULT_THROTTLE_WHEN_HIDDEN,
-  DEFAULT_THROTTLE_VIDEO_BITRATE_WHEN_HIDDEN,
-  DEFAULT_WANTED_BUFFER_AHEAD,
-} = config;
-
 describe("API - parseConstructorOptions", () => {
   beforeEach(() => {
     jest.resetModules();
@@ -75,8 +59,24 @@ describe("API - parseConstructorOptions", () => {
   });
 
   const videoElement = document.createElement("video");
-
+  const {
+    // DEFAULT_AUTO_PLAY,
+    DEFAULT_INITIAL_BITRATES,
+    DEFAULT_LIMIT_VIDEO_WIDTH,
+    // DEFAULT_MANUAL_BITRATE_SWITCHING_MODE,
+    DEFAULT_MIN_BITRATES,
+    DEFAULT_MAX_BITRATES,
+    DEFAULT_MAX_BUFFER_AHEAD,
+    DEFAULT_MAX_BUFFER_BEHIND,
+    DEFAULT_MAX_VIDEO_BUFFER_SIZE,
+    // DEFAULT_SHOW_NATIVE_SUBTITLE,
+    // DEFAULT_TEXT_TRACK_MODE,
+    DEFAULT_THROTTLE_WHEN_HIDDEN,
+    DEFAULT_THROTTLE_VIDEO_BITRATE_WHEN_HIDDEN,
+    DEFAULT_WANTED_BUFFER_AHEAD,
+  } = config.getCurrent();
   const defaultConstructorOptions = {
+    maxVideoBufferSize: DEFAULT_MAX_VIDEO_BUFFER_SIZE,
     maxBufferAhead: DEFAULT_MAX_BUFFER_AHEAD,
     maxBufferBehind: DEFAULT_MAX_BUFFER_BEHIND,
     wantedBufferAhead: DEFAULT_WANTED_BUFFER_AHEAD,

package/src/core/api/get_player_state.ts

@@ -17,7 +17,6 @@
 import config from "../../config";
 import { IStallingSituation } from "../init";
 
-const { FORCED_ENDED_THRESHOLD } = config;
 
 export type IPlayerState = "STOPPED" |
                            "LOADED" |
@@ -56,6 +55,7 @@ export default function getLoadedContentState(
   stalledStatus : IStallingSituation |
                   null
 ) : IPlayerState {
+  const { FORCED_ENDED_THRESHOLD } = config.getCurrent();
   if (mediaElement.ended) {
     return PLAYER_STATES.ENDED;
   }

package/src/core/api/index.ts

@@ -17,10 +17,13 @@
 import PlaybackObserver from "./playback_observer";
 import Player from "./public_api";
 export {
+  IBitrateEstimate,
+  IPositionUpdateItem,
   IStreamEvent,
   IStreamEventData,
 } from "./public_api";
 export { PlaybackObserver };
+export { IPlayerState } from "./get_player_state";
 export {
   IPlaybackObservation,
   IPlaybackObserverEventType,

package/src/core/api/media_element_track_choice_manager.ts

@@ -28,6 +28,7 @@ import {
   ICompatVideoTrackList,
 } from "../../compat/browser_compatibility_types";
 import { Representation } from "../../manifest";
+import assert from "../../utils/assert";
 import EventEmitter from "../../utils/event_emitter";
 import normalizeLanguage from "../../utils/languages";
 import {
@@ -338,7 +339,7 @@ export default class MediaElementTrackChoiceManager
     for (let i = 0; i < this._audioTracks.length; i++) {
       const { track, nativeTrack } = this._audioTracks[i];
       if (track.id === id) {
-        nativeTrack.enabled = true;
+        this._enableAudioTrackFromIndex(i);
         this._audioTrackLockedOn = nativeTrack;
         return;
       }
@@ -589,7 +590,7 @@ export default class MediaElementTrackChoiceManager
       for (let i = 0; i < this._audioTracks.length; i++) {
         const { nativeTrack } = this._audioTracks[i];
         if (nativeTrack === this._audioTrackLockedOn) {
-          nativeTrack.enabled = true;
+          this._enableAudioTrackFromIndex(i);
           return;
         }
       }
@@ -616,7 +617,7 @@ export default class MediaElementTrackChoiceManager
           if (audioTrack.track.normalized === normalized &&
             audioTrack.track.audioDescription === track.audioDescription
           ) {
-            audioTrack.nativeTrack.enabled = true;
+            this._enableAudioTrackFromIndex(j);
             return;
           }
         }
@@ -902,6 +903,24 @@ export default class MediaElementTrackChoiceManager
       };
     }
   }
+
+  /**
+   * Enable an audio track (and disable all others), based on its index in the
+   * `this._audioTracks` array.
+   * @param {number} index}
+   */
+  private _enableAudioTrackFromIndex(index : number) : void {
+    assert(index < this._audioTracks.length);
+
+    // Seen on Safari MacOS only (2022-02-14), not disabling ALL audio tracks
+    // first (even the wanted one), can lead to the media not playing.
+    for (const audioTrack of this._audioTracks) {
+      audioTrack.nativeTrack.enabled = false;
+    }
+
+    this._audioTracks[index].nativeTrack.enabled = true;
+    return;
+  }
 }
 
 /**

package/src/core/api/option_utils.ts

@@ -36,31 +36,13 @@ import {
 } from "../../utils/languages";
 import objectAssign from "../../utils/object_assign";
 import warnOnce from "../../utils/warn_once";
-import { IKeySystemOption } from "../eme";
+import { IKeySystemOption } from "../decrypt";
 import {
   IAudioTrackPreference,
   ITextTrackPreference,
   IVideoTrackPreference,
 } from "./track_choice_manager";
 
-const { DEFAULT_AUDIO_TRACK_SWITCHING_MODE,
-        DEFAULT_AUTO_PLAY,
-        DEFAULT_CODEC_SWITCHING_BEHAVIOR,
-        DEFAULT_ENABLE_FAST_SWITCHING,
-        DEFAULT_INITIAL_BITRATES,
-        DEFAULT_LIMIT_VIDEO_WIDTH,
-        DEFAULT_MANUAL_BITRATE_SWITCHING_MODE,
-        DEFAULT_MIN_BITRATES,
-        DEFAULT_MAX_BITRATES,
-        DEFAULT_MAX_BUFFER_AHEAD,
-        DEFAULT_MAX_BUFFER_BEHIND,
-        DEFAULT_SHOW_NATIVE_SUBTITLE,
-        DEFAULT_STOP_AT_END,
-        DEFAULT_TEXT_TRACK_MODE,
-        DEFAULT_THROTTLE_WHEN_HIDDEN,
-        DEFAULT_THROTTLE_VIDEO_BITRATE_WHEN_HIDDEN,
-        DEFAULT_WANTED_BUFFER_AHEAD } = config;
-
 export { IKeySystemOption };
 
 /** Value of the `serverSyncInfos` transport option. */
@@ -195,6 +177,7 @@ type IParsedStartAtOption = { position : number } |
 export interface IConstructorOptions { maxBufferAhead? : number;
                                        maxBufferBehind? : number;
                                        wantedBufferAhead? : number;
+                                       maxVideoBufferSize?: number;
 
                                        limitVideoWidth? : boolean;
                                        throttleWhenHidden? : boolean;
@@ -218,7 +201,7 @@ export interface IParsedConstructorOptions {
   maxBufferAhead : number;
   maxBufferBehind : number;
   wantedBufferAhead : number;
-
+  maxVideoBufferSize : number;
   limitVideoWidth : boolean;
   throttleWhenHidden : boolean;
   throttleVideoBitrateWhenHidden : boolean;
@@ -328,6 +311,7 @@ function parseConstructorOptions(
   let maxBufferAhead : number;
   let maxBufferBehind : number;
   let wantedBufferAhead : number;
+  let maxVideoBufferSize : number;
 
   let throttleWhenHidden : boolean;
   let throttleVideoBitrateWhenHidden : boolean;
@@ -344,6 +328,18 @@ function parseConstructorOptions(
   let maxAudioBitrate : number;
   let maxVideoBitrate : number;
 
+  const { DEFAULT_INITIAL_BITRATES,
+          DEFAULT_LIMIT_VIDEO_WIDTH,
+          DEFAULT_MIN_BITRATES,
+          DEFAULT_MAX_BITRATES,
+          DEFAULT_MAX_BUFFER_AHEAD,
+          DEFAULT_MAX_BUFFER_BEHIND,
+          DEFAULT_MAX_VIDEO_BUFFER_SIZE,
+          DEFAULT_STOP_AT_END,
+          DEFAULT_THROTTLE_WHEN_HIDDEN,
+          DEFAULT_THROTTLE_VIDEO_BITRATE_WHEN_HIDDEN,
+          DEFAULT_WANTED_BUFFER_AHEAD } = config.getCurrent();
+
   if (isNullOrUndefined(options.maxBufferAhead)) {
     maxBufferAhead = DEFAULT_MAX_BUFFER_AHEAD;
   } else {
@@ -373,6 +369,18 @@ function parseConstructorOptions(
     }
   }
 
+  if (isNullOrUndefined(options.maxVideoBufferSize)) {
+    maxVideoBufferSize = DEFAULT_MAX_VIDEO_BUFFER_SIZE;
+  } else {
+    maxVideoBufferSize = Number(options.maxVideoBufferSize);
+    if (isNaN(maxVideoBufferSize)) {
+      /* eslint-disable max-len */
+      throw new Error("Invalid maxVideoBufferSize parameter. Should be a number.");
+      /* eslint-enable max-len */
+    }
+  }
+
+
   const limitVideoWidth = isNullOrUndefined(options.limitVideoWidth) ?
     DEFAULT_LIMIT_VIDEO_WIDTH :
     !!options.limitVideoWidth;
@@ -514,6 +522,7 @@ function parseConstructorOptions(
            limitVideoWidth,
            videoElement,
            wantedBufferAhead,
+           maxVideoBufferSize,
            throttleWhenHidden,
            throttleVideoBitrateWhenHidden,
            preferredAudioTracks,
@@ -576,6 +585,14 @@ function parseLoadVideoOptions(
   let textTrackElement : HTMLElement|undefined;
   let startAt : IParsedStartAtOption|undefined;
 
+  const { DEFAULT_AUDIO_TRACK_SWITCHING_MODE,
+          DEFAULT_AUTO_PLAY,
+          DEFAULT_CODEC_SWITCHING_BEHAVIOR,
+          DEFAULT_ENABLE_FAST_SWITCHING,
+          DEFAULT_MANUAL_BITRATE_SWITCHING_MODE,
+          DEFAULT_SHOW_NATIVE_SUBTITLE,
+          DEFAULT_TEXT_TRACK_MODE } = config.getCurrent();
+
   if (isNullOrUndefined(options)) {
     throw new Error("No option set on loadVideo");
   }

package/src/core/api/playback_observer.ts

@@ -31,14 +31,6 @@ import log from "../../log";
 import objectAssign from "../../utils/object_assign";
 import { getRange } from "../../utils/ranges";
 
-const { SAMPLING_INTERVAL_MEDIASOURCE,
-        SAMPLING_INTERVAL_LOW_LATENCY,
-        SAMPLING_INTERVAL_NO_MEDIASOURCE,
-        RESUME_GAP_AFTER_SEEKING,
-        RESUME_GAP_AFTER_NOT_ENOUGH_DATA,
-        RESUME_GAP_AFTER_BUFFERING,
-        REBUFFERING_GAP,
-        MINIMUM_BUFFER_AMOUNT_BEFORE_FREEZING } = config;
 
 /**
  * HTMLMediaElement Events for which playback observations are calculated and
@@ -207,7 +199,12 @@ export default class PlaybackObserver {
    * @returns {Observable}
    */
   private _createInnerObservable() : Observable<IPlaybackObservation> {
+
+
     return observableDefer(() : Observable<IPlaybackObservation> => {
+      const { SAMPLING_INTERVAL_MEDIASOURCE,
+              SAMPLING_INTERVAL_LOW_LATENCY,
+              SAMPLING_INTERVAL_NO_MEDIASOURCE } = config.getCurrent();
       const getCurrentObservation = (
         event : IPlaybackObserverEventType
       ) : IPlaybackObservation => {
@@ -452,6 +449,9 @@ function getRebufferingEndGap(
   }
   const suffix : "LOW_LATENCY" | "DEFAULT" = lowLatencyMode ? "LOW_LATENCY" :
                                                               "DEFAULT";
+  const { RESUME_GAP_AFTER_SEEKING,
+          RESUME_GAP_AFTER_NOT_ENOUGH_DATA,
+          RESUME_GAP_AFTER_BUFFERING } = config.getCurrent();
 
   switch (rebufferingStatus.reason) {
     case "seeking":
@@ -474,6 +474,7 @@ function hasLoadedUntilTheEnd(
   duration : number,
   lowLatencyMode : boolean
 ) : boolean {
+  const { REBUFFERING_GAP } = config.getCurrent();
   const suffix : "LOW_LATENCY" | "DEFAULT" = lowLatencyMode ? "LOW_LATENCY" :
                                                               "DEFAULT";
   return currentRange !== null &&
@@ -533,6 +534,8 @@ function getRebufferingStatus(
   currentInfo : IMediaInfos,
   { withMediaSource, lowLatencyMode } : IPlaybackObserverOptions
 ) : IRebufferingStatus | null {
+
+  const { REBUFFERING_GAP } = config.getCurrent();
   const { event: currentEvt,
           position: currentTime,
           bufferGap,
@@ -643,6 +646,7 @@ function getFreezingStatus(
   prevObservation : IPlaybackObservation,
   currentInfo : IMediaInfos
 ) : IFreezingStatus | null {
+  const { MINIMUM_BUFFER_AMOUNT_BEFORE_FREEZING } = config.getCurrent();
   if (prevObservation.freezing) {
     if (currentInfo.ended ||
         currentInfo.paused ||