hls.js 1.5.12-0.canary.10351 → 1.5.12-0.canary.10353

package/dist/hls.js

@@ -522,7 +522,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.5.12-0.canary.10351");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.12-0.canary.10353");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -7304,12 +7304,9 @@
     }
     if (videoPreference) {
       allowedVideoRanges = videoPreference.allowedVideoRanges || VideoRangeValues.slice(0);
-      preferHDR = videoPreference.preferHDR !== undefined ? videoPreference.preferHDR : isHdrSupported();
-      if (preferHDR) {
-        allowedVideoRanges = allowedVideoRanges.filter(function (range) {
-          return range !== 'SDR';
-        });
-      } else {
+      var allowAutoPreferHDR = allowedVideoRanges.join('') !== 'SDR' && !videoPreference.videoCodec;
+      preferHDR = videoPreference.preferHDR !== undefined ? videoPreference.preferHDR : allowAutoPreferHDR && isHdrSupported();
+      if (!preferHDR) {
         allowedVideoRanges = ['SDR'];
       }
     }
@@ -7323,13 +7320,15 @@
     var codecSets = Object.keys(codecTiers);
     var channelsPreference = audioPreference == null ? void 0 : audioPreference.channels;
     var audioCodecPreference = audioPreference == null ? void 0 : audioPreference.audioCodec;
+    var videoCodecPreference = videoPreference == null ? void 0 : videoPreference.videoCodec;
     var preferStereo = channelsPreference && parseInt(channelsPreference) === 2;
     // Use first level set to determine stereo, and minimum resolution and framerate
-    var hasStereo = true;
+    var hasStereo = false;
     var hasCurrentVideoRange = false;
     var minHeight = Infinity;
     var minFramerate = Infinity;
     var minBitrate = Infinity;
+    var minIndex = Infinity;
     var selectedScore = 0;
     var videoRanges = [];
     var _getVideoSelectionOpt = getVideoSelectionOptions(currentVideoRange, videoPreference),
@@ -7337,7 +7336,7 @@
       allowedVideoRanges = _getVideoSelectionOpt.allowedVideoRanges;
     var _loop = function _loop() {
       var tier = codecTiers[codecSets[i]];
-      hasStereo = tier.channels[2] > 0;
+      hasStereo || (hasStereo = tier.channels[2] > 0);
       minHeight = Math.min(minHeight, tier.minHeight);
       minFramerate = Math.min(minFramerate, tier.minFramerate);
       minBitrate = Math.min(minBitrate, tier.minBitrate);
@@ -7346,7 +7345,6 @@
       });
       if (matchingVideoRanges.length > 0) {
         hasCurrentVideoRange = true;
-        videoRanges = matchingVideoRanges;
       }
     };
     for (var i = codecSets.length; i--;) {
@@ -7361,7 +7359,6 @@
     // If there are no variants with matching preference, set currentVideoRange to undefined
     if (!hasCurrentVideoRange) {
       currentVideoRange = undefined;
-      videoRanges = [];
     }
     var codecSet = codecSets.reduce(function (selected, candidate) {
       // Remove candiates which do not meet bitrate, default audio, stereo or channels preference, 1080p or lower, 30fps or lower, or SDR/HDR selection if present
@@ -7369,6 +7366,9 @@
       if (candidate === selected) {
         return selected;
       }
+      videoRanges = hasCurrentVideoRange ? allowedVideoRanges.filter(function (range) {
+        return candidateTier.videoRanges[range] > 0;
+      }) : [];
       if (candidateTier.minBitrate > currentBw) {
         logStartCodecCandidateIgnored(candidate, "min bitrate of " + candidateTier.minBitrate + " > current estimate of " + currentBw);
         return selected;
@@ -7404,6 +7404,10 @@
         logStartCodecCandidateIgnored(candidate, "no variants with VIDEO-RANGE of " + JSON.stringify(videoRanges) + " found");
         return selected;
       }
+      if (videoCodecPreference && candidate.indexOf(videoCodecPreference.substring(0, 4)) % 5 !== 0) {
+        logStartCodecCandidateIgnored(candidate, "video codec preference \"" + videoCodecPreference + "\" not found");
+        return selected;
+      }
       if (candidateTier.maxScore < selectedScore) {
         logStartCodecCandidateIgnored(candidate, "max score of " + candidateTier.maxScore + " < selected max of " + selectedScore);
         return selected;
@@ -7412,6 +7416,7 @@
       if (selected && (codecsSetSelectionPreferenceValue(candidate) >= codecsSetSelectionPreferenceValue(selected) || candidateTier.fragmentError > codecTiers[selected].fragmentError)) {
         return selected;
       }
+      minIndex = candidateTier.minIndex;
       selectedScore = candidateTier.maxScore;
       return candidate;
     }, undefined);
@@ -7420,7 +7425,8 @@
       videoRanges: videoRanges,
       preferHDR: preferHDR,
       minFramerate: minFramerate,
-      minBitrate: minBitrate
+      minBitrate: minBitrate,
+      minIndex: minIndex
     };
   }
   function logStartCodecCandidateIgnored(codeSet, reason) {
@@ -7458,7 +7464,7 @@
     });
   }
   function getCodecTiers(levels, audioTracksByGroup, minAutoLevel, maxAutoLevel) {
-    return levels.slice(minAutoLevel, maxAutoLevel + 1).reduce(function (tiers, level) {
+    return levels.slice(minAutoLevel, maxAutoLevel + 1).reduce(function (tiers, level, index) {
       if (!level.codecSet) {
         return tiers;
       }
@@ -7469,6 +7475,7 @@
           minBitrate: Infinity,
           minHeight: Infinity,
           minFramerate: Infinity,
+          minIndex: index,
           maxScore: 0,
           videoRanges: {
             SDR: 0
@@ -7484,6 +7491,7 @@
       var lesserWidthOrHeight = Math.min(level.height, level.width);
       tier.minHeight = Math.min(tier.minHeight, lesserWidthOrHeight);
       tier.minFramerate = Math.min(tier.minFramerate, level.frameRate);
+      tier.minIndex = Math.min(tier.minIndex, index);
       tier.maxScore = Math.max(tier.maxScore, level.score);
       tier.fragmentError += level.fragmentError;
       tier.videoRanges[level.videoRange] = (tier.videoRanges[level.videoRange] || 0) + 1;
@@ -8037,6 +8045,7 @@
       var audioPreference = config.audioPreference,
         videoPreference = config.videoPreference;
       var audioTracksByGroup = this.audioTracksByGroup || (this.audioTracksByGroup = getAudioTracksByGroup(allAudioTracks));
+      var minStartIndex = -1;
       if (firstSelection) {
         if (this.firstSelection !== -1) {
           return this.firstSelection;
@@ -8047,7 +8056,9 @@
           videoRanges = startTier.videoRanges,
           minFramerate = startTier.minFramerate,
           minBitrate = startTier.minBitrate,
+          minIndex = startTier.minIndex,
           preferHDR = startTier.preferHDR;
+        minStartIndex = minIndex;
         currentCodecSet = codecSet;
         currentVideoRange = preferHDR ? videoRanges[videoRanges.length - 1] : videoRanges[0];
         currentFrameRate = minFramerate;
@@ -8096,8 +8107,10 @@
           // 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)) {
-            levelsSkipped.push(i);
-            return 0; // continue
+            if (firstSelection && i !== minStartIndex) {
+              levelsSkipped.push(i);
+              return 0; // continue
+            }
           }
           var levelDetails = levelInfo.details;
           var avgDuration = (partCurrent ? levelDetails == null ? void 0 : levelDetails.partTarget : levelDetails == null ? void 0 : levelDetails.averagetargetduration) || currentFragDuration;
@@ -8132,7 +8145,7 @@
               if (levelsSkipped.length) {
                 _this3.trace("Skipped level(s) " + levelsSkipped.join(',') + " of " + maxAutoLevel + " max with CODECS and VIDEO-RANGE:\"" + levels[levelsSkipped[0]].codecs + "\" " + levels[levelsSkipped[0]].videoRange + "; not compatible with \"" + level.codecs + "\" " + currentVideoRange);
               }
-              _this3.info("switch candidate:" + selectionBaseLevel + "->" + i + " adjustedbw(" + Math.round(adjustedbw) + ")-bitrate=" + Math.round(adjustedbw - bitrate) + " ttfb:" + ttfbEstimateSec.toFixed(1) + " avgDuration:" + avgDuration.toFixed(1) + " maxFetchDuration:" + maxFetchDuration.toFixed(1) + " fetchDuration:" + fetchDuration.toFixed(1) + " firstSelection:" + firstSelection + " codecSet:" + currentCodecSet + " videoRange:" + currentVideoRange + " hls.loadLevel:" + loadLevel);
+              _this3.info("switch candidate:" + selectionBaseLevel + "->" + i + " adjustedbw(" + Math.round(adjustedbw) + ")-bitrate=" + Math.round(adjustedbw - bitrate) + " ttfb:" + ttfbEstimateSec.toFixed(1) + " avgDuration:" + avgDuration.toFixed(1) + " maxFetchDuration:" + maxFetchDuration.toFixed(1) + " fetchDuration:" + fetchDuration.toFixed(1) + " firstSelection:" + firstSelection + " codecSet:" + level.codecSet + " videoRange:" + level.videoRange + " hls.loadLevel:" + loadLevel);
             }
             if (firstSelection) {
               _this3.firstSelection = i;
@@ -12275,6 +12288,20 @@
         length: 0
       };
     };
+    _proto.getLastNalUnit = function getLastNalUnit(samples) {
+      var _VideoSample;
+      var VideoSample = this.VideoSample;
+      var lastUnit;
+      // try to fallback to previous sample if current one is empty
+      if (!VideoSample || VideoSample.units.length === 0) {
+        VideoSample = samples[samples.length - 1];
+      }
+      if ((_VideoSample = VideoSample) != null && _VideoSample.units) {
+        var units = VideoSample.units;
+        lastUnit = units[units.length - 1];
+      }
+      return lastUnit;
+    };
     _proto.pushAccessUnit = function pushAccessUnit(VideoSample, videoTrack) {
       if (VideoSample.units.length && VideoSample.frame) {
         // if sample does not have PTS/DTS, patch with last sample PTS/DTS
@@ -12297,7 +12324,7 @@
         logger.log(VideoSample.pts + '/' + VideoSample.dts + ':' + VideoSample.debug);
       }
     };
-    _proto.parseNALu = function parseNALu(track, array, last) {
+    _proto.parseNALu = function parseNALu(track, array, endOfSegment) {
       var len = array.byteLength;
       var state = track.naluState || 0;
       var lastState = state;
@@ -12339,10 +12366,6 @@
               data: array.subarray(lastUnitStart, overflow),
               type: lastUnitType
             };
-            if (track.lastNalu) {
-              units.push(track.lastNalu);
-              track.lastNalu = null;
-            }
             // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
             units.push(unit);
           } else {
@@ -12350,7 +12373,7 @@
             // first check if start code delimiter is overlapping between 2 PES packets,
             // ie it started in last packet (lastState not zero)
             // and ended at the beginning of this PES packet (i <= 4 - lastState)
-            var lastUnit = track.lastNalu;
+            var lastUnit = this.getLastNalUnit(track.samples);
             if (lastUnit) {
               if (lastState && i <= 4 - lastState) {
                 // start delimiter overlapping between PES packets
@@ -12367,8 +12390,6 @@
                 // logger.log('first NALU found with overflow:' + overflow);
                 lastUnit.data = appendUint8Array(lastUnit.data, array.subarray(0, overflow));
                 lastUnit.state = 0;
-                units.push(lastUnit);
-                track.lastNalu = null;
               }
             }
           }
@@ -12393,21 +12414,15 @@
           type: lastUnitType,
           state: state
         };
-        if (!last) {
-          track.lastNalu = _unit;
-          // logger.log('store NALu to push it on next PES');
-        } else {
-          units.push(_unit);
-          // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
-        }
-      } else if (units.length === 0) {
-        // no NALu found
+        units.push(_unit);
+        // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
+      }
+      // no NALu found
+      if (units.length === 0) {
         // append pes.data to previous NAL unit
-        var _lastUnit = track.lastNalu;
+        var _lastUnit = this.getLastNalUnit(track.samples);
         if (_lastUnit) {
           _lastUnit.data = appendUint8Array(_lastUnit.data, array);
-          units.push(_lastUnit);
-          track.lastNalu = null;
         }
       }
       track.naluState = state;
@@ -12577,9 +12592,9 @@
     }
     _inheritsLoose(AvcVideoParser, _BaseVideoParser);
     var _proto = AvcVideoParser.prototype;
-    _proto.parsePES = function parsePES(track, textTrack, pes, last, duration) {
+    _proto.parsePES = function parsePES(track, textTrack, pes, endOfSegment, duration) {
       var _this = this;
-      var units = this.parseNALu(track, pes.data, last);
+      var units = this.parseNALu(track, pes.data, endOfSegment);
       var VideoSample = this.VideoSample;
       var push;
       var spsfound = false;
@@ -12709,7 +12724,7 @@
         }
       });
       // if last PES packet, push samples
-      if (last && VideoSample) {
+      if (endOfSegment && VideoSample) {
         this.pushAccessUnit(VideoSample, track);
         this.VideoSample = null;
       }
@@ -12916,9 +12931,9 @@
     }
     _inheritsLoose(HevcVideoParser, _BaseVideoParser);
     var _proto = HevcVideoParser.prototype;
-    _proto.parsePES = function parsePES(track, textTrack, pes, last, duration) {
+    _proto.parsePES = function parsePES(track, textTrack, pes, endOfSegment, duration) {
       var _this2 = this;
-      var units = this.parseNALu(track, pes.data, last);
+      var units = this.parseNALu(track, pes.data, endOfSegment);
       var VideoSample = this.VideoSample;
       var push;
       var spsfound = false;
@@ -13080,7 +13095,7 @@
         }
       });
       // if last PES packet, push samples
