hls.js 1.6.0-beta.2.0.canary.10873 → 1.6.0-beta.2.0.canary.10877

package/dist/hls.js

@@ -1058,7 +1058,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.6.0-beta.2.0.canary.10873");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.2.0.canary.10877");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -12637,9 +12637,7 @@
                 track.params[prop] = config.params[prop];
               }
             }
-            if (!track.vps && !track.sps.length || track.vps && track.vps[0] === _this2.initVPS) {
-              track.sps.push(unit.data);
-            }
+            _this2.pushParameterSet(track.sps, unit.data, track.vps);
             if (!VideoSample) {
               VideoSample = _this2.VideoSample = _this2.createVideoSample(true, pes.pts, pes.dts);
             }
@@ -12657,9 +12655,7 @@
                   track.params[_prop] = _config[_prop];
                 }
               }
-              if (!track.vps && !track.pps.length || track.vps && track.vps[0] === _this2.initVPS) {
-                track.pps.push(unit.data);
-              }
+              _this2.pushParameterSet(track.pps, unit.data, track.vps);
             }
             break;
 
@@ -12690,6 +12686,11 @@
         this.VideoSample = null;
       }
     };
+    _proto.pushParameterSet = function pushParameterSet(parameterSets, data, vps) {
+      if (vps && vps[0] === this.initVPS || !vps && !parameterSets.length) {
+        parameterSets.push(data);
+      }
+    };
     _proto.getNALuType = function getNALuType(data, offset) {
       return (data[offset] & 0x7e) >>> 1;
     };
@@ -13756,7 +13757,6 @@
           // logger.log('AVC PID:'  + pid);
           if (result.videoPid === -1) {
             result.videoPid = pid;
-            result.segmentVideoCodec = 'avc';
           }
           break;
 
@@ -14198,7 +14198,7 @@
       0x00, 0x00]));
     };
     MP4.mdia = function mdia(track) {
-      return MP4.box(MP4.types.mdia, MP4.mdhd(track.timescale, track.duration), MP4.hdlr(track.type), MP4.minf(track));
+      return MP4.box(MP4.types.mdia, MP4.mdhd(track.timescale || 0, track.duration || 0), MP4.hdlr(track.type), MP4.minf(track));
     };
     MP4.mfhd = function mfhd(sequenceNumber) {
       return MP4.box(MP4.types.mfhd, new Uint8Array([0x00, 0x00, 0x00, 0x00,
@@ -14222,7 +14222,7 @@
       while (i--) {
         boxes[i] = MP4.trak(tracks[i]);
       }
-      return MP4.box.apply(null, [MP4.types.moov, MP4.mvhd(tracks[0].timescale, tracks[0].duration)].concat(boxes).concat(MP4.mvex(tracks)));
+      return MP4.box.apply(null, [MP4.types.moov, MP4.mvhd(tracks[0].timescale || 0, tracks[0].duration || 0)].concat(boxes).concat(MP4.mvex(tracks)));
     };
     MP4.mvex = function mvex(tracks) {
       var i = tracks.length;
@@ -14406,7 +14406,7 @@
       ]));
     };
     MP4.audioStsd = function audioStsd(track) {
-      var samplerate = track.samplerate;
+      var samplerate = track.samplerate || 0;
       return new Uint8Array([0x00, 0x00, 0x00,
       // reserved
       0x00, 0x00, 0x00,
@@ -14415,7 +14415,7 @@
       // data_reference_index
       0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
       // reserved
-      0x00, track.channelCount,
+      0x00, track.channelCount || 0,
       // channelcount
       0x00, 0x10,
       // sampleSize:16bits
@@ -14435,25 +14435,36 @@
       return MP4.box(MP4.types['ac-3'], MP4.audioStsd(track), MP4.box(MP4.types.dac3, track.config));
     };
     MP4.stsd = function stsd(track) {
+      var segmentCodec = track.segmentCodec;
       if (track.type === 'audio') {
-        if (track.segmentCodec === 'mp3' && track.codec === 'mp3') {
-          return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track));
+        if (segmentCodec === 'aac') {
+          return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
         }
-        if (track.segmentCodec === 'ac3') {
+        if (segmentCodec === 'ac3' && track.config) {
           return MP4.box(MP4.types.stsd, MP4.STSD, MP4.ac3(track));
         }
-        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
-      } else if (track.segmentCodec === 'avc') {
-        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
+        if (segmentCodec === 'mp3' && track.codec === 'mp3') {
+          return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track));
+        }
       } else {
-        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.hvc1(track));
+        if (track.pps && track.sps) {
+          if (segmentCodec === 'avc') {
+            return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
+          }
+          if (segmentCodec === 'hevc' && track.vps) {
+            return MP4.box(MP4.types.stsd, MP4.STSD, MP4.hvc1(track));
+          }
+        } else {
+          throw new Error("video track missing pps or sps");
+        }
       }
