rx-player 4.4.1-dev.2025101500 → 4.4.1

package/src/manifest/utils.ts

@@ -14,7 +14,6 @@ import arrayFind from "../utils/array_find";
 import isNullOrUndefined from "../utils/is_null_or_undefined";
 import getMonotonicTimeStamp from "../utils/monotonic_timestamp";
 import { objectValues } from "../utils/object_values";
-import { ManifestMetadataFormat } from "./types";
 import type {
   IAdaptationMetadata,
   IManifestMetadata,
@@ -449,9 +448,7 @@ export function updateDecipherabilityFromKeyIds(
   },
 ): IDecipherabilityStatusChangedElement[] {
   const { whitelistedKeyIds, blacklistedKeyIds, delistedKeyIds } = updates;
-  const isDecipherable = (
-    representation: IRepresentationMetadata,
-  ): boolean | undefined => {
+  return updateRepresentationsDeciperability(manifest, (representation) => {
     if (representation.contentProtections === undefined) {
       return representation.decipherable;
     }
@@ -476,14 +473,7 @@ export function updateDecipherabilityFromKeyIds(
       }
     }
     return representation.decipherable;
-  };
-
-  if (manifest.manifestFormat === ManifestMetadataFormat.Class) {
-    (manifest as IManifest).updateRepresentationsDeciperability(({ representation }) => {
-      return isDecipherable(representation);
-    });
-  }
-  return updateRepresentationsDeciperability(manifest, isDecipherable);
+  });
 }
 
 /**
@@ -496,7 +486,7 @@ export function updateDecipherabilityFromProtectionData(
   manifest: IManifestMetadata,
   initData: IProcessedProtectionData,
 ): IDecipherabilityStatusChangedElement[] {
-  const isDecipherable = (representation: IRepresentationMetadata) => {
+  return updateRepresentationsDeciperability(manifest, (representation) => {
     if (representation.decipherable === false) {
       return false;
     }
@@ -520,13 +510,7 @@ export function updateDecipherabilityFromProtectionData(
       }
     }
     return representation.decipherable;
-  };
-  if (manifest.manifestFormat === ManifestMetadataFormat.Class) {
-    (manifest as IManifest).updateRepresentationsDeciperability(({ representation }) => {
-      return isDecipherable(representation);
-    });
-  }
-  return updateRepresentationsDeciperability(manifest, isDecipherable);
+  });
 }
 
 /**

package/src/mse/worker_media_source_interface.ts

@@ -1,19 +1,19 @@
-import type {
-  IAbortBufferCoreMessage,
-  IAddSourceBufferCoreMessage,
-  IAppendBufferCoreMessage,
-  ICreateMediaSourceCoreMessage,
-  IDisposeMediaSourceCoreMessage,
-  IEndOfStreamCoreMessage,
-  IInterruptMediaSourceDurationCoreMessage,
-  IRemoveBufferCoreMessage,
-  IStopEndOfStreamCoreMessage,
-  IUpdateMediaSourceDurationCoreMessage,
-} from "../core/types";
-import { CoreMessageType } from "../core/types";
 import { SourceBufferError } from "../errors";
 import type { ISerializedSourceBufferError } from "../errors/source_buffer_error";
 import log from "../log";
+import type {
+  IAbortBufferWorkerMessage,
+  IAddSourceBufferWorkerMessage,
+  IAppendBufferWorkerMessage,
+  ICreateMediaSourceWorkerMessage,
+  IDisposeMediaSourceWorkerMessage,
+  IEndOfStreamWorkerMessage,
+  IInterruptMediaSourceDurationWorkerMessage,
+  IRemoveBufferWorkerMessage,
+  IStopEndOfStreamWorkerMessage,
+  IUpdateMediaSourceDurationWorkerMessage,
+} from "../multithread_types";
+import { WorkerMessageType } from "../multithread_types";
 import EventEmitter from "../utils/event_emitter";
 import idGenerator from "../utils/id_generator";
 import type { IRange } from "../utils/ranges";
@@ -73,7 +73,7 @@ export default class WorkerMediaSourceInterface
 
     const mediaSourceId = generateMediaSourceId();
     this._messageSender({
-      type: CoreMessageType.CreateMediaSource,
+      type: WorkerMessageType.CreateMediaSource,
       contentId,
       mediaSourceId,
     });
@@ -101,7 +101,7 @@ export default class WorkerMediaSourceInterface
     codec: string,
   ): ISourceBufferInterface {
     this._messageSender({
-      type: CoreMessageType.AddSourceBuffer,
+      type: WorkerMessageType.AddSourceBuffer,
       mediaSourceId: this.id,
       value: {
         sourceBufferType: sbType,
@@ -120,7 +120,7 @@ export default class WorkerMediaSourceInterface
 
   public setDuration(newDuration: number, isRealEndKnown: boolean) {
     this._messageSender({
-      type: CoreMessageType.UpdateMediaSourceDuration,
+      type: WorkerMessageType.UpdateMediaSourceDuration,
       mediaSourceId: this.id,
       value: {
         duration: newDuration,
@@ -131,7 +131,7 @@ export default class WorkerMediaSourceInterface
 
   public interruptDurationSetting() {
     this._messageSender({
-      type: CoreMessageType.InterruptMediaSourceDurationUpdate,
+      type: WorkerMessageType.InterruptMediaSourceDurationUpdate,
       mediaSourceId: this.id,
       value: null,
     });
@@ -139,7 +139,7 @@ export default class WorkerMediaSourceInterface
 
   public maintainEndOfStream() {
     this._messageSender({
-      type: CoreMessageType.EndOfStream,
+      type: WorkerMessageType.EndOfStream,
       mediaSourceId: this.id,
       value: null,
     });
@@ -147,7 +147,7 @@ export default class WorkerMediaSourceInterface
 
   public stopEndOfStream() {
     this._messageSender({
-      type: CoreMessageType.InterruptEndOfStream,
+      type: WorkerMessageType.InterruptEndOfStream,
       mediaSourceId: this.id,
       value: null,
     });
@@ -157,7 +157,7 @@ export default class WorkerMediaSourceInterface
     this.sourceBuffers.forEach((s) => s.dispose());
     this._canceller.cancel();
     this._messageSender({
-      type: CoreMessageType.DisposeMediaSource,
+      type: WorkerMessageType.DisposeMediaSource,
       mediaSourceId: this.id,
       value: null,
     });
@@ -166,16 +166,16 @@ export default class WorkerMediaSourceInterface
 
 export type IWorkerMediaSourceInterfaceMessageSender = (
   msg:
-    | IAppendBufferCoreMessage
-    | IRemoveBufferCoreMessage
-    | IAbortBufferCoreMessage
-    | ICreateMediaSourceCoreMessage
-    | IAddSourceBufferCoreMessage
-    | IUpdateMediaSourceDurationCoreMessage
-    | IInterruptMediaSourceDurationCoreMessage
-    | IEndOfStreamCoreMessage
-    | IStopEndOfStreamCoreMessage
-    | IDisposeMediaSourceCoreMessage,
+    | IAppendBufferWorkerMessage
+    | IRemoveBufferWorkerMessage
+    | IAbortBufferWorkerMessage
+    | ICreateMediaSourceWorkerMessage
+    | IAddSourceBufferWorkerMessage
+    | IUpdateMediaSourceDurationWorkerMessage
+    | IInterruptMediaSourceDurationWorkerMessage
+    | IEndOfStreamWorkerMessage
+    | IStopEndOfStreamWorkerMessage
+    | IDisposeMediaSourceWorkerMessage,
   transferables?: Transferable[],
 ) => void;
 
@@ -299,7 +299,7 @@ export class WorkerSourceBufferInterface implements ISourceBufferInterface {
         const operationId = generateSourceBufferOperationId();
         this._messageSender(
           {
-            type: CoreMessageType.SourceBufferAppend,
+            type: WorkerMessageType.SourceBufferAppend,
             mediaSourceId: this._mediaSourceId,
             sourceBufferType: this.type,
             operationId,
@@ -334,7 +334,7 @@ export class WorkerSourceBufferInterface implements ISourceBufferInterface {
       try {
         const operationId = generateSourceBufferOperationId();
         this._messageSender({
-          type: CoreMessageType.SourceBufferRemove,
+          type: WorkerMessageType.SourceBufferRemove,
           mediaSourceId: this._mediaSourceId,
           sourceBufferType: this.type,
           operationId,
@@ -352,7 +352,7 @@ export class WorkerSourceBufferInterface implements ISourceBufferInterface {
 
   public abort(): void {
     this._messageSender({
-      type: CoreMessageType.AbortSourceBuffer,
+      type: WorkerMessageType.AbortSourceBuffer,
       mediaSourceId: this._mediaSourceId,
       sourceBufferType: this.type,
       value: null,
@@ -411,7 +411,7 @@ export class WorkerSourceBufferInterface implements ISourceBufferInterface {
           const nOpId = generateSourceBufferOperationId();
           this._messageSender(
             {
-              type: CoreMessageType.SourceBufferAppend,
+              type: WorkerMessageType.SourceBufferAppend,
               mediaSourceId: this._mediaSourceId,
               sourceBufferType: this.type,
               operationId: nOpId,
@@ -427,7 +427,7 @@ export class WorkerSourceBufferInterface implements ISourceBufferInterface {
           const [start, end] = nextOp.params;
           const nOpId = generateSourceBufferOperationId();
           this._messageSender({
-            type: CoreMessageType.SourceBufferRemove,
+            type: WorkerMessageType.SourceBufferRemove,
             mediaSourceId: this._mediaSourceId,
             sourceBufferType: this.type,
             operationId: nOpId,