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

package/dist/hls.mjs

@@ -401,7 +401,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.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();
@@ -9847,7 +9847,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.2.0.canary.10873";
+const 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
@@ -12257,9 +12257,7 @@ class HevcVideoParser extends BaseVideoParser {
               track.params[prop] = config.params[prop];
             }
           }
-          if (!track.vps && !track.sps.length || track.vps && track.vps[0] === this.initVPS) {
-            track.sps.push(unit.data);
-          }
+          this.pushParameterSet(track.sps, unit.data, track.vps);
           if (!VideoSample) {
             VideoSample = this.VideoSample = this.createVideoSample(true, pes.pts, pes.dts);
           }
@@ -12277,9 +12275,7 @@ class HevcVideoParser extends BaseVideoParser {
                 track.params[prop] = config[prop];
               }
             }
-            if (!track.vps && !track.pps.length || track.vps && track.vps[0] === this.initVPS) {
-              track.pps.push(unit.data);
-            }
+            this.pushParameterSet(track.pps, unit.data, track.vps);
           }
           break;
 
@@ -12310,6 +12306,11 @@ class HevcVideoParser extends BaseVideoParser {
       this.VideoSample = null;
     }
   }
+  pushParameterSet(parameterSets, data, vps) {
+    if (vps && vps[0] === this.initVPS || !vps && !parameterSets.length) {
+      parameterSets.push(data);
+    }
+  }
   getNALuType(data, offset) {
     return (data[offset] & 0x7e) >>> 1;
   }
