rx-player 4.2.0-dev.2024091000 → 4.2.0-dev.2024092400

package/src/compat/patch_webkit_source_buffer.ts

@@ -85,10 +85,8 @@ export default function patchWebkitSourceBuffer(): void {
       val: unknown,
     ) {
       queueMicrotask(() => {
-        // @ts-expect-error: trigger is normally protected
         this.trigger(eventName, val as Event);
         this.updating = false;
-        // @ts-expect-error: trigger is normally protected
         this.trigger("updateend", new Event("updateend"));
       });
     };
@@ -97,7 +95,6 @@ export default function patchWebkitSourceBuffer(): void {
       if (this.updating) {
         throw new Error("updating");
       }
-      // @ts-expect-error: trigger is normally protected
       this.trigger("updatestart", new Event("updatestart"));
       this.updating = true;
       try {

package/src/config.ts

@@ -9,13 +9,21 @@
 import type { IDefaultConfig } from "./default_config";
 import DEFAULT_CONFIG from "./default_config";
 import deepMerge from "./utils/deep_merge";
+import EventEmitter from "./utils/event_emitter";
 
-class ConfigHandler {
-  _config = DEFAULT_CONFIG;
+interface IConfigHandlerEvents {
+  update: Partial<IDefaultConfig>;
+}
+
+class ConfigHandler extends EventEmitter<IConfigHandlerEvents> {
+  public updated = false;
+  private _config = DEFAULT_CONFIG;
 
   update(config: Partial<IDefaultConfig>) {
     const newConfig = deepMerge(this._config, config);
     this._config = newConfig;
+    this.updated = true;
+    this.trigger("update", config);
   }
 
   getCurrent(): IDefaultConfig {

package/src/core/main/worker/worker_main.ts

@@ -401,6 +401,11 @@ export default function initializeWorkerMain() {
         break;
       }
 
+      case MainThreadMessageType.ConfigUpdate: {
+        config.update(msg.value);
+        break;
+      }
+
       default:
         assertUnreachable(msg);
     }

package/src/core/stream/adaptation/adaptation_stream.ts

@@ -381,7 +381,7 @@ export default function AdaptationStream(
     const bufferGoal = createMappedReference(
       wantedBufferAhead,
       (prev) => {
-        return prev * getBufferGoalRatio(representation);
+        return getBufferGoal(representation, prev);
       },
       bufferGoalCanceller.signal,
     );
@@ -406,10 +406,11 @@ export default function AdaptationStream(
           const lastBufferGoalRatio = bufferGoalRatioMap.get(representation.id) ?? 1;
           // 70%, 49%, 34.3%, 24%, 16.81%, 11.76%, 8.24% and 5.76%
           const newBufferGoalRatio = lastBufferGoalRatio * 0.7;
-          if (newBufferGoalRatio <= 0.05 || wba * newBufferGoalRatio <= 2) {
-            throw formattedError;
-          }
           bufferGoalRatioMap.set(representation.id, newBufferGoalRatio);
+          if (newBufferGoalRatio <= 0.05 || getBufferGoal(representation, wba) <= 2) {
+            representationStreamCallbacks.error(formattedError);
+            return;
+          }
 
           // We wait 4 seconds to let the situation evolve by itself before
           // retrying loading segments with a lower buffer goal
@@ -481,15 +482,25 @@ export default function AdaptationStream(
   }
 
   /**
-   * @param {Object} representation
+   * Returns how much media data should be pre-buffered for this
+   * `Representation`, according to the `wantedBufferAhead` setting and previous
+   * issues encountered with that `Representation`.
+   * @param {Object} representation - The `Representation` you want to buffer.
+   * @param {number} wba - The value of `wantedBufferAhead` set by the user.
    * @returns {number}
    */
-  function getBufferGoalRatio(representation: IRepresentation): number {
+  function getBufferGoal(representation: IRepresentation, wba: number): number {
     const oldBufferGoalRatio = bufferGoalRatioMap.get(representation.id);
     const bufferGoalRatio = oldBufferGoalRatio !== undefined ? oldBufferGoalRatio : 1;
     if (oldBufferGoalRatio === undefined) {
       bufferGoalRatioMap.set(representation.id, bufferGoalRatio);
     }
-    return bufferGoalRatio;
+    if (bufferGoalRatio < 1 && wba === Infinity) {
+      // When `wba` is equal to `Infinity`, dividing it will still make it equal
+      // to `Infinity`. To make the `bufferGoalRatio` still have an effect, we
+      // just starts from a `wba` set to the high value of 5 minutes.
+      return 5 * 60 * 1000 * bufferGoalRatio;
+    }
+    return wba * bufferGoalRatio;
   }
 }

package/src/core/stream/adaptation/index.ts

@@ -15,6 +15,6 @@
  */
 
 import AdaptationStream from "./adaptation_stream";
-export * from "./types";
+export type * from "./types";
 
 export default AdaptationStream;

package/src/core/stream/period/index.ts

@@ -15,6 +15,6 @@
  */
 
 import PeriodStream from "./period_stream";
-export * from "./types";
+export type * from "./types";
 
 export default PeriodStream;

package/src/core/stream/representation/index.ts

@@ -15,6 +15,6 @@
  */
 
 import RepresentationStream from "./representation_stream";
-export * from "./types";
+export type * from "./types";
 
 export default RepresentationStream;

package/src/core/stream/representation/utils/append_segment_to_buffer.ts

@@ -72,8 +72,12 @@ export default async function appendSegmentToBuffer<T>(
       log.warn("Stream: Running garbage collector");
       const start = Math.max(currentPos - 5, 0);
       const end = currentPos + bufferGoal.getValue() + 12;
-      await segmentSink.removeBuffer(0, start);
-      await segmentSink.removeBuffer(end, Number.MAX_VALUE);
+      if (start > 0) {
+        await segmentSink.removeBuffer(0, start);
+      }
+      if (end < Number.MAX_VALUE) {
+        await segmentSink.removeBuffer(end, Number.MAX_VALUE);
+      }
       await sleep(200);
       if (cancellationSignal.cancellationError !== null) {
         throw cancellationSignal.cancellationError;

package/src/default_config.ts

@@ -1187,3 +1187,24 @@ const DEFAULT_CONFIG = {
 
 export type IDefaultConfig = typeof DEFAULT_CONFIG;
 export default DEFAULT_CONFIG;
+
+// NOTE Because the config may have to be serialized and shared between several
+// environments, we check here that some strict type is respected:
+//   - only a subset of types are authorized for now, just make it easier to
+//     reason about.
+//   - Needs to make sense in JSON: no `function`, no `Date`, no `undefined`...
+interface IGenericConfigData {
+  [key: string]:
+    | string
+    | number
+    | boolean
+    | number[]
+    | string[]
+    | Partial<Record<string, string[]>>
+    | IGenericConfigData;
+}
+
+function checkIsSerializable(_conf: IGenericConfigData): void {
+  // noop
+}
+checkIsSerializable(DEFAULT_CONFIG);

package/src/main_thread/api/public_api.ts

@@ -32,6 +32,7 @@ import getStartDate from "../../compat/get_start_date";
 import hasMseInWorker from "../../compat/has_mse_in_worker";
 import hasWorkerApi from "../../compat/has_worker_api";
 import isDebugModeEnabled from "../../compat/is_debug_mode_enabled";
+import config from "../../config";
 import type { ISegmentSinkMetrics } from "../../core/segment_sinks/segment_buffers_store";
 import type {
   IAdaptationChoice,
@@ -39,6 +40,7 @@ import type {
   IABRThrottlers,
   IBufferType,
 } from "../../core/types";
+import type { IDefaultConfig } from "../../default_config";
 import type { IErrorCode, IErrorType } from "../../errors";
 import { ErrorCodes, ErrorTypes, formatError, MediaError } from "../../errors";
 import WorkerInitializationError from "../../errors/worker_initialization_error";
@@ -409,7 +411,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
 
-    this.version = /* PLAYER_VERSION */ "4.2.0-dev.2024091000";
+    this.version = /* PLAYER_VERSION */ "4.2.0-dev.2024092400";
     this.log = log;
     this.state = "STOPPED";
     this.videoElement = videoElement;
@@ -573,6 +575,21 @@ class Player extends EventEmitter<IPublicAPIEvent> {
         },
         this._destroyCanceller.signal,
       );
+
+      const sendConfigUpdates = (updates: Partial<IDefaultConfig>) => {
+        if (this._priv_worker === null) {
+          return;
+        }
+        log.debug("---> Sending To Worker:", MainThreadMessageType.ConfigUpdate);
+        this._priv_worker.postMessage({
+          type: MainThreadMessageType.ConfigUpdate,
+          value: updates,
+        });
+      };
+      if (config.updated) {
+        sendConfigUpdates(config.getCurrent());
+      }
+      config.addEventListener("update", sendConfigUpdates, this._destroyCanceller.signal);
     });
   }
 
@@ -3313,7 +3330,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
   }
 }
-Player.version = /* PLAYER_VERSION */ "4.2.0-dev.2024091000";
+Player.version = /* PLAYER_VERSION */ "4.2.0-dev.2024092400";
 
 /** Every events sent by the RxPlayer's public API. */
 interface IPublicAPIEvent {

package/src/main_thread/decrypt/content_decryptor.ts

@@ -208,6 +208,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
 
         this.systemId = systemId;
         if (this._stateData.state === ContentDecryptorState.Initializing) {
+          log.debug("DRM: Waiting for attachment.");
           this._stateData = {
             state: ContentDecryptorState.WaitingForAttachment,
             isInitDataQueueLocked: true,
@@ -260,6 +261,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
     const shouldDisableLock = options.disableMediaKeysAttachmentLock === true;
 
     if (shouldDisableLock) {
+      log.debug("DRM: disabling MediaKeys attachment lock. Ready for content");
       this._stateData = {
         state: ContentDecryptorState.ReadyForContent,
         isInitDataQueueLocked: true,

package/src/main_thread/decrypt/get_media_keys.ts

@@ -102,6 +102,7 @@ export default async function getMediaKeysInfos(
     currentState !== null &&
     evt.type === "reuse-media-key-system-access"
   ) {
+    log.debug("DRM: Reusing already created MediaKeys");
     const { mediaKeys, loadedSessionsStore } = currentState;
 
     // We might just rely on the currently attached MediaKeys instance.

package/src/main_thread/init/multi_thread_content_initializer.ts

@@ -2006,24 +2006,6 @@ type IDecryptionInitializationState =
    * `HTMLMediaElement` (such as linking a content / `MediaSource` to it).
    */
   | { type: "uninitialized"; value: null }
-  /**
-   * The `MediaSource` or media url has to be linked to the `HTMLMediaElement`
-   * before continuing.
-   * Once it has been linked with success (e.g. the `MediaSource` has "opened"),
-   * the `isMediaLinked` `SharedReference` should be set to `true`.
-   *
-   * In the `MediaSource` case, you should wait until the `"initialized"`
-   * state before pushing segment.
-   *
-   * Note that the `"awaiting-media-link"` is an optional state. It can be
-   * skipped to directly `"initialized"` instead.
-   */
-  | {
-      type: "awaiting-media-link";
-      value: {
-        isMediaLinked: SharedReference<boolean>;
-      };
-    }
   /**
    * The `MediaSource` or media url can be linked AND segments can be pushed to
    * the `HTMLMediaElement` on which decryption capabilities were wanted.

package/src/multithread_types.ts

@@ -14,6 +14,7 @@ import type {
   IRepresentationsChoice,
   ITrackSwitchingMode,
 } from "./core/types";
+import type { IDefaultConfig } from "./default_config";
 import type {
   ISerializedMediaError,
   ISerializedNetworkError,
@@ -158,6 +159,12 @@ export interface ILogLevelUpdateMessage {
   };
 }
 
+/** Message sent by the main thread to update the Worker's global config. */
+export interface IConfigUpdateMessage {
+  type: MainThreadMessageType.ConfigUpdate;
+  value: Partial<IDefaultConfig>;
+}
+
 /**
  * Message sent by the main thread when a new content should be "prepared".
  *
@@ -542,6 +549,7 @@ export const enum MainThreadMessageType {
   RemoveTextDataError = "remove-text-error",
   CodecSupportUpdate = "codec-support-update",
   ContentUrlsUpdate = "urls-update",
+  ConfigUpdate = "config-update",
   DecipherabilityStatusUpdate = "decipherability-update",
   LogLevelUpdate = "log-level-update",
   MediaSourceReadyStateChange = "media-source-ready-state-change",
@@ -560,6 +568,7 @@ export const enum MainThreadMessageType {
 export type IMainThreadMessage =
   | IInitMessage
   | ILogLevelUpdateMessage
+  | IConfigUpdateMessage
   | IPrepareContentMessage
   | IStopContentMessage
   | IStartPreparedContentMessage

package/src/parsers/manifest/dash/wasm-parser/rs/events.rs

@@ -86,6 +86,9 @@ pub enum TagName {
     // -- Inside a <SegmentList> --
     /// Indicate a <SegmentURL> node
     SegmentUrl = 20,
+
+    /// Indicate a <Label> node
+    Label = 21,
 }
 
 #[derive(PartialEq, Clone, Copy)]
@@ -276,8 +279,6 @@ pub enum AttributeName {
     /// namespaces that will appear in it.
     Namespace = 70,
 
-    Label = 71, // String
-
     ServiceLocation = 72, // String
 
     // SegmentTemplate

package/src/parsers/manifest/dash/wasm-parser/rs/processor/mod.rs

@@ -114,7 +114,10 @@ impl MPDProcessor {
                     }
                     b"cenc:pssh" => self.process_cenc_element(),
                     b"Location" => self.process_location_element(),
-                    b"Label" => self.process_label_element(),
+                    b"Label" => {
+                        TagName::Label.report_tag_open();
+                        self.process_label_element();
+                    }
                     b"SegmentTimeline" => self.process_segment_timeline_element(),
 
                     b"EventStream" => {
@@ -274,7 +277,7 @@ impl MPDProcessor {
                 Ok(Event::Text(t)) => {
                     if t.len() > 0 {
                         match t.unescape() {
-                            Ok(unescaped) => AttributeName::Label.report(unescaped),
+                            Ok(unescaped) => AttributeName::Text.report(unescaped),
                             Err(err) => ParsingError::from(err).report_err(),
                         }
                     }
@@ -284,6 +287,7 @@ impl MPDProcessor {
                     if inner_tag > 0 {
                         inner_tag -= 1;
                     } else {
+                        TagName::Label.report_tag_close();
                         break;
                     }
                 }

package/src/parsers/manifest/dash/wasm-parser/ts/generators/AdaptationSet.ts

@@ -27,6 +27,7 @@ import { parseFloatOrBool, parseString } from "../utils";
 import { generateBaseUrlAttrParser } from "./BaseURL";
 import { generateContentComponentAttrParser } from "./ContentComponent";
 import { generateContentProtectionAttrParser } from "./ContentProtection";
+import { generateLabelElementParser } from "./Label";
 import {
   generateRepresentationAttrParser,
   generateRepresentationChildrenParser,
@@ -209,6 +210,15 @@ export function generateAdaptationSetChildrenParser(
         break;
       }
 
+      case TagName.Label: {
+        parsersStack.pushParsers(
+          nodeId,
+          noop, // Label as treated like an attribute
+          generateLabelElementParser(adaptationSetChildren, linearMemory),
+        );
+        break;
+      }
+
       default:
         // Allows to make sure we're not mistakenly closing a re-opened
         // tag.
@@ -363,11 +373,6 @@ export function generateAdaptationSetAttrParser(
       case AttributeName.AvailabilityTimeComplete:
         adaptationAttrs.availabilityTimeComplete = dataView.getUint8(0) === 0;
         break;
-      case AttributeName.Label: {
-        const label = parseString(textDecoder, linearMemory.buffer, ptr, len);
-        adaptationAttrs.label = label;
-        break;
-      }
 
       // TODO
       // case AttributeName.StartsWithSap:

package/src/parsers/manifest/dash/wasm-parser/ts/generators/Label.ts

@@ -0,0 +1,16 @@
+import type { IAdaptationSetChildren } from "../../../node_parser_types";
+import type { IAttributeParser } from "../parsers_stack";
+import { AttributeName } from "../types";
+import { parseString } from "../utils";
+
+export function generateLabelElementParser(
+  adaptationSet: IAdaptationSetChildren,
+  linearMemory: WebAssembly.Memory,
+): IAttributeParser {
+  const textDecoder = new TextDecoder();
+  return function onMPDAttribute(attr: AttributeName, ptr: number, len: number) {
+    if (attr === AttributeName.Text) {
+      adaptationSet.label = parseString(textDecoder, linearMemory.buffer, ptr, len);
+    }
+  };
+}

package/src/parsers/manifest/dash/wasm-parser/ts/types.ts

@@ -108,6 +108,9 @@ export const enum TagName {
 
   /// Indicate a <SegmentURL> node
   SegmentUrl = 20,
+
+  /// Indicate a <Label> node
+  Label = 21,
 }
 
 /**

package/src/parsers/manifest/index.ts

@@ -14,4 +14,4 @@
  * limitations under the License.
  */
 
-export * from "./types";
+export type * from "./types";