hls.js 1.6.0-beta.3.0.canary.10978 → 1.6.0-beta.3.0.canary.10980

package/dist/hls.d.mts

@@ -48,6 +48,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private getBwEstimate;
     private findBestLevel;
     set nextAutoLevel(nextLevel: number);
+    protected deriveNextAutoLevel(nextLevel: number): number;
 }
 
 export declare type ABRControllerConfig = {

package/dist/hls.d.ts

@@ -48,6 +48,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private getBwEstimate;
     private findBestLevel;
     set nextAutoLevel(nextLevel: number);
+    protected deriveNextAutoLevel(nextLevel: number): number;
 }
 
 export declare type ABRControllerConfig = {

package/dist/hls.js

@@ -1059,7 +1059,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.3.0.canary.10978");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.3.0.canary.10980");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -1728,6 +1728,25 @@
     };
   }
 
+  var omitCircularRefsReplacer = function omitCircularRefsReplacer(replacer) {
+    var known = new WeakSet();
+    return function (_, value) {
+      if (replacer) {
+        value = replacer(_, value);
+      }
+      if (typeof value === 'object' && value !== null) {
+        if (known.has(value)) {
+          return;
+        }
+        known.add(value);
+      }
+      return value;
+    };
+  };
+  var stringify = function stringify(object, replacer) {
+    return JSON.stringify(object, omitCircularRefsReplacer(replacer));
+  };
+
   function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPreference, videoPreference) {
     var codecSets = Object.keys(codecTiers);
     var channelsPreference = audioPreference == null ? void 0 : audioPreference.channels;
@@ -1815,7 +1834,7 @@
         if (!videoRanges.some(function (range) {
           return candidateTier.videoRanges[range] > 0;
         })) {
-          logStartCodecCandidateIgnored(candidate, "no variants with VIDEO-RANGE of " + JSON.stringify(videoRanges) + " found");
+          logStartCodecCandidateIgnored(candidate, "no variants with VIDEO-RANGE of " + stringify(videoRanges) + " found");
           return selected;
         }
         if (videoCodecPreference && candidate.indexOf(videoCodecPreference.substring(0, 4)) % 5 !== 0) {
@@ -2535,7 +2554,7 @@
         currentVideoRange = preferHDR ? videoRanges[videoRanges.length - 1] : videoRanges[0];
         currentFrameRate = minFramerate;
         currentBw = Math.max(currentBw, minBitrate);
-        this.log("picked start tier " + JSON.stringify(startTier));
+        this.log("picked start tier " + stringify(startTier));
       } else {
         currentCodecSet = level == null ? void 0 : level.codecSet;
         currentVideoRange = level == null ? void 0 : level.videoRange;
@@ -2564,9 +2583,9 @@
                 var levels = _this3.hls.levels;
                 var index = levels.indexOf(levelInfo);
                 if (decodingInfo.error) {
-                  _this3.warn("MediaCapabilities decodingInfo error: \"" + decodingInfo.error + "\" for level " + index + " " + JSON.stringify(decodingInfo));
+                  _this3.warn("MediaCapabilities decodingInfo error: \"" + decodingInfo.error + "\" for level " + index + " " + stringify(decodingInfo));
                 } else if (!decodingInfo.supported) {
-                  _this3.warn("Unsupported MediaCapabilities decodingInfo result for level " + index + " " + JSON.stringify(decodingInfo));
+                  _this3.warn("Unsupported MediaCapabilities decodingInfo result for level " + index + " " + stringify(decodingInfo));
                   if (index > -1 && levels.length > 1) {
                     _this3.log("Removing unsupported level " + index);
                     _this3.hls.removeLevel(index);
@@ -2642,12 +2661,18 @@
       // not enough time budget even with quality level 0 ... rebuffering might happen
       return -1;
     };
+    _proto.deriveNextAutoLevel = function deriveNextAutoLevel(nextLevel) {
+      var _this$hls2 = this.hls,
+        maxAutoLevel = _this$hls2.maxAutoLevel,
+        minAutoLevel = _this$hls2.minAutoLevel;
+      return Math.min(Math.max(nextLevel, minAutoLevel), maxAutoLevel);
+    };
     return _createClass(AbrController, [{
       key: "firstAutoLevel",
       get: function get() {
-        var _this$hls2 = this.hls,
-          maxAutoLevel = _this$hls2.maxAutoLevel,
-          minAutoLevel = _this$hls2.minAutoLevel;
+        var _this$hls3 = this.hls,
+          maxAutoLevel = _this$hls3.maxAutoLevel,
+          minAutoLevel = _this$hls3.minAutoLevel;
         var bwEstimate = this.getBwEstimate();
         var maxStartDelay = this.hls.config.maxStarvationDelay;
         var abrAutoLevel = this.findBestLevel(bwEstimate, minAutoLevel, maxAutoLevel, 0, maxStartDelay, 1, 1);
@@ -2698,10 +2723,7 @@
         return nextABRAutoLevel;
       },
       set: function set(nextLevel) {
-        var _this$hls3 = this.hls,
-          maxAutoLevel = _this$hls3.maxAutoLevel,
-          minAutoLevel = _this$hls3.minAutoLevel;
-        var value = Math.min(Math.max(nextLevel, minAutoLevel), maxAutoLevel);
+        var value = this.deriveNextAutoLevel(nextLevel);
         if (this._nextAutoLevel !== value) {
           this.nextAutoLevelKey = '';
           this._nextAutoLevel = value;
@@ -8497,7 +8519,7 @@
             dateRange.tagOrder += mergeCount;
           }
         } else {
-          logger.warn("Ignoring invalid Playlist Delta Update DATERANGE tag: \"" + JSON.stringify(deltaDateRanges[id].attr) + "\"");
+          logger.warn("Ignoring invalid Playlist Delta Update DATERANGE tag: \"" + stringify(deltaDateRanges[id].attr) + "\"");
         }
       });
     }
@@ -16358,7 +16380,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.3.0.canary.10978";
+  var version = "1.6.0-beta.3.0.canary.10980";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -16539,7 +16561,7 @@
               cmd: 'init',
               typeSupported: m2tsTypeSupported,
               id: id,
-              config: JSON.stringify(config)
+              config: stringify(config)
             });
           } catch (err) {
             logger.warn("Error setting up \"" + id + "\" Web Worker, fallback to inline", err);
@@ -16567,7 +16589,7 @@
           resetNo: instanceNo,
           typeSupported: m2tsTypeSupported,
           id: this.id,
-          config: JSON.stringify(config)
+          config: stringify(config)
         });
       }
     };
