rx-player 3.26.1 → 3.26.2

package/src/core/api/public_api.ts

@@ -20,34 +20,29 @@
  */
 
 import {
-  BehaviorSubject,
   combineLatest as observableCombineLatest,
   Connectable,
   concat as observableConcat,
   connectable,
+  distinctUntilChanged,
   EMPTY,
+  filter,
+  map,
   merge as observableMerge,
+  mergeMap,
   Observable,
   of as observableOf,
   ReplaySubject,
-  Subject,
-  Subscription,
-} from "rxjs";
-import {
-  distinctUntilChanged,
-  filter,
-  map,
-  mapTo,
-  mergeMap,
-  mergeMapTo,
   share,
   shareReplay,
   skipWhile,
   startWith,
-  switchMapTo,
+  Subject,
+  Subscription,
+  switchMap,
   take,
   takeUntil,
-} from "rxjs/operators";
+} from "rxjs";
 import {
   events,
   exitFullscreen,
@@ -87,6 +82,9 @@ import {
   getPlayedSizeOfRange,
   getSizeOfRange,
 } from "../../utils/ranges";
+import createSharedReference, {
+  ISharedReference,
+} from "../../utils/reference";
 import warnOnce from "../../utils/warn_once";
 import {
   clearEMESession,
@@ -111,9 +109,6 @@ import SegmentBuffersStore, {
   IBufferType,
 } from "../segment_buffers";
 import { IInbandEvent } from "../stream";
-import createClock, {
-  IClockTick,
-} from "./clock";
 import emitSeekEvents from "./emit_seek_events";
 import getPlayerState, {
   IPlayerState,
@@ -128,6 +123,9 @@ import {
   parseConstructorOptions,
   parseLoadVideoOptions,
 } from "./option_utils";
+import PlaybackObserver, {
+  IPlaybackObservation,
+} from "./playback_observer";
 import TrackChoiceManager, {
   IAudioTrackPreference,
   ITextTrackPreference,
@@ -144,7 +142,7 @@ import TrackChoiceManager, {
 
 const { DEFAULT_UNMUTED_VOLUME } = config;
 
-const { isActive,
+const { isPageActive,
         isVideoVisible,
         onEnded$,
         onFullscreenChange$,
@@ -254,10 +252,11 @@ class Player extends EventEmitter<IPublicAPIEvent> {
   private readonly _priv_destroy$ : Subject<void>;
 
   /**
-   * Emit true when the previous content is cleaning-up, false when it's done.
-   * A new content cannot be launched until it emits false.
+   * Contains `true` when the previous content is cleaning-up, `false` when it's
+   * done.
+   * A new content cannot be launched until it stores `false`.
    */
-  private readonly _priv_contentLock$ : BehaviorSubject<boolean>;
+  private readonly _priv_contentLock : ISharedReference<boolean>;
 
   /**
    * Changes on "play" and "pause" events from the media elements.
@@ -265,22 +264,22 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * Switches to ``false`` whent the "pause" event was the last received.
    * ``false`` if no such event was received for the current loaded content.
    */
-  private readonly _priv_playing$ : ReplaySubject<boolean>;
+  private readonly _priv_isPlaying : ISharedReference<boolean>;
 
   /**
    * The speed that should be applied to playback.
    * Used instead of videoElement.playbackRate to allow more flexibility.
    */
-  private readonly _priv_speed$ : BehaviorSubject<number>;
+  private readonly _priv_speed : ISharedReference<number>;
 
   /** Store buffer-related options used needed when initializing a content. */
   private readonly _priv_bufferOptions : {
-    /** Emit the last wanted buffer goal. */
-    wantedBufferAhead$ : BehaviorSubject<number>;
+    /** Last wanted buffer goal. */
+    wantedBufferAhead : ISharedReference<number>;
     /** Maximum kept buffer ahead in the current position, in seconds. */
-    maxBufferAhead$ : BehaviorSubject<number>;
+    maxBufferAhead : ISharedReference<number>;
     /** Maximum kept buffer behind in the current position, in seconds. */
-    maxBufferBehind$ : BehaviorSubject<number>;
+    maxBufferBehind : ISharedReference<number>;
   };
 
   /** Information on the current bitrate settings. */
@@ -295,16 +294,16 @@ class Player extends EventEmitter<IPublicAPIEvent> {
                      image? : number; };
 
     /** Store last wanted minAutoBitrates for the next ABRManager instanciation. */
-    minAutoBitrates : { audio : BehaviorSubject<number>;
-                        video : BehaviorSubject<number>; };
+    minAutoBitrates : { audio : ISharedReference<number>;
+                        video : ISharedReference<number>; };
 
     /** Store last wanted maxAutoBitrates for the next ABRManager instanciation. */
-    maxAutoBitrates : { audio : BehaviorSubject<number>;
-                        video : BehaviorSubject<number>; };
+    maxAutoBitrates : { audio : ISharedReference<number>;
+                        video : ISharedReference<number>; };
 
     /** Store last wanted manual bitrates for the next ABRManager instanciation. */
-    manualBitrates : { audio : BehaviorSubject<number>;
-                       video : BehaviorSubject<number>; };
+    manualBitrates : { audio : ISharedReference<number>;
+                       video : ISharedReference<number>; };
   };
 
   /**
@@ -495,7 +494,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
 
-    this.version = /* PLAYER_VERSION */"3.26.1";
+    this.version = /* PLAYER_VERSION */"3.26.2";
     this.log = log;
     this.state = "STOPPED";
     this.videoElement = videoElement;
@@ -546,26 +545,26 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       )
       .subscribe((x : TextTrack[]) => this._priv_onNativeTextTracksNext(x));
 
-    this._priv_playing$ = new ReplaySubject(1);
-    this._priv_speed$ = new BehaviorSubject(videoElement.playbackRate);
+    this._priv_isPlaying = createSharedReference(false);
+    this._priv_speed = createSharedReference(videoElement.playbackRate);
     this._priv_preferTrickModeTracks = false;
-    this._priv_contentLock$ = new BehaviorSubject<boolean>(false);
+    this._priv_contentLock = createSharedReference<boolean>(false);
 
     this._priv_bufferOptions = {
-      wantedBufferAhead$: new BehaviorSubject(wantedBufferAhead),
-      maxBufferAhead$: new BehaviorSubject(maxBufferAhead),
-      maxBufferBehind$: new BehaviorSubject(maxBufferBehind),
+      wantedBufferAhead: createSharedReference(wantedBufferAhead),
+      maxBufferAhead: createSharedReference(maxBufferAhead),
+      maxBufferBehind: createSharedReference(maxBufferBehind),
     };
 
     this._priv_bitrateInfos = {
       lastBitrates: { audio: initialAudioBitrate,
                       video: initialVideoBitrate },
-      minAutoBitrates: { audio: new BehaviorSubject(minAudioBitrate),
-                         video: new BehaviorSubject(minVideoBitrate) },
-      maxAutoBitrates: { audio: new BehaviorSubject(maxAudioBitrate),
-                         video: new BehaviorSubject(maxVideoBitrate) },
-      manualBitrates: { audio: new BehaviorSubject(-1),
-                        video: new BehaviorSubject(-1) },
+      minAutoBitrates: { audio: createSharedReference(minAudioBitrate),
+                         video: createSharedReference(minVideoBitrate) },
+      maxAutoBitrates: { audio: createSharedReference(maxAudioBitrate),
+                         video: createSharedReference(maxVideoBitrate) },
+      manualBitrates: { audio: createSharedReference(-1),
+                        video: createSharedReference(-1) },
     };
 
     this._priv_throttleWhenHidden = throttleWhenHidden;
@@ -622,20 +621,20 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     this._priv_destroy$.next();
     this._priv_destroy$.complete();
 
-    // Complete all subjects
-    this._priv_playing$.complete();
-    this._priv_speed$.complete();
-    this._priv_contentLock$.complete();
-    this._priv_bufferOptions.wantedBufferAhead$.complete();
-    this._priv_bufferOptions.maxBufferAhead$.complete();
-    this._priv_bufferOptions.maxBufferBehind$.complete();
+    // Complete all subjects and references
     this._priv_pictureInPictureEvent$.complete();
-    this._priv_bitrateInfos.manualBitrates.video.complete();
-    this._priv_bitrateInfos.manualBitrates.audio.complete();
-    this._priv_bitrateInfos.minAutoBitrates.video.complete();
-    this._priv_bitrateInfos.minAutoBitrates.audio.complete();
-    this._priv_bitrateInfos.maxAutoBitrates.video.complete();
-    this._priv_bitrateInfos.maxAutoBitrates.audio.complete();
+    this._priv_isPlaying.finish();
+    this._priv_speed.finish();
+    this._priv_contentLock.finish();
+    this._priv_bufferOptions.wantedBufferAhead.finish();
+    this._priv_bufferOptions.maxBufferAhead.finish();
+    this._priv_bufferOptions.maxBufferBehind.finish();
+    this._priv_bitrateInfos.manualBitrates.video.finish();
+    this._priv_bitrateInfos.manualBitrates.audio.finish();
+    this._priv_bitrateInfos.minAutoBitrates.video.finish();
+    this._priv_bitrateInfos.minAutoBitrates.audio.finish();
+    this._priv_bitrateInfos.maxAutoBitrates.video.finish();
+    this._priv_bitrateInfos.maxAutoBitrates.audio.finish();
 
     this._priv_lastContentPlaybackInfos = {};
 
@@ -745,8 +744,9 @@ class Player extends EventEmitter<IPublicAPIEvent> {
 
 
     const videoElement = this.videoElement;
-    /** Global "clock" used for content playback */
-    const { setCurrentTime, clock$ } = createClock(videoElement, {
+
+    /** Global "playback observer" which will emit playback conditions */
+    const playbackObserver = new PlaybackObserver(videoElement, {
       withMediaSource: !isDirectFile,
       lowLatencyMode,
     });
@@ -754,15 +754,13 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     /** Emit playback events. */
     let playback$ : Connectable<IInitEvent>;
 
-    const speed$ = this._priv_speed$.pipe(distinctUntilChanged());
-
     if (!isDirectFile) {
       const transportFn = features.transports[transport];
       if (typeof transportFn !== "function") {
         // Stop previous content and reset its state
         this.stop();
         this._priv_currentError = null;
-        this._priv_playing$.next(false);
+        this._priv_isPlaying.setValue(false);
         throw new Error(`transport "${transport}" not supported`);
       }
 
@@ -813,7 +811,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       this.stop();
 
       this._priv_currentError = null;
-      this._priv_playing$.next(false);
+      this._priv_isPlaying.setValue(false);
       this._priv_contentInfos = contentInfos;
 
       const relyOnVideoVisibilityAndSize = canRelyOnVideoVisibilityAndSize();
@@ -827,7 +825,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
                    "browser can't be trusted for visibility.");
         } else {
           throttlers.throttle = {
-            video: isActive().pipe(
+            video: isPageActive().pipe(
               map(active => active ? Infinity :
                                        0),
               takeUntil(stopContent$)),
@@ -886,7 +884,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       const init$ = initializeMediaSourcePlayback({ adaptiveOptions,
                                                     autoPlay,
                                                     bufferOptions,
-                                                    clock$,
+                                                    playbackObserver,
                                                     keySystems,
                                                     lowLatencyMode,
                                                     manifest$,
@@ -894,8 +892,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
                                                     mediaElement: videoElement,
                                                     minimumManifestUpdateInterval,
                                                     segmentFetcherCreator,
-                                                    setCurrentTime,
-                                                    speed$,
+                                                    speed: this._priv_speed,
                                                     startAt,
                                                     textTrackOptions })
         .pipe(takeUntil(stopContent$));
@@ -906,7 +903,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       // Stop previous content and reset its state
       this.stop();
       this._priv_currentError = null;
-      this._priv_playing$.next(false);
+      this._priv_isPlaying.setValue(false);
       if (features.directfile === null) {
         throw new Error("DirectFile feature not activated in your build.");
       }
@@ -969,12 +966,11 @@ class Player extends EventEmitter<IPublicAPIEvent> {
 
       const directfileInit$ =
         features.directfile.initDirectFile({ autoPlay,
-                                             clock$,
                                              keySystems,
                                              mediaElement: videoElement,
-                                             speed$: this._priv_speed$,
+                                             speed: this._priv_speed,
+                                             playbackObserver,
                                              startAt,
-                                             setCurrentTime,
                                              url })
           .pipe(takeUntil(stopContent$));
 
@@ -1014,7 +1010,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
 
     /** Emit state updates once the content is considered "loaded". */
     const loadedStateUpdates$ = observableCombineLatest([
-      this._priv_playing$,
+      this._priv_isPlaying.asObservable(),
       stalled$.pipe(startWith(null)),
       endedEvent$.pipe(startWith(null)),
       seekingEvent$.pipe(startWith(null)),
@@ -1030,7 +1026,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       observableOf(PLAYER_STATES.LOADING), // Begin with LOADING
 
       // LOADED as soon as the first "loaded" event is sent
-      loaded$.pipe(take(1), mapTo(PLAYER_STATES.LOADED)),
+      loaded$.pipe(take(1), map(() => PLAYER_STATES.LOADED)),
 
       observableMerge(
         loadedStateUpdates$
@@ -1042,10 +1038,10 @@ class Player extends EventEmitter<IPublicAPIEvent> {
 
         // when reloading
         reloading$.pipe(
-          switchMapTo(
+          switchMap(() =>
             loaded$.pipe(
               take(1), // wait for the next loaded event
-              mergeMapTo(loadedStateUpdates$), // to update the state as usual
+              mergeMap(() => loadedStateUpdates$), // to update the state as usual
               startWith(PLAYER_STATES.RELOADING) // Starts with "RELOADING" state
             )
           )
@@ -1067,14 +1063,16 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       .pipe(takeUntil(stopContent$))
       .subscribe(e => this._priv_onPlayPauseNext(e.type === "play"));
 
-    // Link "positionUpdate" events to the clock
-    clock$
+    const observation$ = playbackObserver.observe(true);
+
+    // Link "positionUpdate" events to the PlaybackObserver
+    observation$
       .pipe(takeUntil(stopContent$))
-      .subscribe(x => this._priv_triggerPositionUpdate(x));
+      .subscribe(o => this._priv_triggerPositionUpdate(o));
 
     // Link "seeking" and "seeked" events (once the content is loaded)
     loaded$.pipe(
-      switchMapTo(emitSeekEvents(this.videoElement, clock$)),
+      switchMap(() => emitSeekEvents(this.videoElement, observation$)),
       takeUntil(stopContent$)
     ).subscribe((evt : "seeking" | "seeked") => {
       log.info(`API: Triggering "${evt}" event`);
@@ -1103,7 +1101,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     });
 
     // initialize the content only when the lock is inactive
-    this._priv_contentLock$
+    this._priv_contentLock.asObservable()
       .pipe(
         filter((isLocked) => !isLocked),
         take(1),
@@ -1375,7 +1373,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @returns {Number}
    */
   getPlaybackRate() : number {
-    return this._priv_speed$.getValue();
+    return this._priv_speed.getValue();
   }
 
   /**
@@ -1438,7 +1436,9 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     rate : number,
     opts? : { preferTrickModeTracks? : boolean }
   ) : void {
-    this._priv_speed$.next(rate);
+    if (rate !== this._priv_speed.getValue()) {
+      this._priv_speed.setValue(rate);
+    }
 
     const preferTrickModeTracks = opts?.preferTrickModeTracks;
     if (typeof preferTrickModeTracks !== "boolean") {
@@ -1770,7 +1770,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @param {Number} btr
    */
   setVideoBitrate(btr : number) : void {
-    this._priv_bitrateInfos.manualBitrates.video.next(btr);
+    this._priv_bitrateInfos.manualBitrates.video.setValue(btr);
   }
 
   /**
@@ -1779,7 +1779,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @param {Number} btr
    */
   setAudioBitrate(btr : number) : void {
-    this._priv_bitrateInfos.manualBitrates.audio.next(btr);
+    this._priv_bitrateInfos.manualBitrates.audio.setValue(btr);
   }
 
   /**
@@ -1793,7 +1793,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
                       `Its value, "${btr}" is superior the current maximum ` +
                       `video birate, "${maxVideoBitrate}".`);
     }
-    this._priv_bitrateInfos.minAutoBitrates.video.next(btr);
+    this._priv_bitrateInfos.minAutoBitrates.video.setValue(btr);
   }
 
   /**
@@ -1807,7 +1807,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
                       `Its value, "${btr}" is superior the current maximum ` +
                       `audio birate, "${maxAudioBitrate}".`);
     }
-    this._priv_bitrateInfos.minAutoBitrates.audio.next(btr);
+    this._priv_bitrateInfos.minAutoBitrates.audio.setValue(btr);
   }
 
   /**
@@ -1821,7 +1821,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
                       `Its value, "${btr}" is inferior the current minimum ` +
                       `video birate, "${minVideoBitrate}".`);
     }
-    this._priv_bitrateInfos.maxAutoBitrates.video.next(btr);
+    this._priv_bitrateInfos.maxAutoBitrates.video.setValue(btr);
   }
 
   /**
@@ -1835,7 +1835,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
                       `Its value, "${btr}" is inferior the current minimum ` +
                       `audio birate, "${minAudioBitrate}".`);
     }
-    this._priv_bitrateInfos.maxAutoBitrates.audio.next(btr);
+    this._priv_bitrateInfos.maxAutoBitrates.audio.setValue(btr);
   }
 
   /**
@@ -1844,7 +1844,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @param {Number} depthInSeconds
    */
   setMaxBufferBehind(depthInSeconds : number) : void {
-    this._priv_bufferOptions.maxBufferBehind$.next(depthInSeconds);
+    this._priv_bufferOptions.maxBufferBehind.setValue(depthInSeconds);
   }
 
   /**
@@ -1853,7 +1853,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @param {Number} depthInSeconds
    */
   setMaxBufferAhead(depthInSeconds : number) : void {
-    this._priv_bufferOptions.maxBufferAhead$.next(depthInSeconds);
+    this._priv_bufferOptions.maxBufferAhead.setValue(depthInSeconds);
   }
 
   /**
@@ -1862,7 +1862,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @param {Number} sizeInSeconds
    */
   setWantedBufferAhead(sizeInSeconds : number) : void {
-    this._priv_bufferOptions.wantedBufferAhead$.next(sizeInSeconds);
+    this._priv_bufferOptions.wantedBufferAhead.setValue(sizeInSeconds);
   }
 
   /**
@@ -1870,7 +1870,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @returns {Number}
    */
   getMaxBufferBehind() : number {
-    return this._priv_bufferOptions.maxBufferBehind$.getValue();
+    return this._priv_bufferOptions.maxBufferBehind.getValue();
   }
 
   /**
@@ -1878,7 +1878,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @returns {Number}
    */
   getMaxBufferAhead() : number {
-    return this._priv_bufferOptions.maxBufferAhead$.getValue();
+    return this._priv_bufferOptions.maxBufferAhead.getValue();
   }
 
   /**
@@ -1886,7 +1886,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
    * @returns {Number}
    */
   getWantedBufferAhead() : number {
-    return this._priv_bufferOptions.wantedBufferAhead$.getValue();
+    return this._priv_bufferOptions.wantedBufferAhead.getValue();
   }
 
   /**
@@ -2327,7 +2327,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     log.debug("Locking `contentLock` to clean-up the current content.");
 
     // lock playback of new contents while cleaning up is pending
-    this._priv_contentLock$.next(true);
+    this._priv_contentLock.setValue(true);
 
     this._priv_contentInfos = null;
     this._priv_trackChoiceManager = null;
@@ -2339,7 +2339,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // EME cleaning
     const freeUpContentLock = () => {
       log.debug("Unlocking `contentLock`. Next content can begin.");
-      this._priv_contentLock$.next(false);
+      this._priv_contentLock.setValue(false);
     };
 
     if (!isNullOrUndefined(this.videoElement)) {
@@ -2848,7 +2848,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
       throw new Error("Disposed player");
     }
 
-    this._priv_playing$.next(isPlaying);
+    this._priv_isPlaying.setValue(isPlaying);
   }
 
   /**
@@ -2878,13 +2878,13 @@ class Player extends EventEmitter<IPublicAPIEvent> {
   }
 
   /**
-   * Triggered each time a new clock tick object is emitted.
+   * Triggered each time a playback observation.
    *
    * Trigger the right Player Event
    *
-   * @param {Object} clockTick
+   * @param {Object} observation
    */
-  private _priv_triggerPositionUpdate(clockTick : IClockTick) : void {
+  private _priv_triggerPositionUpdate(observation : IPlaybackObservation) : void {
     if (this._priv_contentInfos === null) {
       log.warn("API: Cannot perform time update: no content loaded.");
       return;
@@ -2895,33 +2895,33 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
 
     const { isDirectFile, manifest } = this._priv_contentInfos;
-    if ((!isDirectFile && manifest === null) || isNullOrUndefined(clockTick)) {
+    if ((!isDirectFile && manifest === null) || isNullOrUndefined(observation)) {
       return;
     }
 
-    this._priv_lastContentPlaybackInfos.lastPlaybackPosition = clockTick.position;
+    this._priv_lastContentPlaybackInfos.lastPlaybackPosition = observation.position;
 
     const maximumPosition = manifest !== null ? manifest.getMaximumPosition() :
                                                 undefined;
     const positionData : IPositionUpdateItem = {
-      position: clockTick.position,
-      duration: clockTick.duration,
-      playbackRate: clockTick.playbackRate,
+      position: observation.position,
+      duration: observation.duration,
+      playbackRate: observation.playbackRate,
       maximumBufferTime: maximumPosition,
 
       // TODO fix higher up?
-      bufferGap: isFinite(clockTick.bufferGap) ? clockTick.bufferGap :
+      bufferGap: isFinite(observation.bufferGap) ? observation.bufferGap :
                                                  0,
     };
 
     if (manifest !== null &&
         maximumPosition !== undefined &&
         manifest.isLive &&
-        clockTick.position > 0
+        observation.position > 0
     ) {
       const ast = manifest.availabilityStartTime ?? 0;
-      positionData.wallClockTime = clockTick.position + ast;
-      positionData.liveGap = maximumPosition - clockTick.position;
+      positionData.wallClockTime = observation.position + ast;
+      positionData.liveGap = maximumPosition - observation.position;
     }
 
     this.trigger("positionUpdate", positionData);
@@ -2975,7 +2975,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     return activeRepresentations[currentPeriod.id];
   }
 }
-Player.version = /* PLAYER_VERSION */"3.26.1";
+Player.version = /* PLAYER_VERSION */"3.26.2";
 
 export default Player;
 export { IStreamEventData };

package/src/core/api/track_choice_manager.ts

@@ -325,7 +325,8 @@ export default class TrackChoiceManager {
     const adaptations = period.getSupportedAdaptations(bufferType);
     if (periodItem !== undefined) {
       if (periodItem[bufferType] !== undefined) {
-        log.warn(`TrackChoiceManager: ${bufferType} already added for period`, period);
+        log.warn(`TrackChoiceManager: ${bufferType} already added for period`,
+                 period.start);
         return;
       } else {
         periodItem[bufferType] = { adaptations, adaptation$ };
@@ -348,13 +349,15 @@ export default class TrackChoiceManager {
   ) : void {
     const periodIndex = findPeriodIndex(this._periods, period);
     if (periodIndex === undefined) {
-      log.warn(`TrackChoiceManager: ${bufferType} not found for period`, period);
+      log.warn(`TrackChoiceManager: ${bufferType} not found for period`,
+               period.start);
       return;
     }
 
     const periodItem = this._periods.get(periodIndex);
     if (periodItem[bufferType] === undefined) {
-      log.warn(`TrackChoiceManager: ${bufferType} already removed for period`, period);
+      log.warn(`TrackChoiceManager: ${bufferType} already removed for period`,
+               period.start);
       return;
     }
     delete periodItem[bufferType];

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

@@ -23,8 +23,10 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable no-restricted-properties */
 
-import { Subject } from "rxjs";
-import { takeUntil } from "rxjs/operators";
+import {
+  Subject,
+  takeUntil,
+} from "rxjs";
 import { ICustomError } from "../../../../errors";
 import { concat } from "../../../../utils/byte_parsing";
 import { IContentProtection } from "../../types";
@@ -353,7 +355,7 @@ function checkGetLicense(
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     .subscribe((evt : any) => {
       if (evt.type === "created-media-keys") {
-        evt.value.attachMediaKeys$.next();
+        evt.value.canAttachMediaKeys.setValue(true);
       }
       eventsReceived++;
       // Those first three have been tested enough