hls.js 1.6.0-beta.4.0.canary.11068 → 1.6.0-rc.1

package/dist/hls.light.js

@@ -1044,7 +1044,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.4.0.canary.11068");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-rc.1");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -1842,6 +1842,7 @@
     var sampleEntriesEnd = sampleEntries.subarray(8 + 78);
     var fourCC = bin2str(sampleEntries.subarray(4, 8));
     var codec = fourCC;
+    var supplemental;
     var encrypted = fourCC === 'enca' || fourCC === 'encv';
     if (encrypted) {
       var encBox = findBox(sampleEntries, [fourCC])[0];
@@ -1861,6 +1862,7 @@
         }
       });
     }
+    var codecFourCC = codec;
     switch (codec) {
       case 'avc1':
       case 'avc2':
@@ -1870,6 +1872,7 @@
           // extract profile + compatibility + level out of avcC box
           var 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':
@@ -1920,55 +1923,59 @@
       case 'hvc1':
       case 'hev1':
         {
-          var hvcCBox = findBox(sampleEntriesEnd, ['hvcC'])[0];
-          var profileByte = hvcCBox[1];
-          var profileSpace = ['', 'A', 'B', 'C'][profileByte >> 6];
-          var generalProfileIdc = profileByte & 0x1f;
-          var profileCompat = readUint32(hvcCBox, 2);
-          var tierFlag = (profileByte & 0x20) >> 5 ? 'H' : 'L';
-          var levelIDC = hvcCBox[12];
-          var constraintIndicator = hvcCBox.subarray(6, 12);
-          codec += '.' + profileSpace + generalProfileIdc;
-          codec += '.' + profileCompat.toString(16).toUpperCase();
-          codec += '.' + tierFlag + levelIDC;
-          var constraintString = '';
-          for (var _i = constraintIndicator.length; _i--;) {
-            var _byte = constraintIndicator[_i];
-            if (_byte || constraintString) {
-              var encodedByte = _byte.toString(16).toUpperCase();
-              constraintString = '.' + encodedByte + constraintString;
+          var hvcCBoxes = findBox(sampleEntriesEnd, ['hvcC']);
+          if (hvcCBoxes) {
+            var hvcCBox = hvcCBoxes[0];
+            var profileByte = hvcCBox[1];
+            var profileSpace = ['', 'A', 'B', 'C'][profileByte >> 6];
+            var generalProfileIdc = profileByte & 0x1f;
+            var profileCompat = readUint32(hvcCBox, 2);
+            var tierFlag = (profileByte & 0x20) >> 5 ? 'H' : 'L';
+            var levelIDC = hvcCBox[12];
+            var constraintIndicator = hvcCBox.subarray(6, 12);
+            codec += '.' + profileSpace + generalProfileIdc;
+            codec += '.' + profileCompat.toString(16).toUpperCase();
+            codec += '.' + tierFlag + levelIDC;
+            var constraintString = '';
+            for (var _i = constraintIndicator.length; _i--;) {
+              var _byte = constraintIndicator[_i];
+              if (_byte || constraintString) {
+                var 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':
         {
-          var dvcCBox = findBox(sampleEntriesEnd, ['dvcC'])[0];
-          var profile = dvcCBox[2] >> 1 & 0x7f;
-          var level = dvcCBox[2] << 5 & 0x20 | dvcCBox[3] >> 3 & 0x1f;
-          codec += '.' + addLeadingZero(profile) + '.' + addLeadingZero(level);
+          codec = parseSupplementalDoViCodec(codec, sampleEntriesEnd) || codec;
           break;
         }
       case 'vp09':
         {
           var vpcCBox = findBox(sampleEntriesEnd, ['vpcC'])[0];
-          var _profile = vpcCBox[4];
-          var _level = vpcCBox[5];
+          var profile = vpcCBox[4];
+          var level = vpcCBox[5];
           var bitDepth = vpcCBox[6] >> 4 & 0x0f;
-          codec += '.' + addLeadingZero(_profile) + '.' + addLeadingZero(_level) + '.' + addLeadingZero(bitDepth);
+          codec += '.' + addLeadingZero(profile) + '.' + addLeadingZero(level) + '.' + addLeadingZero(bitDepth);
           break;
         }
       case 'av01':
         {
           var av1CBox = findBox(sampleEntriesEnd, ['av1C'])[0];
-          var _profile2 = av1CBox[1] >>> 5;
-          var _level2 = av1CBox[1] & 0x1f;
+          var _profile = av1CBox[1] >>> 5;
+          var _level = av1CBox[1] & 0x1f;
           var _tierFlag = av1CBox[2] >>> 7 ? 'H' : 'M';
           var highBitDepth = (av1CBox[2] & 0x40) >> 6;
           var twelveBit = (av1CBox[2] & 0x20) >> 5;
-          var _bitDepth = _profile2 === 2 && highBitDepth ? twelveBit ? 12 : 10 : highBitDepth ? 10 : 8;
+          var _bitDepth = _profile === 2 && highBitDepth ? twelveBit ? 12 : 10 : highBitDepth ? 10 : 8;
           var monochrome = (av1CBox[2] & 0x10) >> 4;
           var chromaSubsamplingX = (av1CBox[2] & 0x08) >> 3;
           var chromaSubsamplingY = (av1CBox[2] & 0x04) >> 2;
@@ -1980,15 +1987,26 @@
           var transferCharacteristics = 1;
           var matrixCoefficients = 1;
           var videoFullRangeFlag = 0;
-          codec += '.' + _profile2 + '.' + addLeadingZero(_level2) + _tierFlag + '.' + addLeadingZero(_bitDepth) + '.' + monochrome + '.' + chromaSubsamplingX + chromaSubsamplingY + chromaSamplePosition + '.' + addLeadingZero(colorPrimaries) + '.' + addLeadingZero(transferCharacteristics) + '.' + addLeadingZero(matrixCoefficients) + '.' + videoFullRangeFlag;
+          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: codec,
-      encrypted: encrypted
+      encrypted: encrypted,
+      supplemental: supplemental
     };
   }
+  function parseSupplementalDoViCodec(fourCC, sampleEntriesEnd) {
+    var dvvCResult = findBox(sampleEntriesEnd, ['dvvC']); // used by DoVi Profile 8 to 10
+    var dvXCBox = dvvCResult.length ? dvvCResult[0] : findBox(sampleEntriesEnd, ['dvcC'])[0]; // used by DoVi Profiles up to 7 and 20
+    if (dvXCBox) {
+      var doViProfile = dvXCBox[2] >> 1 & 0x7f;
+      var doViLevel = dvXCBox[2] << 5 & 0x20 | dvXCBox[3] >> 3 & 0x1f;
+      return fourCC + '.' + addLeadingZero(doViProfile) + '.' + addLeadingZero(doViLevel);
+    }
+  }
   function skipBERInteger(bytes, i) {
     var limit = i + 5;
     while (bytes[i++] & 0x80 && i < limit) {
@@ -2744,6 +2762,7 @@
       avc4: 1,
       avcp: 1,
       av01: 0.8,
+      dav1: 0.8,
       drac: 1,
       dva1: 1,
       dvav: 1,
@@ -2980,6 +2999,7 @@
       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;
@@ -3013,6 +3033,14 @@
       }).map(function (s) {
         return s.substring(0, 4);
       }).join(',');
+      if ('supplemental' in data) {
+        var _data$supplemental;
+        this.supplemental = data.supplemental;
+        var 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);
     }
@@ -5475,7 +5503,8 @@
           codec = parsedTrack.codec,
           levelCodec = parsedTrack.levelCodec,
           container = parsedTrack.container,
-          metadata = parsedTrack.metadata;
+          metadata = parsedTrack.metadata,
+          supplemental = parsedTrack.supplemental;
         var track = tracks[trackName];
         var transferredTrack = (_this9$transferData = _this9.transferData) == null ? void 0 : (_this9$transferData$t = _this9$transferData.tracks) == null ? void 0 : _this9$transferData$t[trackName];
         var sbTrack = transferredTrack != null && transferredTrack.buffer ? transferredTrack : track;
@@ -5486,6 +5515,7 @@
             buffer: undefined,
             listeners: [],
             codec: codec,
+            supplemental: supplemental,
             container: container,
             levelCodec: levelCodec,
             metadata: metadata,
@@ -6098,6 +6128,7 @@
               buffer: buffer,
               container: track.container,
               codec: track.codec,
+              supplemental: track.supplemental,
               levelCodec: track.levelCodec,
               id: track.id,
               metadata: track.metadata
@@ -6168,6 +6199,11 @@
       this.bufferCreated();
     };
     _proto.getTrackCodec = function getTrackCodec(track, trackName) {
+      // Use supplemental video codec when supported when adding SourceBuffer (#5558)
+      var supplementalCodec = track.supplemental;
+      if (supplementalCodec && trackName === 'video' && areCodecsMediaSourceSupported(supplementalCodec, trackName)) {
+        return supplementalCodec;
+      }
       var codec = pickMostCompleteCodecName(track.codec, track.levelCodec);
       if (codec) {
         if (trackName.slice(0, 5) === 'audio') {
@@ -6189,6 +6225,7 @@
         codec: codec,
         container: track.container,
         levelCodec: track.levelCodec,
+        supplemental: track.supplemental,
         metadata: track.metadata,
         id: track.id,
         listeners: []
@@ -7379,6 +7416,11 @@
             level.height = resolution.height;
           }
           setCodecs(attrs.CODECS, level);
+          var supplementalCodecs = attrs['SUPPLEMENTAL-CODECS'];
+          if (supplementalCodecs) {
+            level.supplemental = {};
+            setCodecs(supplementalCodecs, level.supplemental);
+          }
           if (!((_level$unknownCodecs = level.unknownCodecs) != null && _level$unknownCodecs.length)) {
             levelsWithKnownCodecs.push(level);
           }
@@ -7956,7 +7998,9 @@
       });
       if (filtered.length) {
         // Comma separated list of all codecs for type
-        level[type + "Codec"] = filtered.join(',');
+        level[type + "Codec"] = filtered.map(function (c) {
+          return c.split('/')[0];
+        }).join(',');
         // Remove known codecs so that only unknownCodecs are left after iterating through each type
         codecs = codecs.filter(function (codec) {
           return filtered.indexOf(codec) === -1;
@@ -10657,10 +10701,12 @@
         var _initData$video = initData.video,
           id = _initData$video.id,
           timescale = _initData$video.timescale,
-          codec = _initData$video.codec;
+          codec = _initData$video.codec,
+          supplemental = _initData$video.supplemental;
         videoTrack.id = id;
         videoTrack.timescale = captionTrack.timescale = timescale;
         videoTrack.codec = codec;
+        videoTrack.supplemental = supplemental;
       }
       if (initData.audio) {
         var _initData$audio = initData.audio,
@@ -13917,6 +13963,7 @@
         tracks.video = {
           container: 'video/mp4',
           codec: videoCodec,
+          supplemental: initData.video.supplemental,
           initSegment: initSegment,
           id: 'main'
         };
@@ -19424,6 +19471,7 @@
         videoCodecFound || (videoCodecFound = !!videoCodec);
         audioCodecFound || (audioCodecFound = !!audioCodec);
         if (unknownUnsupportedCodecCount || audioCodec && !_this2.isAudioSupported(audioCodec) || videoCodec && !_this2.isVideoSupported(videoCodec)) {
+          _this2.log("Some or all CODECS not supported \"" + attributes.CODECS + "\"");
           return;
         }
         var CODECS = attributes.CODECS,
@@ -19435,7 +19483,7 @@
         var contentSteeringPrefix = (PATHWAY || '.') + "-";
         var levelKey = "" + contentSteeringPrefix + levelParsed.bitrate + "-" + RESOLUTION + "-" + FRAMERATE + "-" + CODECS + "-" + VIDEO_RANGE + "-" + HDCP;
         if (!redundantSet[levelKey]) {
-          var level = new Level(levelParsed);
+          var level = _this2.createLevel(levelParsed);
           redundantSet[levelKey] = level;
           generatePathwaySet[levelKey] = 1;
           levels.push(level);
@@ -19444,7 +19492,7 @@
           // Content Steering controller to handles Pathway fallback on error
           var pathwayCount = generatePathwaySet[levelKey] += 1;
           levelParsed.attrs['PATHWAY-ID'] = new Array(pathwayCount + 1).join('.');
-          var _level = new Level(levelParsed);
+          var _level = _this2.createLevel(levelParsed);
           redundantSet[levelKey] = _level;
           levels.push(_level);
         } else {
@@ -19454,6 +19502,16 @@
       });
       this.filterAndSortMediaOptions(levels, data, resolutionFound, videoCodecFound, audioCodecFound);
     };
+    _proto.createLevel = function createLevel(levelParsed) {
+      var level = new Level(levelParsed);
+      var supplemental = levelParsed.supplemental;
+      if (supplemental != null && supplemental.videoCodec && !this.isVideoSupported(supplemental.videoCodec)) {
+        var error = new Error("SUPPLEMENTAL-CODECS not supported \"" + supplemental.videoCodec + "\"");
+        this.log(error.message);
+        level.supportedResult = emptyExports.getUnsupportedResult(error, []);
+      }
+      return level;
+    };
     _proto.isAudioSupported = function isAudioSupported(codec) {
       return areCodecsMediaSourceSupported(codec, 'audio', this.hls.config.preferManagedMediaSource);
     };
@@ -19480,17 +19538,25 @@
         // Dispatch error after MANIFEST_LOADED is done propagating
         Promise.resolve().then(function () {
           if (_this3.hls) {
+            var message = 'no level with compatible codecs found in manifest';
+            var reason = message;
             if (data.levels.length) {
-              _this3.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(function (level) {
+                return level.attrs.CODECS;
+              }).filter(function (value, index, array) {
+                return array.indexOf(value) === index;
+              }));
+              _this3.warn(reason);
+              message += " (" + reason + ")";
             }
-            var error = new Error('no level with compatible codecs found in manifest');
+            var error = new Error(message);
             _this3.hls.trigger(Events.ERROR, {
               type: ErrorTypes.MEDIA_ERROR,
               details: ErrorDetails.MANIFEST_INCOMPATIBLE_CODECS_ERROR,
               fatal: true,
               url: data.url,
               error: error,
-              reason: error.message
+              reason: reason
             });
           }
         });
@@ -20081,7 +20147,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.4.0.canary.11068";
+  var version = "1.6.0-rc.1";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -21545,7 +21611,7 @@
               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) {
@@ -22532,6 +22598,18 @@
       smooth: true
     }]
   };
+  function getUnsupportedResult(error, configurations) {
+    return {
+      supported: false,
+      configurations: configurations,
+      decodingInfoResults: [{
+        supported: false,
+        smooth: false,
+        powerEfficient: false
+      }],
+      error: error
+    };
+  }
   var SUPPORTED_INFO_CACHE = {};
   function getMediaDecodingInfoPromise(level, audioTracksByGroup, mediaCapabilities) {
     var videoCodecs = level.videoCodec;
@@ -22558,16 +22636,7 @@
       if (videoCodecsArray.some(function (videoCodec) {
         return isHEVC(videoCodec);
       }) && userAgentHevcSupportIsInaccurate()) {
-        return Promise.resolve({
-          supported: false,
-          configurations: 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(function (videoCodec) {
         return {