hls.js 1.6.0-beta.1.0.canary.10749 → 1.6.0-beta.1.0.canary.10751

package/dist/hls.mjs

@@ -400,7 +400,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.1.0.canary.10749"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10751"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -8246,22 +8246,24 @@ class BaseStreamController extends TaskLoop {
     this.startFragRequested = true;
     this._loadFragForPlayback(frag, level, targetBufferTime);
   }
-  _loadFragForPlayback(frag, level, targetBufferTime) {
+  _loadFragForPlayback(fragment, level, targetBufferTime) {
     const progressCallback = data => {
+      const frag = data.frag;
       if (this.fragContextChanged(frag)) {
-        this.warn(`Fragment ${frag.sn}${data.part ? ' p: ' + data.part.index : ''} of level ${frag.level} was dropped during download.`);
+        this.warn(`${frag.type} sn: ${frag.sn}${data.part ? ' part: ' + data.part.index : ''} of ${this.fragInfo(frag, false, data.part)}) was dropped during download.`);
         this.fragmentTracker.removeFragment(frag);
         return;
       }
       frag.stats.chunkCount++;
       this._handleFragmentLoadProgress(data);
     };
-    this._doFragLoad(frag, level, targetBufferTime, progressCallback).then(data => {
+    this._doFragLoad(fragment, level, targetBufferTime, progressCallback).then(data => {
       if (!data) {
         // if we're here we probably needed to backtrack or are waiting for more parts
         return;
       }
       const state = this.state;
+      const frag = data.frag;
       if (this.fragContextChanged(frag)) {
         if (state === State.FRAG_LOADING || !this.fragCurrent && state === State.PARSING) {
           this.fragmentTracker.removeFragment(frag);
@@ -8281,7 +8283,7 @@ class BaseStreamController extends TaskLoop {
         return;
       }
       this.warn(`Frag error: ${(reason == null ? void 0 : reason.message) || reason}`);
-      this.resetFragmentLoading(frag);
+      this.resetFragmentLoading(fragment);
     });
   }
   clearTrackerIfNeeded(frag) {
@@ -8345,9 +8347,10 @@ class BaseStreamController extends TaskLoop {
     };
     this.hls.trigger(Events.BUFFER_FLUSHING, flushScope);
   }
-  _loadInitSegment(frag, level) {
-    this._doFragLoad(frag, level).then(data => {
-      if (!data || this.fragContextChanged(frag) || !this.levels) {
+  _loadInitSegment(fragment, level) {
+    this._doFragLoad(fragment, level).then(data => {
+      const frag = data == null ? void 0 : data.frag;
+      if (!frag || this.fragContextChanged(frag) || !this.levels) {
         throw new Error('init load aborted');
       }
       return data;
@@ -8356,6 +8359,7 @@ class BaseStreamController extends TaskLoop {
         hls
       } = this;
       const {
+        frag,
         payload
       } = data;
       const decryptData = frag.decryptdata;
@@ -8394,7 +8398,7 @@ class BaseStreamController extends TaskLoop {
         return;
       }
       this.warn(reason);
-      this.resetFragmentLoading(frag);
+      this.resetFragmentLoading(fragment);
     });
   }
   completeInitSegmentLoad(data) {
@@ -8421,7 +8425,7 @@ class BaseStreamController extends TaskLoop {
   }
   fragBufferedComplete(frag, part) {
     const media = this.mediaBuffer ? this.mediaBuffer : this.media;
-    this.log(`Buffered ${frag.type} sn: ${frag.sn}${part ? ' part: ' + part.index : ''} of ${this.fragInfo(frag)} > buffer:${media ? TimeRanges.toString(BufferHelper.getBuffered(media)) : '(detached)'})`);
+    this.log(`Buffered ${frag.type} sn: ${frag.sn}${part ? ' part: ' + part.index : ''} of ${this.fragInfo(frag, false, part)} > buffer:${media ? TimeRanges.toString(BufferHelper.getBuffered(media)) : '(detached)'})`);
     if (frag.sn !== 'initSegment') {
       var _this$levels;
       if (frag.type !== PlaylistLevelType.SUBTITLE) {
@@ -8508,7 +8512,8 @@ class BaseStreamController extends TaskLoop {
         const partIndex = this.getNextPart(partList, frag, targetBufferTime);
         if (partIndex > -1) {
           const part = partList[partIndex];
-          this.log(`Loading part sn: ${frag.sn} p: ${part.index} cc: ${frag.cc} of playlist [${details.startSN}-${details.endSN}] parts [0-${partIndex}-${partList.length - 1}] ${this.playlistLabel()}: ${frag.level}, target: ${parseFloat(targetBufferTime.toFixed(3))}`);
+          frag = this.fragCurrent = part.fragment;
+          this.log(`Loading ${frag.type} sn: ${frag.sn} part: ${part.index} (${partIndex}/${partList.length - 1}) of ${this.fragInfo(frag, false, part)}) cc: ${frag.cc} [${details.startSN}-${details.endSN}], target: ${parseFloat(targetBufferTime.toFixed(3))}`);
           this.nextLoadPosition = part.start + part.duration;
           this.state = State.FRAG_LOADING;
           let _result;
@@ -9305,7 +9310,7 @@ class BaseStreamController extends TaskLoop {
       // For this error fallthrough. Marking parsed will allow advancing to next fragment.
     }
     this.state = State.PARSED;
-    this.log(`Parsed ${frag.type} sn: ${frag.sn}${part ? ' part: ' + part.index : ''} of ${this.fragInfo(frag)})`);
+    this.log(`Parsed ${frag.type} sn: ${frag.sn}${part ? ' part: ' + part.index : ''} of ${this.fragInfo(frag, false, part)})`);
     this.hls.trigger(Events.FRAG_PARSED, {
       frag,
       part
@@ -9314,9 +9319,9 @@ class BaseStreamController extends TaskLoop {
   playlistLabel() {
     return this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track';
   }
-  fragInfo(frag, pts = true) {
+  fragInfo(frag, pts = true, part) {
     var _ref, _ref2;
-    return `${this.playlistLabel()} ${frag.level} (frag:[${((_ref = pts ? frag.startPTS : frag.start) != null ? _ref : NaN).toFixed(3)}-${((_ref2 = pts ? frag.endPTS : frag.end) != null ? _ref2 : NaN).toFixed(3)}]`;
+    return `${this.playlistLabel()} ${frag.level} (${part ? 'part' : 'frag'}:[${((_ref = pts && !part ? frag.startPTS : (part || frag).start) != null ? _ref : NaN).toFixed(3)}-${((_ref2 = pts && !part ? frag.endPTS : (part || frag).end) != null ? _ref2 : NaN).toFixed(3)}]${part && frag.type === 'main' ? 'INDEPENDENT=' + (part.independent ? 'YES' : 'NO') : ''}`;
   }
   resetTransmuxer() {
     var _this$transmuxer2;
@@ -9729,7 +9734,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10749";
+const version = "1.6.0-beta.1.0.canary.10751";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -15468,7 +15473,7 @@ class Transmuxer {
       accurateTimeOffset,
       timeOffset
     } = this.currentTransmuxState;
-    this.logger.log(`[transmuxer.ts]: Flushed ${this.id} sn: ${chunkMeta.sn}${chunkMeta.part > -1 ? ' p: ' + chunkMeta.part : ''} of ${this.id === PlaylistLevelType.MAIN ? 'level' : 'track'} ${chunkMeta.level}`);
+    this.logger.log(`[transmuxer.ts]: Flushed ${this.id} sn: ${chunkMeta.sn}${chunkMeta.part > -1 ? ' part: ' + chunkMeta.part : ''} of ${this.id === PlaylistLevelType.MAIN ? 'level' : 'track'} ${chunkMeta.level}`);
     const remuxResult = this.remuxer.remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, true, this.id);
     transmuxResults.push({
       remuxResult,
@@ -15853,7 +15858,7 @@ class TransmuxerInterface {
     const initSegmentChange = !(lastFrag && ((_frag$initSegment = frag.initSegment) == null ? void 0 : _frag$initSegment.url) === ((_lastFrag$initSegment = lastFrag.initSegment) == null ? void 0 : _lastFrag$initSegment.url));
     const state = new TransmuxState(discontinuity, contiguous, accurateTimeOffset, trackSwitch, timeOffset, initSegmentChange);
     if (!contiguous || discontinuity || initSegmentChange) {
-      this.hls.logger.log(`[transmuxer-interface, ${frag.type}]: Starting new transmux session for sn: ${chunkMeta.sn} p: ${chunkMeta.part} level: ${chunkMeta.level} id: ${chunkMeta.id}
+      this.hls.logger.log(`[transmuxer-interface]: Starting new transmux session for ${frag.type} sn: ${chunkMeta.sn}${chunkMeta.part > -1 ? ' part: ' + chunkMeta.part : ''} ${this.id === PlaylistLevelType.MAIN ? 'level' : 'track'}: ${chunkMeta.level} id: ${chunkMeta.id}
         discontinuity: ${discontinuity}
         trackSwitch: ${trackSwitch}
         contiguous: ${contiguous}
@@ -19148,7 +19153,7 @@ class CapLevelController {
         /* no-op */
       }
     }
-    return pixelRatio;
+    return Math.min(pixelRatio, this.hls.config.maxDevicePixelRatio);
   }
   isLevelAllowed(level) {
     const restrictedLevels = this.restrictedLevels;
@@ -29083,6 +29088,8 @@ const hlsDefaultConfig = _objectSpread2(_objectSpread2({
   // used by cap-level-controller
   ignoreDevicePixelRatio: false,
   // used by cap-level-controller
+  maxDevicePixelRatio: Number.POSITIVE_INFINITY,
+  // used by cap-level-controller
   preferManagedMediaSource: true,
   initialLiveManifestSize: 1,
   // used by stream-controller
@@ -31847,13 +31854,14 @@ class StreamController extends BaseStreamController {
     }
     return audioCodec;
   }
-  _loadBitrateTestFrag(frag, level) {
-    frag.bitrateTest = true;
-    this._doFragLoad(frag, level).then(data => {
+  _loadBitrateTestFrag(fragment, level) {
+    fragment.bitrateTest = true;
+    this._doFragLoad(fragment, level).then(data => {
       const {
         hls
       } = this;
-      if (!data || this.fragContextChanged(frag)) {
+      const frag = data == null ? void 0 : data.frag;
+      if (!frag || this.fragContextChanged(frag)) {
         return;
       }
       level.fragmentError = 0;