@@ -18578,9 +18600,9 @@
           this.log("attachTransferred: waiting for SourceBuffer track info");
           return;
         }
-        this.log("attachTransferred: (bufferCodecEventsTotal " + this.bufferCodecEventsTotal + ")\nrequired tracks: " + JSON.stringify(requiredTracks, function (key, value) {
+        this.log("attachTransferred: (bufferCodecEventsTotal " + this.bufferCodecEventsTotal + ")\nrequired tracks: " + stringify(requiredTracks, function (key, value) {
           return key === 'initSegment' ? undefined : value;
-        }) + ";\ntransfer tracks: " + JSON.stringify(transferredTracks, function (key, value) {
+        }) + ";\ntransfer tracks: " + stringify(transferredTracks, function (key, value) {
           return key === 'initSegment' ? undefined : value;
         }) + "}");
         if (!isCompatibleTrackChange(transferredTracks, requiredTracks)) {
@@ -19371,7 +19393,7 @@
       var bufferCodecEventsTotal = this.bufferCodecEventsTotal,
         pendingTrackCount = this.pendingTrackCount,
         tracks = this.tracks;
-      this.log("checkPendingTracks (pending: " + pendingTrackCount + " codec events expected: " + bufferCodecEventsTotal + ") " + JSON.stringify(tracks));
+      this.log("checkPendingTracks (pending: " + pendingTrackCount + " codec events expected: " + bufferCodecEventsTotal + ") " + stringify(tracks));
       // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once.
       // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after
       // data has been appended to existing ones.
@@ -19440,7 +19462,7 @@
           var codec = this.getTrackCodec(track, type);
           var mimeType = track.container + ";codecs=" + codec;
           track.codec = codec;
-          this.log("creating sourceBuffer(" + mimeType + ")" + (this.currentOp(type) ? ' Queued' : '') + " " + JSON.stringify(track));
+          this.log("creating sourceBuffer(" + mimeType + ")" + (this.currentOp(type) ? ' Queued' : '') + " " + stringify(track));
           try {
             var sb = mediaSource.addSourceBuffer(mimeType);
             var sbIndex = sourceBufferNameToIndex(type);
@@ -21473,7 +21495,7 @@
           errorAction.resolved = this.pathwayId !== errorPathway;
         }
         if (!errorAction.resolved) {
-          this.warn("Could not resolve " + data.details + " (\"" + data.error.message + "\") with content-steering for Pathway: " + errorPathway + " levels: " + (levels ? levels.length : levels) + " priorities: " + JSON.stringify(pathwayPriority) + " penalized: " + JSON.stringify(this.penalizedPathways));
+          this.warn("Could not resolve " + data.details + " (\"" + data.error.message + "\") with content-steering for Pathway: " + errorPathway + " levels: " + (levels ? levels.length : levels) + " priorities: " + stringify(pathwayPriority) + " penalized: " + stringify(this.penalizedPathways));
         }
       }
     };
@@ -22072,7 +22094,7 @@
       var keySystemAccessPromises = this.keySystemAccessPromises[keySystem];
       var keySystemAccess = keySystemAccessPromises == null ? void 0 : keySystemAccessPromises.keySystemAccess;
       if (!keySystemAccess) {
-        this.log("Requesting encrypted media \"" + keySystem + "\" key-system access with config: " + JSON.stringify(mediaKeySystemConfigs));
+        this.log("Requesting encrypted media \"" + keySystem + "\" key-system access with config: " + stringify(mediaKeySystemConfigs));
         keySystemAccess = this.requestMediaKeySystemAccess(keySystem, mediaKeySystemConfigs);
         var _keySystemAccessPromises = this.keySystemAccessPromises[keySystem] = {
           keySystemAccess: keySystemAccess
@@ -22245,7 +22267,7 @@
           type: ErrorTypes.KEY_SYSTEM_ERROR,
           details: ErrorDetails.KEY_SYSTEM_NO_CONFIGURED_LICENSE,
           fatal: true
-        }, "Missing key-system license configuration options " + JSON.stringify({
+        }, "Missing key-system license configuration options " + stringify({
           drmSystems: this.config.drmSystems
         }));
       }
@@ -23901,22 +23923,6 @@
     el.removeEventListener(type, listener);
   }
 
-  var replacer = function replacer() {
-    var known = new WeakSet();
-    return function (_, value) {
-      if (typeof value === 'object' && value !== null) {
-        if (known.has(value)) {
-          return;
-        }
-        known.add(value);
-      }
-      return value;
-    };
-  };
-  var stringify = function stringify(object) {
-    return JSON.stringify(object, replacer());
-  };
-
   function playWithCatch(media) {
     media == null ? void 0 : media.play().catch(function () {
       /* no-op */
@@ -27319,7 +27325,7 @@
     };
     _proto5.setPAC = function setPAC(pacData) {
       this.logger.log(2, function () {
-        return 'pacData = ' + JSON.stringify(pacData);
+        return 'pacData = ' + stringify(pacData);
       });
       var newRow = pacData.row - 1;
       if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) {
@@ -27372,7 +27378,7 @@
      */;
     _proto5.setBkgData = function setBkgData(bkgData) {
       this.logger.log(2, function () {
-        return 'bkgData = ' + JSON.stringify(bkgData);
+        return 'bkgData = ' + stringify(bkgData);
       });
       this.backSpace();
       this.setPen(bkgData);
@@ -27627,7 +27633,7 @@
       } else {
         styles.foreground = 'white';
       }
-      this.logger.log(2, 'MIDROW: ' + JSON.stringify(styles));
+      this.logger.log(2, 'MIDROW: ' + stringify(styles));
       this.writeScreen.setPen(styles);
     };
     _proto6.outputDataUpdate = function outputDataUpdate(dispatch) {
@@ -30660,7 +30666,7 @@
         }
       });
       if (report.length) {
-        logger.warn("hls.js config: \"" + report.join('", "') + "\" setting(s) are deprecated, use \"" + policyName + "\": " + JSON.stringify(userConfig[policyName]));
+        logger.warn("hls.js config: \"" + report.join('", "') + "\" setting(s) are deprecated, use \"" + policyName + "\": " + stringify(userConfig[policyName]));
       }
     });
     return _objectSpread2(_objectSpread2({}, defaultsCopy), userConfig);
