hls.js 1.5.14-0.canary.10567 → 1.5.14-0.canary.10570

package/dist/hls.d.mts

@@ -840,6 +840,7 @@ export declare class EMEController extends Logger implements ComponentAPI {
     private registerListeners;
     private unregisterListeners;
     private getLicenseServerUrl;
+    private getLicenseServerUrlOrThrow;
     private getServerCertificateUrl;
     private attemptKeySystemAccess;
     private requestMediaKeySystemAccess;

package/dist/hls.d.ts

@@ -840,6 +840,7 @@ export declare class EMEController extends Logger implements ComponentAPI {
     private registerListeners;
     private unregisterListeners;
     private getLicenseServerUrl;
+    private getLicenseServerUrlOrThrow;
     private getServerCertificateUrl;
     private attemptKeySystemAccess;
     private requestMediaKeySystemAccess;

package/dist/hls.js

@@ -523,7 +523,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.14-0.canary.10567");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.14-0.canary.10570");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -1548,6 +1548,27 @@
     };
     return [baseConfig];
   }
+  function parsePlayReadyWRM(keyBytes) {
+    var keyBytesUtf16 = new Uint16Array(keyBytes.buffer, keyBytes.byteOffset, keyBytes.byteLength / 2);
+    var keyByteStr = String.fromCharCode.apply(null, Array.from(keyBytesUtf16));
+
+    // Parse Playready WRMHeader XML
+    var xmlKeyBytes = keyByteStr.substring(keyByteStr.indexOf('<'), keyByteStr.length);
+    var parser = new DOMParser();
+    var xmlDoc = parser.parseFromString(xmlKeyBytes, 'text/xml');
+    var keyData = xmlDoc.getElementsByTagName('KID')[0];
+    if (keyData) {
+      var keyId = keyData.childNodes[0] ? keyData.childNodes[0].nodeValue : keyData.getAttribute('VALUE');
+      if (keyId) {
+        var keyIdArray = base64Decode(keyId).subarray(0, 16);
+        // KID value in PRO is a base64-encoded little endian GUID interpretation of UUID
+        // KID value in ‘tenc’ is a big endian UUID GUID interpretation of UUID
+        changeEndianness(keyIdArray);
+        return keyIdArray;
+      }
+    }
+    return null;
+  }
 
   function sliceUint8(array, start, end) {
     // @ts-expect-error This polyfills IE11 usage of Uint8Array slice.
@@ -2903,6 +2924,8 @@
       if (keyBytes) {
         switch (this.keyFormat) {
           case KeySystemFormats.WIDEVINE:
+            // Setting `pssh` on this LevelKey/DecryptData allows HLS.js to generate a session using
+            // the playlist-key before the "encrypted" event. (Comment out to only use "encrypted" path.)
             this.pssh = keyBytes;
             // In case of widevine keyID is embedded in PSSH box. Read Key ID.
             if (keyBytes.length >= 22) {
@@ -2912,25 +2935,11 @@
           case KeySystemFormats.PLAYREADY:
             {
               var PlayReadyKeySystemUUID = new Uint8Array([0x9a, 0x04, 0xf0, 0x79, 0x98, 0x40, 0x42, 0x86, 0xab, 0x92, 0xe6, 0x5b, 0xe0, 0x88, 0x5f, 0x95]);
+
+              // Setting `pssh` on this LevelKey/DecryptData allows HLS.js to generate a session using
+              // the playlist-key before the "encrypted" event. (Comment out to only use "encrypted" path.)
               this.pssh = mp4pssh(PlayReadyKeySystemUUID, null, keyBytes);
-              var keyBytesUtf16 = new Uint16Array(keyBytes.buffer, keyBytes.byteOffset, keyBytes.byteLength / 2);
-              var keyByteStr = String.fromCharCode.apply(null, Array.from(keyBytesUtf16));
-
-              // Parse Playready WRMHeader XML
-              var xmlKeyBytes = keyByteStr.substring(keyByteStr.indexOf('<'), keyByteStr.length);
-              var parser = new DOMParser();
-              var xmlDoc = parser.parseFromString(xmlKeyBytes, 'text/xml');
-              var keyData = xmlDoc.getElementsByTagName('KID')[0];
-              if (keyData) {
-                var keyId = keyData.childNodes[0] ? keyData.childNodes[0].nodeValue : keyData.getAttribute('VALUE');
-                if (keyId) {
-                  var keyIdArray = base64Decode(keyId).subarray(0, 16);
-                  // KID value in PRO is a base64-encoded little endian GUID interpretation of UUID
-                  // KID value in ‘tenc’ is a big endian UUID GUID interpretation of UUID
-                  changeEndianness(keyIdArray);
-                  this.keyId = keyIdArray;
-                }
-              }
+              this.keyId = parsePlayReadyWRM(keyBytes);
               break;
             }
           default:
@@ -2949,15 +2958,15 @@
 
       // Default behavior: assign a new keyId for each uri
       if (!this.keyId || this.keyId.byteLength !== 16) {
-        var _keyId = keyUriToKeyIdMap[this.uri];
-        if (!_keyId) {
+        var keyId = keyUriToKeyIdMap[this.uri];
+        if (!keyId) {
           var val = Object.keys(keyUriToKeyIdMap).length % Number.MAX_SAFE_INTEGER;
-          _keyId = new Uint8Array(16);
-          var dv = new DataView(_keyId.buffer, 12, 4); // Just set the last 4 bytes
+          keyId = new Uint8Array(16);
+          var dv = new DataView(keyId.buffer, 12, 4); // Just set the last 4 bytes
           dv.setUint32(0, val);
-          keyUriToKeyIdMap[this.uri] = _keyId;
+          keyUriToKeyIdMap[this.uri] = keyId;
         }
-        this.keyId = _keyId;
+        this.keyId = keyId;
       }
       return this;
     };
@@ -11679,23 +11688,11 @@
     return timeOffset * 90000 + init90kHz;
   };
 
-  /**
-   * ADTS parser helper
-   * @link https://wiki.multimedia.cx/index.php?title=ADTS
-   */
-  function getAudioConfig(observer, data, offset, audioCodec) {
-    var adtsObjectType;
-    var originalAdtsObjectType;
-    var adtsExtensionSamplingIndex;
-    var adtsChannelConfig;
-    var config;
-    var userAgent = navigator.userAgent.toLowerCase();
-    var manifestCodec = audioCodec;
+  function getAudioConfig(observer, data, offset, manifestCodec) {
     var adtsSamplingRates = [96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350];
-    // byte 2
-    adtsObjectType = originalAdtsObjectType = ((data[offset + 2] & 0xc0) >>> 6) + 1;
-    var adtsSamplingIndex = (data[offset + 2] & 0x3c) >>> 2;
-    if (adtsSamplingIndex > adtsSamplingRates.length - 1) {
+    var byte2 = data[offset + 2];
+    var adtsSamplingIndex = byte2 >> 2 & 0xf;
+    if (adtsSamplingIndex > 12) {
       var error = new Error("invalid ADTS sampling index:" + adtsSamplingIndex);
       observer.emit(Events.ERROR, Events.ERROR, {
         type: ErrorTypes.MEDIA_ERROR,
@@ -11706,53 +11703,12 @@
       });
       return;
     }
-    adtsChannelConfig = (data[offset + 2] & 0x01) << 2;
-    // byte 3
-    adtsChannelConfig |= (data[offset + 3] & 0xc0) >>> 6;
-    logger.log("manifest codec:" + audioCodec + ", ADTS type:" + adtsObjectType + ", samplingIndex:" + adtsSamplingIndex);
-    // Firefox and Pale Moon: freq less than 24kHz = AAC SBR (HE-AAC)
-    if (/firefox|palemoon/i.test(userAgent)) {
-      if (adtsSamplingIndex >= 6) {
-        adtsObjectType = 5;
-        config = new Array(4);
-        // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies
-        // there is a factor 2 between frame sample rate and output sample rate
-        // multiply frequency by 2 (see table below, equivalent to substract 3)
-        adtsExtensionSamplingIndex = adtsSamplingIndex - 3;
-      } else {
-        adtsObjectType = 2;
-        config = new Array(2);
-        adtsExtensionSamplingIndex = adtsSamplingIndex;
-      }
-      // Android : always use AAC
-    } else if (userAgent.indexOf('android') !== -1) {
-      adtsObjectType = 2;
-      config = new Array(2);
-      adtsExtensionSamplingIndex = adtsSamplingIndex;
-    } else {
-      /*  for other browsers (Chrome/Vivaldi/Opera ...)
-          always force audio type to be HE-AAC SBR, as some browsers do not support audio codec switch properly (like Chrome ...)
-      */
-      adtsObjectType = 5;
-      config = new Array(4);
-      // if (manifest codec is HE-AAC or HE-AACv2) OR (manifest codec not specified AND frequency less than 24kHz)
-      if (audioCodec && (audioCodec.indexOf('mp4a.40.29') !== -1 || audioCodec.indexOf('mp4a.40.5') !== -1) || !audioCodec && adtsSamplingIndex >= 6) {
-        // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies
-        // there is a factor 2 between frame sample rate and output sample rate
-        // multiply frequency by 2 (see table below, equivalent to substract 3)
-        adtsExtensionSamplingIndex = adtsSamplingIndex - 3;
-      } else {
-        // if (manifest codec is AAC) AND (frequency less than 24kHz AND nb channel is 1) OR (manifest codec not specified and mono audio)
-        // Chrome fails to play back with low frequency AAC LC mono when initialized with HE-AAC.  This is not a problem with stereo.
-        if (audioCodec && audioCodec.indexOf('mp4a.40.2') !== -1 && (adtsSamplingIndex >= 6 && adtsChannelConfig === 1 || /vivaldi/i.test(userAgent)) || !audioCodec && adtsChannelConfig === 1) {
-          adtsObjectType = 2;
-          config = new Array(2);
-        }
-        adtsExtensionSamplingIndex = adtsSamplingIndex;
-      }
-    }
+    // MPEG-4 Audio Object Type (profile_ObjectType+1)
+    var adtsObjectType = (byte2 >> 6 & 0x3) + 1;
+    var channelCount = data[offset + 3] >> 6 & 0x3 | (byte2 & 1) << 2;
+    var codec = 'mp4a.40.' + adtsObjectType;
     /* refer to http://wiki.multimedia.cx/index.php?title=MPEG-4_Audio#Audio_Specific_Config
-        ISO 14496-3 (AAC).pdf - Table 1.13 — Syntax of AudioSpecificConfig()
+        ISO/IEC 14496-3 - Table 1.13 — Syntax of AudioSpecificConfig()
       Audio Profile / Audio Object Type
       0: Null
       1: AAC Main
@@ -11785,27 +11741,22 @@
       2: 2 channels: front-left, front-right
     */
     // audioObjectType = profile => profile, the MPEG-4 Audio Object Type minus 1
-    config[0] = adtsObjectType << 3;
-    // samplingFrequencyIndex
-    config[0] |= (adtsSamplingIndex & 0x0e) >> 1;
-    config[1] |= (adtsSamplingIndex & 0x01) << 7;
-    // channelConfiguration
-    config[1] |= adtsChannelConfig << 3;
-    if (adtsObjectType === 5) {
-      // adtsExtensionSamplingIndex
-      config[1] |= (adtsExtensionSamplingIndex & 0x0e) >> 1;
-      config[2] = (adtsExtensionSamplingIndex & 0x01) << 7;
-      // adtsObjectType (force to 2, chrome is checking that object type is less than 5 ???
-      //    https://chromium.googlesource.com/chromium/src.git/+/master/media/formats/mp4/aac.cc
-      config[2] |= 2 << 2;
-      config[3] = 0;
-    }
+    var samplerate = adtsSamplingRates[adtsSamplingIndex];
+    var aacSampleIndex = adtsSamplingIndex;
+    if (adtsObjectType === 5 || adtsObjectType === 29) {
+      // HE-AAC uses SBR (Spectral Band Replication) , high frequencies are constructed from low frequencies
+      // there is a factor 2 between frame sample rate and output sample rate
+      // multiply frequency by 2 (see table above, equivalent to substract 3)
+      aacSampleIndex -= 3;
+    }
+    var config = [adtsObjectType << 3 | (aacSampleIndex & 0x0e) >> 1, (aacSampleIndex & 0x01) << 7 | channelCount << 3];
+    logger.log("manifest codec:" + manifestCodec + ", parsed codec:" + codec + ", channels:" + channelCount + ", rate:" + samplerate + " (ADTS object type:" + adtsObjectType + " sampling index:" + adtsSamplingIndex + ")");
     return {
       config: config,
-      samplerate: adtsSamplingRates[adtsSamplingIndex],
-      channelCount: adtsChannelConfig,
-      codec: 'mp4a.40.' + adtsObjectType,
-      parsedCodec: 'mp4a.40.' + originalAdtsObjectType,
+      samplerate: samplerate,
+      channelCount: channelCount,
+      codec: codec,
+      parsedCodec: codec,
       manifestCodec: manifestCodec
     };
   }
@@ -11855,13 +11806,7 @@
       if (!config) {
         return;
       }
-      track.config = config.config;
-      track.samplerate = config.samplerate;
-      track.channelCount = config.channelCount;
-      track.codec = config.codec;
-      track.manifestCodec = config.manifestCodec;
-      track.parsedCodec = config.parsedCodec;
-      logger.log("parsed codec:" + track.parsedCodec + ", codec:" + track.codec + ", rate:" + config.samplerate + ", channels:" + config.channelCount);
+      _extends(track, config);
     }
   }
   function getFrameDuration(samplerate) {
@@ -15078,7 +15023,7 @@
       vSpacing >> 16 & 0xff, vSpacing >> 8 & 0xff, vSpacing & 0xff])));
     };
     MP4.esds = function esds(track) {
-      var configlen = track.config.length;
+      var config = track.config;
       return new Uint8Array([0x00,
       // version 0
       0x00, 0x00, 0x00,
@@ -15086,16 +15031,18 @@
 
       0x03,
       // descriptor_type
-      0x17 + configlen,
+      0x19,
       // length
+
       0x00, 0x01,
       // es_id
+
       0x00,
       // stream_priority
 
       0x04,
       // descriptor_type
-      0x0f + configlen,
+      0x11,
       // length
       0x40,
       // codec : mpeg4_audio
@@ -15108,8 +15055,10 @@
       0x00, 0x00, 0x00, 0x00,
       // avgBitrate
 
-      0x05 // descriptor_type
-      ].concat([configlen]).concat(track.config).concat([0x06, 0x01, 0x02])); // GASpecificConfig)); // length + audio config descriptor
+      0x05,
+      // descriptor_type
+      0x02].concat(config, [0x06, 0x01, 0x02 // GASpecificConfig)); // length + audio config descriptor
+      ]));
     };
     MP4.audioStsd = function audioStsd(track) {
       var samplerate = track.samplerate;
@@ -17362,7 +17311,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.5.14-0.canary.10567";
+  var version = "1.5.14-0.canary.10570";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -24215,7 +24164,7 @@
         }
         var keyId;
         var keySystemDomain;
