hls.js 1.5.14-0.canary.10557 → 1.5.14-0.canary.10561

package/dist/hls.mjs

@@ -421,7 +421,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.14-0.canary.10557"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.5.14-0.canary.10561"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1279,15 +1279,19 @@ function keySystemFormatToKeySystemDomain(format) {
 
 // System IDs for which we can extract a key ID from "encrypted" event PSSH
 var KeySystemIds = {
+  CENC: "1077efecc0b24d02ace33c1e52e2fb4b",
+  CLEARKEY: "e2719d58a985b3c9781ab030af78d30e",
+  FAIRPLAY: "94ce86fb07ff4f43adb893d2fa968ca2",
+  PLAYREADY: "9a04f07998404286ab92e65be0885f95",
   WIDEVINE: "edef8ba979d64acea3c827dcd51d21ed"
 };
 function keySystemIdToKeySystemDomain(systemId) {
   if (systemId === KeySystemIds.WIDEVINE) {
     return KeySystems.WIDEVINE;
-    // } else if (systemId === KeySystemIds.PLAYREADY) {
-    //   return KeySystems.PLAYREADY;
-    // } else if (systemId === KeySystemIds.CENC || systemId === KeySystemIds.CLEARKEY) {
-    //   return KeySystems.CLEARKEY;
+  } else if (systemId === KeySystemIds.PLAYREADY) {
+    return KeySystems.PLAYREADY;
+  } else if (systemId === KeySystemIds.CENC || systemId === KeySystemIds.CLEARKEY) {
+    return KeySystems.CLEARKEY;
   }
 }
 function keySystemDomainToKeySystemFormat(keySystem) {
@@ -1893,7 +1897,6 @@ function parseSinf(sinf) {
       return findBox(sinf, ['schi', 'tenc'])[0];
     }
   }
-  logger.error(`[eme] missing 'schm' box`);
   return null;
 }
 
@@ -2558,43 +2561,77 @@ function mp4pssh(systemId, keyids, data) {
   // 16 bytes
   kidCount, kids, dataSize, data || new Uint8Array());
 }
