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

package/dist/hls.mjs

@@ -420,7 +420,7 @@ function enableLogs(debugConfig, context, id) {
     // 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();
@@ -6990,10 +6990,9 @@ function getVideoSelectionOptions(currentVideoRange, videoPreference) {
   }
   if (videoPreference) {
     allowedVideoRanges = videoPreference.allowedVideoRanges || VideoRangeValues.slice(0);
-    preferHDR = videoPreference.preferHDR !== undefined ? videoPreference.preferHDR : isHdrSupported();
-    if (preferHDR) {
-      allowedVideoRanges = allowedVideoRanges.filter(range => range !== 'SDR');
-    } else {
+    const allowAutoPreferHDR = allowedVideoRanges.join('') !== 'SDR' && !videoPreference.videoCodec;
+    preferHDR = videoPreference.preferHDR !== undefined ? videoPreference.preferHDR : allowAutoPreferHDR && isHdrSupported();
+    if (!preferHDR) {
       allowedVideoRanges = ['SDR'];
     }
   }
@@ -7007,13 +7006,15 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
   const codecSets = Object.keys(codecTiers);
   const channelsPreference = audioPreference == null ? void 0 : audioPreference.channels;
   const audioCodecPreference = audioPreference == null ? void 0 : audioPreference.audioCodec;
+  const videoCodecPreference = videoPreference == null ? void 0 : videoPreference.videoCodec;
   const preferStereo = channelsPreference && parseInt(channelsPreference) === 2;
   // Use first level set to determine stereo, and minimum resolution and framerate
-  let hasStereo = true;
+  let hasStereo = false;
   let hasCurrentVideoRange = false;
   let minHeight = Infinity;
   let minFramerate = Infinity;
   let minBitrate = Infinity;
+  let minIndex = Infinity;
   let selectedScore = 0;
   let videoRanges = [];
   const {
@@ -7022,14 +7023,13 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
   } = getVideoSelectionOptions(currentVideoRange, videoPreference);
   for (let i = codecSets.length; i--;) {
     const 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);
     const matchingVideoRanges = allowedVideoRanges.filter(range => tier.videoRanges[range] > 0);
     if (matchingVideoRanges.length > 0) {
       hasCurrentVideoRange = true;
-      videoRanges = matchingVideoRanges;
     }
   }
   minHeight = isFiniteNumber(minHeight) ? minHeight : 0;
@@ -7041,7 +7041,6 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
   // If there are no variants with matching preference, set currentVideoRange to undefined
   if (!hasCurrentVideoRange) {
     currentVideoRange = undefined;
-    videoRanges = [];
   }
   const codecSet = codecSets.reduce((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
@@ -7049,6 +7048,7 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
     if (candidate === selected) {
       return selected;
     }
+    videoRanges = hasCurrentVideoRange ? allowedVideoRanges.filter(range => candidateTier.videoRanges[range] > 0) : [];
     if (candidateTier.minBitrate > currentBw) {
       logStartCodecCandidateIgnored(candidate, `min bitrate of ${candidateTier.minBitrate} > current estimate of ${currentBw}`);
       return selected;
@@ -7082,6 +7082,10 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
       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;
@@ -7090,6 +7094,7 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
     if (selected && (codecsSetSelectionPreferenceValue(candidate) >= codecsSetSelectionPreferenceValue(selected) || candidateTier.fragmentError > codecTiers[selected].fragmentError)) {
       return selected;
     }
+    minIndex = candidateTier.minIndex;
     selectedScore = candidateTier.maxScore;
     return candidate;
   }, undefined);
@@ -7098,7 +7103,8 @@ function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPrefer
     videoRanges,
     preferHDR,
     minFramerate,
-    minBitrate
+    minBitrate,
+    minIndex
   };
 }
 function logStartCodecCandidateIgnored(codeSet, reason) {
@@ -7136,7 +7142,7 @@ function getAudioTracksByGroup(allAudioTracks) {
   });
 }
 function getCodecTiers(levels, audioTracksByGroup, minAutoLevel, maxAutoLevel) {
-  return levels.slice(minAutoLevel, maxAutoLevel + 1).reduce((tiers, level) => {
+  return levels.slice(minAutoLevel, maxAutoLevel + 1).reduce((tiers, level, index) => {
     if (!level.codecSet) {
       return tiers;
     }
@@ -7147,6 +7153,7 @@ function getCodecTiers(levels, audioTracksByGroup, minAutoLevel, maxAutoLevel) {
         minBitrate: Infinity,
         minHeight: Infinity,
         minFramerate: Infinity,
+        minIndex: index,
         maxScore: 0,
         videoRanges: {
           SDR: 0
@@ -7162,6 +7169,7 @@ function getCodecTiers(levels, audioTracksByGroup, minAutoLevel, maxAutoLevel) {
     const 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;
@@ -7785,6 +7793,7 @@ class AbrController extends Logger {
       videoPreference
     } = config;
     const audioTracksByGroup = this.audioTracksByGroup || (this.audioTracksByGroup = getAudioTracksByGroup(allAudioTracks));
+    let minStartIndex = -1;
     if (firstSelection) {
       if (this.firstSelection !== -1) {
         return this.firstSelection;
@@ -7796,8 +7805,10 @@ class AbrController extends Logger {
         videoRanges,
         minFramerate,
         minBitrate,
+        minIndex,
         preferHDR
       } = startTier;
+      minStartIndex = minIndex;
       currentCodecSet = codecSet;
       currentVideoRange = preferHDR ? videoRanges[videoRanges.length - 1] : videoRanges[0];
       currentFrameRate = minFramerate;
@@ -7846,8 +7857,10 @@ class AbrController extends Logger {
       // 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);
-        continue;
+        if (firstSelection && i !== minStartIndex) {
+          levelsSkipped.push(i);
+          continue;
+        }
       }
       const levelDetails = levelInfo.details;
       const avgDuration = (partCurrent ? levelDetails == null ? void 0 : levelDetails.partTarget : levelDetails == null ? void 0 : levelDetails.averagetargetduration) || currentFragDuration;
@@ -7882,7 +7895,7 @@ class AbrController extends Logger {
           if (levelsSkipped.length) {
             this.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}`);
           }
-          this.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}`);
+          this.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) {
           this.firstSelection = i;
@@ -11948,6 +11961,20 @@ class BaseVideoParser {
       length: 0
     };
   }
+  getLastNalUnit(samples) {
+    var _VideoSample;
+    let VideoSample = this.VideoSample;
+    let 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) {
+      const units = VideoSample.units;
+      lastUnit = units[units.length - 1];
+    }
+    return lastUnit;
+  }
   pushAccessUnit(VideoSample, videoTrack) {
     if (VideoSample.units.length && VideoSample.frame) {
       // if sample does not have PTS/DTS, patch with last sample PTS/DTS
@@ -11970,7 +11997,7 @@ class BaseVideoParser {
       logger.log(VideoSample.pts + '/' + VideoSample.dts + ':' + VideoSample.debug);
     }
   }
-  parseNALu(track, array, last) {
+  parseNALu(track, array, endOfSegment) {
     const len = array.byteLength;
     let state = track.naluState || 0;
     const lastState = state;
@@ -12012,10 +12039,6 @@ class BaseVideoParser {
             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 {
@@ -12023,7 +12046,7 @@ class BaseVideoParser {
           // 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)
-          const lastUnit = track.lastNalu;
+          const lastUnit = this.getLastNalUnit(track.samples);
           if (lastUnit) {
             if (lastState && i <= 4 - lastState) {
               // start delimiter overlapping between PES packets
@@ -12040,8 +12063,6 @@ class BaseVideoParser {
               // 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;
             }
           }
         }
@@ -12066,21 +12087,15 @@ class BaseVideoParser {
         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
-      const lastUnit = track.lastNalu;
+      const lastUnit = this.getLastNalUnit(track.samples);
       if (lastUnit) {
         lastUnit.data = appendUint8Array(lastUnit.data, array);
-        units.push(lastUnit);
-        track.lastNalu = null;
       }
     }
     track.naluState = state;
@@ -12231,8 +12246,8 @@ class ExpGolomb {
 }
 
 class AvcVideoParser extends BaseVideoParser {
-  parsePES(track, textTrack, pes, last, duration) {
-    const units = this.parseNALu(track, pes.data, last);
+  parsePES(track, textTrack, pes, endOfSegment, duration) {
+    const units = this.parseNALu(track, pes.data, endOfSegment);
     let VideoSample = this.VideoSample;
     let push;
     let spsfound = false;
@@ -12362,7 +12377,7 @@ class AvcVideoParser extends BaseVideoParser {
       }
     });
     // if last PES packet, push samples
-    if (last && VideoSample) {
+    if (endOfSegment && VideoSample) {
       this.pushAccessUnit(VideoSample, track);
       this.VideoSample = null;
     }
@@ -12561,8 +12576,8 @@ class HevcVideoParser extends BaseVideoParser {
     super(...args);
     this.initVPS = null;
   }
-  parsePES(track, textTrack, pes, last, duration) {
-    const units = this.parseNALu(track, pes.data, last);
+  parsePES(track, textTrack, pes, endOfSegment, duration) {
+    const units = this.parseNALu(track, pes.data, endOfSegment);
     let VideoSample = this.VideoSample;
     let push;
     let spsfound = false;
@@ -12724,7 +12739,7 @@ class HevcVideoParser extends BaseVideoParser {
       }
     });
     // if last PES packet, push samples
-    if (last && VideoSample) {
+    if (endOfSegment && VideoSample) {
       this.pushAccessUnit(VideoSample, track);
       this.VideoSample = null;
     }
@@ -29156,7 +29171,7 @@ class Hls {
    * Get the video-dev/hls.js package version.
    */
   static get version() {
-    return "1.5.12-0.canary.10351";
+    return "1.5.12-0.canary.10353";
   }
 
   /**
@@ -29806,7 +29821,7 @@ class Hls {
    */
   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.
@@ -29814,8 +29829,7 @@ class Hls {
    */
   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;
   }
 
   /**