shaka-player 4.7.13 → 4.8.0

package/lib/hls/hls_parser.js

@@ -37,9 +37,9 @@ goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.Pssh');
 goog.require('shaka.media.SegmentUtils');
 goog.require('shaka.util.Timer');
+goog.require('shaka.util.TXml');
 goog.require('shaka.util.Platform');
 goog.require('shaka.util.Uint8ArrayUtils');
-goog.require('shaka.util.XmlUtils');
 goog.requireType('shaka.hls.Segment');
 
 
@@ -217,6 +217,18 @@ shaka.hls.HlsParser = class {
      * {!Map.<string, !shaka.media.InitSegmentReference>} */
     this.mapTagToInitSegmentRefMap_ = new Map();
 
+    /** @private {Map.<string, !shaka.extern.aesKey>} */
+    this.aesKeyInfoMap_ = new Map();
+
+    /** @private {Map.<string, !Promise.<shaka.extern.Response>>} */
+    this.aesKeyMap_ = new Map();
+
+    /** @private {Map.<string, !Promise.<shaka.extern.Response>>} */
+    this.identityKeyMap_ = new Map();
+
+    /** @private {Map.<!shaka.media.InitSegmentReference, ?string>} */
+    this.identityKidMap_ = new Map();
+
     /** @private {boolean} */
     this.lowLatencyMode_ = false;
 
@@ -297,6 +309,10 @@ shaka.hls.HlsParser = class {
     this.groupIdToCodecsMap_.clear();
     this.globalVariables_.clear();
     this.mapTagToInitSegmentRefMap_.clear();
+    this.aesKeyInfoMap_.clear();
+    this.aesKeyMap_.clear();
+    this.identityKeyMap_.clear();
+    this.identityKidMap_.clear();
 
     if (this.contentSteeringManager_) {
       this.contentSteeringManager_.destroy();
@@ -434,7 +450,8 @@ shaka.hls.HlsParser = class {
 
     const mediaSequenceToStartTime =
         this.getMediaSequenceToStartTimeFor_(streamInfo);
-    const {keyIds, drmInfos} = this.parseDrmInfo_(playlist, stream.mimeType);
+    const {keyIds, drmInfos} = await this.parseDrmInfo_(
+        playlist, stream.mimeType, streamInfo.getUris, mediaVariables);
 
     const keysAreEqual =
       (a, b) => a.size === b.size && [...a].every((value) => b.has(value));
@@ -447,7 +464,7 @@ shaka.hls.HlsParser = class {
 
     const {segments, bandwidth} = this.createSegments_(
         playlist, stream, mediaSequenceToStartTime, mediaVariables,
-        streamInfo.getUris);
+        streamInfo.getUris, streamInfo.type);
     if (bandwidth) {
       stream.bandwidth = bandwidth;
     }
@@ -581,6 +598,9 @@ shaka.hls.HlsParser = class {
         this.minSequenceNumber_);
 
     for (const streamInfo of streamInfos) {
+      if (!this.ignoreManifestProgramDateTimeFor_(streamInfo.type)) {
+        continue;
+      }
       const segmentIndex = streamInfo.stream.segmentIndex;
       if (segmentIndex) {
         // Drop any earlier references.
@@ -637,6 +657,9 @@ shaka.hls.HlsParser = class {
     shaka.log.debug('Syncing HLS streams against base time:', lowestSyncTime);
 
     for (const streamInfo of this.uriToStreamInfosMap_.values()) {
+      if (this.ignoreManifestProgramDateTimeFor_(streamInfo.type)) {
+        continue;
+      }
       const segmentIndex = streamInfo.stream.segmentIndex;
       if (segmentIndex != null) {
         // A segment's startTime should be based on its syncTime vs the lowest
@@ -718,12 +741,12 @@ shaka.hls.HlsParser = class {
     /** @type {!Array.<!shaka.extern.Stream>} */
     let imageStreams = [];
 
+    const getUris = () => {
+      return [uri];
+    };
+
     // Parsing a media playlist results in a single-variant stream.
     if (playlist.type == shaka.hls.PlaylistType.MEDIA) {
-      const getUris = () => {
-        return [uri];
-      };
-
       // Get necessary info for this stream. These are things we would normally
       // find from the master playlist (e.g. from values on EXT-X-MEDIA tags).
       const basicInfo =
@@ -737,6 +760,7 @@ shaka.hls.HlsParser = class {
       const channelsCount = basicInfo.channelCount;
       const sampleRate = basicInfo.sampleRate;
       const closedCaptions = basicInfo.closedCaptions;
+      const videoRange = basicInfo.videoRange;
 
       // Some values we cannot figure out, and aren't important enough to ask
       // the user to provide through config values. A lot of these are only
@@ -757,8 +781,7 @@ shaka.hls.HlsParser = class {
 
       if (type == 'video') {
         this.addVideoAttributes_(streamInfo.stream, width, height,
-            /* frameRate= */ null, /* videoRange= */ null,
-            /* videoLayout= */ null);
+            /* frameRate= */ null, videoRange, /* videoLayout= */ null);
       }
 
       // Wrap the stream from that stream info with a variant.
@@ -805,8 +828,9 @@ shaka.hls.HlsParser = class {
       this.parseCodecs_(variantTags);
 
       this.parseClosedCaptions_(mediaTags);
-      variants =
-          this.createVariantsForTags_(variantTags, sessionKeyTags, mediaTags);
+      variants = await this.createVariantsForTags_(
+          variantTags, sessionKeyTags, mediaTags, getUris,
+          this.globalVariables_);
       textStreams = this.parseTexts_(mediaTags);
       imageStreams = await this.parseImages_(imageTags, iFrameTags);
     }
@@ -876,6 +900,19 @@ shaka.hls.HlsParser = class {
     }
 
     this.playerInterface_.makeTextStreamsForClosedCaptions(this.manifest_);
+
+    if (variants.length == 1) {
+      const createSegmentIndexPromises = [];
+      const variant = variants[0];
+      for (const stream of [variant.video, variant.audio]) {
+        if (stream && !stream.segmentIndex) {
+          createSegmentIndexPromises.push(stream.createSegmentIndex());
+        }
+      }
+      if (createSegmentIndexPromises.length > 0) {
+        await Promise.all(createSegmentIndexPromises);
+      }
+    }
   }
 
   /**
@@ -986,27 +1023,27 @@ shaka.hls.HlsParser = class {
         this.presentationTimeline_.setSegmentAvailabilityDuration(
             segmentAvailabilityDuration);
       }
-
-      if (!this.presentationTimeline_.isStartTimeLocked()) {
-        for (const streamInfo of this.uriToStreamInfosMap_.values()) {
-          if (!streamInfo.stream.segmentIndex) {
-            continue; // Not active.
-          }
-          if (streamInfo.type != 'audio' && streamInfo.type != 'video') {
-            continue;
-          }
-          const firstReference = streamInfo.stream.segmentIndex.get(0);
-          if (firstReference && firstReference.syncTime) {
-            const syncTime = firstReference.syncTime;
-            this.presentationTimeline_.setInitialProgramDateTime(syncTime);
-          }
-        }
-      }
     } else {
       // Use the minimum duration as the presentation duration.
       this.presentationTimeline_.setDuration(this.getMinDuration_());
     }
 
+    if (!this.presentationTimeline_.isStartTimeLocked()) {
+      for (const streamInfo of this.uriToStreamInfosMap_.values()) {
+        if (!streamInfo.stream.segmentIndex) {
+          continue; // Not active.
+        }
+        if (streamInfo.type != 'audio' && streamInfo.type != 'video') {
+          continue;
+        }
+        const firstReference = streamInfo.stream.segmentIndex.get(0);
+        if (firstReference && firstReference.syncTime) {
+          const syncTime = firstReference.syncTime;
+          this.presentationTimeline_.setInitialProgramDateTime(syncTime);
+        }
+      }
+    }
+
     // This is the first point where we have a meaningful presentation start
     // time, and we need to tell PresentationTimeline that so that it can
     // maintain consistency from here on.
@@ -1323,37 +1360,48 @@ shaka.hls.HlsParser = class {
    * from the playlist.
    * @param {!Array.<!shaka.hls.Tag>} mediaTags EXT-X-MEDIA tags from the
    * playlist.
-   * @return {!Array.<!shaka.extern.Variant>}
+   * @param {function():!Array.<string>} getUris
+   * @param {?Map.<string, string>=} variables
+   * @return {!Promise.<!Array.<!shaka.extern.Variant>>}
    * @private
    */
-  createVariantsForTags_(tags, sessionKeyTags, mediaTags) {
+  async createVariantsForTags_(tags, sessionKeyTags, mediaTags, getUris,
+      variables) {
     // EXT-X-SESSION-KEY processing
     const drmInfos = [];
     const keyIds = new Set();
     if (sessionKeyTags.length > 0) {
       for (const drmTag of sessionKeyTags) {
         const method = drmTag.getRequiredAttrValue('METHOD');
-        if (method != 'NONE' && method != 'AES-128') {
-          // According to the HLS spec, KEYFORMAT is optional and implicitly
-          // defaults to "identity".
-          // https://datatracker.ietf.org/doc/html/draft-pantos-hls-rfc8216bis-11#section-4.4.4.4
-          const keyFormat =
-              drmTag.getAttributeValue('KEYFORMAT') || 'identity';
+        // According to the HLS spec, KEYFORMAT is optional and implicitly
+        // defaults to "identity".
+        // https://datatracker.ietf.org/doc/html/draft-pantos-hls-rfc8216bis-11#section-4.4.4.4
+        const keyFormat =
+            drmTag.getAttributeValue('KEYFORMAT') || 'identity';
+        let drmInfo = null;
+        if (method == 'NONE' || this.isAesMethod_(method)) {
+          continue;
+        } else if (keyFormat == 'identity') {
+          // eslint-disable-next-line no-await-in-loop
+          drmInfo = await this.identityDrmParser_(
+              drmTag, /* mimeType= */ '', getUris,
+              /* initSegmentRef= */ null, variables);
+        } else {
           const drmParser =
               shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_[keyFormat];
 
-          const drmInfo = drmParser ?
+          drmInfo = drmParser ?
               drmParser(drmTag, /* mimeType= */ '') : null;
-          if (drmInfo) {
-            if (drmInfo.keyIds) {
-              for (const keyId of drmInfo.keyIds) {
-                keyIds.add(keyId);
-              }
+        }
+        if (drmInfo) {
+          if (drmInfo.keyIds) {
+            for (const keyId of drmInfo.keyIds) {
+              keyIds.add(keyId);
             }
-            drmInfos.push(drmInfo);
-          } else {
-            shaka.log.warning('Unsupported HLS KEYFORMAT', keyFormat);
           }
+          drmInfos.push(drmInfo);
+        } else {
+          shaka.log.warning('Unsupported HLS KEYFORMAT', keyFormat);
         }
       }
     }
@@ -1587,6 +1635,9 @@ shaka.hls.HlsParser = class {
   getCodecsForVariantTag_(tag) {
     let codecsString = tag.getAttributeValue('CODECS') || '';
 
+    const supplementalCodecsString =
+        tag.getAttributeValue('SUPPLEMENTAL-CODECS');
+
     this.codecInfoInManifest_ = codecsString.length > 0;
 
     if (!this.codecInfoInManifest_ && !this.config_.hls.disableCodecGuessing) {
@@ -1607,34 +1658,15 @@ shaka.hls.HlsParser = class {
     /** @type {!Array.<string>} */
     const codecs = codecsString.split(/\s*,\s*/);
 
-    return this.filterDuplicateCodecs_(codecs);
-  }
-
-
-  /**
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>} codecs
-   * @private
-   */
-  filterDuplicateCodecs_(codecs) {
-    // Filter out duplicate codecs.
-    const seen = new Set();
-    const ret = [];
-    for (const codec of codecs) {
-      // HLS says the CODECS field needs to include all codecs that appear in
-      // the content. This means that if the content changes profiles, it should
-      // include both. Since all known browsers support changing profiles
-      // without any other work, just ignore them.  See also:
-      // https://github.com/shaka-project/shaka-player/issues/1817
-      const shortCodec = shaka.util.MimeUtils.getCodecBase(codec);
-      if (!seen.has(shortCodec)) {
-        ret.push(codec);
-        seen.add(shortCodec);
-      } else {
-        shaka.log.debug('Ignoring duplicate codec');
-      }
+    if (supplementalCodecsString) {
+      const supplementalCodecs = supplementalCodecsString.split(/\s*,\s*/)
+          .map((codec) => {
+            return codec.split('/')[0];
+          });
+      codecs.push(...supplementalCodecs);
     }
-    return ret;
+
+    return shaka.media.SegmentUtils.codecsFiltering(codecs);
   }
 
   /**
@@ -2444,7 +2476,23 @@ shaka.hls.HlsParser = class {
       this.syncStreamsWithSequenceNumber_(streamInfos);
     } else {
       this.syncStreamsWithProgramDateTime_(streamInfos);
+      if (this.config_.hls.ignoreManifestProgramDateTimeForTypes.length > 0) {
+        this.syncStreamsWithSequenceNumber_(streamInfos);
+      }
+    }
+  }
+
+  /**
+   * @param {string} type
+   * @return {boolean}
+   * @private
+   */
+  ignoreManifestProgramDateTimeFor_(type) {
+    if (this.config_.hls.ignoreManifestProgramDateTime) {
+      return true;
     }
+    const forTypes = this.config_.hls.ignoreManifestProgramDateTimeForTypes;
+    return forTypes.includes(type);
   }
 
   /**
@@ -2534,7 +2582,7 @@ shaka.hls.HlsParser = class {
     }
 
     const {drmInfos, keyIds, encrypted, aesEncrypted} =
-                        this.parseDrmInfo_(playlist, mimeType);
+        await this.parseDrmInfo_(playlist, mimeType, getUris, mediaVariables);
 
     if (encrypted && !drmInfos.length && !aesEncrypted) {
       throw new shaka.util.Error(
@@ -2556,7 +2604,8 @@ shaka.hls.HlsParser = class {
         this.mediaSequenceToStartTimeByType_.get(type) : new Map();
 
     const {segments, bandwidth} = this.createSegments_(
-        playlist, stream, mediaSequenceToStartTime, mediaVariables, getUris);
+        playlist, stream, mediaSequenceToStartTime, mediaVariables, getUris,
+        type);
     if (bandwidth) {
       stream.bandwidth = bandwidth;
     }
@@ -2753,22 +2802,31 @@ shaka.hls.HlsParser = class {
   /**
    * @param {!shaka.hls.Playlist} playlist
    * @param {string} mimeType
-   * @return {{
+   * @param {function():!Array.<string>} getUris
+   * @param {?Map.<string, string>=} variables
+   * @return {Promise.<{
    *   drmInfos: !Array.<shaka.extern.DrmInfo>,
    *   keyIds: !Set.<string>,
    *   encrypted: boolean,
    *   aesEncrypted: boolean
-   * }}
+   * }>}
    * @private
    */
-  parseDrmInfo_(playlist, mimeType) {
-    /** @type {!Array.<!shaka.hls.Tag>} */
-    const drmTags = [];
+  async parseDrmInfo_(playlist, mimeType, getUris, variables) {
+    /** @type {!Map<!shaka.hls.Tag, ?shaka.media.InitSegmentReference>} */
+    const drmTagsMap = new Map();
     if (playlist.segments) {
       for (const segment of playlist.segments) {
         const segmentKeyTags = shaka.hls.Utils.filterTagsByName(segment.tags,
             'EXT-X-KEY');
-        drmTags.push(...segmentKeyTags);
+        let initSegmentRef = null;
+        if (segmentKeyTags.length) {
+          initSegmentRef = this.getInitSegmentReference_(playlist,
+              segment.tags, getUris, variables);
+          for (const segmentKeyTag of segmentKeyTags) {
+            drmTagsMap.set(segmentKeyTag, initSegmentRef);
+          }
+        }
       }
     }
 
@@ -2779,34 +2837,43 @@ shaka.hls.HlsParser = class {
     const drmInfos = [];
     const keyIds = new Set();
 
-    for (const drmTag of drmTags) {
+    for (const [key, value] of drmTagsMap) {
+      const drmTag = /** @type {!shaka.hls.Tag} */ (key);
+      const initSegmentRef =
+      /** @type {?shaka.media.InitSegmentReference} */ (value);
       const method = drmTag.getRequiredAttrValue('METHOD');
       if (method != 'NONE') {
         encrypted = true;
 
-        if (method == 'AES-128') {
+        // According to the HLS spec, KEYFORMAT is optional and implicitly
+        // defaults to "identity".
+        // https://datatracker.ietf.org/doc/html/draft-pantos-hls-rfc8216bis-11#section-4.4.4.4
+        const keyFormat =
+            drmTag.getAttributeValue('KEYFORMAT') || 'identity';
+        let drmInfo = null;
+
+        if (this.isAesMethod_(method)) {
           // These keys are handled separately.
           aesEncrypted = true;
+          continue;
+        } else if (keyFormat == 'identity') {
+          // eslint-disable-next-line no-await-in-loop
+          drmInfo = await this.identityDrmParser_(
+              drmTag, mimeType, getUris, initSegmentRef, variables);
         } else {
-          // According to the HLS spec, KEYFORMAT is optional and implicitly
-          // defaults to "identity".
-          // https://datatracker.ietf.org/doc/html/draft-pantos-hls-rfc8216bis-11#section-4.4.4.4
-          const keyFormat =
-              drmTag.getAttributeValue('KEYFORMAT') || 'identity';
           const drmParser =
               shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_[keyFormat];
-
-          const drmInfo = drmParser ? drmParser(drmTag, mimeType) : null;
-          if (drmInfo) {
-            if (drmInfo.keyIds) {
-              for (const keyId of drmInfo.keyIds) {
-                keyIds.add(keyId);
-              }
+          drmInfo = drmParser ? drmParser(drmTag, mimeType) : null;
+        }
+        if (drmInfo) {
+          if (drmInfo.keyIds) {
+            for (const keyId of drmInfo.keyIds) {
+              keyIds.add(keyId);
             }
-            drmInfos.push(drmInfo);
-          } else {
-            shaka.log.warning('Unsupported HLS KEYFORMAT', keyFormat);
           }
+          drmInfos.push(drmInfo);
+        } else {
+          shaka.log.warning('Unsupported HLS KEYFORMAT', keyFormat);
         }
       }
     }
@@ -2819,14 +2886,14 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Playlist} playlist
    * @param {function():!Array.<string>} getUris
    * @param {?Map.<string, string>=} variables
-   * @return {!shaka.extern.aes128Key}
+   * @return {!shaka.extern.aesKey}
    * @private
    */
-  parseAES128DrmTag_(drmTag, playlist, getUris, variables) {
+  parseAESDrmTag_(drmTag, playlist, getUris, variables) {
     // Check if the Web Crypto API is available.
     if (!window.crypto || !window.crypto.subtle) {
       shaka.log.alwaysWarn('Web Crypto API is not available to decrypt ' +
-          'AES-128. (Web Crypto only exists in secure origins like https)');
+          'AES. (Web Crypto only exists in secure origins like https)');
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MANIFEST,
@@ -2857,36 +2924,63 @@ shaka.hls.HlsParser = class {
       }
     }
 
-    const keyInfo = {method: 'AES-128', iv, firstMediaSequenceNumber};
-
-    // Don't download the key object until the segment is parsed, to avoid a
-    // startup delay for long manifests with lots of keys.
-    keyInfo.fetchKey = async () => {
-      const keyUris = shaka.hls.Utils.constructSegmentUris(
-          getUris(), drmTag.getRequiredAttrValue('URI'), variables);
-
-      const requestType = shaka.net.NetworkingEngine.RequestType.KEY;
-      const request = shaka.net.NetworkingEngine.makeRequest(
-          keyUris, this.config_.retryParameters);
-      const keyResponse = await this.makeNetworkRequest_(request, requestType);
+    const aesKeyInfoKey = `${drmTag.toString()}-${firstMediaSequenceNumber}`;
+    if (!this.aesKeyInfoMap_.has(aesKeyInfoKey)) {
+      // Default AES-128
+      const keyInfo = {
+        bitsKey: 128,
+        blockCipherMode: 'CBC',
+        iv,
+        firstMediaSequenceNumber,
+      };
 
-      // keyResponse.status is undefined when URI is "data:text/plain;base64,"
-      if (!keyResponse.data || keyResponse.data.byteLength != 16) {
-        throw new shaka.util.Error(
-            shaka.util.Error.Severity.CRITICAL,
-            shaka.util.Error.Category.MANIFEST,
-            shaka.util.Error.Code.AES_128_INVALID_KEY_LENGTH);
+      const method = drmTag.getRequiredAttrValue('METHOD');
+      switch (method) {
+        case 'AES-256':
+          keyInfo.bitsKey = 256;
+          break;
+        case 'AES-256-CTR':
+          keyInfo.bitsKey = 256;
+          keyInfo.blockCipherMode = 'CTR';
+          break;
       }
 
-      const algorithm = {
-        name: 'AES-CBC',
-      };
-      keyInfo.cryptoKey = await window.crypto.subtle.importKey(
-          'raw', keyResponse.data, algorithm, true, ['decrypt']);
-      keyInfo.fetchKey = undefined; // No longer needed.
-    };
+      // Don't download the key object until the segment is parsed, to avoid a
+      // startup delay for long manifests with lots of keys.
+      keyInfo.fetchKey = async () => {
+        const keyUris = shaka.hls.Utils.constructSegmentUris(
+            getUris(), drmTag.getRequiredAttrValue('URI'), variables);
+
+        const keyMapKey = keyUris.sort().join('');
+        if (!this.aesKeyMap_.has(keyMapKey)) {
+          const requestType = shaka.net.NetworkingEngine.RequestType.KEY;
+          const request = shaka.net.NetworkingEngine.makeRequest(
+              keyUris, this.config_.retryParameters);
+          const keyResponse = this.makeNetworkRequest_(request, requestType);
+          this.aesKeyMap_.set(keyMapKey, keyResponse);
+        }
+        const keyResponse = await this.aesKeyMap_.get(keyMapKey);
+
+        // keyResponse.status is undefined when URI is "data:text/plain;base64,"
+        if (!keyResponse.data ||
+            keyResponse.data.byteLength != (keyInfo.bitsKey / 8)) {
+          throw new shaka.util.Error(
+              shaka.util.Error.Severity.CRITICAL,
+              shaka.util.Error.Category.MANIFEST,
+              shaka.util.Error.Code.AES_128_INVALID_KEY_LENGTH);
+        }
 
-    return keyInfo;
+        const algorithm = {
+          name: keyInfo.blockCipherMode == 'CTR' ? 'AES-CTR' : 'AES-CBC',
+          length: keyInfo.bitsKey,
+        };
+        keyInfo.cryptoKey = await window.crypto.subtle.importKey(
+            'raw', keyResponse.data, algorithm, true, ['decrypt']);
+        keyInfo.fetchKey = undefined; // No longer needed.
+      };
+      this.aesKeyInfoMap_.set(aesKeyInfoKey, keyInfo);
+    }
+    return this.aesKeyInfoMap_.get(aesKeyInfoKey);
   }
 
 
@@ -3066,22 +3160,22 @@ shaka.hls.HlsParser = class {
       mapTag.getAttributeValue('BYTERANGE', ''),
     ].join('-');
     if (!this.mapTagToInitSegmentRefMap_.has(mapTagKey)) {
-      /** @type {shaka.extern.aes128Key|undefined} */
-      let aes128Key = undefined;
+      /** @type {shaka.extern.aesKey|undefined} */
+      let aesKey = undefined;
       let byteRangeTag = null;
       for (const tag of tags) {
         if (tag.name == 'EXT-X-KEY') {
-          if (tag.getRequiredAttrValue('METHOD') == 'AES-128' &&
+          if (this.isAesMethod_(tag.getRequiredAttrValue('METHOD')) &&
               tag.id < mapTag.id) {
-            aes128Key =
-                this.parseAES128DrmTag_(tag, playlist, getUris, variables);
+            aesKey =
+                this.parseAESDrmTag_(tag, playlist, getUris, variables);
           }
         } else if (tag.name == 'EXT-X-BYTERANGE' && tag.id < mapTag.id) {
           byteRangeTag = tag;
         }
       }
       const initSegmentRef = this.createInitSegmentReference_(
-          absoluteInitSegmentUris, mapTag, byteRangeTag, aes128Key);
+          absoluteInitSegmentUris, mapTag, byteRangeTag, aesKey);
       this.mapTagToInitSegmentRefMap_.set(mapTagKey, initSegmentRef);
     }
     return this.mapTagToInitSegmentRefMap_.get(mapTagKey);
@@ -3093,12 +3187,12 @@ shaka.hls.HlsParser = class {
    * @param {!Array.<string>} absoluteInitSegmentUris
    * @param {!shaka.hls.Tag} mapTag EXT-X-MAP
    * @param {shaka.hls.Tag=} byteRangeTag EXT-X-BYTERANGE
-   * @param {shaka.extern.aes128Key=} aes128Key
+   * @param {shaka.extern.aesKey=} aesKey
    * @return {!shaka.media.InitSegmentReference}
    * @private
    */
   createInitSegmentReference_(absoluteInitSegmentUris, mapTag, byteRangeTag,
-      aes128Key) {
+      aesKey) {
     let startByte = 0;
     let endByte = null;
     let byterange = mapTag.getAttributeValue('BYTERANGE');
@@ -3113,8 +3207,8 @@ shaka.hls.HlsParser = class {
       startByte = Number(blocks[1]);
       endByte = startByte + byteLength - 1;
 
-      if (aes128Key) {
-        // MAP segment encrypted with method 'AES-128', when served with
+      if (aesKey) {
+        // MAP segment encrypted with method AES, when served with
         // HTTP Range, has the unencrypted size specified in the range.
         // See: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
         const length = (endByte + 1) - startByte;
@@ -3131,7 +3225,7 @@ shaka.hls.HlsParser = class {
         /* mediaQuality= */ null,
         /* timescale= */ null,
         /* segmentData= */ null,
-        aes128Key);
+        aesKey);
     return initSegmentRef;
   }
 
@@ -3146,13 +3240,13 @@ shaka.hls.HlsParser = class {
    * @param {!shaka.hls.Playlist} playlist
    * @param {shaka.extern.Stream} stream
    * @param {function():!Array.<string>} getUris
-   * @param {shaka.extern.aes128Key=} aes128Key
+   * @param {shaka.extern.aesKey=} aesKey
    * @return {shaka.media.SegmentReference}
    * @private
    */
   createSegmentReference_(
       initSegmentReference, previousReference, hlsSegment, startTime,
-      variables, playlist, stream, getUris, aes128Key) {
+      variables, playlist, stream, getUris, aesKey) {
     const tags = hlsSegment.tags;
     const extinfTag =
         shaka.hls.Utils.getFirstTagWithName(tags, 'EXTINF');
@@ -3173,7 +3267,7 @@ shaka.hls.HlsParser = class {
       const dateTimeTag =
           shaka.hls.Utils.getFirstTagWithName(tags, 'EXT-X-PROGRAM-DATE-TIME');
       if (dateTimeTag && dateTimeTag.value) {
-        syncTime = shaka.util.XmlUtils.parseDate(dateTimeTag.value);
+        syncTime = shaka.util.TXml.parseDate(dateTimeTag.value);
         goog.asserts.assert(syncTime != null,
             'EXT-X-PROGRAM-DATE-TIME format not valid');
       }
@@ -3298,7 +3392,7 @@ shaka.hls.HlsParser = class {
             /* tileDuration= */ null,
             partialSyncTime,
             partialStatus,
-            aes128Key);
+            aesKey);
         if (item.name == 'EXT-X-PRELOAD-HINT') {
           partial.markAsPreload();
           isPreloadSegment = true;
@@ -3413,7 +3507,7 @@ shaka.hls.HlsParser = class {
         tileDuration,
         syncTime,
         status,
-        aes128Key,
+        aesKey,
         allPartialSegments,
     );
 
@@ -3467,12 +3561,13 @@ shaka.hls.HlsParser = class {
    * @param {!Map.<number, number>} mediaSequenceToStartTime
    * @param {!Map.<string, string>} variables
    * @param {function():!Array.<string>} getUris
+   * @param {string} type
    * @return {{segments: !Array.<!shaka.media.SegmentReference>,
    *          bandwidth: (number|undefined)}}
    * @private
    */
   createSegments_(playlist, stream, mediaSequenceToStartTime, variables,
-      getUris) {
+      getUris, type) {
     /** @type {Array.<!shaka.hls.Segment>} */
     const hlsSegments = playlist.segments;
     goog.asserts.assert(hlsSegments.length, 'Playlist should have segments!');
@@ -3480,8 +3575,8 @@ shaka.hls.HlsParser = class {
     /** @type {shaka.media.InitSegmentReference} */
     let initSegmentRef;
 
-    /** @type {shaka.extern.aes128Key|undefined} */
-    let aes128Key = undefined;
+    /** @type {shaka.extern.aesKey|undefined} */
+    let aesKey = undefined;
 
     let discontinuitySequence = shaka.hls.Utils.getFirstTagWithNameAsNumber(
         playlist.tags, 'EXT-X-DISCONTINUITY-SEQUENCE', 0);
@@ -3527,14 +3622,14 @@ shaka.hls.HlsParser = class {
         discontinuitySequence++;
       }
 
-      // Apply new AES-128 tags as you see them, keeping a running total.
+      // Apply new AES tags as you see them, keeping a running total.
       for (const drmTag of item.tags) {
         if (drmTag.name == 'EXT-X-KEY') {
-          if (drmTag.getRequiredAttrValue('METHOD') == 'AES-128') {
-            aes128Key =
-                this.parseAES128DrmTag_(drmTag, playlist, getUris, variables);
+          if (this.isAesMethod_(drmTag.getRequiredAttrValue('METHOD'))) {
+            aesKey =
+                this.parseAESDrmTag_(drmTag, playlist, getUris, variables);
           } else {
-            aes128Key = undefined;
+            aesKey = undefined;
           }
         }
       }
@@ -3565,7 +3660,7 @@ shaka.hls.HlsParser = class {
           playlist,
           stream,
           getUris,
-          aes128Key);
+          aesKey);
 
       if (reference) {
         const bitrate = shaka.hls.Utils.getFirstTagWithNameAsNumber(
@@ -3586,7 +3681,7 @@ shaka.hls.HlsParser = class {
         previousReference = reference;
         reference.discontinuitySequence = discontinuitySequence;
 
-        if (this.config_.hls.ignoreManifestProgramDateTime &&
+        if (this.ignoreManifestProgramDateTimeFor_(type) &&
             this.minSequenceNumber_ != null &&
             position < this.minSequenceNumber_) {
           // This segment is ignored as part of our fallback synchronization
@@ -3687,8 +3782,10 @@ shaka.hls.HlsParser = class {
     // skip this step, and wait until we have sync time across stream types.
     const lowestSyncTime = this.lowestSyncTime_;
     if (someSyncTime && lowestSyncTime != Infinity) {
-      for (const reference of references) {
-        reference.syncAgainst(lowestSyncTime);
+      if (!this.ignoreManifestProgramDateTimeFor_(type)) {
+        for (const reference of references) {
+          reference.syncAgainst(lowestSyncTime);
+        }
       }
     }
 
@@ -4037,6 +4134,17 @@ shaka.hls.HlsParser = class {
     return op.promise;
   }
 
+  /**
+   * @param {string} method
+   * @return {boolean}
+   * @private
+   */
+  isAesMethod_(method) {
+    return method == 'AES-128' ||
+        method == 'AES-256' ||
+        method == 'AES-256-CTR';
+  }
+
   /**
    * @param {!shaka.hls.Tag} drmTag
    * @param {string} mimeType
@@ -4059,13 +4167,28 @@ shaka.hls.HlsParser = class {
               .HLS_MSE_ENCRYPTED_LEGACY_APPLE_MEDIA_KEYS_NOT_SUPPORTED);
     }
 
+    const method = drmTag.getRequiredAttrValue('METHOD');
+    const VALID_METHODS = ['SAMPLE-AES', 'SAMPLE-AES-CTR'];
+    if (!VALID_METHODS.includes(method)) {
+      shaka.log.error('FairPlay in HLS is only supported with [',
+          VALID_METHODS.join(', '), '], not', method);
+      return null;
+    }
+
+    let encryptionScheme = 'cenc';
+    if (method == 'SAMPLE-AES') {
+      // It should be 'cbcs-1-9' but Safari doesn't support it.
+      // See: https://github.com/WebKit/WebKit/blob/main/Source/WebCore/Modules/encryptedmedia/MediaKeyEncryptionScheme.idl
+      encryptionScheme = 'cbcs';
+    }
+
     /*
      * Even if we're not able to construct initData through the HLS tag, adding
      * a DRMInfo will allow DRM Engine to request a media key system access
      * with the correct keySystem and initDataType
      */
     const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-        'com.apple.fps', [
+        'com.apple.fps', encryptionScheme, [
           {initDataType: 'sinf', initData: new Uint8Array(0), keyId: null},
         ]);
 
@@ -4086,13 +4209,18 @@ shaka.hls.HlsParser = class {
       return null;
     }
 
+    let encryptionScheme = 'cenc';
+    if (method == 'SAMPLE-AES') {
+      encryptionScheme = 'cbcs';
+    }
+
     const uri = drmTag.getRequiredAttrValue('URI');
     const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
 
     // The data encoded in the URI is a PSSH box to be used as init data.
     const pssh = shaka.util.BufferUtils.toUint8(parsedData.data);
     const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-        'com.widevine.alpha', [
+        'com.widevine.alpha', encryptionScheme, [
           {initDataType: 'cenc', initData: pssh},
         ]);
 
@@ -4124,6 +4252,11 @@ shaka.hls.HlsParser = class {
       return null;
     }
 
+    let encryptionScheme = 'cenc';
+    if (method == 'SAMPLE-AES') {
+      encryptionScheme = 'cbcs';
+    }
+
     const uri = drmTag.getRequiredAttrValue('URI');
     const parsedData = shaka.net.DataUriPlugin.parseRaw(uri);
 
@@ -4139,7 +4272,7 @@ shaka.hls.HlsParser = class {
     const pssh =
         shaka.util.Pssh.createPssh(data, systemId, keyIds, psshVersion);
     const drmInfo = shaka.util.ManifestParserUtils.createDrmInfo(
-        'com.microsoft.playready', [
+        'com.microsoft.playready', encryptionScheme, [
           {initDataType: 'cenc', initData: pssh},
         ]);
 
@@ -4150,10 +4283,15 @@ shaka.hls.HlsParser = class {
    * See: https://datatracker.ietf.org/doc/html/draft-pantos-hls-rfc8216bis-11#section-5.1
    *
    * @param {!shaka.hls.Tag} drmTag
-   * @return {?shaka.extern.DrmInfo}
+   * @param {string} mimeType
+   * @param {function():!Array.<string>} getUris
+   * @param {?shaka.media.InitSegmentReference} initSegmentRef
+   * @param {?Map.<string, string>=} variables
+   * @return {!Promise.<?shaka.extern.DrmInfo>}
    * @private
    */
-  static identityDrmParser_(drmTag, mimeType) {
+  async identityDrmParser_(drmTag, mimeType, getUris, initSegmentRef,
+      variables) {
     if (mimeType == 'video/mp2t') {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
@@ -4177,15 +4315,73 @@ shaka.hls.HlsParser = class {
       return null;
     }
 
+    const keyUris = shaka.hls.Utils.constructSegmentUris(
+        getUris(), drmTag.getRequiredAttrValue('URI'), variables);
+
+    let key;
+    if (keyUris[0].startsWith('data:text/plain;base64,')) {
+      key = shaka.util.Uint8ArrayUtils.toHex(
+          shaka.util.Uint8ArrayUtils.fromBase64(
+              keyUris[0].split('data:text/plain;base64,').pop()));
+    } else {
+      const keyMapKey = keyUris.sort().join('');
+      if (!this.identityKeyMap_.has(keyMapKey)) {
+        const requestType = shaka.net.NetworkingEngine.RequestType.KEY;
+        const request = shaka.net.NetworkingEngine.makeRequest(
+            keyUris, this.config_.retryParameters);
+        const keyResponse = this.makeNetworkRequest_(request, requestType);
+        this.identityKeyMap_.set(keyMapKey, keyResponse);
+      }
+      const keyResponse = await this.identityKeyMap_.get(keyMapKey);
+      key = shaka.util.Uint8ArrayUtils.toHex(keyResponse.data);
+    }
+
     // NOTE: The ClearKey CDM requires a key-id to key mapping.  HLS doesn't
     // provide a key ID anywhere.  So although we could use the 'URI' attribute
     // to fetch the actual 16-byte key, without a key ID, we can't provide this
-    // automatically to the ClearKey CDM.  Instead, the application will have
-    // to use player.configure('drm.clearKeys', { ... }) to provide the key IDs
+    // automatically to the ClearKey CDM. By default we assume that keyId is 0,
+    // but we will try to get key ID from Init Segment.
+    // If the application want override this behavior will have to use
+    // player.configure('drm.clearKeys', { ... }) to provide the key IDs
     // and keys or player.configure('drm.servers.org\.w3\.clearkey', ...) to
     // provide a ClearKey license server URI.
-    return shaka.util.ManifestParserUtils.createDrmInfo(
-        'org.w3.clearkey', /* initDatas= */ null);
+    let keyId = '00000000000000000000000000000000';
+
+    if (initSegmentRef) {
+      let defaultKID;
+      if (this.identityKidMap_.has(initSegmentRef)) {
+        defaultKID = this.identityKidMap_.get(initSegmentRef);
+      } else {
+        const initSegmentRequest = shaka.util.Networking.createSegmentRequest(
+            initSegmentRef.getUris(),
+            initSegmentRef.getStartByte(),
+            initSegmentRef.getEndByte(),
+            this.config_.retryParameters);
+        const requestType = shaka.net.NetworkingEngine.RequestType.SEGMENT;
+        const initType =
+            shaka.net.NetworkingEngine.AdvancedRequestType.INIT_SEGMENT;
+        const initResponse = await this.makeNetworkRequest_(
+            initSegmentRequest, requestType, {type: initType});
+
+        defaultKID = shaka.media.SegmentUtils.getDefaultKID(
+            initResponse.data);
+        this.identityKidMap_.set(initSegmentRef, defaultKID);
+      }
+      if (defaultKID) {
+        keyId = defaultKID;
+      }
+    }
+
+    const clearkeys = new Map();
+    clearkeys.set(keyId, key);
+
+    let encryptionScheme = 'cenc';
+    if (method == 'SAMPLE-AES') {
+      encryptionScheme = 'cbcs';
+    }
+
+    return shaka.util.ManifestParserUtils.createDrmInfoFromClearKeys(
+        clearkeys, encryptionScheme);
   }
 };
 
@@ -4366,8 +4562,6 @@ shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_ = {
       shaka.hls.HlsParser.widevineDrmParser_,
   'com.microsoft.playready':
       shaka.hls.HlsParser.playreadyDrmParser_,
-  'identity':
-      shaka.hls.HlsParser.identityDrmParser_,
 };