hls.js 1.6.0-beta.2.0.canary.10871 → 1.6.0-beta.2.0.canary.10876

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.10871"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10876"}`);
     } 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.10871";
+const version = "1.6.0-beta.2.0.canary.10876";
 
 // 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) {
@@ -28828,7 +28837,6 @@ class FetchLoader {
     }
     stats.loading.start = self.performance.now();
     const initParams = getRequestParameters(context, this.controller.signal);
-    const onProgress = callbacks.onProgress;
     const isArrayBuffer = context.responseType === 'arraybuffer';
     const LENGTH = isArrayBuffer ? 'byteLength' : 'length';
     const {
@@ -28842,18 +28850,23 @@ class FetchLoader {
     self.clearTimeout(this.requestTimeout);
     config.timeout = maxTimeToFirstByteMs && isFiniteNumber(maxTimeToFirstByteMs) ? maxTimeToFirstByteMs : maxLoadTimeMs;
     this.requestTimeout = self.setTimeout(() => {
-      this.abortInternal();
-      callbacks.onTimeout(stats, context, this.response);
+      if (this.callbacks) {
+        this.abortInternal();
+        this.callbacks.onTimeout(stats, context, this.response);
+      }
     }, config.timeout);
     const fetchPromise = isPromise(this.request) ? this.request.then(self.fetch) : self.fetch(this.request);
     fetchPromise.then(response => {
+      var _this$callbacks2;
       this.response = this.loader = response;
       const first = Math.max(self.performance.now(), stats.loading.start);
       self.clearTimeout(this.requestTimeout);
       config.timeout = maxLoadTimeMs;
       this.requestTimeout = self.setTimeout(() => {
-        this.abortInternal();
-        callbacks.onTimeout(stats, context, this.response);
+        if (this.callbacks) {
+          this.abortInternal();
+          this.callbacks.onTimeout(stats, context, this.response);
+        }
       }, maxLoadTimeMs - (first - stats.loading.start));
       if (!response.ok) {
         const {
@@ -28864,6 +28877,7 @@ class FetchLoader {
       }
       stats.loading.first = first;
       stats.total = getContentLength(response.headers) || stats.total;
+      const onProgress = (_this$callbacks2 = this.callbacks) == null ? void 0 : _this$callbacks2.onProgress;
       if (onProgress && isFiniteNumber(config.highWaterMark)) {
         return this.loadProgressively(response, stats, context, config.highWaterMark, onProgress);
       }
@@ -28875,6 +28889,7 @@ class FetchLoader {
       }
       return response.text();
     }).then(responseData => {
+      var _this$callbacks3, _this$callbacks4;
       const response = this.response;
       if (!response) {
         throw new Error('loader destroyed');
@@ -28890,11 +28905,13 @@ class FetchLoader {
         data: responseData,
         code: response.status
       };
+      const onProgress = (_this$callbacks3 = this.callbacks) == null ? void 0 : _this$callbacks3.onProgress;
       if (onProgress && !isFiniteNumber(config.highWaterMark)) {
         onProgress(stats, context, responseData, response);
       }
-      callbacks.onSuccess(loaderResponse, stats, context, response);
+      (_this$callbacks4 = this.callbacks) == null ? void 0 : _this$callbacks4.onSuccess(loaderResponse, stats, context, response);
     }).catch(error => {
+      var _this$callbacks5;
       self.clearTimeout(this.requestTimeout);
       if (stats.aborted) {
         return;
@@ -28903,7 +28920,7 @@ class FetchLoader {
       // when destroying, 'error' itself can be undefined
       const code = !error ? 0 : error.code || 0;
       const text = !error ? null : error.message;
-      callbacks.onError({
+      (_this$callbacks5 = this.callbacks) == null ? void 0 : _this$callbacks5.onError({
         code,
         text
       }, context, error ? error.details : null, stats);
@@ -29081,8 +29098,9 @@ class XhrLoader {
         if (this.loader !== xhr || this.stats.aborted) return;
         this.openAndSendXhr(xhr, context, config);
       }).catch(error => {
+        var _this$callbacks2;
         // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
-        this.callbacks.onError({
+        (_this$callbacks2 = this.callbacks) == null ? void 0 : _this$callbacks2.onError({
           code: xhr.status,
           text: error.message
         }, context, xhr, stats);
@@ -29156,26 +29174,21 @@ class XhrLoader {
         if (status >= 200 && status < 300) {
           const data = useResponseText != null ? useResponseText : xhr.response;
           if (data != null) {
+            var _this$callbacks3, _this$callbacks4;
             stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
             const len = xhr.responseType === 'arraybuffer' ? data.byteLength : data.length;
             stats.loaded = stats.total = len;
             stats.bwEstimate = stats.total * 8000 / (stats.loading.end - stats.loading.first);
-            if (!this.callbacks) {
-              return;
-            }
-            const onProgress = this.callbacks.onProgress;
+            const onProgress = (_this$callbacks3 = this.callbacks) == null ? void 0 : _this$callbacks3.onProgress;
             if (onProgress) {
               onProgress(stats, context, data, xhr);
             }
-            if (!this.callbacks) {
-              return;
-            }
             const _response = {
               url: xhr.responseURL,
               data: data,
               code: status
             };
-            this.callbacks.onSuccess(_response, stats, context, xhr);
+            (_this$callbacks4 = this.callbacks) == null ? void 0 : _this$callbacks4.onSuccess(_response, stats, context, xhr);
             return;
           }
         }
@@ -29192,8 +29205,9 @@ class XhrLoader {
         if (shouldRetry(retryConfig, retryCount, false, response)) {
           this.retry(retryConfig);
         } else {
+          var _this$callbacks5;
           logger.error(`${status} while loading ${context.url}`);
-          this.callbacks.onError({
+          (_this$callbacks5 = this.callbacks) == null ? void 0 : _this$callbacks5.onError({
             code: status,
             text: xhr.statusText
           }, context, xhr, stats);