@@ -13375,7 +13376,6 @@ function parsePMT(data, offset, typeSupported, isSampleAes, observer, logger) {
         // logger.log('AVC PID:'  + pid);
         if (result.videoPid === -1) {
           result.videoPid = pid;
-          result.segmentVideoCodec = 'avc';
         }
         break;
 
@@ -13812,7 +13812,7 @@ class MP4 {
     0x00, 0x00]));
   }
   static 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));
   }
   static mfhd(sequenceNumber) {
     return MP4.box(MP4.types.mfhd, new Uint8Array([0x00, 0x00, 0x00, 0x00,
@@ -13836,7 +13836,7 @@ class MP4 {
     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)));
   }
   static mvex(tracks) {
     let i = tracks.length;
@@ -14022,7 +14022,7 @@ class MP4 {
     ]);
   }
   static audioStsd(track) {
-    const samplerate = track.samplerate;
+    const samplerate = track.samplerate || 0;
     return new Uint8Array([0x00, 0x00, 0x00,
     // reserved
     0x00, 0x00, 0x00,
@@ -14031,7 +14031,7 @@ class MP4 {
     // data_reference_index
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     // reserved
-    0x00, track.channelCount,
+    0x00, track.channelCount || 0,
     // channelcount
     0x00, 0x10,
     // sampleSize:16bits
@@ -14051,25 +14051,38 @@ class MP4 {
     return MP4.box(MP4.types['ac-3'], MP4.audioStsd(track), MP4.box(MP4.types.dac3, track.config));
   }
   static stsd(track) {
+    const {
+      segmentCodec
+    } = track;
     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})`);
   }
   static tkhd(track) {
     const id = track.id;
-    const duration = track.duration * track.timescale;
-    const width = track.width;
-    const height = track.height;
+    const duration = (track.duration || 0) * (track.timescale || 0);
+    const width = track.width || 0;
+    const height = track.height || 0;
     const upperWordDuration = Math.floor(duration / (UINT32_MAX + 1));
     const lowerWordDuration = Math.floor(duration % (UINT32_MAX + 1));
     return MP4.box(MP4.types.tkhd, new Uint8Array([0x01,
@@ -14312,6 +14325,21 @@ const MPEG_AUDIO_SAMPLE_PER_FRAME = 1152;
 const AC3_SAMPLES_PER_FRAME = 1536;
 let chromeVersion = null;
 let safariWebkitVersion = null;
+function createMp4Sample(isKeyframe, duration, size, cts) {
+  return {
+    duration,
+    size,
+    cts,
+    flags: {
+      isLeading: 0,
+      isDependedOn: 0,
+      hasRedundancy: 0,
+      degradPrio: 0,
+      dependsOn: isKeyframe ? 2 : 1,
+      isNonSync: isKeyframe ? 0 : 1
+    }
+  };
+}
 class MP4Remuxer {
   constructor(observer, config, typeSupported, logger) {
     this.logger = void 0;
@@ -14810,7 +14838,7 @@ class MP4Remuxer {
       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) {
@@ -14847,7 +14875,7 @@ class MP4Remuxer {
     this.nextAvcDts = nextAvcDts = lastDTS + mp4SampleDuration;
     this.videoSampleDuration = mp4SampleDuration;
     this.isVideoContiguous = true;
-    const moof = MP4.moof(track.sequenceNumber++, firstDTS, _extends({}, track, {
+    const moof = MP4.moof(track.sequenceNumber++, firstDTS, _extends(track, {
       samples: outputSamples
     }));
     const type = 'video';
@@ -15049,7 +15077,7 @@ class MP4Remuxer {
       // 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 = pts;
     }
 
@@ -15155,25 +15183,6 @@ function flushTextTrackUserdataCueSamples(track, timeOffset, initPTS) {
     samples
   };
 }
-class Mp4Sample {
-  constructor(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
-    };
-  }
-}
 
 class PassThroughRemuxer {
   constructor(observer, config, typeSupported, logger) {
@@ -21093,109 +21102,127 @@ class EMEController extends Logger {
       if (initData === null) {
         return;
       }
-      let keyId;
-      let keySystemDomain;
-      if (initDataType === 'sinf' && this.getLicenseServerUrl(KeySystems.FAIRPLAY)) {
-        // Match sinf keyId to playlist skd://keyId=
-        const json = bin2str(new Uint8Array(initData));
-        try {
-          const sinf = base64Decode(JSON.parse(json).sinf);
-          const 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)
-        const psshResults = parseMultiPssh(initData);
-
-        // TODO: If using keySystemAccessPromises we might want to wait until one is resolved
+      if (!this.keyFormatPromise) {
         let keySystems = Object.keys(this.keySystemAccessPromises);
         if (!keySystems.length) {
           keySystems = getKeySystemsForConfig(this.config);
         }
-        const psshInfo = psshResults.filter(pssh => {
-          const keySystem = pssh.systemId ? keySystemIdToKeySystemDomain(pssh.systemId) : null;
-          return keySystem ? keySystems.indexOf(keySystem) > -1 : false;
-        })[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`);
+        const keyFormats = keySystems.map(keySystemDomainToKeySystemFormat).filter(k => !!k);
+        this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
+      }
+      this.keyFormatPromise.then(keySystemFormat => {
+        const keySystem = keySystemFormatToKeySystemDomain(keySystemFormat);
+        let keyId;
+        let 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) {
-            const 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=
+          const json = bin2str(new Uint8Array(initData));
+          try {
+            const sinf = base64Decode(JSON.parse(json).sinf);
+            const 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 (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)
+          const psshResults = parseMultiPssh(initData);
+          const psshInfos = psshResults.filter(pssh => !!pssh.systemId && keySystemIdToKeySystemDomain(pssh.systemId) === keySystem);
+          if (psshInfos.length) {
+            this.warn(`${logMessage} Using first of ${psshInfos.length} pssh found for selected key-system ${keySystem}`);
+          }
+          const psshInfo = psshInfos[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;
+          }
+          keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
+          if (psshInfo.version === 0 && psshInfo.data) {
+            if (keySystemDomain === KeySystems.WIDEVINE) {
+              const 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;
-      }
-      const keyIdHex = Hex.hexDump(keyId);
-      const {
-        keyIdToKeySessionPromise,
-        mediaKeySessions
-      } = this;
-      let keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
-      for (let i = 0; i < mediaKeySessions.length; i++) {
-        // Match playlist key
-        const keyContext = mediaKeySessions[i];
-        const decryptdata = keyContext.decryptdata;
-        if (!decryptdata.keyId) {
-          continue;
+        if (!keySystemDomain || !keyId) {
+          return;
         }
-        const oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-        if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-          keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-          if (decryptdata.pssh) {
+        const keyIdHex = Hex.hexDump(keyId);
+        const {
+          keyIdToKeySessionPromise,
+          mediaKeySessions
+        } = this;
+        let keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
+        for (let i = 0; i < mediaKeySessions.length; i++) {
+          // Match playlist key
+          const keyContext = mediaKeySessions[i];
+          const decryptdata = keyContext.decryptdata;
+          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;
+            keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
+              return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
+            });
+            keySessionContextPromise.catch(error => this.handleError(error));
             break;
           }
-          delete keyIdToKeySessionPromise[oldKeyIdHex];
-          decryptdata.pssh = new Uint8Array(initData);
-          decryptdata.keyId = keyId;
-          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
-            return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
-          });
-          keySessionContextPromise.catch(error => this.handleError(error));
-          break;
         }
-      }
-      if (!keySessionContextPromise) {
-        // Clear-lead key (not encountered in playlist)
-        keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(({
-          keySystem,
-          mediaKeys
-        }) => {
-          var _keySystemToKeySystem;
-          this.throwIfDestroyed();
-          const 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(() => {
+        if (!keySessionContextPromise) {
+          if (keySystemDomain !== keySystem) {
+            this.log(`Ignoring "${event.type}" event with ${keySystemDomain} init data for selected key-system ${keySystem}`);
+            return;
+          }
+          // "Clear-lead" (misc key not encountered in playlist)
+          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(({
+            keySystem,
+            mediaKeys
+          }) => {
+            var _keySystemToKeySystem;
             this.throwIfDestroyed();
-            const keySessionContext = this.createMediaKeySessionContext({
-              decryptdata,
-              keySystem,
-              mediaKeys
+            const 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(() => {
+              this.throwIfDestroyed();
+              const keySessionContext = this.createMediaKeySessionContext({
+                decryptdata,
+                keySystem,
+                mediaKeys
+              });
+              return this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
             });
-            return this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
           });
-        });
-        keySessionContextPromise.catch(error => this.handleError(error));
-      }
+          keySessionContextPromise.catch(error => this.handleError(error));
+        }
+      });
     };
     this.onWaitingForKey = event => {
       this.log(`"${event.type}" event`);
@@ -32558,7 +32585,7 @@ class KeyLoader {
     }
   }
   load(frag) {
-    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(keySystemFormat => {
         return this.loadInternal(frag, keySystemFormat);