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

package/README.md

@@ -86,20 +86,18 @@ For details on the HLS format and these tags' meanings, see https://datatracker.
 - `#EXT-X-CONTENT-STEERING:<attribute-list>` Content Steering
 - `#EXT-X-DEFINE:<attribute-list>` Variable Substitution (`NAME,VALUE,QUERYPARAM` attributes)
 
-The following properties are added to their respective variants' attribute list but are not implemented in their selection and playback.
-
-- `VIDEO-RANGE` (See [#2489](https://github.com/video-dev/hls.js/issues/2489))
-
 #### Media Playlist tags
 
-- `#EXTM3U`
-- `#EXT-X-VERSION=<n>`
+- `#EXTM3U` (ignored)
+- `#EXT-X-INDEPENDENT-SEGMENTS` (ignored)
+- `#EXT-X-VERSION=<n>` (value is ignored)
 - `#EXTINF:<duration>,[<title>]`
 - `#EXT-X-ENDLIST`
 - `#EXT-X-MEDIA-SEQUENCE=<n>`
 - `#EXT-X-TARGETDURATION=<n>`
 - `#EXT-X-DISCONTINUITY`
 - `#EXT-X-DISCONTINUITY-SEQUENCE=<n>`
+- `#EXT-X-BITRATE`
 - `#EXT-X-BYTERANGE=<n>[@<o>]`
 - `#EXT-X-MAP:<attribute-list>`
 - `#EXT-X-KEY:<attribute-list>` (`KEYFORMAT="identity",METHOD=SAMPLE-AES` is only supports with MPEG-2 TS segments)
@@ -115,11 +113,7 @@ The following properties are added to their respective variants' attribute list
 - `#EXT-X-DEFINE:<attribute-list>` Variable Import and Substitution (`NAME,VALUE,IMPORT,QUERYPARAM` attributes)
 - `#EXT-X-GAP` (Skips loading GAP segments and parts. Skips playback of unbuffered program containing only GAP content and no suitable alternates. See [#2940](https://github.com/video-dev/hls.js/issues/2940))
 
-The following tags are added to their respective fragment's attribute list but are not implemented in streaming and playback.
-
-- `#EXT-X-BITRATE` (Not used in ABR controller)
-
-Parsed but missing feature support
+Parsed but missing feature support:
 
 - `#EXT-X-PRELOAD-HINT:<attribute-list>` (See [#5074](https://github.com/video-dev/hls.js/issues/3988))
   - #5074
@@ -129,6 +123,7 @@ Parsed but missing feature support
 For a complete list of issues, see ["Top priorities" in the Release Planning and Backlog project tab](https://github.com/video-dev/hls.js/projects/6). Codec support is dependent on the runtime environment (for example, not all browsers on the same OS support HEVC).
 
 - `#EXT-X-I-FRAME-STREAM-INF` I-frame Media Playlist files
+- `REQ-VIDEO-LAYOUT` is not used in variant filtering or selection
 - "identity" format `SAMPLE-AES` method keys with fmp4, aac, mp3, vtt... segments (MPEG-2 TS only)
 - MPEG-2 TS segments with FairPlay Streaming, PlayReady, or Widevine encryption
 - FairPlay Streaming legacy keys (For com.apple.fps.1_0 use native Safari playback)

package/dist/hls.d.mts

@@ -1290,6 +1290,7 @@ export declare class Fragment extends BaseSegment {
     private _decryptdata;
     private _programDateTime;
     private _ref;
+    private _bitrate?;
     rawProgramDateTime: string | null;
     tagList: Array<string[]>;
     duration: number;
@@ -1319,6 +1320,9 @@ export declare class Fragment extends BaseSegment {
     gap?: boolean;
     urlId: number;
     constructor(type: PlaylistLevelType, base: Base | string);
+    get byteLength(): number | null;
+    get bitrate(): number | null;
+    set bitrate(value: number);
     get decryptdata(): LevelKey | null;
     get end(): number;
     get endProgramDateTime(): number | null;

package/dist/hls.d.ts

@@ -1290,6 +1290,7 @@ export declare class Fragment extends BaseSegment {
     private _decryptdata;
     private _programDateTime;
     private _ref;
+    private _bitrate?;
     rawProgramDateTime: string | null;
     tagList: Array<string[]>;
     duration: number;
@@ -1319,6 +1320,9 @@ export declare class Fragment extends BaseSegment {
     gap?: boolean;
     urlId: number;
     constructor(type: PlaylistLevelType, base: Base | string);
+    get byteLength(): number | null;
+    get bitrate(): number | null;
+    set bitrate(value: number);
     get decryptdata(): LevelKey | null;
     get end(): number;
     get endProgramDateTime(): number | null;

package/dist/hls.js

@@ -1057,7 +1057,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();
@@ -2115,7 +2115,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);
@@ -2595,7 +2595,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
@@ -4330,6 +4330,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
@@ -4437,6 +4439,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;
@@ -7649,6 +7683,7 @@
       var currentPart = 0;
       var totalduration = 0;
       var discontinuityCounter = 0;
+      var currentBitrate = 0;
       var prevFrag = null;
       var frag = new Fragment(type, base);
       var result;
@@ -7669,6 +7704,9 @@
           frag.start = totalduration;
           frag.sn = currentSN;
           frag.cc = discontinuityCounter;
+          if (currentBitrate) {
+            frag.bitrate = currentBitrate;
+          }
           frag.level = id;
           if (currentInitSegment) {
             frag.initSegment = currentInitSegment;
@@ -7798,6 +7836,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':
               {
@@ -16178,7 +16222,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
@@ -17862,12 +17906,16 @@
       return -1;
     };
     _proto.loadPlaylist = function loadPlaylist(hlsUrlParameters) {
+      var _this$hls$levels$this;
       var audioTrack = this.currentTrack;
-      if (this.shouldLoadPlaylist(audioTrack) && audioTrack) {
+      if (!audioTrack) {
+        return;
+      }
+      var url = audioTrack.url;
+      if (this.shouldLoadPlaylist(audioTrack) && url !== ((_this$hls$levels$this = this.hls.levels[this.hls.loadLevel]) == null ? void 0 : _this$hls$levels$this.uri)) {
         _BasePlaylistControll.prototype.loadPlaylist.call(this);
         var id = audioTrack.id;
         var groupId = audioTrack.groupId;
-        var url = audioTrack.url;
         if (hlsUrlParameters) {
           try {
             url = hlsUrlParameters.addDirectives(url);
@@ -29851,47 +29899,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);
           }
         }
       }

package/dist/hls.js.d.ts

@@ -1290,6 +1290,7 @@ export declare class Fragment extends BaseSegment {
     private _decryptdata;
     private _programDateTime;
     private _ref;
+    private _bitrate?;
     rawProgramDateTime: string | null;
     tagList: Array<string[]>;
     duration: number;
@@ -1319,6 +1320,9 @@ export declare class Fragment extends BaseSegment {
     gap?: boolean;
     urlId: number;
     constructor(type: PlaylistLevelType, base: Base | string);
+    get byteLength(): number | null;
+    get bitrate(): number | null;
+    set bitrate(value: number);
     get decryptdata(): LevelKey | null;
     get end(): number;
     get endProgramDateTime(): number | null;