@@ -31063,7 +31069,7 @@
       if (!stallReported && stalled !== null && media && hls) {
         // Report stalled error once
         this.stallReported = true;
-        var error = new Error("Playback stalling at @" + media.currentTime + " due to low buffer (" + JSON.stringify(bufferInfo) + ")");
+        var error = new Error("Playback stalling at @" + media.currentTime + " due to low buffer (" + stringify(bufferInfo) + ")");
         this.warn(error.message);
         hls.trigger(Events.ERROR, {
           type: ErrorTypes.MEDIA_ERROR,
@@ -31251,7 +31257,7 @@
         cue.type = type;
       }
     } catch (e) {
-      cue = new Cue(startTime, endTime, JSON.stringify(type ? _objectSpread2({
+      cue = new Cue(startTime, endTime, stringify(type ? _objectSpread2({
         type: type
       }, data) : data));
     }
@@ -31997,7 +32003,7 @@
         Promise.resolve().then(function () {
           if (_this3.hls) {
             if (data.levels.length) {
-              _this3.warn("One or more CODECS in variant not supported: " + JSON.stringify(data.levels[0].attrs));
+              _this3.warn("One or more CODECS in variant not supported: " + stringify(data.levels[0].attrs));
             }
             var error = new Error('no level with compatible codecs found in manifest');
             _this3.hls.trigger(Events.ERROR, {

package/dist/hls.js.d.ts

@@ -48,6 +48,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private getBwEstimate;
     private findBestLevel;
     set nextAutoLevel(nextLevel: number);
+    protected deriveNextAutoLevel(nextLevel: number): number;
 }
 
 export declare type ABRControllerConfig = {