hls.js 1.6.6-0.canary.11352 → 1.6.6-0.canary.11353

package/dist/hls.d.mts

@@ -20,6 +20,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private partCurrent;
     private bitrateTestDelay;
     private rebufferNotice;
+    private supportedCache;
     bwEstimator: EwmaBandWidthEstimator;
     constructor(hls: Hls);
     resetEstimator(abrEwmaDefaultEstimate?: number): void;

package/dist/hls.d.ts

@@ -20,6 +20,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private partCurrent;
     private bitrateTestDelay;
     private rebufferNotice;
+    private supportedCache;
     bwEstimator: EwmaBandWidthEstimator;
     constructor(hls: Hls);
     resetEstimator(abrEwmaDefaultEstimate?: number): void;

package/dist/hls.js

@@ -1165,7 +1165,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.6-0.canary.11352");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.6-0.canary.11353");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3163,9 +3163,9 @@
       error: error
     };
   }
-  var SUPPORTED_INFO_CACHE = {};
   function requiresMediaCapabilitiesDecodingInfo(level, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference) {
     // Only test support when configuration is exceeds minimum options
+    var videoCodecs = level.videoCodec;
     var audioGroups = level.audioCodec ? level.audioGroups : null;
     var audioCodecPreference = audioPreference == null ? void 0 : audioPreference.audioCodec;
     var channelsPreference = audioPreference == null ? void 0 : audioPreference.channels;
@@ -3196,77 +3196,56 @@
         return true;
       }
     }
