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

package/dist/hls.light.js

@@ -1028,7 +1028,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.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();
@@ -1817,7 +1817,7 @@
         var bwEstimate = _this.getBwEstimate();
         var levels = hls.levels;
         var level = levels[frag.level];
-        var expectedLen = stats.total || Math.max(stats.loaded, Math.round(duration * level.averageBitrate / 8));
+        var expectedLen = Math.max(stats.loaded, Math.round(duration * (frag.bitrate || level.averageBitrate) / 8));
         var timeStreaming = loadedFirstByte ? timeLoading - ttfb : timeLoading;
         if (timeStreaming < 1 && loadedFirstByte) {
           timeStreaming = Math.min(timeLoading, stats.loaded * 8 / bwEstimate);
@@ -2272,7 +2272,7 @@
           }
 
           // Use average bitrate when starvation delay (buffer length) is gt or eq two segment durations and rebuffering is not expected (maxStarvationDelay > 0)
-          var bitrate = currentFragDuration && bufferStarvationDelay >= currentFragDuration * 2 && maxStarvationDelay === 0 ? levels[i].averageBitrate : levels[i].maxBitrate;
+          var bitrate = currentFragDuration && bufferStarvationDelay >= currentFragDuration * 2 && maxStarvationDelay === 0 ? levelInfo.averageBitrate : levelInfo.maxBitrate;
           var fetchDuration = _this3.getTimeToLoadFrag(ttfbEstimateSec, adjustedbw, bitrate * avgDuration, levelDetails === undefined);
           var canSwitchWithinTolerance =
           // if adjusted bw is greater than level bitrate AND
@@ -3286,6 +3286,8 @@
       _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
