wip3

canalplus · Oct 29, 2024 · fc67ea9 · fc67ea9
1 parent 39e4df9
commit fc67ea9
Showing 1 changed file with 9 additions and 22 deletions.
diff --git a/src/main_thread/decrypt/content_decryptor.ts b/src/main_thread/decrypt/content_decryptor.ts
@@ -324,7 +324,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
           state: ContentDecryptorState.ReadyForContent,
           isMediaKeysAttached: MediaKeyAttachmentStatus.Attached,
           isInitDataQueueLocked: false,
-          data: { mediaKeysData: mediaKeysInfo, isFull: false, isPending: false },
+          data: { mediaKeysData: mediaKeysInfo },
         };
         if (prevState !== ContentDecryptorState.ReadyForContent) {
           this.trigger("stateChange", ContentDecryptorState.ReadyForContent);
@@ -649,7 +649,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
       }
 
       // We unlock the init data queue first, to avoid weird states.
-      this._tryUnlockInitDataQueue();
+      this._unlockInitDataQueue();
       if (this._isStopped()) {
         return;
       }
@@ -734,7 +734,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
           }
 
           // Make sure to disable the processing log if not already done
-          this._tryUnlockInitDataQueue();
+          this._unlockInitDataQueue();
         },
         onWarning: (value: IPlayerError): void => {
           this.trigger("warning", value);
@@ -759,7 +759,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
                 log.warn("DRM: failed to close expired session", closeError);
               })
               .then(() => {
-                this._tryUnlockInitDataQueue();
+                this._unlockInitDataQueue();
               })
               .catch((retryError) => this._onFatalError(retryError));
 
@@ -780,7 +780,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
             this.trigger("blackListProtectionData", initializationData);
           }
 
-          this._tryUnlockInitDataQueue();
+          this._unlockInitDataQueue();
 
           // TODO warning for blacklisted session?
         },
@@ -792,7 +792,7 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
       options.singleLicensePer === undefined ||
       options.singleLicensePer === "init-data"
     ) {
-      this._tryUnlockInitDataQueue();
+      this._unlockInitDataQueue();
     }
 
     if (sessionRes.type === MediaKeySessionLoadingType.Created) {
@@ -1074,12 +1074,6 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
    * an impact on the handling of other initialization data.
    */
   private _lockInitDataQueue(): void {
-    if (this._stateData.isMediaKeysAttached === MediaKeyAttachmentStatus.Attached) {
-      this._stateData.data.isPending = true;
-    } else {
-      log.error("DRM: Processing init data without a MediaKeys attached.");
-    }
-
     if (this._stateData.isInitDataQueueLocked === false) {
       this._stateData.isInitDataQueueLocked = true;
     }
@@ -1090,14 +1084,9 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
    *
    * Should have no effect if the `_initDataQueue` was not locked.
    */
-  private _tryUnlockInitDataQueue(): void {
-    if (this._stateData.isMediaKeysAttached === MediaKeyAttachmentStatus.Attached) {
-      this._stateData.data.isPending = false;
-      if (this._stateData.data.isFull) {
-        return;
-      }
-    } else {
-      log.error("DRM: Processing init data without a MediaKeys attached.");
+  private _unlockInitDataQueue(): void {
+    if (this._stateData.isMediaKeysAttached !== MediaKeyAttachmentStatus.Attached) {
+      log.error("DRM: Trying to unlock in the wrong state");
       return;
     }
     this._stateData.isInitDataQueueLocked = false;
@@ -1494,8 +1483,6 @@ type IReadyForContentStateDataAttached = IContentDecryptorStateBase<
      * Initialized state (@see ContentDecryptorState).
      */
     mediaKeysData: IAttachedMediaKeysData;
-    isFull: boolean;
-    isPending: boolean;
   }
 >;