-function parsePssh(initData) {
-  if (!(initData instanceof ArrayBuffer) || initData.byteLength < 32) {
-    return null;
+function parseMultiPssh(initData) {
+  const results = [];
+  if (initData instanceof ArrayBuffer) {
+    const length = initData.byteLength;
+    let offset = 0;
+    while (offset + 32 < length) {
+      const view = new DataView(initData, offset);
+      const pssh = parsePssh(view);
+      results.push(pssh);
+      offset += pssh.size;
+    }
   }
-  const result = {
-    version: 0,
-    systemId: '',
-    kids: null,
-    data: null
-  };
-  const view = new DataView(initData);
-  const boxSize = view.getUint32(0);
-  if (initData.byteLength !== boxSize && boxSize > 44) {
-    return null;
+  return results;
+}
+function parsePssh(view) {
+  const size = view.getUint32(0);
+  const offset = view.byteOffset;
+  const length = view.byteLength;
+  if (length < size) {
+    return {
+      offset,
+      size: length
+    };
   }
   const type = view.getUint32(4);
   if (type !== 0x70737368) {
-    return null;
+    return {
+      offset,
+      size
+    };
   }
-  result.version = view.getUint32(8) >>> 24;
-  if (result.version > 1) {
-    return null;
+  const version = view.getUint32(8) >>> 24;
+  if (version !== 0 && version !== 1) {
+    return {
+      offset,
+      size
+    };
   }
-  result.systemId = Hex.hexDump(new Uint8Array(initData, 12, 16));
+  const buffer = view.buffer;
+  const systemId = Hex.hexDump(new Uint8Array(buffer, offset + 12, 16));
   const dataSizeOrKidCount = view.getUint32(28);
-  if (result.version === 0) {
-    if (boxSize - 32 < dataSizeOrKidCount) {
-      return null;
+  let kids = null;
+  let data = null;
+  if (version === 0) {
+    if (size - 32 < dataSizeOrKidCount || dataSizeOrKidCount < 22) {
+      return {
+        offset,
+        size
+      };
     }
-    result.data = new Uint8Array(initData, 32, dataSizeOrKidCount);
-  } else if (result.version === 1) {
-    result.kids = [];
+    data = new Uint8Array(buffer, offset + 32, dataSizeOrKidCount);
+  } else if (version === 1) {
+    if (!dataSizeOrKidCount || length < offset + 32 + dataSizeOrKidCount * 16 + 16) {
+      return {
+        offset,
+        size
+      };
+    }
+    kids = [];
     for (let i = 0; i < dataSizeOrKidCount; i++) {
-      result.kids.push(new Uint8Array(initData, 32 + i * 16, 16));
+      kids.push(new Uint8Array(buffer, offset + 32 + i * 16, 16));
     }
   }
-  return result;
+  return {
+    version,
+    systemId,
+    kids,
+    data,
+    offset,
+    size
+  };
 }
 
 let keyUriToKeyIdMap = {};
@@ -11033,7 +11070,7 @@ function concatUint8Arrays(chunks, dataLength) {
   return result;
 }
 
-const version = "1.5.14-0.canary.10557";
+const version = "1.5.14-0.canary.10561";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -23580,7 +23617,8 @@ class EMEController extends Logger {
         initDataType,
         initData
       } = event;
-      this.debug(`"${event.type}" event: init data type: "${initDataType}"`);
+      const logMessage = `"${event.type}" event: init data type: "${initDataType}"`;
+      this.debug(logMessage);
 
       // Ignore event when initData is null
       if (initData === null) {
@@ -23595,24 +23633,31 @@ class EMEController extends Logger {
           const sinf = base64Decode(JSON.parse(json).sinf);
           const tenc = parseSinf(new Uint8Array(sinf));
           if (!tenc) {
-            return;
+            throw new Error(`'schm' box missing or not cbcs/cenc with schi > tenc`);
           }
           keyId = tenc.subarray(8, 24);
           keySystemDomain = KeySystems.FAIRPLAY;
         } catch (error) {
-          this.warn('Failed to parse sinf "encrypted" event message initData');
+          this.warn(`${logMessage} Failed to parse sinf: ${error}`);
           return;
         }
       } else {
-        // Support clear-lead key-session creation (otherwise depend on playlist keys)
-        const psshInfo = parsePssh(initData);
-        if (psshInfo === null) {
+        // Support Widevine clear-lead key-session creation (otherwise depend on playlist keys)
+        const psshResults = parseMultiPssh(initData);
+        const psshInfo = psshResults.filter(pssh => pssh.systemId === KeySystemIds.WIDEVINE)[0];
+        if (!psshInfo) {
+          if (psshResults.length === 0 || psshResults.some(pssh => !pssh.systemId)) {
+            this.warn(`${logMessage} contains incomplete or invalid pssh data`);
+          } else {
+            this.log(`ignoring ${logMessage} for ${psshResults.map(pssh => keySystemIdToKeySystemDomain(pssh.systemId)).join(',')} pssh data in favor of playlist keys`);
+          }
           return;
         }
-        if (psshInfo.version === 0 && psshInfo.systemId === KeySystemIds.WIDEVINE && psshInfo.data) {
-          keyId = psshInfo.data.subarray(8, 24);
-        }
         keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
+        if (psshInfo.version === 0 && psshInfo.data) {
+          const offset = psshInfo.data.length - 22;
+          keyId = psshInfo.data.subarray(offset, offset + 16);
+        }
       }
       if (!keySystemDomain || !keyId) {
         return;
@@ -23627,12 +23672,15 @@ class EMEController extends Logger {
         // Match playlist key
         const keyContext = mediaKeySessions[i];
         const decryptdata = keyContext.decryptdata;
-        if (decryptdata.pssh || !decryptdata.keyId) {
+        if (!decryptdata.keyId) {
           continue;
         }
         const oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
         if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
           keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
+          if (decryptdata.pssh) {
+            break;
+          }
           delete keyIdToKeySessionPromise[oldKeyIdHex];
           decryptdata.pssh = new Uint8Array(initData);
           decryptdata.keyId = keyId;