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

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.10751");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10754");
       } 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':
               {
@@ -14676,47 +14720,51 @@
           xhr.onprogress = null;
           var _status = xhr.status;
           // http status between 200 to 299 are all successful
-          var useResponse = xhr.responseType !== 'text';
-          if (_status >= 200 && _status < 300 && (useResponse && xhr.response || xhr.responseText !== null)) {
-            stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
-            var data = useResponse ? xhr.response : xhr.responseText;
-            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;
-            if (onProgress) {
-              onProgress(stats, context, data, xhr);
-            }
-            if (!this.callbacks) {
+          var useResponseText = xhr.responseType === 'text' ? xhr.responseText : null;
+          if (_status >= 200 && _status < 300) {
+            var data = useResponseText != null ? useResponseText : xhr.response;
+            if (data != null) {
+              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;
+              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);
               return;
             }
-            var response = {
-              url: xhr.responseURL,
-              data: data,
-              code: _status
-            };
-            this.callbacks.onSuccess(response, stats, context, xhr);
+          }
+
+          // Handle bad status or nullish response
+          var retryConfig = config.loadPolicy.errorRetry;
+          var retryCount = stats.retry;
+          // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
+          var response = {
+            url: context.url,
+            data: undefined,
+            code: _status
+          };
+          if (shouldRetry(retryConfig, retryCount, false, response)) {
+            this.retry(retryConfig);
           } else {
-            var retryConfig = config.loadPolicy.errorRetry;
-            var retryCount = stats.retry;
-            // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
-            var _response = {
-              url: context.url,
-              data: undefined,
-              code: _status
-            };
-            if (shouldRetry(retryConfig, retryCount, false, _response)) {
-              this.retry(retryConfig);
-            } else {
-              logger.error(_status + " while loading " + context.url);
-              this.callbacks.onError({
-                code: _status,
-                text: xhr.statusText
-              }, context, xhr, stats);
-            }
+            logger.error(_status + " while loading " + context.url);
+            this.callbacks.onError({
+              code: _status,
+              text: xhr.statusText
+            }, context, xhr, stats);
           }
         }
       }
@@ -19649,7 +19697,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10751";
+  var version = "1.6.0-beta.1.0.canary.10754";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js