hls.js 1.6.6-0.canary.11291 → 1.6.6-0.canary.11294

package/dist/hls.mjs

@@ -523,7 +523,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.6.6-0.canary.11291"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.6-0.canary.11294"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -2382,29 +2382,39 @@ function parsePssh(view) {
   }
   const buffer = view.buffer;
   const systemId = Hex.hexDump(new Uint8Array(buffer, offset + 12, 16));
-  const dataSizeOrKidCount = view.getUint32(28);
   let kids = null;
   let data = null;
+  let dataSizeOffset = 0;
   if (version === 0) {
-    if (size - 32 < dataSizeOrKidCount || dataSizeOrKidCount < 22) {
-      return {
-        offset,
-        size
-      };
-    }
-    data = new Uint8Array(buffer, offset + 32, dataSizeOrKidCount);
+    dataSizeOffset = 28;
   } else if (version === 1) {
-    if (!dataSizeOrKidCount || length < offset + 32 + dataSizeOrKidCount * 16 + 16) {
+    const kidCounts = view.getUint32(28);
+    if (!kidCounts || length < 32 + kidCounts * 16) {
       return {
         offset,
         size
       };
     }
     kids = [];
-    for (let i = 0; i < dataSizeOrKidCount; i++) {
+    for (let i = 0; i < kidCounts; i++) {
       kids.push(new Uint8Array(buffer, offset + 32 + i * 16, 16));
     }
+    dataSizeOffset = 32 + kidCounts * 16;
+  }
+  if (!dataSizeOffset) {
+    return {
+      offset,
+      size
+    };
+  }
+  const dataSizeOrKidCount = view.getUint32(dataSizeOffset);
+  if (size - 32 < dataSizeOrKidCount) {
+    return {
+      offset,
+      size
+    };
   }
+  data = new Uint8Array(buffer, offset + dataSizeOffset + 4, dataSizeOrKidCount);
   return {
     version,
     systemId,
@@ -10240,7 +10250,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.6-0.canary.11291";
+const version = "1.6.6-0.canary.11294";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js