-    return level.videoCodec !== undefined && (level.width > 1920 && level.height > 1088 || level.height > 1920 && level.width > 1088 || level.frameRate > Math.max(currentFrameRate, 30) || level.videoRange !== 'SDR' && level.videoRange !== currentVideoRange || level.bitrate > Math.max(currentBw, 8e6)) || !!audioChannels && isFiniteNumber(maxChannels) && Object.keys(audioChannels).some(function (channels) {
+    return videoCodecs !== undefined && (
+    // Force media capabilities check for HEVC to avoid failure on Windows
+    videoCodecs.split(',').some(function (videoCodec) {
+      return isHEVC(videoCodec);
+    }) || level.width > 1920 && level.height > 1088 || level.height > 1920 && level.width > 1088 || level.frameRate > Math.max(currentFrameRate, 30) || level.videoRange !== 'SDR' && level.videoRange !== currentVideoRange || level.bitrate > Math.max(currentBw, 8e6)) || !!audioChannels && isFiniteNumber(maxChannels) && Object.keys(audioChannels).some(function (channels) {
       return parseInt(channels) > maxChannels;
     });
   }
-  function getMediaDecodingInfoPromise(level, audioTracksByGroup, mediaCapabilities) {
+  function getMediaDecodingInfoPromise(level, audioTracksByGroup, mediaCapabilities, cache) {
+    if (cache === void 0) {
+      cache = {};
+    }
     var videoCodecs = level.videoCodec;
-    var audioCodecs = level.audioCodec;
-    if (!videoCodecs && !audioCodecs || !mediaCapabilities) {
+    if (!videoCodecs && !level.audioCodec || !mediaCapabilities) {
       return Promise.resolve(SUPPORTED_INFO_DEFAULT);
     }
     var configurations = [];
-    if (videoCodecs) {
-      var baseVideoConfiguration = {
-        width: level.width,
-        height: level.height,
-        bitrate: Math.ceil(Math.max(level.bitrate * 0.9, level.averageBitrate)),
-        // Assume a framerate of 30fps since MediaCapabilities will not accept Level default of 0.
-        framerate: level.frameRate || 30
+    var videoDecodeList = makeVideoConfigurations(level);
+    var videoCount = videoDecodeList.length;
+    var audioDecodeList = makeAudioConfigurations(level, audioTracksByGroup, videoCount > 0);
+    var audioCount = audioDecodeList.length;
+    for (var i = videoCount || 1 * audioCount || 1; i--;) {
+      var configuration = {
+        type: 'media-source'
       };
-      var videoRange = level.videoRange;
-      if (videoRange !== 'SDR') {
-        baseVideoConfiguration.transferFunction = videoRange.toLowerCase();
+      if (videoCount) {
+        configuration.video = videoDecodeList[i % videoCount];
       }
-      var videoCodecsArray = videoCodecs.split(',');
+      if (audioCount) {
+        configuration.audio = audioDecodeList[i % audioCount];
+        var audioBitrate = configuration.audio.bitrate;
+        if (configuration.video && audioBitrate) {
+          configuration.video.bitrate -= audioBitrate;
+        }
+      }
+      configurations.push(configuration);
+    }
+    if (videoCodecs) {
       // Override Windows Firefox HEVC MediaCapabilities result (https://github.com/video-dev/hls.js/issues/7046)
       var ua = navigator.userAgent;
-      if (videoCodecsArray.some(function (videoCodec) {
+      if (videoCodecs.split(',').some(function (videoCodec) {
         return isHEVC(videoCodec);
       }) && userAgentHevcSupportIsInaccurate()) {
-        return Promise.resolve(getUnsupportedResult(new Error("Overriding Windows Firefox HEVC MediaCapabilities result based on user-agent sting: (" + ua + ")"), configurations));
+        return Promise.resolve(getUnsupportedResult(new Error("Overriding Windows Firefox HEVC MediaCapabilities result based on user-agent string: (" + ua + ")"), configurations));
       }
-      configurations.push.apply(configurations, videoCodecsArray.map(function (videoCodec) {
-        return {
-          type: 'media-source',
-          video: _objectSpread2(_objectSpread2({}, baseVideoConfiguration), {}, {
-            contentType: mimeTypeForCodec(fillInMissingAV01Params(videoCodec), 'video')
-          })
-        };
-      }));
-    }
-    if (audioCodecs && level.audioGroups) {
-      level.audioGroups.forEach(function (audioGroupId) {
-        var _audioTracksByGroup$g;
-        if (!audioGroupId) {
-          return;
-        }
-        (_audioTracksByGroup$g = audioTracksByGroup.groups[audioGroupId]) == null ? void 0 : _audioTracksByGroup$g.tracks.forEach(function (audioTrack) {
-          if (audioTrack.groupId === audioGroupId) {
-            var channels = audioTrack.channels || '';
-            var channelsNumber = parseFloat(channels);
-            if (isFiniteNumber(channelsNumber) && channelsNumber > 2) {
-              configurations.push.apply(configurations, audioCodecs.split(',').map(function (audioCodec) {
-                return {
-                  type: 'media-source',
-                  audio: {
-                    contentType: mimeTypeForCodec(audioCodec, 'audio'),
-                    channels: '' + channelsNumber
-                    // spatialRendering:
-                    //   audioCodec === 'ec-3' && channels.indexOf('JOC'),
-                  }
-                };
-              }));
-            }
-          }
-        });
-      });
     }
     return Promise.all(configurations.map(function (configuration) {
       // Cache MediaCapabilities promises
       var decodingInfoKey = getMediaDecodingInfoKey(configuration);
-      return SUPPORTED_INFO_CACHE[decodingInfoKey] || (SUPPORTED_INFO_CACHE[decodingInfoKey] = mediaCapabilities.decodingInfo(configuration));
+      return cache[decodingInfoKey] || (cache[decodingInfoKey] = mediaCapabilities.decodingInfo(configuration));
     })).then(function (decodingInfoResults) {
       return {
         supported: !decodingInfoResults.some(function (info) {
@@ -3284,20 +3263,88 @@
       };
     });
   }
+  function makeVideoConfigurations(level) {
+    var _level$videoCodec;
+    var videoCodecs = (_level$videoCodec = level.videoCodec) == null ? void 0 : _level$videoCodec.split(',');
+    var bitrate = getVariantDecodingBitrate(level);
+    var width = level.width || 640;
+    var height = level.height || 480;
+    // Assume a framerate of 30fps since MediaCapabilities will not accept Level default of 0.
+    var framerate = level.frameRate || 30;
+    var videoRange = level.videoRange.toLowerCase();
+    return videoCodecs ? videoCodecs.map(function (videoCodec) {
+      var videoConfiguration = {
+        contentType: mimeTypeForCodec(fillInMissingAV01Params(videoCodec), 'video'),
+        width: width,
+        height: height,
+        bitrate: bitrate,
+        framerate: framerate
+      };
+      if (videoRange !== 'sdr') {
+        videoConfiguration.transferFunction = videoRange;
+      }
+      return videoConfiguration;
+    }) : [];
+  }
+  function makeAudioConfigurations(level, audioTracksByGroup, hasVideo) {
+    var _level$audioCodec;
+    var audioCodecs = (_level$audioCodec = level.audioCodec) == null ? void 0 : _level$audioCodec.split(',');
+    var combinedBitrate = getVariantDecodingBitrate(level);
+    if (audioCodecs && level.audioGroups) {
+      return level.audioGroups.reduce(function (configurations, audioGroupId) {
+        var _audioTracksByGroup$g;
+        var tracks = audioGroupId ? (_audioTracksByGroup$g = audioTracksByGroup.groups[audioGroupId]) == null ? void 0 : _audioTracksByGroup$g.tracks : null;
+        if (tracks) {
+          return tracks.reduce(function (configs, audioTrack) {
+            if (audioTrack.groupId === audioGroupId) {
+              var channelsNumber = parseFloat(audioTrack.channels || '');
+              audioCodecs.forEach(function (audioCodec) {
+                var audioConfiguration = {
+                  contentType: mimeTypeForCodec(audioCodec, 'audio'),
+                  bitrate: hasVideo ? estimatedAudioBitrate(audioCodec, combinedBitrate) : combinedBitrate
+                };
+                if (channelsNumber) {
+                  audioConfiguration.channels = '' + channelsNumber;
+                }
+                configs.push(audioConfiguration);
+              });
+            }
+            return configs;
+          }, configurations);
+        }
+        return configurations;
+      }, []);
+    }
+    return [];
+  }
+  function estimatedAudioBitrate(audioCodec, levelBitrate) {
+    if (levelBitrate <= 1) {
+      return 1;
+    }
+    var audioBitrate = 128000;
+    if (audioCodec === 'ec-3') {
+      audioBitrate = 768000;
+    } else if (audioCodec === 'ac-3') {
+      audioBitrate = 640000;
+    }
+    return Math.min(levelBitrate / 2, audioBitrate); // Don't exceed some % of level bitrate
+  }
+  function getVariantDecodingBitrate(level) {
+    return Math.ceil(Math.max(level.bitrate * 0.9, level.averageBitrate) / 1000) * 1000 || 1;
+  }
   function getMediaDecodingInfoKey(config) {
+    var key = '';
     var audio = config.audio,
       video = config.video;
-    var mediaConfig = video || audio;
-    if (mediaConfig) {
-      var codec = getCodecsForMimeType(mediaConfig.contentType);
-      if (video) {
-        return "r" + video.height + "x" + video.width + "f" + Math.ceil(video.framerate) + (video.transferFunction || 'sd') + "_" + codec + "_" + Math.ceil(video.bitrate / 1e5);
-      }
-      if (audio) {
-        return "c" + audio.channels + (audio.spatialRendering ? 's' : 'n') + "_" + codec;
-      }
+    if (video) {
+      var codec = getCodecsForMimeType(video.contentType);
+      key += codec + "_r" + video.height + "x" + video.width + "f" + Math.ceil(video.framerate) + (video.transferFunction || 'sd') + "_" + Math.ceil(video.bitrate / 1e5);
     }
-    return '';
+    if (audio) {
+      var _codec = getCodecsForMimeType(audio.contentType);
+      key += "" + (video ? '_' : '') + _codec + "_c" + audio.channels;
+    }
+    return key;
   }
 
   var HdcpLevels = ['NONE', 'TYPE-0', 'TYPE-1', null];
@@ -3945,6 +3992,7 @@
       _this.partCurrent = null;
       _this.bitrateTestDelay = 0;
       _this.rebufferNotice = -1;
+      _this.supportedCache = {};
       _this.bwEstimator = void 0;
       /*
           This method monitors the download rate of the current fragment, and will downswitch if that fragment will not load
@@ -4141,13 +4189,14 @@
       this.unregisterListeners();
       this.clearTimer();
       // @ts-ignore
-      this.hls = this._abandonRulesCheck = null;
+      this.hls = this._abandonRulesCheck = this.supportedCache = null;
       this.fragCurrent = this.partCurrent = null;
     };
     _proto.onManifestLoading = function onManifestLoading(event, data) {
       this.lastLoadedFragLevel = -1;
       this.firstSelection = -1;
       this.lastLevelLoadSec = 0;
+      this.supportedCache = {};
       this.fragCurrent = this.partCurrent = null;
       this.onLevelsUpdated();
       this.clearTimer();
@@ -4441,7 +4490,7 @@
       var ttfbEstimateSec = this.bwEstimator.getEstimateTTFB() / 1000;
       var levelsSkipped = [];
       var _loop = function _loop() {
-          var _levelInfo$supportedR;
+          var _levelInfo$supportedR, _levelInfo$supportedR2;
           var levelInfo = levels[i];
           var upSwitch = i > selectionBaseLevel;
           if (!levelInfo) {
@@ -4449,9 +4498,8 @@
           }
           if (config.useMediaCapabilities && !levelInfo.supportedResult && !levelInfo.supportedPromise) {
             var mediaCapabilities = navigator.mediaCapabilities;
-            if (typeof (mediaCapabilities == null ? void 0 : mediaCapabilities.decodingInfo) === 'function' && (requiresMediaCapabilitiesDecodingInfo(levelInfo, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference) || isHEVC(levelInfo.videoCodec)) // Force media capabilities check for HEVC to avoid failure on Windows
-            ) {
-              levelInfo.supportedPromise = getMediaDecodingInfoPromise(levelInfo, audioTracksByGroup, mediaCapabilities);
+            if (typeof (mediaCapabilities == null ? void 0 : mediaCapabilities.decodingInfo) === 'function' && requiresMediaCapabilitiesDecodingInfo(levelInfo, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference)) {
+              levelInfo.supportedPromise = getMediaDecodingInfoPromise(levelInfo, audioTracksByGroup, mediaCapabilities, _this3.supportedCache);
               levelInfo.supportedPromise.then(function (decodingInfo) {
                 if (!_this3.hls) {
                   return;
@@ -4470,6 +4518,10 @@
                       _this3.hls.nextLoadLevel = 0;
                     }
                   }
+                } else if (decodingInfo.decodingInfoResults.some(function (info) {
+                  return info.smooth === false || info.powerEfficient === false;
+                })) {
+                  _this3.log("MediaCapabilities decodingInfo for level " + index + " not smooth or powerEfficient: " + stringify(decodingInfo));
                 }
               });
             } else {
@@ -4479,7 +4531,9 @@
 
           // skip candidates which change codec-family or video-range,
           // and which decrease or increase frame-rate for up and down-switch respectfully
-          if (currentCodecSet && levelInfo.codecSet !== currentCodecSet || currentVideoRange && levelInfo.videoRange !== currentVideoRange || upSwitch && currentFrameRate > levelInfo.frameRate || !upSwitch && currentFrameRate > 0 && currentFrameRate < levelInfo.frameRate || levelInfo.supportedResult && !((_levelInfo$supportedR = levelInfo.supportedResult.decodingInfoResults) != null && _levelInfo$supportedR[0].smooth)) {
+          if (currentCodecSet && levelInfo.codecSet !== currentCodecSet || currentVideoRange && levelInfo.videoRange !== currentVideoRange || upSwitch && currentFrameRate > levelInfo.frameRate || !upSwitch && currentFrameRate > 0 && currentFrameRate < levelInfo.frameRate || (_levelInfo$supportedR = levelInfo.supportedResult) != null && (_levelInfo$supportedR2 = _levelInfo$supportedR.decodingInfoResults) != null && _levelInfo$supportedR2.some(function (info) {
+            return info.smooth === false;
+          })) {
             if (!firstSelection || i !== minStartIndex) {
               levelsSkipped.push(i);
               return 0; // continue
@@ -16671,7 +16725,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.6-0.canary.11352";
+  var version = "1.6.6-0.canary.11353";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js

package/dist/hls.js.d.ts

@@ -20,6 +20,7 @@ export declare class AbrController extends Logger implements AbrComponentAPI {
     private partCurrent;
     private bitrateTestDelay;
     private rebufferNotice;
+    private supportedCache;
     bwEstimator: EwmaBandWidthEstimator;
     constructor(hls: Hls);
     resetEstimator(abrEwmaDefaultEstimate?: number): void;