rx-player 4.0.0-beta.2 → 4.0.0-beta.3

package/src/core/api/track_management/tracks_store.ts

@@ -48,9 +48,7 @@ import assert from "../../../utils/assert";
 import EventEmitter from "../../../utils/event_emitter";
 import isNullOrUndefined from "../../../utils/is_null_or_undefined";
 import objectAssign from "../../../utils/object_assign";
-import createSharedReference, {
-  ISharedReference,
-} from "../../../utils/reference";
+import SharedReference from "../../../utils/reference";
 import {
   IAdaptationChoice,
   IRepresentationsChoice,
@@ -71,8 +69,12 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * Store track selection information, per Period.
    * Sorted by Period's start time ascending
    */
-  private _storedPeriodInfo : ITMPeriodObject[];
+  private _storedPeriodInfo : ITSPeriodObject[];
 
+  /**
+   * If `true`, the current `TracksStore` instance has been disposed. It
+   * shouldn't perform side-effects anymore.
+   */
   private _isDisposed : boolean;
 
   /**
@@ -83,11 +85,16 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * for example not in the Manifest anymore as long as the same Period's
    * reference is still kept.
    */
-  private _cachedPeriodInfo : WeakMap<Period, ITMPeriodObject>;
+  private _cachedPeriodInfo : WeakMap<Period, ITSPeriodObject>;
 
   /** Tells if trick mode has been enabled by the RxPlayer user */
   private _isTrickModeTrackEnabled: boolean;
 
+  /**
+   * In absence of another setting, this is the default "switching mode" for the
+   * audio track.
+   * See type documentation.
+   */
   private _defaultAudioTrackSwitchingMode : IAudioTrackSwitchingMode;
 
   constructor(args : {
@@ -110,10 +117,12 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @returns {Array.<Object>}
    */
   public getAvailablePeriods() : IPeriod[] {
-    // Note: We voluntarly do not include any Period from `_cachedPeriodInfo` here;
-    // because we do not want to allow the user switching tracks for older
-    // Periods.
-    return this._storedPeriodInfo.map(p => toExposedPeriod(p.period));
+    return this._storedPeriodInfo.reduce((acc: IPeriod[], p) => {
+      if (p.isPeriodAdvertised) {
+        acc.push(toExposedPeriod(p.period));
+      }
+      return acc;
+    }, []);
   }
 
   /**
@@ -127,14 +136,14 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
 
     // We assume that they are always sorted chronologically
     // In dev mode, perform a runtime check that this is the case
-    if (__ENVIRONMENT__.CURRENT_ENV === __ENVIRONMENT__.DEV as number) {
+    if (__ENVIRONMENT__.CURRENT_ENV as number === __ENVIRONMENT__.DEV as number) {
       for (let i = 1; i < periods.length; i++) {
         assert(periods[i - 1].start <= periods[i].start);
       }
     }
 
     /** Periods which have just been added. */
-    const addedPeriods : ITMPeriodObject[] = [];
+    const addedPeriods : ITSPeriodObject[] = [];
 
     let newPListIdx = 0;
     for (let i = 0; i < this._storedPeriodInfo.length; i++) {
@@ -192,7 +201,8 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
               const adaptationBase = videoAdaptations[0];
               const adaptation = getRightVideoTrack(adaptationBase,
                                                     this._isTrickModeTrackEnabled);
-              const lockedRepresentations = createSharedReference(null);
+              const lockedRepresentations =
+                new SharedReference<IRepresentationsChoice | null>(null);
               storedSettings = { adaptationBase,
                                  adaptation,
                                  switchingMode: DEFAULT_VIDEO_TRACK_SWITCHING_MODE,
@@ -231,7 +241,8 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
               null :
               { adaptation: audioAdaptations[0],
                 switchingMode: this._defaultAudioTrackSwitchingMode,
-                lockedRepresentations: createSharedReference(null) };
+                lockedRepresentations:
+                  new SharedReference<IRepresentationsChoice | null>(null) };
             periodItem.audio.storedSettings = storedSettings;
             this.trigger("trackUpdate", { period: toExposedPeriod(newPeriod),
                                           trackType: "audio",
@@ -284,17 +295,6 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
       this._storedPeriodInfo.push(...periodsToAdd);
       addedPeriods.push(...periodsToAdd);
     }
-
-    const periodsAdded = addedPeriods.reduce((acc : IPeriod[], p) => {
-      if (!p.isRemoved) {
-        acc.push({ id: p.period.id, start: p.period.start, end: p.period.end });
-      }
-      return acc;
-    }, []);
-
-    if (periodsAdded.length > 0) {
-      this.trigger("newAvailablePeriods", periodsAdded);
-    }
   }
 
   /**
@@ -313,14 +313,34 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
     bufferType : "audio" | "text"| "video",
     manifest : Manifest,
     period : Period,
-    adaptationRef : ISharedReference<IAdaptationChoice|null|undefined>
+    adaptationRef : SharedReference<IAdaptationChoice|null|undefined>
   ) : void {
     let periodObj = getPeriodItem(this._storedPeriodInfo, period.id);
     if (periodObj === undefined) { // The Period has not yet been added.
-      periodObj = this._addPeriod(period);
+      periodObj = generatePeriodInfo(period,
+                                     false,
+                                     this._isTrickModeTrackEnabled,
+                                     this._defaultAudioTrackSwitchingMode);
+      let found = false;
+      for (let i = 0; i < this._storedPeriodInfo.length; i++) {
+        if (this._storedPeriodInfo[i].period.start > period.start) {
+          this._storedPeriodInfo.splice(i, 0, periodObj);
+          found = true;
+        }
+      }
+      if (!found) {
+        this._storedPeriodInfo.push(periodObj);
+      }
+    }
+
+    if (!periodObj.isPeriodAdvertised) {
+      periodObj.isPeriodAdvertised = true;
       this.trigger("newAvailablePeriods", [{ id: period.id,
                                              start: period.start,
                                              end: period.end }]);
+      if (this._isDisposed) {
+        return;
+      }
     }
 
     if (periodObj[bufferType].dispatcher !== null) {
@@ -339,7 +359,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
       if (nextAdaptation === undefined) {
         const noRepErr = new MediaError("NO_PLAYABLE_REPRESENTATION",
                                         `No ${bufferType} Representation can be played`,
-                                        { adaptation: undefined });
+                                        { adaptations: undefined });
         this.trigger("error", noRepErr);
         this.dispose();
         return;
@@ -351,9 +371,11 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
       const switchingMode = bufferType === "audio" ?
         this._defaultAudioTrackSwitchingMode :
         "reload";
-      const storedSettings = { adaptation: nextAdaptation,
-                               switchingMode,
-                               lockedRepresentations: createSharedReference(null) };
+      const storedSettings = {
+        adaptation: nextAdaptation,
+        switchingMode,
+        lockedRepresentations: new SharedReference<IRepresentationsChoice | null>(null),
+      };
       typeInfo.storedSettings = storedSettings;
       this.trigger("trackUpdate", { period: toExposedPeriod(period),
                                     trackType: bufferType,
@@ -434,7 +456,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    */
   public getPeriodObjectFromPeriod(
     period : Period
-  ) : ITMPeriodObject | undefined {
+  ) : ITSPeriodObject | undefined {
     const periodObj = getPeriodItem(this._storedPeriodInfo, period.id);
     if (periodObj === undefined && period !== undefined) {
       return this._cachedPeriodInfo.get(period);
@@ -458,7 +480,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    */
   public getPeriodObjectFromId(
     periodId : string
-  ) : ITMPeriodObject | undefined {
+  ) : ITSPeriodObject | undefined {
     return getPeriodItem(this._storedPeriodInfo, periodId);
   }
 
@@ -518,7 +540,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * `null` if no Audio Representation should be locked.
    */
   public setAudioTrack(
-    periodObj : ITMPeriodObject,
+    periodObj : ITSPeriodObject,
     wantedId : string,
     switchingMode : IAudioTrackSwitchingMode | undefined,
     reprsToLock : string[] | null
@@ -536,7 +558,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @param {Object} periodObj - The concerned Period's object.
    * @param {string} wantedId - adaptation id of the wanted track.
    */
-  public setTextTrack(periodObj : ITMPeriodObject, wantedId : string) : void {
+  public setTextTrack(periodObj : ITSPeriodObject, wantedId : string) : void {
     return this._setAudioOrTextTrack("text", periodObj, wantedId, "direct", null);
   }
 
@@ -552,7 +574,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    */
   private _setAudioOrTextTrack(
     bufferType : "audio" | "text",
-    periodObj : ITMPeriodObject,
+    periodObj : ITSPeriodObject,
     wantedId : string,
     switchingMode : IAudioTrackSwitchingMode,
     reprsToLock : string[] | null
@@ -566,16 +588,16 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
     }
 
     const typeInfo = periodObj[bufferType];
-    let lockedRepresentations;
+    let lockedRepresentations: SharedReference<IRepresentationsChoice | null>;
     if (reprsToLock === null) {
-      lockedRepresentations = createSharedReference(null);
+      lockedRepresentations = new SharedReference<IRepresentationsChoice | null>(null);
     } else {
       const representationsToLock = this._getRepresentationsToLock(wantedAdaptation,
                                                                    reprsToLock);
       const repSwitchingMode = bufferType === "audio" ?
         this._defaultAudioTrackSwitchingMode :
         "direct" as const;
-      lockedRepresentations = createSharedReference({
+      lockedRepresentations = new SharedReference<IRepresentationsChoice | null>({
         representations: representationsToLock,
         switchingMode: repSwitchingMode,
       });
@@ -614,7 +636,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * `null` if no Video Representation should be locked.
    */
   public setVideoTrack(
-    periodObj : ITMPeriodObject,
+    periodObj : ITSPeriodObject,
     wantedId : string,
     switchingMode : IVideoTrackSwitchingMode | undefined,
     reprsToLock : string[]| null
@@ -634,12 +656,12 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
 
     let lockedRepresentations;
     if (reprsToLock === null) {
-      lockedRepresentations = createSharedReference(null);
+      lockedRepresentations = new SharedReference<IRepresentationsChoice | null>(null);
     } else {
       const representationsToLock = this._getRepresentationsToLock(wantedAdaptation,
                                                                    reprsToLock);
       const repSwitchingMode = DEFAULT_VIDEO_TRACK_SWITCHING_MODE;
-      lockedRepresentations = createSharedReference({
+      lockedRepresentations = new SharedReference<IRepresentationsChoice | null>({
         representations: representationsToLock,
         switchingMode: repSwitchingMode,
       });
@@ -677,7 +699,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @throws Error - Throws if the period given has not been added
    */
   public disableTrack(
-    periodObj : ITMPeriodObject,
+    periodObj : ITSPeriodObject,
     bufferType : "audio" | "video" | "text"
   ) : void {
     const trackInfo = periodObj[bufferType];
@@ -728,7 +750,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * known.
    */
   public getChosenAudioTrack(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : IAudioTrack | null {
     return periodObj.audio.storedSettings === null ?
       null :
@@ -746,7 +768,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @returns {Object|null} - The text track chosen for this Period
    */
   public getChosenTextTrack(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : ITextTrack | null {
     return periodObj.text.storedSettings === null ?
       null :
@@ -764,7 +786,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @returns {Object|null} - The video track chosen for this Period
    */
   public getChosenVideoTrack(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : IVideoTrack | null {
     if (periodObj.video.storedSettings === null) {
       return null;
@@ -783,7 +805,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @returns {Array.<Object>}
    */
   public getAvailableAudioTracks(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : IAvailableAudioTrack[]|undefined {
     const storedSettings = periodObj.audio.storedSettings;
     const currentId = storedSettings !== null ?
@@ -807,7 +829,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @returns {Array.<Object>}
    */
   public getAvailableTextTracks(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : IAvailableTextTrack[]|undefined {
     const storedSettings = periodObj.text.storedSettings;
     const currentId = storedSettings !== null ?
@@ -832,7 +854,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
    * @returns {Array.<Object>}
    */
   public getAvailableVideoTracks(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : IAvailableVideoTrack[]|undefined {
     const storedSettings = periodObj.video.storedSettings;
     const currentId = storedSettings === null ?
@@ -860,7 +882,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
   }
 
   public getLockedAudioRepresentations(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : string[] | null {
     const { storedSettings } = periodObj.audio;
     if (storedSettings === null) {
@@ -873,7 +895,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
   }
 
   public getLockedVideoRepresentations(
-    periodObj : ITMPeriodObject
+    periodObj : ITSPeriodObject
   ) : string[] | null {
     const { storedSettings } = periodObj.video;
     if (storedSettings === null) {
@@ -886,7 +908,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
   }
 
   public lockAudioRepresentations(
-    periodObj : ITMPeriodObject,
+    periodObj : ITSPeriodObject,
     lockSettings : IAudioRepresentationsLockSettings
   ) : void {
     const { storedSettings } = periodObj.audio;
@@ -904,7 +926,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
   }
 
   public lockVideoRepresentations(
-    periodObj : ITMPeriodObject,
+    periodObj : ITSPeriodObject,
     lockSettings : IVideoRepresentationsLockSettings
   ) : void {
     const { storedSettings } = periodObj.video;
@@ -921,7 +943,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
                                                     switchingMode });
   }
 
-  public unlockAudioRepresentations(periodObj : ITMPeriodObject) : void {
+  public unlockAudioRepresentations(periodObj : ITSPeriodObject) : void {
     const { storedSettings } = periodObj.audio;
     if (storedSettings === null ||
         storedSettings.lockedRepresentations.getValue() === null)
@@ -931,7 +953,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
     storedSettings.lockedRepresentations.setValue(null);
   }
 
-  public unlockVideoRepresentations(periodObj : ITMPeriodObject) : void {
+  public unlockVideoRepresentations(periodObj : ITSPeriodObject) : void {
     const { storedSettings } = periodObj.video;
     if (storedSettings === null ||
         storedSettings.lockedRepresentations.getValue() === null)
@@ -952,25 +974,6 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
     }
   }
 
-  /**
-   * @param {Period} period
-   * @returns {Object}
-   */
-  private _addPeriod(period : Period) : ITMPeriodObject {
-    const periodObj = generatePeriodInfo(period,
-                                         false,
-                                         this._isTrickModeTrackEnabled,
-                                         this._defaultAudioTrackSwitchingMode);
-    for (let i = 0; i < this._storedPeriodInfo.length; i++) {
-      if (this._storedPeriodInfo[i].period.start > period.start) {
-        this._storedPeriodInfo.splice(i, 0, periodObj);
-        return periodObj;
-      }
-    }
-    this._storedPeriodInfo.push(periodObj);
-    return periodObj;
-  }
-
   private _resetVideoTrackChoices(reason : "trickmode-enabled" | "trickmode-disabled") {
     for (let i = 0; i < this._storedPeriodInfo.length; i++) {
       const periodObj = this._storedPeriodInfo[i];
@@ -1014,7 +1017,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
   private _removePeriodObject(
     index : number
   ) {
-    if (__ENVIRONMENT__.CURRENT_ENV === __ENVIRONMENT__.DEV as number) {
+    if (__ENVIRONMENT__.CURRENT_ENV as number === __ENVIRONMENT__.DEV as number) {
       assert(index < this._storedPeriodInfo.length, "Invalid index for Period removal");
     }
     const oldPeriodItem = this._storedPeriodInfo[index];
@@ -1057,7 +1060,7 @@ export default class TracksStore extends EventEmitter<ITracksStoreEvents> {
  * @returns {number|undefined}
  */
 function findPeriodIndex(
-  periods : ITMPeriodObject[],
+  periods : ITSPeriodObject[],
   period : Period
 ) : number|undefined {
   for (let i = 0; i < periods.length; i++) {
@@ -1077,9 +1080,9 @@ function findPeriodIndex(
  * @returns {Object|undefined}
  */
 function getPeriodItem(
-  periods : ITMPeriodObject[],
+  periods : ITSPeriodObject[],
   periodId : string
-) : ITMPeriodObject|undefined {
+) : ITSPeriodObject|undefined {
   for (let i = 0; i < periods.length; i++) {
     const periodI = periods[i];
     if (periodI.period.id === periodId) {
@@ -1089,13 +1092,13 @@ function getPeriodItem(
 }
 
 /**
- * A `ITMPeriodObject` should only be removed once all References linked to it
+ * A `ITSPeriodObject` should only be removed once all References linked to it
  * do not exist anymore, to keep the possibility of making track choices.
  * @param {Object} periodObj
  * @returns {boolean}
  */
 function isPeriodItemRemovable(
-  periodObj : ITMPeriodObject
+  periodObj : ITSPeriodObject
 ) : boolean {
   return !periodObj.inManifest &&
          periodObj.text?.dispatcher === null &&
@@ -1116,7 +1119,7 @@ function getRightVideoTrack(
 }
 
 /**
- * Generate an `ITMPeriodObject` object for the given Period, selecting the
+ * Generate an `ITSPeriodObject` object for the given Period, selecting the
  * default track for each type.
  * @param {Object} period
  * @param {boolean} inManifest
@@ -1128,7 +1131,7 @@ function generatePeriodInfo(
   inManifest : boolean,
   isTrickModeTrackEnabled: boolean,
   defaultAudioTrackSwitchingMode : IAudioTrackSwitchingMode
-) : ITMPeriodObject {
+) : ITSPeriodObject {
   const audioAdaptation = period.getSupportedAdaptations("audio")[0];
   const baseVideoAdaptation = period.getSupportedAdaptations("video")[0];
   const videoAdaptation = getRightVideoTrack(baseVideoAdaptation,
@@ -1137,13 +1140,14 @@ function generatePeriodInfo(
   const audioSettings = audioAdaptation !== undefined ?
     { adaptation: audioAdaptation,
       switchingMode: defaultAudioTrackSwitchingMode,
-      lockedRepresentations: createSharedReference(null) } :
+      lockedRepresentations: new SharedReference<IRepresentationsChoice | null>(null) } :
     null;
   const videoSettings = videoAdaptation !== undefined ?
     { adaptation: videoAdaptation,
       adaptationBase: baseVideoAdaptation,
       switchingMode: DEFAULT_VIDEO_TRACK_SWITCHING_MODE,
-      lockedRepresentations: createSharedReference(null) } :
+      lockedRepresentations:
+        new SharedReference<IRepresentationsChoice | null>(null) } :
     null;
 
   let textAdaptation : Adaptation | null = null;
@@ -1168,10 +1172,12 @@ function generatePeriodInfo(
   if (textAdaptation !== null) {
     textSettings = { adaptation: textAdaptation,
                      switchingMode: ("direct" as const),
-                     lockedRepresentations: createSharedReference(null) };
+                     lockedRepresentations:
+                      new SharedReference<IRepresentationsChoice | null>(null) };
   }
   return { period,
            inManifest,
+           isPeriodAdvertised: false,
            isRemoved: false,
            audio: { storedSettings: audioSettings,
                     dispatcher: null },
@@ -1186,7 +1192,7 @@ function toExposedPeriod(p: Period) : IPeriod {
 }
 
 /** Every information stored for a single Period. */
-export interface ITMPeriodObject {
+export interface ITSPeriodObject {
   /** The Period in question. */
   period : Period;
   /**
@@ -1197,10 +1203,26 @@ export interface ITMPeriodObject {
    * because some audio/video/text buffer still contains data of the given type.
    */
   inManifest : boolean;
+  /**
+   * Set to `true` once a `newAvailablePeriods` event has been sent for this
+   * particular Period.
+   */
+  isPeriodAdvertised : boolean;
+  /**
+   * Information on the selected audio track and Representations for this Period.
+   */
   audio : IAudioPeriodInfo;
+  /**
+   * Information on the selected text track and Representations for this Period.
+   */
   text : ITextPeriodInfo;
+  /**
+   * Information on the selected video track and Representations for this Period.
+   */
   video : IVideoPeriodInfo;
-
+  /**
+   * If `true`, this object was since cleaned-up.
+   */
   isRemoved : boolean;
 }
 
@@ -1223,7 +1245,7 @@ interface IAudioPeriodInfo {
      * by the user.
      * `null` if no Representation is locked.
      */
-    lockedRepresentations : ISharedReference<IRepresentationsChoice | null>;
+    lockedRepresentations : SharedReference<IRepresentationsChoice | null>;
   } | null;
   /**
    * Tracks are internally emitted through RxJS's `Subject`s.
@@ -1256,7 +1278,7 @@ export interface ITextPeriodInfo {
      * by the user.
      * `null` if no Representation is locked.
      */
-    lockedRepresentations : ISharedReference<IRepresentationsChoice | null>;
+    lockedRepresentations : SharedReference<IRepresentationsChoice | null>;
   } | null;
   /**
    * Tracks are internally emitted through RxJS's `Subject`s.
@@ -1300,7 +1322,7 @@ export interface IVideoPeriodInfo {
      * by the user.
      * `null` if no Representation is locked.
      */
-    lockedRepresentations : ISharedReference<IRepresentationsChoice | null>;
+    lockedRepresentations : SharedReference<IRepresentationsChoice | null>;
   } | null;
   /**
    * Tracks are internally emitted through RxJS's `Subject`s.
@@ -1335,7 +1357,7 @@ type IVideoStoredSettings = {
    * by the user.
    * `null` if no Representation is locked.
    */
-  lockedRepresentations : ISharedReference<IRepresentationsChoice | null>;
+  lockedRepresentations : SharedReference<IRepresentationsChoice | null>;
 } | null;
 
 /** Events emitted by the TracksStore. */

package/src/core/api/utils.ts

@@ -17,7 +17,7 @@
 import config from "../../config";
 import { IPlayerState } from "../../public_types";
 import arrayIncludes from "../../utils/array_includes";
-import createSharedReference, {
+import SharedReference, {
   IReadOnlySharedReference,
 } from "../../utils/reference";
 import { CancellationSignal } from "../../utils/task_canceller";
@@ -116,8 +116,8 @@ export function constructPlayerStateReference(
   playbackObserver : IReadOnlyPlaybackObserver<IPlaybackObservation>,
   cancelSignal : CancellationSignal
 ) : IReadOnlySharedReference<IPlayerState> {
-  const playerStateRef = createSharedReference<IPlayerState>(PLAYER_STATES.LOADING,
-                                                             cancelSignal);
+  const playerStateRef = new SharedReference<IPlayerState>(PLAYER_STATES.LOADING,
+                                                           cancelSignal);
   initializer.addEventListener("loaded", () => {
     if (playerStateRef.getValue() === PLAYER_STATES.LOADING) {
       playerStateRef.setValue(PLAYER_STATES.LOADED);

package/src/core/decrypt/__tests__/__global__/get_license.test.ts

@@ -38,7 +38,7 @@ const videoElt = document.createElement("video");
 /* eslint-disable max-len */
 describe("core - decrypt - global tests - getLicense", () => {
 
-  beforeEach(() => {
+  afterEach(() => {
     jest.resetModules();
     jest.restoreAllMocks();
   });
@@ -212,7 +212,7 @@ describe("core - decrypt - global tests - getLicense", () => {
                             getTimeout: () => undefined,
                             nbRetries: 6,
                             ignoreLicenseRequests: false });
-  }, 15000);
+  }, 25000);
 
   it("should fail after 7 failures when getLicenseConfig.retry is set to `6`", async () => {
     await checkGetLicense({ isGetLicensePromiseBased: true,
@@ -344,7 +344,7 @@ function checkGetLicense(
     }
 
     // == test ==
-    const { ContentDecryptorState } = jest.requireActual("../../content_decryptor");
+    const { ContentDecryptorState } = jest.requireActual("../../types");
     const ContentDecryptor = jest.requireActual("../../content_decryptor").default;
     const contentDecryptor = new ContentDecryptor(videoElt, ksConfig);