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

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.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();
@@ -12606,8 +12606,10 @@
           case 32:
             push = true;
             if (!track.vps) {
-              var config = _this2.readVPS(unit.data);
-              track.params = _objectSpread2({}, config);
+              if (typeof track.params !== 'object') {
+                track.params = {};
+              }
+              track.params = _extends(track.params, _this2.readVPS(unit.data));
               _this2.initVPS = unit.data;
             }
             track.vps = [unit.data];
@@ -12617,26 +12619,27 @@
           case 33:
             push = true;
             spsfound = true;
-            if (typeof track.params === 'object') {
-              if (track.vps !== undefined && track.vps[0] !== _this2.initVPS && track.sps !== undefined && !_this2.matchSPS(track.sps[0], unit.data)) {
-                _this2.initVPS = track.vps[0];
-                track.sps = track.pps = undefined;
-              }
-              if (!track.sps) {
-                var _config = _this2.readSPS(unit.data);
-                track.width = _config.width;
-                track.height = _config.height;
-                track.pixelRatio = _config.pixelRatio;
-                track.codec = _config.codecString;
-                track.sps = [];
-                for (var prop in _config.params) {
-                  track.params[prop] = _config.params[prop];
-                }
+            if (track.vps !== undefined && track.vps[0] !== _this2.initVPS && track.sps !== undefined && !_this2.matchSPS(track.sps[0], unit.data)) {
+              _this2.initVPS = track.vps[0];
+              track.sps = track.pps = undefined;
+            }
+            if (!track.sps) {
+              var config = _this2.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] === _this2.initVPS) {
-                track.sps.push(unit.data);
+              for (var prop in config.params) {
+                track.params[prop] = config.params[prop];
               }
             }
+            if (!track.vps && !track.sps.length || track.vps && track.vps[0] === _this2.initVPS) {
+              track.sps.push(unit.data);
+            }
             if (!VideoSample) {
               VideoSample = _this2.VideoSample = _this2.createVideoSample(true, pes.pts, pes.dts);
             }
@@ -12649,12 +12652,12 @@
             if (typeof track.params === 'object') {
               if (!track.pps) {
                 track.pps = [];
-                var _config2 = _this2.readPPS(unit.data);
-                for (var _prop in _config2) {
-                  track.params[_prop] = _config2[_prop];
+                var _config = _this2.readPPS(unit.data);
+                for (var _prop in _config) {
+                  track.params[_prop] = _config[_prop];
                 }
               }
-              if (track.vps !== undefined && track.vps[0] === _this2.initVPS) {
+              if (!track.vps && !track.pps.length || track.vps && track.vps[0] === _this2.initVPS) {
                 track.pps.push(unit.data);
               }
             }
@@ -16308,7 +16311,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.2.0.canary.10869";
+  var 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
@@ -29739,7 +29742,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,
@@ -29752,18 +29754,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,
@@ -29772,6 +29779,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);
         }
@@ -29783,6 +29791,7 @@
         }
         return response.text();
       }).then(function (responseData) {
+        var _this$callbacks3, _this$callbacks4;
         var response = _this.response;
         if (!response) {
           throw new Error('loader destroyed');
@@ -29798,11 +29807,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;
@@ -29811,7 +29822,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);
@@ -29997,8 +30008,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);
@@ -30069,26 +30081,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;
             }
           }
@@ -30105,8 +30112,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);