-      if (last && VideoSample) {
+      if (endOfSegment && VideoSample) {
         this.pushAccessUnit(VideoSample, track);
         this.VideoSample = null;
       }
@@ -30129,7 +30144,7 @@
      */
     _proto.setAudioOption = function setAudioOption(audioOption) {
       var _this$audioTrackContr;
-      return (_this$audioTrackContr = this.audioTrackController) == null ? void 0 : _this$audioTrackContr.setAudioOption(audioOption);
+      return ((_this$audioTrackContr = this.audioTrackController) == null ? void 0 : _this$audioTrackContr.setAudioOption(audioOption)) || null;
     }
     /**
      * Find and select the best matching subtitle track, making a level switch when a Group change is necessary.
@@ -30137,8 +30152,7 @@
      */;
     _proto.setSubtitleOption = function setSubtitleOption(subtitleOption) {
       var _this$subtitleTrackCo;
-      (_this$subtitleTrackCo = this.subtitleTrackController) == null ? void 0 : _this$subtitleTrackCo.setSubtitleOption(subtitleOption);
-      return null;
+      return ((_this$subtitleTrackCo = this.subtitleTrackController) == null ? void 0 : _this$subtitleTrackCo.setSubtitleOption(subtitleOption)) || null;
     }
 
     /**
@@ -30663,7 +30677,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.12-0.canary.10351";
+        return "1.5.12-0.canary.10353";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -3156,6 +3156,7 @@ declare const VideoRangeValues: readonly ["SDR", "PQ", "HLG"];
 export declare type VideoSelectionOption = {
     preferHDR?: boolean;
     allowedVideoRanges?: Array<VideoRange>;
+    videoCodec?: string;
 };
 
 export { }