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

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.10869"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.2.0.canary.10873"}`);
     } 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.10869";
+const version = "1.6.0-beta.2.0.canary.10873";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -12226,8 +12226,10 @@ class HevcVideoParser extends BaseVideoParser {
         case 32:
           push = true;
           if (!track.vps) {
-            const config = this.readVPS(unit.data);
-            track.params = _objectSpread2({}, config);
+            if (typeof track.params !== 'object') {
+              track.params = {};
+            }
+            track.params = _extends(track.params, this.readVPS(unit.data));
             this.initVPS = unit.data;
           }
           track.vps = [unit.data];
@@ -12237,26 +12239,27 @@ class HevcVideoParser extends BaseVideoParser {
         case 33:
           push = true;
           spsfound = true;
-          if (typeof track.params === 'object') {
-            if (track.vps !== undefined && track.vps[0] !== this.initVPS && track.sps !== undefined && !this.matchSPS(track.sps[0], unit.data)) {
-              this.initVPS = track.vps[0];
-              track.sps = track.pps = undefined;
-            }
-            if (!track.sps) {
-              const config = this.readSPS(unit.data);
-              track.width = config.width;
-              track.height = config.height;
-              track.pixelRatio = config.pixelRatio;
-              track.codec = config.codecString;
-              track.sps = [];
-              for (const prop in config.params) {
-                track.params[prop] = config.params[prop];
-              }
+          if (track.vps !== undefined && track.vps[0] !== this.initVPS && track.sps !== undefined && !this.matchSPS(track.sps[0], unit.data)) {
+            this.initVPS = track.vps[0];
+            track.sps = track.pps = undefined;
+          }
+          if (!track.sps) {
+            const config = this.readSPS(unit.data);
+            track.width = config.width;
+            track.height = config.height;
+            track.pixelRatio = config.pixelRatio;
+            track.codec = config.codecString;
+            track.sps = [];
+            if (typeof track.params !== 'object') {
+              track.params = {};
             }
-            if (track.vps !== undefined && track.vps[0] === this.initVPS) {
-              track.sps.push(unit.data);
+            for (const prop in config.params) {
+              track.params[prop] = config.params[prop];
             }
           }
+          if (!track.vps && !track.sps.length || track.vps && track.vps[0] === this.initVPS) {
+            track.sps.push(unit.data);
+          }
           if (!VideoSample) {
             VideoSample = this.VideoSample = this.createVideoSample(true, pes.pts, pes.dts);
           }
@@ -12274,7 +12277,7 @@ class HevcVideoParser extends BaseVideoParser {
                 track.params[prop] = config[prop];
               }
             }
-            if (track.vps !== undefined && track.vps[0] === this.initVPS) {
+            if (!track.vps && !track.pps.length || track.vps && track.vps[0] === this.initVPS) {
               track.pps.push(unit.data);
             }
           }
@@ -28825,7 +28828,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 {
@@ -28839,18 +28841,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 {
@@ -28861,6 +28868,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);
       }
@@ -28872,6 +28880,7 @@ class FetchLoader {
       }
       return response.text();
     }).then(responseData => {
+      var _this$callbacks3, _this$callbacks4;
       const response = this.response;
       if (!response) {
         throw new Error('loader destroyed');
@@ -28887,11 +28896,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;
@@ -28900,7 +28911,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);
@@ -29078,8 +29089,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);
@@ -29153,26 +29165,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;
           }
         }
@@ -29189,8 +29196,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);