+      throw new Error("unsupported " + track.type + " segment codec (" + segmentCodec + "/" + track.codec + ")");
     };
     MP4.tkhd = function tkhd(track) {
       var id = track.id;
-      var duration = track.duration * track.timescale;
-      var width = track.width;
-      var height = track.height;
+      var duration = (track.duration || 0) * (track.timescale || 0);
+      var width = track.width || 0;
+      var height = track.height || 0;
       var upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
       var lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
       return MP4.box(MP4.types.tkhd, new Uint8Array([0x01,
@@ -14712,6 +14723,21 @@
   var AC3_SAMPLES_PER_FRAME = 1536;
   var chromeVersion = null;
   var safariWebkitVersion = null;
+  function createMp4Sample(isKeyframe, duration, size, cts) {
+    return {
+      duration: duration,
+      size: size,
+      cts: cts,
+      flags: {
+        isLeading: 0,
+        isDependedOn: 0,
+        hasRedundancy: 0,
+        degradPrio: 0,
+        dependsOn: isKeyframe ? 2 : 1,
+        isNonSync: isKeyframe ? 0 : 1
+      }
+    };
+  }
   var MP4Remuxer = /*#__PURE__*/function () {
     function MP4Remuxer(observer, config, typeSupported, logger) {
       this.logger = void 0;
@@ -15211,7 +15237,7 @@
         maxDtsDelta = Math.max(maxDtsDelta, mp4SampleDuration);
         minPtsDelta = Math.min(minPtsDelta, ptsDelta);
         maxPtsDelta = Math.max(maxPtsDelta, ptsDelta);
-        outputSamples.push(new Mp4Sample(VideoSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
+        outputSamples.push(createMp4Sample(VideoSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
       }
       if (outputSamples.length) {
         if (chromeVersion) {
@@ -15248,7 +15274,7 @@
       this.nextAvcDts = nextAvcDts = lastDTS + mp4SampleDuration;
       this.videoSampleDuration = mp4SampleDuration;
       this.isVideoContiguous = true;
-      var moof = MP4.moof(track.sequenceNumber++, firstDTS, _extends({}, track, {
+      var moof = MP4.moof(track.sequenceNumber++, firstDTS, _extends(track, {
         samples: outputSamples
       }));
       var type = 'video';
@@ -15452,7 +15478,7 @@
         // Default the sample's duration to the computed mp4SampleDuration, which will either be 1024 for AAC or 1152 for MPEG
         // In the case that we have 1 sample, this will be the duration. If we have more than one sample, the duration
         // becomes the PTS diff with the previous sample
-        outputSamples.push(new Mp4Sample(true, mp4SampleDuration, unitLen, 0));
+        outputSamples.push(createMp4Sample(true, mp4SampleDuration, unitLen, 0));
         lastPTS = _pts2;
       }
 
@@ -15561,23 +15587,6 @@
       samples: samples
     };
   }
-  var Mp4Sample = function Mp4Sample(isKeyframe, duration, size, cts) {
-    this.size = void 0;
-    this.duration = void 0;
-    this.cts = void 0;
-    this.flags = void 0;
-    this.duration = duration;
-    this.size = size;
-    this.cts = cts;
-    this.flags = {
-      isLeading: 0,
-      isDependedOn: 0,
-      hasRedundancy: 0,
-      degradPrio: 0,
-      dependsOn: isKeyframe ? 2 : 1,
-      isNonSync: isKeyframe ? 0 : 1
-    };
-  };
 
   var PassThroughRemuxer = /*#__PURE__*/function () {
     function PassThroughRemuxer(observer, config, typeSupported, logger) {
@@ -16311,7 +16320,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10873";
+  var version = "1.6.0-beta.2.0.canary.10877";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -21764,121 +21773,143 @@
         if (initData === null) {
           return;
         }
-        var keyId;
-        var keySystemDomain;
-        if (initDataType === 'sinf' && _this.getLicenseServerUrl(KeySystems.FAIRPLAY)) {
-          // Match sinf keyId to playlist skd://keyId=
-          var json = bin2str(new Uint8Array(initData));
-          try {
-            var sinf = base64Decode(JSON.parse(json).sinf);
-            var tenc = parseSinf(sinf);
-            if (!tenc) {
-              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(logMessage + " Failed to parse sinf: " + error);
-            return;
-          }
-        } else if (_this.getLicenseServerUrl(KeySystems.WIDEVINE)) {
-          // Support Widevine clear-lead key-session creation (otherwise depend on playlist keys)
-          var psshResults = parseMultiPssh(initData);
-
-          // TODO: If using keySystemAccessPromises we might want to wait until one is resolved
+        if (!_this.keyFormatPromise) {
           var keySystems = Object.keys(_this.keySystemAccessPromises);
           if (!keySystems.length) {
             keySystems = getKeySystemsForConfig(_this.config);
           }
-          var psshInfo = psshResults.filter(function (pssh) {
-            var keySystem = pssh.systemId ? keySystemIdToKeySystemDomain(pssh.systemId) : null;
-            return keySystem ? keySystems.indexOf(keySystem) > -1 : false;
-          })[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");
+          var keyFormats = keySystems.map(keySystemDomainToKeySystemFormat).filter(function (k) {
+            return !!k;
+          });
+          _this.keyFormatPromise = _this.getKeyFormatPromise(keyFormats);
+        }
+        _this.keyFormatPromise.then(function (keySystemFormat) {
+          var keySystem = keySystemFormatToKeySystemDomain(keySystemFormat);
+          var keyId;
+          var keySystemDomain;
+          if (initDataType === 'sinf') {
+            if (keySystem !== KeySystems.FAIRPLAY) {
+              _this.warn("Ignoring unexpected \"" + event.type + "\" event with init data type: \"" + initDataType + "\" for selected key-system " + keySystem);
+              return;
             }
-            return;
-          }
-          keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
-          if (psshInfo.version === 0 && psshInfo.data) {
-            if (keySystemDomain === KeySystems.WIDEVINE) {
-              var offset = psshInfo.data.length - 22;
-              keyId = psshInfo.data.subarray(offset, offset + 16);
-            } else if (keySystemDomain === KeySystems.PLAYREADY) {
-              keyId = parsePlayReadyWRM(psshInfo.data);
+            // Match sinf keyId to playlist skd://keyId=
+            var json = bin2str(new Uint8Array(initData));
+            try {
+              var sinf = base64Decode(JSON.parse(json).sinf);
+              var tenc = parseSinf(sinf);
+              if (!tenc) {
+                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(logMessage + " Failed to parse sinf: " + error);
+              return;
             }
-          }
-        }
-        if (!keySystemDomain || !keyId) {
-          return;
-        }
-        var keyIdHex = Hex.hexDump(keyId);
-        var _this2 = _this,
-          keyIdToKeySessionPromise = _this2.keyIdToKeySessionPromise,
-          mediaKeySessions = _this2.mediaKeySessions;
-        var keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
-        var _loop = function _loop() {
-            // Match playlist key
-            var keyContext = mediaKeySessions[i];
-            var decryptdata = keyContext.decryptdata;
-            if (!decryptdata.keyId) {
-              return 0; // continue
+          } else {
+            if (keySystem !== KeySystems.WIDEVINE && keySystem !== KeySystems.PLAYREADY) {
+              _this.warn("Ignoring unexpected \"" + event.type + "\" event with init data type: \"" + initDataType + "\" for selected key-system " + keySystem);
+              return;
+            }
+            // Support Widevine/PlayReady clear-lead key-session creation (otherwise depend on playlist keys)
+            var psshResults = parseMultiPssh(initData);
+            var psshInfos = psshResults.filter(function (pssh) {
+              return !!pssh.systemId && keySystemIdToKeySystemDomain(pssh.systemId) === keySystem;
+            });
+            if (psshInfos.length) {
+              _this.warn(logMessage + " Using first of " + psshInfos.length + " pssh found for selected key-system " + keySystem);
+            }
+            var psshInfo = psshInfos[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;
             }
-            var oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-            if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-              keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-              if (decryptdata.pssh) {
+            keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
+            if (psshInfo.version === 0 && psshInfo.data) {
+              if (keySystemDomain === KeySystems.WIDEVINE) {
+                var offset = psshInfo.data.length - 22;
+                keyId = psshInfo.data.subarray(offset, offset + 16);
+              } else if (keySystemDomain === KeySystems.PLAYREADY) {
+                keyId = parsePlayReadyWRM(psshInfo.data);
+              }
+            }
+          }
+          if (!keySystemDomain || !keyId) {
+            return;
+          }
+          var keyIdHex = Hex.hexDump(keyId);
+          var _this2 = _this,
+            keyIdToKeySessionPromise = _this2.keyIdToKeySessionPromise,
+            mediaKeySessions = _this2.mediaKeySessions;
+          var keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
+          var _loop = function _loop() {
+              // Match playlist key
+              var keyContext = mediaKeySessions[i];
+              var decryptdata = keyContext.decryptdata;
+              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;
+                keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(function () {
+                  return _this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
+                });
+                keySessionContextPromise.catch(function (error) {
+                  return _this.handleError(error);
+                });
                 return 1; // break
               }
-              delete keyIdToKeySessionPromise[oldKeyIdHex];
-              decryptdata.pssh = new Uint8Array(initData);
-              decryptdata.keyId = keyId;
-              keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(function () {
-                return _this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
-              });
-              keySessionContextPromise.catch(function (error) {
-                return _this.handleError(error);
-              });
-              return 1; // break
+            },
+            _ret;
+          for (var i = 0; i < mediaKeySessions.length; i++) {
+            _ret = _loop();
+            if (_ret === 0) continue;
+            if (_ret === 1) break;
+          }
+          if (!keySessionContextPromise) {
+            if (keySystemDomain !== keySystem) {
+              _this.log("Ignoring \"" + event.type + "\" event with " + keySystemDomain + " init data for selected key-system " + keySystem);
+              return;
             }
-          },
-          _ret;
-        for (var i = 0; i < mediaKeySessions.length; i++) {
-          _ret = _loop();
-          if (_ret === 0) continue;
-          if (_ret === 1) break;
-        }
-        if (!keySessionContextPromise) {
-          // Clear-lead key (not encountered in playlist)
-          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = _this.getKeySystemSelectionPromise([keySystemDomain]).then(function (_ref) {
-            var _keySystemToKeySystem;
-            var keySystem = _ref.keySystem,
-              mediaKeys = _ref.mediaKeys;
-            _this.throwIfDestroyed();
-            var decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
-            decryptdata.pssh = new Uint8Array(initData);
-            decryptdata.keyId = keyId;
-            return _this.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
+            // "Clear-lead" (misc key not encountered in playlist)
+            keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = _this.getKeySystemSelectionPromise([keySystemDomain]).then(function (_ref) {
+              var _keySystemToKeySystem;
+              var keySystem = _ref.keySystem,
+                mediaKeys = _ref.mediaKeys;
               _this.throwIfDestroyed();
-              var keySessionContext = _this.createMediaKeySessionContext({
-                decryptdata: decryptdata,
-                keySystem: keySystem,
-                mediaKeys: mediaKeys
+              var decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
+              decryptdata.pssh = new Uint8Array(initData);
+              decryptdata.keyId = keyId;
+              return _this.attemptSetMediaKeys(keySystem, mediaKeys).then(function () {
+                _this.throwIfDestroyed();
+                var keySessionContext = _this.createMediaKeySessionContext({
+                  decryptdata: decryptdata,
+                  keySystem: keySystem,
+                  mediaKeys: mediaKeys
+                });
+                return _this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
               });
-              return _this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
             });
-          });
-          keySessionContextPromise.catch(function (error) {
-            return _this.handleError(error);
-          });
-        }
+            keySessionContextPromise.catch(function (error) {
+              return _this.handleError(error);
+            });
+          }
+        });
       };
       _this.onWaitingForKey = function (event) {
         _this.log("\"" + event.type + "\" event");
@@ -33463,7 +33494,7 @@
     };
     _proto.load = function load(frag) {
       var _this2 = this;
-      if (!frag.decryptdata && frag.encrypted && this.emeController) {
+      if (!frag.decryptdata && frag.encrypted && this.emeController && this.config.emeEnabled) {
         // Multiple keys, but none selected, resolve in eme-controller
         return this.emeController.selectKeySystemFormat(frag).then(function (keySystemFormat) {
           return _this2.loadInternal(frag, keySystemFormat);