@@ -3393,6 +3395,38 @@
       info.endDTS = Math.max(info.endDTS, endDTS);
     };
     return _createClass(Fragment, [{
+      key: "byteLength",
+      get: function get() {
+        if (this.hasStats) {
+          var total = this.stats.total;
+          if (total) {
+            return total;
+          }
+        }
+        if (this.byteRange) {
+          var start = this.byteRange[0];
+          var end = this.byteRange[1];
+          if (isFiniteNumber(start) && isFiniteNumber(end)) {
+            return end - start;
+          }
+        }
+        return null;
+      }
+    }, {
+      key: "bitrate",
+      get: function get() {
+        if (this.byteLength) {
+          return this.byteLength * 8 / this.duration;
+        }
+        if (this._bitrate) {
+          return this._bitrate;
+        }
+        return null;
+      },
+      set: function set(value) {
+        this._bitrate = value;
+      }
+    }, {
       key: "decryptdata",
       get: function get() {
         var levelkeys = this.levelkeys;
@@ -7346,6 +7380,7 @@
       var currentPart = 0;
       var totalduration = 0;
       var discontinuityCounter = 0;
+      var currentBitrate = 0;
       var prevFrag = null;
       var frag = new Fragment(type, base);
       var result;
@@ -7366,6 +7401,9 @@
           frag.start = totalduration;
           frag.sn = currentSN;
           frag.cc = discontinuityCounter;
+          if (currentBitrate) {
+            frag.bitrate = currentBitrate;
+          }
           frag.level = id;
           if (currentInitSegment) {
             frag.initSegment = currentInitSegment;
@@ -7495,6 +7533,12 @@
               break;
             case 'BITRATE':
               frag.tagList.push([tag, value1]);
+              currentBitrate = parseInt(value1) * 1000;
+              if (isFiniteNumber(currentBitrate)) {
+                frag.bitrate = currentBitrate;
+              } else {
+                currentBitrate = 0;
+              }
               break;
             case 'DATERANGE':
               {
@@ -14129,7 +14173,7 @@
       var _this$currentTransmux = this.currentTransmuxState,
         accurateTimeOffset = _this$currentTransmux.accurateTimeOffset,
         timeOffset = _this$currentTransmux.timeOffset;
-      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);
       var remuxResult = this.remuxer.remux(audioTrack, videoTrack, id3Track, textTrack, timeOffset, accurateTimeOffset, true, this.id);
       transmuxResults.push({
         remuxResult: remuxResult,
@@ -18034,23 +18078,25 @@
       this.startFragRequested = true;
       this._loadFragForPlayback(frag, level, targetBufferTime);
     };
-    _proto._loadFragForPlayback = function _loadFragForPlayback(frag, level, targetBufferTime) {
+    _proto._loadFragForPlayback = function _loadFragForPlayback(fragment, level, targetBufferTime) {
       var _this3 = this;
       var progressCallback = function progressCallback(data) {
+        var frag = data.frag;
         if (_this3.fragContextChanged(frag)) {
-          _this3.warn("Fragment " + frag.sn + (data.part ? ' p: ' + data.part.index : '') + " of level " + frag.level + " was dropped during download.");
+          _this3.warn(frag.type + " sn: " + frag.sn + (data.part ? ' part: ' + data.part.index : '') + " of " + _this3.fragInfo(frag, false, data.part) + ") was dropped during download.");
           _this3.fragmentTracker.removeFragment(frag);
           return;
         }
         frag.stats.chunkCount++;
         _this3._handleFragmentLoadProgress(data);
       };
-      this._doFragLoad(frag, level, targetBufferTime, progressCallback).then(function (data) {
+      this._doFragLoad(fragment, level, targetBufferTime, progressCallback).then(function (data) {
         if (!data) {
           // if we're here we probably needed to backtrack or are waiting for more parts
           return;
         }
         var state = _this3.state;
+        var frag = data.frag;
         if (_this3.fragContextChanged(frag)) {
           if (state === State.FRAG_LOADING || !_this3.fragCurrent && state === State.PARSING) {
             _this3.fragmentTracker.removeFragment(frag);
@@ -18070,7 +18116,7 @@
           return;
         }
         _this3.warn("Frag error: " + ((reason == null ? void 0 : reason.message) || reason));
-        _this3.resetFragmentLoading(frag);
+        _this3.resetFragmentLoading(fragment);
       });
     };
     _proto.clearTrackerIfNeeded = function clearTrackerIfNeeded(frag) {
@@ -18135,16 +18181,18 @@
       };
       this.hls.trigger(Events.BUFFER_FLUSHING, flushScope);
     };
-    _proto._loadInitSegment = function _loadInitSegment(frag, level) {
+    _proto._loadInitSegment = function _loadInitSegment(fragment, level) {
       var _this4 = this;
-      this._doFragLoad(frag, level).then(function (data) {
-        if (!data || _this4.fragContextChanged(frag) || !_this4.levels) {
+      this._doFragLoad(fragment, level).then(function (data) {
+        var frag = data == null ? void 0 : data.frag;
+        if (!frag || _this4.fragContextChanged(frag) || !_this4.levels) {
           throw new Error('init load aborted');
         }
         return data;
       }).then(function (data) {
         var hls = _this4.hls;
-        var payload = data.payload;
+        var frag = data.frag,
+          payload = data.payload;
         var decryptData = frag.decryptdata;
 
         // check to see if the payload needs to be decrypted
@@ -18181,7 +18229,7 @@
           return;
         }
         _this4.warn(reason);
-        _this4.resetFragmentLoading(frag);
+        _this4.resetFragmentLoading(fragment);
       });
     };
     _proto.completeInitSegmentLoad = function completeInitSegmentLoad(data) {
@@ -18204,7 +18252,7 @@
     };
     _proto.fragBufferedComplete = function fragBufferedComplete(frag, part) {
       var 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) {
@@ -18296,7 +18344,8 @@
           var partIndex = this.getNextPart(partList, frag, targetBufferTime);
           if (partIndex > -1) {
             var 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;
             var _result;
@@ -19084,7 +19133,7 @@
         // 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: frag,
         part: part
@@ -19093,12 +19142,12 @@
     _proto.playlistLabel = function playlistLabel() {
       return this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track';
     };
-    _proto.fragInfo = function fragInfo(frag, pts) {
+    _proto.fragInfo = function fragInfo(frag, pts, part) {
       var _ref3, _ref4;
       if (pts === void 0) {
         pts = true;
       }
-      return this.playlistLabel() + " " + frag.level + " (frag:[" + ((_ref3 = pts ? frag.startPTS : frag.start) != null ? _ref3 : NaN).toFixed(3) + "-" + ((_ref4 = pts ? frag.endPTS : frag.end) != null ? _ref4 : NaN).toFixed(3) + "]";
+      return this.playlistLabel() + " " + frag.level + " (" + (part ? 'part' : 'frag') + ":[" + ((_ref3 = pts && !part ? frag.startPTS : (part || frag).start) != null ? _ref3 : NaN).toFixed(3) + "-" + ((_ref4 = pts && !part ? frag.endPTS : (part || frag).end) != null ? _ref4 : NaN).toFixed(3) + "]" + (part && frag.type === 'main' ? 'INDEPENDENT=' + (part.independent ? 'YES' : 'NO') : '');
     };
     _proto.resetTransmuxer = function resetTransmuxer() {
       var _this$transmuxer2;
@@ -19644,7 +19693,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10750";
+  var 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
@@ -19916,7 +19965,7 @@
       var initSegmentChange = !(lastFrag && ((_frag$initSegment = frag.initSegment) == null ? void 0 : _frag$initSegment.url) === ((_lastFrag$initSegment = lastFrag.initSegment) == null ? void 0 : _lastFrag$initSegment.url));
       var 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 + "\n        discontinuity: " + discontinuity + "\n        trackSwitch: " + trackSwitch + "\n        contiguous: " + contiguous + "\n        accurateTimeOffset: " + accurateTimeOffset + "\n        timeOffset: " + timeOffset + "\n        initSegmentChange: " + initSegmentChange);
+        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 + "\n        discontinuity: " + discontinuity + "\n        trackSwitch: " + trackSwitch + "\n        contiguous: " + contiguous + "\n        accurateTimeOffset: " + accurateTimeOffset + "\n        timeOffset: " + timeOffset + "\n        initSegmentChange: " + initSegmentChange);
         var config = new TransmuxConfig(audioCodec, videoCodec, initSegmentData, duration, defaultInitPTS);
         this.configureTransmuxer(config);
       }
@@ -20889,12 +20938,13 @@
       }
       return audioCodec;
     };
-    _proto._loadBitrateTestFrag = function _loadBitrateTestFrag(frag, level) {
+    _proto._loadBitrateTestFrag = function _loadBitrateTestFrag(fragment, level) {
       var _this2 = this;
-      frag.bitrateTest = true;
-      this._doFragLoad(frag, level).then(function (data) {
+      fragment.bitrateTest = true;
+      this._doFragLoad(fragment, level).then(function (data) {
         var hls = _this2.hls;
-        if (!data || _this2.fragContextChanged(frag)) {
+        var frag = data == null ? void 0 : data.frag;
+        if (!frag || _this2.fragContextChanged(frag)) {
           return;
         }
         level.fragmentError = 0;