Modify key-system helpers so that it's easier to support additional k…

…ey-system strings
video-dev · Dec 15, 2022 · d3eefb7 · d3eefb7
1 parent 78dadb7
commit d3eefb7
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 46 deletions.
diff --git a/src/controller/eme-controller.ts b/src/controller/eme-controller.ts
@@ -325,10 +325,11 @@ class EMEController implements ComponentAPI {
       mediaKeySessionContext
     );
     const keyId = this.getKeyIdString(decryptdata);
+    const scheme = 'cenc';
     this.keyIdToKeySessionPromise[keyId] =
       this.generateRequestWithPreferredKeySession(
         keySessionContext,
-        'cenc',
+        scheme,
         decryptdata.pssh
       );
     this.removeSession(mediaKeySessionContext);
@@ -380,7 +381,7 @@ class EMEController implements ComponentAPI {
   }
 
   public selectKeySystemFormat(frag: Fragment): Promise<KeySystemFormats> {
-    const keyFormats = Object.keys(frag.levelkeys || {});
+    const keyFormats = Object.keys(frag.levelkeys || {}) as KeySystemFormats[];
     if (!this.keyFormatPromise) {
       this.log(
         `Selecting key-system from fragment (sn: ${frag.sn} ${frag.type}: ${
@@ -392,7 +393,9 @@ class EMEController implements ComponentAPI {
     return this.keyFormatPromise;
   }
 
-  private getKeyFormatPromise(keyFormats: string[]): Promise<KeySystemFormats> {
+  private getKeyFormatPromise(
+    keyFormats: KeySystemFormats[]
+  ): Promise<KeySystemFormats> {
     return new Promise((resolve, reject) => {
       const keySystemsInConfig = getKeySystemsForConfig(this.config);
       const keySystemsToAttempt = keyFormats
@@ -440,9 +443,10 @@ class EMEController implements ComponentAPI {
                 mediaKeys,
                 decryptdata,
               });
+              const scheme = 'cenc';
               return this.generateRequestWithPreferredKeySession(
                 keySessionContext,
-                'cenc',
+                scheme,
                 decryptdata.pssh
               );
             });
@@ -1104,10 +1108,12 @@ class EMEController implements ComponentAPI {
       return;
     }
     if (!this.keyFormatPromise) {
-      const keyFormats = sessionKeys.reduce(
-        (formats: string[], sessionKey: LevelKey) => {
-          if (formats.indexOf(sessionKey.keyFormat) === -1) {
-            formats.push(sessionKey.keyFormat);
+      const keyFormats: KeySystemFormats[] = sessionKeys.reduce(
+        (formats: KeySystemFormats[], sessionKey: LevelKey) => {
+          if (
+            formats.indexOf(sessionKey.keyFormat as KeySystemFormats) === -1
+          ) {
+            formats.push(sessionKey.keyFormat as KeySystemFormats);
           }
           return formats;
         },

diff --git a/src/loader/key-loader.ts b/src/loader/key-loader.ts
@@ -179,7 +179,7 @@ export default class KeyLoader implements ComponentAPI {
       case 'SAMPLE-AES-CENC':
       case 'SAMPLE-AES-CTR':
         if (decryptdata.keyFormat === 'identity') {
-          // loadKeyHTTP handles data URLs
+          // loadKeyHTTP handles http(s) and data URLs
           return this.loadKeyHTTP(keyInfo, frag);
         }
         return this.loadKeyEME(keyInfo, frag);

diff --git a/src/loader/level-key.ts b/src/loader/level-key.ts
@@ -175,6 +175,16 @@ export class LevelKey implements DecryptData {
           }
           break;
         }
+        default: {
+          let keydata = keyBytes.subarray(0, 16);
+          if (keydata.length !== 16) {
+            const padded = new Uint8Array(16);
+            padded.set(keydata, 16 - keydata.length);
+            keydata = padded;
+          }
+          this.keyId = keydata;
+          break;
+        }
       }
     }
 
@@ -257,15 +267,14 @@ function getFairPlayV3Pssh(
     const fpsk = mp4Box.apply(null, args as [ArrayLike<number>, Uint8Array]);
     return fpsk;
   };
-  const args = [
-    FpsBoxTypes.fpsd,
-    makeFpsKeySystemInfoBox(scheme),
-    makeFpsKeyRequestBox(keyId, keyFormatVersions),
-  ];
-  const data = mp4Box.apply(null, args as [ArrayLike<number>, Uint8Array]);
   const kFairPlayStreamingKeySystemUUID = new Uint8Array([
     0x94, 0xce, 0x86, 0xfb, 0x07, 0xff, 0x4f, 0x43, 0xad, 0xb8, 0x93, 0xd2,
     0xfa, 0x96, 0x8c, 0xa2,
   ]);
+  const data = mp4Box(
+    FpsBoxTypes.fpsd,
+    makeFpsKeySystemInfoBox(scheme),
+    makeFpsKeyRequestBox(keyId, keyFormatVersions)
+  );
   return mp4pssh(kFairPlayStreamingKeySystemUUID, null, data);
 }
diff --git a/src/utils/mediakeys-helper.ts b/src/utils/mediakeys-helper.ts
@@ -21,14 +21,15 @@ export enum KeySystemFormats {
 export function keySystemFormatToKeySystemDomain(
   format: KeySystemFormats
 ): KeySystems | undefined {
-  if (format === KeySystemFormats.FAIRPLAY) {
-    return KeySystems.FAIRPLAY;
-  } else if (format === KeySystemFormats.PLAYREADY) {
-    return KeySystems.PLAYREADY;
-  } else if (format === KeySystemFormats.WIDEVINE) {
-    return KeySystems.WIDEVINE;
-  } else if (format === KeySystemFormats.CLEARKEY) {
-    return KeySystems.CLEARKEY;
+  switch (format) {
+    case KeySystemFormats.FAIRPLAY:
+      return KeySystems.FAIRPLAY;
+    case KeySystemFormats.PLAYREADY:
+      return KeySystems.PLAYREADY;
+    case KeySystemFormats.WIDEVINE:
+      return KeySystems.WIDEVINE;
+    case KeySystemFormats.CLEARKEY:
+      return KeySystems.CLEARKEY;
   }
 }
 
@@ -56,37 +57,32 @@ export function keySystemIdToKeySystemDomain(
 export function keySystemDomainToKeySystemFormat(
   keySystem: KeySystems
 ): KeySystemFormats | undefined {
-  if (keySystem === KeySystems.FAIRPLAY) {
-    return KeySystemFormats.FAIRPLAY;
-  } else if (keySystem === KeySystems.PLAYREADY) {
-    return KeySystemFormats.PLAYREADY;
-  } else if (keySystem === KeySystems.WIDEVINE) {
-    return KeySystemFormats.WIDEVINE;
-  } else if (keySystem === KeySystems.CLEARKEY) {
-    return KeySystemFormats.CLEARKEY;
+  switch (keySystem) {
+    case KeySystems.FAIRPLAY:
+      return KeySystemFormats.FAIRPLAY;
+    case KeySystems.PLAYREADY:
+      return KeySystemFormats.PLAYREADY;
+    case KeySystems.WIDEVINE:
+      return KeySystemFormats.WIDEVINE;
+    case KeySystems.CLEARKEY:
+      return KeySystemFormats.CLEARKEY;
   }
 }
 
 export function getKeySystemsForConfig(
   config: EMEControllerConfig
 ): KeySystems[] {
   const { drmSystems, widevineLicenseUrl } = config;
-  const keySystemsToAttempt: KeySystems[] = [];
-  [KeySystems.FAIRPLAY, KeySystems.PLAYREADY, KeySystems.CLEARKEY].forEach(
-    (keySystem) => {
-      if (drmSystems?.[keySystem]) {
-        keySystemsToAttempt.push(keySystem);
-      }
-    }
-  );
-  if (widevineLicenseUrl || drmSystems?.[KeySystems.WIDEVINE]) {
+  const keySystemsToAttempt: KeySystems[] = drmSystems
+    ? [
+        KeySystems.FAIRPLAY,
+        KeySystems.WIDEVINE,
+        KeySystems.PLAYREADY,
+        KeySystems.CLEARKEY,
+      ].filter((keySystem) => !!drmSystems[keySystem])
+    : [];
+  if (!keySystemsToAttempt[KeySystems.WIDEVINE] && widevineLicenseUrl) {
     keySystemsToAttempt.push(KeySystems.WIDEVINE);
-  } else if (keySystemsToAttempt.length === 0) {
-    keySystemsToAttempt.push(
-      KeySystems.WIDEVINE,
-      KeySystems.FAIRPLAY,
-      KeySystems.PLAYREADY
-    );
   }
   return keySystemsToAttempt;
 }