-        if (initDataType === 'sinf' && _this.config.drmSystems[KeySystems.FAIRPLAY]) {
+        if (initDataType === 'sinf' && _this.getLicenseServerUrl(KeySystems.FAIRPLAY)) {
           // Match sinf keyId to playlist skd://keyId=
           var json = bin2str(new Uint8Array(initData));
           try {
@@ -24230,11 +24179,18 @@
             _this.warn(logMessage + " Failed to parse sinf: " + error);
             return;
           }
-        } else {
+        } else if (_this.getLicenseServerUrl(KeySystems.WIDEVINE)) {
           // Support Widevine clear-lead key-session creation (otherwise depend on playlist keys)
           var psshResults = parseMultiPssh(initData);
+
+          // TODO: If using keySystemAccessPromises we might want to wait until one is resolved
+          var keySystems = Object.keys(_this.keySystemAccessPromises);
+          if (!keySystems.length) {
+            keySystems = getKeySystemsForConfig(_this.config);
+          }
           var psshInfo = psshResults.filter(function (pssh) {
-            return pssh.systemId === KeySystemIds.WIDEVINE;
+            var keySystem = pssh.systemId ? keySystemIdToKeySystemDomain(pssh.systemId) : null;
+            return keySystem ? keySystems.indexOf(keySystem) > -1 : false;
           })[0];
           if (!psshInfo) {
             if (psshResults.length === 0 || psshResults.some(function (pssh) {
@@ -24250,8 +24206,12 @@
           }
           keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
           if (psshInfo.version === 0 && psshInfo.data) {
-            var offset = psshInfo.data.length - 22;
-            keyId = psshInfo.data.subarray(offset, offset + 16);
+            if (keySystemDomain === KeySystems.WIDEVINE) {
+              var offset = psshInfo.data.length - 22;
+              keyId = psshInfo.data.subarray(offset, offset + 16);
+            } else if (keySystemDomain === KeySystems.PLAYREADY) {
+              keyId = parsePlayReadyWRM(psshInfo.data);
+            }
           }
         }
         if (!keySystemDomain || !keyId) {
@@ -24363,7 +24323,13 @@
       if (keySystem === KeySystems.WIDEVINE && widevineLicenseUrl) {
         return widevineLicenseUrl;
       }
-      throw new Error("no license server URL configured for key-system \"" + keySystem + "\"");
+    };
+    _proto.getLicenseServerUrlOrThrow = function getLicenseServerUrlOrThrow(keySystem) {
+      var url = this.getLicenseServerUrl(keySystem);
+      if (url === undefined) {
+        throw new Error("no license server URL configured for key-system \"" + keySystem + "\"");
+      }
+      return url;
     };
     _proto.getServerCertificateUrl = function getServerCertificateUrl(keySystem) {
       var drmSystems = this.config.drmSystems;
@@ -24911,7 +24877,7 @@
       var _this13 = this;
       var keyLoadPolicy = this.config.keyLoadPolicy.default;
       return new Promise(function (resolve, reject) {
-        var url = _this13.getLicenseServerUrl(keySessionContext.keySystem);
+        var url = _this13.getLicenseServerUrlOrThrow(keySessionContext.keySystem);
         _this13.log("Sending license request to URL: " + url);
         var xhr = new XMLHttpRequest();
         xhr.responseType = 'arraybuffer';

package/dist/hls.js.d.ts

@@ -840,6 +840,7 @@ export declare class EMEController extends Logger implements ComponentAPI {
     private registerListeners;
     private unregisterListeners;
     private getLicenseServerUrl;
+    private getLicenseServerUrlOrThrow;
     private getServerCertificateUrl;
     private attemptKeySystemAccess;
     private requestMediaKeySystemAccess;