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

package/dist/hls.js

@@ -523,7 +523,7 @@
       // 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();
@@ -1458,15 +1458,19 @@
 
   // 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) {
@@ -2081,7 +2085,6 @@
         return findBox(sinf, ['schi', 'tenc'])[0];
       }
     }
-    logger.error("[eme] missing 'schm' box");
     return null;
   }
 
@@ -2751,43 +2754,77 @@
     // 16 bytes
     kidCount, kids, dataSize, data || new Uint8Array());
   }
-  function parsePssh(initData) {
-    if (!(initData instanceof ArrayBuffer) || initData.byteLength < 32) {
-      return null;
+  function parseMultiPssh(initData) {
+    var results = [];
+    if (initData instanceof ArrayBuffer) {
+      var length = initData.byteLength;
+      var offset = 0;
+      while (offset + 32 < length) {
+        var view = new DataView(initData, offset);
+        var pssh = parsePssh(view);
+        results.push(pssh);
+        offset += pssh.size;
+      }
     }
-    var result = {
-      version: 0,
-      systemId: '',
-      kids: null,
-      data: null
-    };
-    var view = new DataView(initData);
-    var boxSize = view.getUint32(0);
-    if (initData.byteLength !== boxSize && boxSize > 44) {
-      return null;
+    return results;
+  }
+  function parsePssh(view) {
+    var size = view.getUint32(0);
+    var offset = view.byteOffset;
+    var length = view.byteLength;
+    if (length < size) {
+      return {
+        offset: offset,
+        size: length
+      };
     }
     var type = view.getUint32(4);
     if (type !== 0x70737368) {
-      return null;
+      return {
+        offset: offset,
+        size: size
+      };
     }
-    result.version = view.getUint32(8) >>> 24;
-    if (result.version > 1) {
-      return null;
+    var version = view.getUint32(8) >>> 24;
+    if (version !== 0 && version !== 1) {
+      return {
+        offset: offset,
+        size: size
+      };
     }
-    result.systemId = Hex.hexDump(new Uint8Array(initData, 12, 16));
+    var buffer = view.buffer;
+    var systemId = Hex.hexDump(new Uint8Array(buffer, offset + 12, 16));
     var dataSizeOrKidCount = view.getUint32(28);
-    if (result.version === 0) {
-      if (boxSize - 32 < dataSizeOrKidCount) {
-        return null;
+    var kids = null;
+    var data = null;
+    if (version === 0) {
+      if (size - 32 < dataSizeOrKidCount || dataSizeOrKidCount < 22) {
+        return {
+          offset: offset,
+          size: 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: offset,
+          size: size
+        };
+      }
+      kids = [];
       for (var 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: version,
+      systemId: systemId,
+      kids: kids,
+      data: data,
+      offset: offset,
+      size: size
+    };
   }
 
   var keyUriToKeyIdMap = {};
@@ -17325,7 +17362,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.5.14-0.canary.10557";
+  var 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
@@ -24169,7 +24206,8 @@
       _this.onMediaEncrypted = function (event) {
         var initDataType = event.initDataType,
           initData = event.initData;
-        _this.debug("\"" + event.type + "\" event: init data type: \"" + initDataType + "\"");
+        var logMessage = "\"" + event.type + "\" event: init data type: \"" + initDataType + "\"";
+        _this.debug(logMessage);
 
         // Ignore event when initData is null
         if (initData === null) {
@@ -24184,24 +24222,37 @@
             var sinf = base64Decode(JSON.parse(json).sinf);
             var 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)
-          var psshInfo = parsePssh(initData);
-          if (psshInfo === null) {
+          // Support Widevine clear-lead key-session creation (otherwise depend on playlist keys)
+          var psshResults = parseMultiPssh(initData);
+          var psshInfo = psshResults.filter(function (pssh) {
+            return pssh.systemId === KeySystemIds.WIDEVINE;
+          })[0];
+          if (!psshInfo) {
+            if (psshResults.length === 0 || psshResults.some(function (pssh) {
+              return !pssh.systemId;
+            })) {
+              _this.warn(logMessage + " contains incomplete or invalid pssh data");
+            } else {
+              _this.log("ignoring " + logMessage + " for " + psshResults.map(function (pssh) {
+                return 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) {
+            var offset = psshInfo.data.length - 22;
+            keyId = psshInfo.data.subarray(offset, offset + 16);
+          }
         }
         if (!keySystemDomain || !keyId) {
           return;
@@ -24215,12 +24266,15 @@
             // Match playlist key
             var keyContext = mediaKeySessions[i];
             var decryptdata = keyContext.decryptdata;
-            if (decryptdata.pssh || !decryptdata.keyId) {
+            if (!decryptdata.keyId) {
               return 0; // continue
             }
             var oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
             if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
               keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
+              if (decryptdata.pssh) {
+                return 1; // break
+              }
               delete keyIdToKeySessionPromise[oldKeyIdHex];
               decryptdata.pssh = new Uint8Array(initData);
               decryptdata.keyId = keyId;