hls.js 1.6.0-beta.1.0.canary.10750 → 1.6.0-beta.1.0.canary.10752

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.10750"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10752"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1375,7 +1375,7 @@ class AbrController extends Logger {
       const bwEstimate = this.getBwEstimate();
       const levels = hls.levels;
       const level = levels[frag.level];
-      const expectedLen = stats.total || Math.max(stats.loaded, Math.round(duration * level.averageBitrate / 8));
+      const expectedLen = Math.max(stats.loaded, Math.round(duration * (frag.bitrate || level.averageBitrate) / 8));
       let timeStreaming = loadedFirstByte ? timeLoading - ttfb : timeLoading;
       if (timeStreaming < 1 && loadedFirstByte) {
         timeStreaming = Math.min(timeLoading, stats.loaded * 8 / bwEstimate);
@@ -1933,7 +1933,7 @@ class AbrController extends Logger {
       }
 
       // Use average bitrate when starvation delay (buffer length) is gt or eq two segment durations and rebuffering is not expected (maxStarvationDelay > 0)
-      const bitrate = currentFragDuration && bufferStarvationDelay >= currentFragDuration * 2 && maxStarvationDelay === 0 ? levels[i].averageBitrate : levels[i].maxBitrate;
+      const bitrate = currentFragDuration && bufferStarvationDelay >= currentFragDuration * 2 && maxStarvationDelay === 0 ? levelInfo.averageBitrate : levelInfo.maxBitrate;
       const fetchDuration = this.getTimeToLoadFrag(ttfbEstimateSec, adjustedbw, bitrate * avgDuration, levelDetails === undefined);
       const canSwitchWithinTolerance =
       // if adjusted bw is greater than level bitrate AND
@@ -3737,6 +3737,8 @@ class Fragment extends BaseSegment {
     this._decryptdata = null;
     this._programDateTime = null;
     this._ref = null;
+    // Approximate bit rate of the fragment expressed in bits per second (bps) as indicated by the last EXT-X-BITRATE (kbps) tag
+    this._bitrate = void 0;
     this.rawProgramDateTime = null;
     this.tagList = [];
     // EXTINF has to be present for a m3u8 to be considered valid
@@ -3791,6 +3793,34 @@ class Fragment extends BaseSegment {
     this.urlId = 0;
     this.type = type;
   }
+  get byteLength() {
+    if (this.hasStats) {
+      const total = this.stats.total;
+      if (total) {
+        return total;
+      }
+    }
+    if (this.byteRange) {
+      const start = this.byteRange[0];
+      const end = this.byteRange[1];
+      if (isFiniteNumber(start) && isFiniteNumber(end)) {
+        return end - start;
+      }
+    }
+    return null;
+  }
+  get bitrate() {
+    if (this.byteLength) {
+      return this.byteLength * 8 / this.duration;
+    }
+    if (this._bitrate) {
+      return this._bitrate;
+    }
+    return null;
+  }
+  set bitrate(value) {
+    this._bitrate = value;
+  }
   get decryptdata() {
     const {
       levelkeys
@@ -6918,6 +6948,7 @@ class M3U8Parser {
     let currentPart = 0;
     let totalduration = 0;
     let discontinuityCounter = 0;
+    let currentBitrate = 0;
     let prevFrag = null;
     let frag = new Fragment(type, base);
     let result;
@@ -6938,6 +6969,9 @@ class M3U8Parser {
         frag.start = totalduration;
         frag.sn = currentSN;
         frag.cc = discontinuityCounter;
+        if (currentBitrate) {
+          frag.bitrate = currentBitrate;
+        }
         frag.level = id;
         if (currentInitSegment) {
           frag.initSegment = currentInitSegment;
@@ -7067,6 +7101,12 @@ class M3U8Parser {
             break;
           case 'BITRATE':
             frag.tagList.push([tag, value1]);
+            currentBitrate = parseInt(value1) * 1000;
+            if (isFiniteNumber(currentBitrate)) {
+              frag.bitrate = currentBitrate;
+            } else {
+              currentBitrate = 0;
+            }
             break;
           case 'DATERANGE':
             {
@@ -8246,22 +8286,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 +8323,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 +8387,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 +8399,7 @@ class BaseStreamController extends TaskLoop {
         hls
       } = this;
       const {
+        frag,
         payload
       } = data;
       const decryptData = frag.decryptdata;
@@ -8394,7 +8438,7 @@ class BaseStreamController extends TaskLoop {
         return;
       }
       this.warn(reason);
-      this.resetFragmentLoading(frag);
+      this.resetFragmentLoading(fragment);
     });
   }
   completeInitSegmentLoad(data) {
@@ -8421,7 +8465,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 +8552,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 +9350,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 +9359,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 +9774,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10750";
+const version = "1.6.0-beta.1.0.canary.10752";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -15468,7 +15513,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 +15898,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}
@@ -31849,13 +31894,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;