hls.js 1.6.0-beta.4.0.canary.11066 → 1.6.0-beta.4.0.canary.11069

package/dist/hls.mjs

@@ -402,7 +402,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.6.0-beta.4.0.canary.11066"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.4.0.canary.11069"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -1343,6 +1343,7 @@ function parseStsd(stsd) {
   const sampleEntriesEnd = sampleEntries.subarray(8 + 78);
   const fourCC = bin2str(sampleEntries.subarray(4, 8));
   let codec = fourCC;
+  let supplemental;
   const encrypted = fourCC === 'enca' || fourCC === 'encv';
   if (encrypted) {
     const encBox = findBox(sampleEntries, [fourCC])[0];
@@ -1362,6 +1363,7 @@ function parseStsd(stsd) {
       }
     });
   }
+  const codecFourCC = codec;
   switch (codec) {
     case 'avc1':
     case 'avc2':
@@ -1371,6 +1373,7 @@ function parseStsd(stsd) {
         // extract profile + compatibility + level out of avcC box
         const avcCBox = findBox(sampleEntriesEnd, ['avcC'])[0];
         codec += '.' + toHex(avcCBox[1]) + toHex(avcCBox[2]) + toHex(avcCBox[3]);
+        supplemental = parseSupplementalDoViCodec(codecFourCC === 'avc1' ? 'dva1' : 'dvav', sampleEntriesEnd);
         break;
       }
     case 'mp4a':
@@ -1421,35 +1424,39 @@ function parseStsd(stsd) {
     case 'hvc1':
     case 'hev1':
       {
-        const hvcCBox = findBox(sampleEntriesEnd, ['hvcC'])[0];
-        const profileByte = hvcCBox[1];
-        const profileSpace = ['', 'A', 'B', 'C'][profileByte >> 6];
-        const generalProfileIdc = profileByte & 0x1f;
-        const profileCompat = readUint32(hvcCBox, 2);
-        const tierFlag = (profileByte & 0x20) >> 5 ? 'H' : 'L';
-        const levelIDC = hvcCBox[12];
-        const constraintIndicator = hvcCBox.subarray(6, 12);
-        codec += '.' + profileSpace + generalProfileIdc;
-        codec += '.' + profileCompat.toString(16).toUpperCase();
-        codec += '.' + tierFlag + levelIDC;
-        let constraintString = '';
-        for (let i = constraintIndicator.length; i--;) {
-          const byte = constraintIndicator[i];
-          if (byte || constraintString) {
-            const encodedByte = byte.toString(16).toUpperCase();
-            constraintString = '.' + encodedByte + constraintString;
+        const hvcCBoxes = findBox(sampleEntriesEnd, ['hvcC']);
+        if (hvcCBoxes) {
+          const hvcCBox = hvcCBoxes[0];
+          const profileByte = hvcCBox[1];
+          const profileSpace = ['', 'A', 'B', 'C'][profileByte >> 6];
+          const generalProfileIdc = profileByte & 0x1f;
+          const profileCompat = readUint32(hvcCBox, 2);
+          const tierFlag = (profileByte & 0x20) >> 5 ? 'H' : 'L';
+          const levelIDC = hvcCBox[12];
+          const constraintIndicator = hvcCBox.subarray(6, 12);
+          codec += '.' + profileSpace + generalProfileIdc;
+          codec += '.' + profileCompat.toString(16).toUpperCase();
+          codec += '.' + tierFlag + levelIDC;
+          let constraintString = '';
+          for (let i = constraintIndicator.length; i--;) {
+            const byte = constraintIndicator[i];
+            if (byte || constraintString) {
+              const encodedByte = byte.toString(16).toUpperCase();
+              constraintString = '.' + encodedByte + constraintString;
+            }
           }
+          codec += constraintString;
         }
-        codec += constraintString;
+        supplemental = parseSupplementalDoViCodec(codecFourCC == 'hev1' ? 'dvhe' : 'dvh1', sampleEntriesEnd);
         break;
       }
     case 'dvh1':
     case 'dvhe':
+    case 'dvav':
+    case 'dva1':
+    case 'dav1':
       {
-        const dvcCBox = findBox(sampleEntriesEnd, ['dvcC'])[0];
-        const profile = dvcCBox[2] >> 1 & 0x7f;
-        const level = dvcCBox[2] << 5 & 0x20 | dvcCBox[3] >> 3 & 0x1f;
-        codec += '.' + addLeadingZero(profile) + '.' + addLeadingZero(level);
+        codec = parseSupplementalDoViCodec(codec, sampleEntriesEnd) || codec;
         break;
       }
     case 'vp09':
@@ -1482,14 +1489,25 @@ function parseStsd(stsd) {
         const matrixCoefficients = 1;
         const videoFullRangeFlag = 0;
         codec += '.' + profile + '.' + addLeadingZero(level) + tierFlag + '.' + addLeadingZero(bitDepth) + '.' + monochrome + '.' + chromaSubsamplingX + chromaSubsamplingY + chromaSamplePosition + '.' + addLeadingZero(colorPrimaries) + '.' + addLeadingZero(transferCharacteristics) + '.' + addLeadingZero(matrixCoefficients) + '.' + videoFullRangeFlag;
+        supplemental = parseSupplementalDoViCodec('dav1', sampleEntriesEnd);
         break;
       }
   }
   return {
     codec,
-    encrypted
+    encrypted,
+    supplemental
   };
 }
+function parseSupplementalDoViCodec(fourCC, sampleEntriesEnd) {
+  const dvvCResult = findBox(sampleEntriesEnd, ['dvvC']); // used by DoVi Profile 8 to 10
+  const dvXCBox = dvvCResult.length ? dvvCResult[0] : findBox(sampleEntriesEnd, ['dvcC'])[0]; // used by DoVi Profiles up to 7 and 20
+  if (dvXCBox) {
+    const doViProfile = dvXCBox[2] >> 1 & 0x7f;
+    const doViLevel = dvXCBox[2] << 5 & 0x20 | dvXCBox[3] >> 3 & 0x1f;
+    return fourCC + '.' + addLeadingZero(doViProfile) + '.' + addLeadingZero(doViLevel);
+  }
+}
 function skipBERInteger(bytes, i) {
   const limit = i + 5;
   while (bytes[i++] & 0x80 && i < limit) {
@@ -2339,6 +2357,7 @@ const sampleEntryCodesISO = {
     avc4: 1,
     avcp: 1,
     av01: 0.8,
+    dav1: 0.8,
     drac: 1,
     dva1: 1,
     dvav: 1,
@@ -2501,6 +2520,18 @@ const SUPPORTED_INFO_DEFAULT = {
     smooth: true
   }]
 };
+function getUnsupportedResult(error, configurations) {
+  return {
+    supported: false,
+    configurations,
+    decodingInfoResults: [{
+      supported: false,
+      smooth: false,
+      powerEfficient: false
+    }],
+    error
+  };
+}
 const SUPPORTED_INFO_CACHE = {};
 function requiresMediaCapabilitiesDecodingInfo(level, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference) {
   // Only test support when configuration is exceeds minimum options
@@ -2559,16 +2590,7 @@ function getMediaDecodingInfoPromise(level, audioTracksByGroup, mediaCapabilitie
     // Override Windows Firefox HEVC MediaCapabilities result (https://github.com/video-dev/hls.js/issues/7046)
     const ua = navigator.userAgent;
     if (videoCodecsArray.some(videoCodec => isHEVC(videoCodec)) && userAgentHevcSupportIsInaccurate()) {
-      return Promise.resolve({
-        supported: false,
-        configurations,
-        decodingInfoResults: [{
-          supported: false,
-          smooth: false,
-          powerEfficient: false
-        }],
-        error: new Error(`Overriding Windows Firefox HEVC MediaCapabilities result based on user-agent sting: (${ua})`)
-      });
+      return Promise.resolve(getUnsupportedResult(new Error(`Overriding Windows Firefox HEVC MediaCapabilities result based on user-agent sting: (${ua})`), configurations));
     }
     configurations.push.apply(configurations, videoCodecsArray.map(videoCodec => ({
       type: 'media-source',
@@ -2700,6 +2722,7 @@ class Level {
     this.height = void 0;
     this.id = void 0;
     this.name = void 0;
+    this.supplemental = void 0;
     this.videoCodec = void 0;
     this.width = void 0;
     this.details = void 0;
@@ -2729,6 +2752,14 @@ class Level {
     this.audioCodec = data.audioCodec;
     this.videoCodec = data.videoCodec;
     this.codecSet = [data.videoCodec, data.audioCodec].filter(c => !!c).map(s => s.substring(0, 4)).join(',');
+    if ('supplemental' in data) {
+      var _data$supplemental;
+      this.supplemental = data.supplemental;
+      const supplementalVideo = (_data$supplemental = data.supplemental) == null ? void 0 : _data$supplemental.videoCodec;
+      if (supplementalVideo && supplementalVideo !== data.videoCodec) {
+        this.codecSet += `,${supplementalVideo.substring(0, 4)}`;
+      }
+    }
     this.addGroupId('audio', data.attrs.AUDIO);
     this.addGroupId('text', data.attrs.SUBTITLES);
   }
@@ -6935,6 +6966,11 @@ class M3U8Parser {
           level.height = resolution.height;
         }
         setCodecs(attrs.CODECS, level);
+        const supplementalCodecs = attrs['SUPPLEMENTAL-CODECS'];
+        if (supplementalCodecs) {
+          level.supplemental = {};
+          setCodecs(supplementalCodecs, level.supplemental);
+        }
         if (!((_level$unknownCodecs = level.unknownCodecs) != null && _level$unknownCodecs.length)) {
           levelsWithKnownCodecs.push(level);
         }
@@ -7516,7 +7552,7 @@ function setCodecs(codecsAttributeValue, level) {
     const filtered = codecs.filter(codec => isCodecType(codec, type));
     if (filtered.length) {
       // Comma separated list of all codecs for type
-      level[`${type}Codec`] = filtered.join(',');
+      level[`${type}Codec`] = filtered.map(c => c.split('/')[0]).join(',');
       // Remove known codecs so that only unknownCodecs are left after iterating through each type
       codecs = codecs.filter(codec => filtered.indexOf(codec) === -1);
     }
@@ -9965,7 +10001,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.4.0.canary.11066";
+const version = "1.6.0-beta.4.0.canary.11069";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -11405,11 +11441,13 @@ class MP4Demuxer {
       const {
         id,
         timescale,
-        codec
+        codec,
+        supplemental
       } = initData.video;
       videoTrack.id = id;
       videoTrack.timescale = captionTrack.timescale = timescale;
       videoTrack.codec = codec;
+      videoTrack.supplemental = supplemental;
     }
     if (initData.audio) {
       const {
@@ -15366,6 +15404,7 @@ class PassThroughRemuxer {
       tracks.video = {
         container: 'video/mp4',
         codec: videoCodec,
+        supplemental: initData.video.supplemental,
         initSegment,
         id: 'main'
       };
@@ -18276,7 +18315,8 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
         codec,
         levelCodec,
         container,
-        metadata
+        metadata,
+        supplemental
       } = parsedTrack;
       let track = tracks[trackName];
       const transferredTrack = (_this$transferData3 = this.transferData) == null ? void 0 : (_this$transferData3$t = _this$transferData3.tracks) == null ? void 0 : _this$transferData3$t[trackName];
@@ -18288,6 +18328,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
           buffer: undefined,
           listeners: [],
           codec,
+          supplemental,
           container,
           levelCodec,
           metadata,
@@ -18918,6 +18959,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
             buffer,
             container: track.container,
             codec: track.codec,
+            supplemental: track.supplemental,
             levelCodec: track.levelCodec,
             id: track.id,
             metadata: track.metadata
@@ -18989,6 +19031,11 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
     this.bufferCreated();
   }
   getTrackCodec(track, trackName) {
+    // Use supplemental video codec when supported when adding SourceBuffer (#5558)
+    const supplementalCodec = track.supplemental;
+    if (supplementalCodec && trackName === 'video' && areCodecsMediaSourceSupported(supplementalCodec, trackName)) {
+      return supplementalCodec;
+    }
     const codec = pickMostCompleteCodecName(track.codec, track.levelCodec);
     if (codec) {
       if (trackName.slice(0, 5) === 'audio') {
@@ -19009,6 +19056,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => key === 'initSeg
       codec,
       container: track.container,
       levelCodec: track.levelCodec,
+      supplemental: track.supplemental,
       metadata: track.metadata,
       id: track.id,
       listeners: []
@@ -31220,6 +31268,7 @@ class LevelController extends BasePlaylistController {
       videoCodecFound || (videoCodecFound = !!videoCodec);
       audioCodecFound || (audioCodecFound = !!audioCodec);
       if (unknownUnsupportedCodecCount || audioCodec && !this.isAudioSupported(audioCodec) || videoCodec && !this.isVideoSupported(videoCodec)) {
+        this.log(`Some or all CODECS not supported "${attributes.CODECS}"`);
         return;
       }
       const {
@@ -31233,7 +31282,7 @@ class LevelController extends BasePlaylistController {
       const contentSteeringPrefix = `${PATHWAY || '.'}-`;
       const levelKey = `${contentSteeringPrefix}${levelParsed.bitrate}-${RESOLUTION}-${FRAMERATE}-${CODECS}-${VIDEO_RANGE}-${HDCP}`;
       if (!redundantSet[levelKey]) {
-        const level = new Level(levelParsed);
+        const level = this.createLevel(levelParsed);
         redundantSet[levelKey] = level;
         generatePathwaySet[levelKey] = 1;
         levels.push(level);
@@ -31242,7 +31291,7 @@ class LevelController extends BasePlaylistController {
         // Content Steering controller to handles Pathway fallback on error
         const pathwayCount = generatePathwaySet[levelKey] += 1;
         levelParsed.attrs['PATHWAY-ID'] = new Array(pathwayCount + 1).join('.');
-        const level = new Level(levelParsed);
+        const level = this.createLevel(levelParsed);
         redundantSet[levelKey] = level;
         levels.push(level);
       } else {
@@ -31252,6 +31301,16 @@ class LevelController extends BasePlaylistController {
     });
     this.filterAndSortMediaOptions(levels, data, resolutionFound, videoCodecFound, audioCodecFound);
   }
+  createLevel(levelParsed) {
+    const level = new Level(levelParsed);
+    const supplemental = levelParsed.supplemental;
+    if (supplemental != null && supplemental.videoCodec && !this.isVideoSupported(supplemental.videoCodec)) {
+      const error = new Error(`SUPPLEMENTAL-CODECS not supported "${supplemental.videoCodec}"`);
+      this.log(error.message);
+      level.supportedResult = getUnsupportedResult(error, []);
+    }
+    return level;
+  }
   isAudioSupported(codec) {
     return areCodecsMediaSourceSupported(codec, 'audio', this.hls.config.preferManagedMediaSource);
   }
@@ -31276,17 +31335,21 @@ class LevelController extends BasePlaylistController {
       // Dispatch error after MANIFEST_LOADED is done propagating
       Promise.resolve().then(() => {
         if (this.hls) {
+          let message = 'no level with compatible codecs found in manifest';
+          let reason = message;
           if (data.levels.length) {
-            this.warn(`One or more CODECS in variant not supported: ${stringify(data.levels[0].attrs)}`);
+            reason = `one or more CODECS in variant not supported: ${stringify(data.levels.map(level => level.attrs.CODECS).filter((value, index, array) => array.indexOf(value) === index))}`;
+            this.warn(reason);
+            message += ` (${reason})`;
           }
-          const error = new Error('no level with compatible codecs found in manifest');
+          const error = new Error(message);
           this.hls.trigger(Events.ERROR, {
             type: ErrorTypes.MEDIA_ERROR,
             details: ErrorDetails.MANIFEST_INCOMPATIBLE_CODECS_ERROR,
             fatal: true,
             url: data.url,
             error,
-            reason: error.message
+            reason
           });
         }
       });
@@ -32825,7 +32888,7 @@ class StreamController extends BaseStreamController {
             break;
         }
       }
-      this.log(`Init video buffer, container:${video.container}, codecs[level/parsed]=[${currentLevel.videoCodec || ''}/${parsedVideoCodec}${video.codec !== parsedVideoCodec ? ' parsed-corrected=' + video.codec : ''}}]`);
+      this.log(`Init video buffer, container:${video.container}, codecs[level/parsed]=[${currentLevel.videoCodec || ''}/${parsedVideoCodec}]${video.codec !== parsedVideoCodec ? ' parsed-corrected=' + video.codec : ''}${video.supplemental ? ' supplemental=' + video.supplemental : ''}`);
       delete tracks.audiovideo;
     }
     if (audiovideo) {