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

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.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();
@@ -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.10871";
+  var 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
@@ -29742,7 +29751,6 @@
       }
       stats.loading.start = self.performance.now();
       var initParams = getRequestParameters(context, this.controller.signal);
-      var onProgress = callbacks.onProgress;
       var isArrayBuffer = context.responseType === 'arraybuffer';
       var LENGTH = isArrayBuffer ? 'byteLength' : 'length';
       var _config$loadPolicy = config.loadPolicy,
@@ -29755,18 +29763,23 @@
       self.clearTimeout(this.requestTimeout);
       config.timeout = maxTimeToFirstByteMs && isFiniteNumber(maxTimeToFirstByteMs) ? maxTimeToFirstByteMs : maxLoadTimeMs;
       this.requestTimeout = self.setTimeout(function () {
-        _this.abortInternal();
-        callbacks.onTimeout(stats, context, _this.response);
+        if (_this.callbacks) {
+          _this.abortInternal();
+          _this.callbacks.onTimeout(stats, context, _this.response);
+        }
       }, config.timeout);
       var fetchPromise = isPromise(this.request) ? this.request.then(self.fetch) : self.fetch(this.request);
       fetchPromise.then(function (response) {
+        var _this$callbacks2;
         _this.response = _this.loader = response;
         var first = Math.max(self.performance.now(), stats.loading.start);
         self.clearTimeout(_this.requestTimeout);
         config.timeout = maxLoadTimeMs;
         _this.requestTimeout = self.setTimeout(function () {
-          _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) {
           var status = response.status,
@@ -29775,6 +29788,7 @@
         }
         stats.loading.first = first;
         stats.total = getContentLength(response.headers) || stats.total;
+        var 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);
         }
@@ -29786,6 +29800,7 @@
         }
         return response.text();
       }).then(function (responseData) {
+        var _this$callbacks3, _this$callbacks4;
         var response = _this.response;
         if (!response) {
           throw new Error('loader destroyed');
@@ -29801,11 +29816,13 @@
           data: responseData,
           code: response.status
         };
+        var 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(function (error) {
+        var _this$callbacks5;
         self.clearTimeout(_this.requestTimeout);
         if (stats.aborted) {
           return;
@@ -29814,7 +29831,7 @@
         // when destroying, 'error' itself can be undefined
         var code = !error ? 0 : error.code || 0;
         var text = !error ? null : error.message;
-        callbacks.onError({
+        (_this$callbacks5 = _this.callbacks) == null ? void 0 : _this$callbacks5.onError({
           code: code,
           text: text
         }, context, error ? error.details : null, stats);
@@ -30000,8 +30017,9 @@
           if (_this.loader !== xhr || _this.stats.aborted) return;
           _this.openAndSendXhr(xhr, context, config);
         }).catch(function (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);
@@ -30072,26 +30090,21 @@
           if (_status >= 200 && _status < 300) {
             var 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);
               var 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;
-              }
-              var onProgress = this.callbacks.onProgress;
+              var onProgress = (_this$callbacks3 = this.callbacks) == null ? void 0 : _this$callbacks3.onProgress;
               if (onProgress) {
                 onProgress(stats, context, data, xhr);
               }
-              if (!this.callbacks) {
-                return;
-              }
               var _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;
             }
           }
@@ -30108,8 +30121,9 @@
           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);