shaka-player 4.12.9 → 4.13.0

package/lib/hls/hls_parser.js

@@ -10,6 +10,9 @@ goog.provide('shaka.hls.HlsParser');
 goog.require('goog.Uri');
 goog.require('goog.asserts');
 goog.require('shaka.abr.Ewma');
+goog.require('shaka.drm.DrmUtils');
+goog.require('shaka.drm.PlayReady');
+goog.require('shaka.hls.Attribute');
 goog.require('shaka.hls.ManifestTextParser');
 goog.require('shaka.hls.Playlist');
 goog.require('shaka.hls.PlaylistType');
@@ -22,12 +25,12 @@ goog.require('shaka.media.PresentationTimeline');
 goog.require('shaka.media.QualityObserver');
 goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.media.SegmentReference');
+goog.require('shaka.media.SegmentUtils');
 goog.require('shaka.net.DataUriPlugin');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.net.NetworkingEngine.PendingRequest');
 goog.require('shaka.util.ArrayUtils');
 goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.ContentSteeringManager');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
@@ -38,7 +41,6 @@ goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Networking');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.Pssh');
-goog.require('shaka.media.SegmentUtils');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.TsParser');
 goog.require('shaka.util.TXml');
@@ -68,12 +70,12 @@ shaka.hls.HlsParser = class {
     /** @private {number} */
     this.globalId_ = 1;
 
-    /** @private {!Map.<string, string>} */
+    /** @private {!Map<string, string>} */
     this.globalVariables_ = new Map();
 
     /**
      * A map from group id to stream infos created from the media tags.
-     * @private {!Map.<string, !Array.<?shaka.hls.HlsParser.StreamInfo>>}
+     * @private {!Map<string, !Array<?shaka.hls.HlsParser.StreamInfo>>}
      */
     this.groupIdToStreamInfosMap_ = new Map();
 
@@ -84,7 +86,7 @@ shaka.hls.HlsParser = class {
      * This map stores those relationships.
      * Only used during livestreams; we do not assume that VOD content is
      * aligned in that way.
-     * @private {!Map.<string, !Map.<number, number>>}
+     * @private {!Map<string, !Map<number, number>>}
      */
     this.mediaSequenceToStartTimeByType_ = new Map();
 
@@ -102,7 +104,7 @@ shaka.hls.HlsParser = class {
      *
      * Used to avoid duplicates that vary only in their text stream.
      *
-     * @private {!Set.<string>}
+     * @private {!Set<string>}
      */
     this.variantUriSet_ = new Set();
 
@@ -119,7 +121,7 @@ shaka.hls.HlsParser = class {
      * createStreamInfoFromMediaTags_, createStreamInfoFromImageTag_ and
      * createStreamInfoFromVariantTags_.
      *
-     * @private {!Map.<string, shaka.hls.HlsParser.StreamInfo>}
+     * @private {!Map<string, shaka.hls.HlsParser.StreamInfo>}
      */
     this.uriToStreamInfosMap_ = new Map();
 
@@ -208,7 +210,8 @@ shaka.hls.HlsParser = class {
     /** @private {number} */
     this.lastTargetDuration_ = Infinity;
 
-    /** Partial segments target duration.
+    /**
+     * Partial segments target duration.
      * @private {number}
      */
     this.partialTargetDuration_ = 0;
@@ -222,32 +225,35 @@ shaka.hls.HlsParser = class {
     /** @private {shaka.util.OperationManager} */
     this.operationManager_ = new shaka.util.OperationManager();
 
-    /** A map from closed captions' group id, to a map of closed captions info.
+    /**
+     * A map from closed captions' group id, to a map of closed captions info.
      * {group id -> {closed captions channel id -> language}}
-     * @private {Map.<string, Map.<string, string>>}
+     * @private {Map<string, Map<string, string>>}
      */
     this.groupIdToClosedCaptionsMap_ = new Map();
 
-    /** @private {Map.<string, string>} */
+    /** @private {Map<string, string>} */
     this.groupIdToCodecsMap_ = new Map();
 
-    /** A cache mapping EXT-X-MAP tag info to the InitSegmentReference created
+    /**
+     * A cache mapping EXT-X-MAP tag info to the InitSegmentReference created
      * from the tag.
      * The key is a string combining the EXT-X-MAP tag's absolute uri, and
      * its BYTERANGE if available.
-     * {!Map.<string, !shaka.media.InitSegmentReference>} */
+     * @private {!Map<string, !shaka.media.InitSegmentReference>}
+     */
     this.mapTagToInitSegmentRefMap_ = new Map();
 
-    /** @private {Map.<string, !shaka.extern.aesKey>} */
+    /** @private {Map<string, !shaka.extern.aesKey>} */
     this.aesKeyInfoMap_ = new Map();
 
-    /** @private {Map.<string, !Promise.<shaka.extern.Response>>} */
+    /** @private {Map<string, !Promise<shaka.extern.Response>>} */
     this.aesKeyMap_ = new Map();
 
-    /** @private {Map.<string, !Promise.<shaka.extern.Response>>} */
+    /** @private {Map<string, !Promise<shaka.extern.Response>>} */
     this.identityKeyMap_ = new Map();
 
-    /** @private {Map.<!shaka.media.InitSegmentReference, ?string>} */
+    /** @private {Map<!shaka.media.InitSegmentReference, ?string>} */
     this.identityKidMap_ = new Map();
 
     /** @private {boolean} */
@@ -269,7 +275,7 @@ shaka.hls.HlsParser = class {
     /** @private {boolean} */
     this.needsClosedCaptionsDetection_ = true;
 
-    /** @private {Set.<string>} */
+    /** @private {Set<string>} */
     this.dateRangeIdsEmitted_ = new Set();
 
     /** @private {shaka.util.EventManager} */
@@ -344,7 +350,7 @@ shaka.hls.HlsParser = class {
       this.updatePlaylistTimer_ = null;
     }
 
-    /** @type {!Array.<!Promise>} */
+    /** @type {!Array<!Promise>} */
     const pending = [];
 
     if (this.operationManager_) {
@@ -388,7 +394,7 @@ shaka.hls.HlsParser = class {
       return;
     }
 
-    /** @type {!Array.<!Promise>} */
+    /** @type {!Array<!Promise>} */
     const updates = [];
     const streamInfos = Array.from(this.uriToStreamInfosMap_.values());
 
@@ -438,7 +444,7 @@ shaka.hls.HlsParser = class {
 
   /**
    * @param {!shaka.hls.HlsParser.StreamInfo} streamInfo
-   * @return {!Map.<number, number>}
+   * @return {!Map<number, number>}
    * @private
    */
   getMediaSequenceToStartTimeFor_(streamInfo) {
@@ -519,7 +525,7 @@ shaka.hls.HlsParser = class {
       streamInfo.redirectUris.push(responseUri);
     }
 
-    /** @type {!Array.<!shaka.hls.Tag>} */
+    /** @type {!Array<!shaka.hls.Tag>} */
     const variablesTags = shaka.hls.Utils.filterTagsByName(playlist.tags,
         'EXT-X-DEFINE');
 
@@ -640,7 +646,7 @@ shaka.hls.HlsParser = class {
   /**
    * Align the streams by sequence number by dropping early segments.  Then
    * offset the streams to begin at presentation time 0.
-   * @param {!Array.<!shaka.hls.HlsParser.StreamInfo>} streamInfos
+   * @param {!Array<!shaka.hls.HlsParser.StreamInfo>} streamInfos
    * @param {boolean=} force
    * @private
    */
@@ -728,7 +734,7 @@ shaka.hls.HlsParser = class {
    * Synchronize streams by the EXT-X-PROGRAM-DATE-TIME tags attached to their
    * segments.  Also normalizes segment times so that the earliest segment in
    * any stream is at time 0.
-   * @param {!Array.<!shaka.hls.HlsParser.StreamInfo>} streamInfos
+   * @param {!Array<!shaka.hls.HlsParser.StreamInfo>} streamInfos
    * @private
    */
   syncStreamsWithProgramDateTime_(streamInfos) {
@@ -836,14 +842,14 @@ shaka.hls.HlsParser = class {
 
     const playlist = this.manifestTextParser_.parsePlaylist(data);
 
-    /** @type {!Array.<!shaka.hls.Tag>} */
+    /** @type {!Array<!shaka.hls.Tag>} */
     const variablesTags = Utils.filterTagsByName(playlist.tags, 'EXT-X-DEFINE');
 
-    /** @type {!Array.<!shaka.extern.Variant>} */
+    /** @type {!Array<!shaka.extern.Variant>} */
     let variants = [];
-    /** @type {!Array.<!shaka.extern.Stream>} */
+    /** @type {!Array<!shaka.extern.Stream>} */
     let textStreams = [];
-    /** @type {!Array.<!shaka.extern.Stream>} */
+    /** @type {!Array<!shaka.extern.Stream>} */
     let imageStreams = [];
 
     // This assert is our own sanity check.
@@ -865,14 +871,14 @@ shaka.hls.HlsParser = class {
     /** @type {?string} */
     let mediaPlaylistType = null;
 
-    /** @type {!Map.<string, string>} */
+    /** @type {!Map<string, string>} */
     let mediaVariables = new Map();
 
     // Parsing a media playlist results in a single-variant stream.
     if (playlist.type == shaka.hls.PlaylistType.MEDIA) {
       this.needsClosedCaptionsDetection_ = false;
 
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const variablesTags = shaka.hls.Utils.filterTagsByName(playlist.tags,
           'EXT-X-DEFINE');
 
@@ -932,31 +938,58 @@ shaka.hls.HlsParser = class {
     } else {
       this.parseMasterVariables_(variablesTags);
 
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const mediaTags = Utils.filterTagsByName(
           playlist.tags, 'EXT-X-MEDIA');
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const variantTags = Utils.filterTagsByName(
           playlist.tags, 'EXT-X-STREAM-INF');
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const imageTags = Utils.filterTagsByName(
           playlist.tags, 'EXT-X-IMAGE-STREAM-INF');
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const iFrameTags = Utils.filterTagsByName(
           playlist.tags, 'EXT-X-I-FRAME-STREAM-INF');
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const sessionKeyTags = Utils.filterTagsByName(
           playlist.tags, 'EXT-X-SESSION-KEY');
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const sessionDataTags = Utils.filterTagsByName(
           playlist.tags, 'EXT-X-SESSION-DATA');
-      /** @type {!Array.<!shaka.hls.Tag>} */
+      /** @type {!Array<!shaka.hls.Tag>} */
       const contentSteeringTags = Utils.filterTagsByName(
           playlist.tags, 'EXT-X-CONTENT-STEERING');
 
       this.processSessionData_(sessionDataTags);
       await this.processContentSteering_(contentSteeringTags);
 
+      if (!this.config_.hls.ignoreSupplementalCodecs) {
+        // Duplicate variant tags with supplementalCodecs
+        const newVariantTags = [];
+        for (const tag of variantTags) {
+          const supplementalCodecsString =
+              tag.getAttributeValue('SUPPLEMENTAL-CODECS');
+          if (!supplementalCodecsString) {
+            continue;
+          }
+          const supplementalCodecs = supplementalCodecsString.split(/\s*,\s*/)
+              .map((codec) => {
+                return codec.split('/')[0];
+              });
+          const newAttributes = tag.attributes.map((attr) => {
+            const name = attr.name;
+            let value = attr.value;
+            if (name == 'CODECS') {
+              value = supplementalCodecs.join(',');
+            }
+            return new shaka.hls.Attribute(name, value);
+          });
+          newVariantTags.push(
+              new shaka.hls.Tag(tag.id, tag.name, newAttributes, null));
+        }
+        variantTags.push(...newVariantTags);
+      }
+
       this.parseCodecs_(variantTags);
 
       this.parseClosedCaptions_(mediaTags);
@@ -1002,7 +1035,6 @@ shaka.hls.HlsParser = class {
       textStreams,
       imageStreams,
       offlineSessionIds: [],
-      minBufferTime: 0,
       sequenceMode: this.config_.hls.sequenceMode,
       ignoreManifestTimestampsInSegmentsMode:
         this.config_.hls.ignoreManifestTimestampsInSegmentsMode,
@@ -1033,24 +1065,11 @@ 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);
-      }
-    }
   }
 
   /**
-   * @param {!Array.<!shaka.media.SegmentReference>} segments
-   * @return {!Promise.<shaka.media.SegmentUtils.BasicInfo>}
+   * @param {!Array<!shaka.media.SegmentReference>} segments
+   * @return {!Promise<shaka.media.SegmentUtils.BasicInfo>}
    * @private
    */
   async getBasicInfoFromSegments_(segments) {
@@ -1222,7 +1241,7 @@ shaka.hls.HlsParser = class {
 
   /**
    * Get the variables of each variant tag, and store in a map.
-   * @param {!Array.<!shaka.hls.Tag>} tags Variant tags from the playlist.
+   * @param {!Array<!shaka.hls.Tag>} tags Variant tags from the playlist.
    * @private
    */
   parseMasterVariables_(tags) {
@@ -1247,9 +1266,9 @@ shaka.hls.HlsParser = class {
 
   /**
    * Get the variables of each variant tag, and store in a map.
-   * @param {!Array.<!shaka.hls.Tag>} tags Variant tags from the playlist.
+   * @param {!Array<!shaka.hls.Tag>} tags Variant tags from the playlist.
    * @param {string} uri Media playlist URI.
-   * @return {!Map.<string, string>}
+   * @return {!Map<string, string>}
    * @private
    */
   parseMediaVariables_(tags, uri) {
@@ -1283,8 +1302,8 @@ shaka.hls.HlsParser = class {
 
   /**
    * Get the codecs of each variant tag, and store in a map from
-   * audio/video/subtitle group id to the codecs arraylist.
-   * @param {!Array.<!shaka.hls.Tag>} tags Variant tags from the playlist.
+   * audio/video/subtitle group id to the codecs array list.
+   * @param {!Array<!shaka.hls.Tag>} tags Variant tags from the playlist.
    * @private
    */
   parseCodecs_(tags) {
@@ -1325,7 +1344,7 @@ shaka.hls.HlsParser = class {
   /**
    * Process EXT-X-SESSION-DATA tags.
    *
-   * @param {!Array.<!shaka.hls.Tag>} tags
+   * @param {!Array<!shaka.hls.Tag>} tags
    * @private
    */
   processSessionData_(tags) {
@@ -1355,7 +1374,7 @@ shaka.hls.HlsParser = class {
   /**
    * Process EXT-X-CONTENT-STEERING tags.
    *
-   * @param {!Array.<!shaka.hls.Tag>} tags
+   * @param {!Array<!shaka.hls.Tag>} tags
    * @return {!Promise}
    * @private
    */
@@ -1388,8 +1407,8 @@ shaka.hls.HlsParser = class {
    * Parse Subtitles and Closed Captions from 'EXT-X-MEDIA' tags.
    * Create text streams for Subtitles, but not Closed Captions.
    *
-   * @param {!Array.<!shaka.hls.Tag>} mediaTags Media tags from the playlist.
-   * @return {!Array.<!shaka.extern.Stream>}
+   * @param {!Array<!shaka.hls.Tag>} mediaTags Media tags from the playlist.
+   * @return {!Array<!shaka.extern.Stream>}
    * @private
    */
   parseTexts_(mediaTags) {
@@ -1454,9 +1473,9 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.hls.Tag>} imageTags from the playlist.
-   * @param {!Array.<!shaka.hls.Tag>} iFrameTags from the playlist.
-   * @return {!Promise.<!Array.<!shaka.extern.Stream>>}
+   * @param {!Array<!shaka.hls.Tag>} imageTags from the playlist.
+   * @param {!Array<!shaka.hls.Tag>} iFrameTags from the playlist.
+   * @return {!Promise<!Array<!shaka.extern.Stream>>}
    * @private
    */
   async parseImages_(imageTags, iFrameTags) {
@@ -1499,8 +1518,8 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.hls.Tag>} mediaTags Media tags from the playlist.
-   * @param {!Map.<string, string>} groupIdPathwayIdMapping
+   * @param {!Array<!shaka.hls.Tag>} mediaTags Media tags from the playlist.
+   * @param {!Map<string, string>} groupIdPathwayIdMapping
    * @private
    */
   createStreamInfosFromMediaTags_(mediaTags, groupIdPathwayIdMapping) {
@@ -1529,8 +1548,8 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.hls.Tag>} iFrameTags from the playlist.
-   * @return {!Array.<!shaka.extern.Stream>}
+   * @param {!Array<!shaka.hls.Tag>} iFrameTags from the playlist.
+   * @return {!Array<!shaka.extern.Stream>}
    * @private
    */
   parseIFrames_(iFrameTags) {
@@ -1549,15 +1568,15 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.hls.Tag>} tags Variant tags from the playlist.
-   * @param {!Array.<!shaka.hls.Tag>} sessionKeyTags EXT-X-SESSION-KEY tags
+   * @param {!Array<!shaka.hls.Tag>} tags Variant tags from the playlist.
+   * @param {!Array<!shaka.hls.Tag>} sessionKeyTags EXT-X-SESSION-KEY tags
    * from the playlist.
-   * @param {!Array.<!shaka.hls.Tag>} mediaTags EXT-X-MEDIA tags from the
+   * @param {!Array<!shaka.hls.Tag>} mediaTags EXT-X-MEDIA tags from the
    * playlist.
-   * @param {function():!Array.<string>} getUris
-   * @param {?Map.<string, string>} variables
-   * @param {!Array.<!shaka.extern.Stream>} iFrameStreams
-   * @return {!Promise.<!Array.<!shaka.extern.Variant>>}
+   * @param {function(): !Array<string>} getUris
+   * @param {?Map<string, string>} variables
+   * @param {!Array<!shaka.extern.Stream>} iFrameStreams
+   * @return {!Promise<!Array<!shaka.extern.Variant>>}
    * @private
    */
   async createVariantsForTags_(tags, sessionKeyTags, mediaTags, getUris,
@@ -1681,8 +1700,8 @@ shaka.hls.HlsParser = class {
    * Create audio and video streamInfos from an 'EXT-X-STREAM-INF' tag and its
    * related media tags.
    *
-   * @param {!Array.<!shaka.hls.Tag>} tags
-   * @param {!Array.<!shaka.hls.Tag>} mediaTags
+   * @param {!Array<!shaka.hls.Tag>} tags
+   * @param {!Array<!shaka.hls.Tag>} mediaTags
    * @param {?string} resolution
    * @param {?string} frameRate
    * @return {!shaka.hls.HlsParser.StreamInfos}
@@ -1757,7 +1776,7 @@ shaka.hls.HlsParser = class {
       });
     });
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     let allCodecs = this.getCodecsForVariantTag_(tags[0]);
     const videoCodecs = shaka.util.ManifestParserUtils.guessCodecsSafe(
         ContentType.VIDEO, allCodecs);
@@ -1809,15 +1828,12 @@ shaka.hls.HlsParser = class {
    * Get the codecs from the 'EXT-X-STREAM-INF' tag.
    *
    * @param {!shaka.hls.Tag} tag
-   * @return {!Array.<string>} codecs
+   * @return {!Array<string>} codecs
    * @private
    */
   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) {
@@ -1835,17 +1851,9 @@ shaka.hls.HlsParser = class {
     }
 
     // Strip out internal whitespace while splitting on commas:
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const codecs = codecsString.split(/\s*,\s*/);
 
-    if (supplementalCodecsString) {
-      const supplementalCodecs = supplementalCodecsString.split(/\s*,\s*/)
-          .map((codec) => {
-            return codec.split('/')[0];
-          });
-      codecs.push(...supplementalCodecs);
-    }
-
     return shaka.media.SegmentUtils.codecsFiltering(codecs);
   }
 
@@ -1865,8 +1873,8 @@ shaka.hls.HlsParser = class {
     if (!channels) {
       return null;
     }
-    const channelcountstring = channels.split('/')[0];
-    const count = parseInt(channelcountstring, 10);
+    const channelCountString = channels.split('/')[0];
+    const count = parseInt(channelCountString, 10);
     return count;
   }
 
@@ -1911,7 +1919,7 @@ shaka.hls.HlsParser = class {
    * create the stream info.
    * @param {!shaka.hls.Tag} tag
    * @param {string} type
-   * @return {Map.<string, string>} closedCaptions
+   * @return {Map<string, string>} closedCaptions
    * @private
    */
   getClosedCaptions_(tag, type) {
@@ -1973,25 +1981,25 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<shaka.hls.HlsParser.StreamInfo>} audioInfos
-   * @param {!Array.<shaka.hls.HlsParser.StreamInfo>} videoInfos
+   * @param {!Array<shaka.hls.HlsParser.StreamInfo>} audioInfos
+   * @param {!Array<shaka.hls.HlsParser.StreamInfo>} videoInfos
    * @param {number} bandwidth
    * @param {?string} width
    * @param {?string} height
    * @param {?string} frameRate
    * @param {?string} videoRange
    * @param {?string} videoLayout
-   * @param {!Array.<shaka.extern.DrmInfo>} drmInfos
-   * @param {!Set.<string>} keyIds
-   * @param {!Array.<!shaka.extern.Stream>} iFrameStreams
-   * @return {!Array.<!shaka.extern.Variant>}
+   * @param {!Array<shaka.extern.DrmInfo>} drmInfos
+   * @param {!Set<string>} keyIds
+   * @param {!Array<!shaka.extern.Stream>} iFrameStreams
+   * @return {!Array<!shaka.extern.Variant>}
    * @private
    */
   createVariants_(
       audioInfos, videoInfos, bandwidth, width, height, frameRate, videoRange,
       videoLayout, drmInfos, keyIds, iFrameStreams) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
-    const DrmUtils = shaka.util.DrmUtils;
+    const DrmUtils = shaka.drm.DrmUtils;
 
     for (const info of videoInfos) {
       this.addVideoAttributes_(
@@ -2041,7 +2049,18 @@ shaka.hls.HlsParser = class {
             videoInfo ? videoInfo.getUris().sort().join(',') : '';
         const audioStreamUri =
             audioInfo ? audioInfo.getUris().sort().join(',') : '';
-        const variantUriKey = videoStreamUri + ' - ' + audioStreamUri;
+        const codecs = [];
+        if (audioStream && audioStream.codecs) {
+          codecs.push(audioStream.codecs);
+        }
+        if (videoStream && videoStream.codecs) {
+          codecs.push(videoStream.codecs);
+        }
+        const variantUriKey = [
+          videoStreamUri,
+          audioStreamUri,
+          codecs.sort(),
+        ].join('-');
 
         if (audioStream && videoStream) {
           if (!DrmUtils.areDrmCompatible(audioDrmInfos, videoDrmInfos)) {
@@ -2090,7 +2109,7 @@ shaka.hls.HlsParser = class {
    * Parses an array of EXT-X-MEDIA tags, then stores the values of all tags
    * with TYPE="CLOSED-CAPTIONS" into a map of group id to closed captions.
    *
-   * @param {!Array.<!shaka.hls.Tag>} mediaTags
+   * @param {!Array<!shaka.hls.Tag>} mediaTags
    * @private
    */
   parseClosedCaptions_(mediaTags) {
@@ -2129,8 +2148,8 @@ shaka.hls.HlsParser = class {
   /**
    * Parse EXT-X-MEDIA media tag into a Stream object.
    *
-   * @param {!Array.<!shaka.hls.Tag>} tags
-   * @param {!Map.<string, string>} groupIdPathwayIdMapping
+   * @param {!Array<!shaka.hls.Tag>} tags
+   * @param {!Map<string, string>} groupIdPathwayIdMapping
    * @param {boolean=} requireUri
    * @return {!shaka.hls.HlsParser.StreamInfo}
    * @private
@@ -2139,7 +2158,7 @@ shaka.hls.HlsParser = class {
       requireUri = true) {
     const verbatimMediaPlaylistUris = [];
     const globalGroupIds = [];
-    const groupIdUriMappping = new Map();
+    const groupIdUriMapping = new Map();
     for (const tag of tags) {
       goog.asserts.assert(tag.name == 'EXT-X-MEDIA',
           'Should only be called on media tags!');
@@ -2148,7 +2167,7 @@ shaka.hls.HlsParser = class {
       const groupId = tag.getRequiredAttrValue('GROUP-ID');
       verbatimMediaPlaylistUris.push(uri);
       globalGroupIds.push(groupId);
-      groupIdUriMappping.set(groupId, uri);
+      groupIdUriMapping.set(groupId, uri);
     }
 
     const globalGroupId = globalGroupIds.sort().join(',');
@@ -2175,7 +2194,7 @@ shaka.hls.HlsParser = class {
     }
     const streamId = this.globalId_++;
     if (this.contentSteeringManager_) {
-      for (const [groupId, uri] of groupIdUriMappping) {
+      for (const [groupId, uri] of groupIdUriMapping) {
         const pathwayId = groupIdPathwayIdMapping.get(groupId);
         if (pathwayId) {
           this.contentSteeringManager_.addLocation(streamId, pathwayId, uri);
@@ -2227,7 +2246,7 @@ shaka.hls.HlsParser = class {
    * Parse EXT-X-IMAGE-STREAM-INF media tag into a Stream object.
    *
    * @param {shaka.hls.Tag} tag
-   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async createStreamInfoFromImageTag_(tag) {
@@ -2341,8 +2360,8 @@ shaka.hls.HlsParser = class {
   /**
    * Parse an EXT-X-STREAM-INF media tag into a Stream object.
    *
-   * @param {!Array.<!shaka.hls.Tag>} tags
-   * @param {!Array.<string>} allCodecs
+   * @param {!Array<!shaka.hls.Tag>} tags
+   * @param {!Array<string>} allCodecs
    * @param {string} type
    * @return {!shaka.hls.HlsParser.StreamInfo}
    * @private
@@ -2361,7 +2380,8 @@ shaka.hls.HlsParser = class {
       verbatimMediaPlaylistUris.push(uri);
     }
 
-    const key = verbatimMediaPlaylistUris.sort().join(',');
+    const key = verbatimMediaPlaylistUris.sort().join(',') +
+        allCodecs.sort().join(',');
     if (this.uriToStreamInfosMap_.has(key)) {
       return this.uriToStreamInfosMap_.get(key);
     }
@@ -2371,7 +2391,7 @@ shaka.hls.HlsParser = class {
     const streamInfo = this.createStreamInfo_(
         streamId, verbatimMediaPlaylistUris,
         codecs, type, /* language= */ null, /* primary= */ false,
-        /* name= */ null, /* channelcount= */ null, closedCaptions,
+        /* name= */ null, /* channelCount= */ null, closedCaptions,
         /* characteristics= */ null, /* forced= */ false,
         /* sampleRate= */ null, /* spatialAudio= */ false);
 
@@ -2382,14 +2402,14 @@ shaka.hls.HlsParser = class {
 
   /**
    * @param {number} streamId
-   * @param {!Array.<string>} verbatimMediaPlaylistUris
+   * @param {!Array<string>} verbatimMediaPlaylistUris
    * @param {string} codecs
    * @param {string} type
    * @param {?string} languageValue
    * @param {boolean} primary
    * @param {?string} name
    * @param {?number} channelsCount
-   * @param {Map.<string, string>} closedCaptions
+   * @param {Map<string, string>} closedCaptions
    * @param {?string} characteristics
    * @param {boolean} forced
    * @param {?number} sampleRate
@@ -2477,7 +2497,7 @@ shaka.hls.HlsParser = class {
               shaka.util.Error.Code.HLS_INVALID_PLAYLIST_HIERARCHY);
         }
 
-        /** @type {!Array.<!shaka.hls.Tag>} */
+        /** @type {!Array<!shaka.hls.Tag>} */
         const variablesTags = shaka.hls.Utils.filterTagsByName(playlist.tags,
             'EXT-X-DEFINE');
 
@@ -2735,7 +2755,7 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.extern.Stream>} streams
+   * @param {!Array<!shaka.extern.Stream>} streams
    * @private
    */
   notifySegmentsForStreams_(streams) {
@@ -2753,7 +2773,7 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.hls.HlsParser.StreamInfo>} streamInfos
+   * @param {!Array<!shaka.hls.HlsParser.StreamInfo>} streamInfos
    * @private
    */
   finalizeStreams_(streamInfos) {
@@ -2836,8 +2856,9 @@ shaka.hls.HlsParser = class {
 
   /**
    * @param {number} streamId
+   * @param {!Map<string, string>} variables
    * @param {!shaka.hls.Playlist} playlist
-   * @param {function():!Array.<string>} getUris
+   * @param {function(): !Array<string>} getUris
    * @param {string} responseUri
    * @param {string} codecs
    * @param {string} type
@@ -2845,7 +2866,7 @@ shaka.hls.HlsParser = class {
    * @param {boolean} primary
    * @param {?string} name
    * @param {?number} channelsCount
-   * @param {Map.<string, string>} closedCaptions
+   * @param {Map<string, string>} closedCaptions
    * @param {?string} characteristics
    * @param {boolean} forced
    * @param {?number} sampleRate
@@ -2853,7 +2874,7 @@ shaka.hls.HlsParser = class {
    * @param {(string|undefined)} mimeType
    * @param {boolean=} requestBasicInfo
    * @param {boolean=} allowOverrideMimeType
-   * @return {!Promise.<!shaka.hls.HlsParser.StreamInfo>}
+   * @return {!Promise<!shaka.hls.HlsParser.StreamInfo>}
    * @private
    */
   async convertParsedPlaylistIntoStreamInfo_(streamId, variables, playlist,
@@ -2943,7 +2964,7 @@ shaka.hls.HlsParser = class {
     const stream = this.makeStreamObject_(streamId, codecs, type,
         languageValue, primary, name, channelsCount, closedCaptions,
         characteristics, forced, sampleRate, spatialAudio);
-    stream.encrypted = encrypted;
+    stream.encrypted = encrypted && !aesEncrypted;
     stream.drmInfos = drmInfos;
     stream.keyIds = keyIds;
     stream.mimeType = mimeType;
@@ -3005,7 +3026,7 @@ shaka.hls.HlsParser = class {
    * Get the next msn and part
    *
    * @param {number} mediaSequenceNumber
-   * @param {!Array.<!shaka.media.SegmentReference>} segments
+   * @param {!Array<!shaka.media.SegmentReference>} segments
    * @return {{nextMediaSequence: number, nextPart:number}}}
    * @private
    */
@@ -3058,7 +3079,7 @@ shaka.hls.HlsParser = class {
    * @param {boolean} primary
    * @param {?string} name
    * @param {?number} channelsCount
-   * @param {Map.<string, string>} closedCaptions
+   * @param {Map<string, string>} closedCaptions
    * @param {?string} characteristics
    * @param {boolean} forced
    * @param {?number} sampleRate
@@ -3152,11 +3173,11 @@ shaka.hls.HlsParser = class {
   /**
    * @param {!shaka.hls.Playlist} playlist
    * @param {string} mimeType
-   * @param {function():!Array.<string>} getUris
-   * @param {?Map.<string, string>=} variables
-   * @return {Promise.<{
-   *   drmInfos: !Array.<shaka.extern.DrmInfo>,
-   *   keyIds: !Set.<string>,
+   * @param {function(): !Array<string>} getUris
+   * @param {?Map<string, string>=} variables
+   * @return {Promise<{
+   *   drmInfos: !Array<shaka.extern.DrmInfo>,
+   *   keyIds: !Set<string>,
    *   encrypted: boolean,
    *   aesEncrypted: boolean
    * }>}
@@ -3183,7 +3204,7 @@ shaka.hls.HlsParser = class {
     let encrypted = false;
     let aesEncrypted = false;
 
-    /** @type {!Array.<shaka.extern.DrmInfo>}*/
+    /** @type {!Array<shaka.extern.DrmInfo>}*/
     const drmInfos = [];
     const keyIds = new Set();
 
@@ -3234,8 +3255,8 @@ shaka.hls.HlsParser = class {
   /**
    * @param {!shaka.hls.Tag} drmTag
    * @param {!shaka.hls.Playlist} playlist
-   * @param {function():!Array.<string>} getUris
-   * @param {?Map.<string, string>=} variables
+   * @param {function(): !Array<string>} getUris
+   * @param {?Map<string, string>=} variables
    * @return {!shaka.extern.aesKey}
    * @private
    */
@@ -3274,7 +3295,11 @@ shaka.hls.HlsParser = class {
       }
     }
 
-    const aesKeyInfoKey = `${drmTag.toString()}-${firstMediaSequenceNumber}`;
+    const keyUris = shaka.hls.Utils.constructSegmentUris(
+        getUris(), drmTag.getRequiredAttrValue('URI'), variables);
+    const keyMapKey = keyUris.sort().join('');
+    const aesKeyInfoKey =
+        `${drmTag.toString()}-${firstMediaSequenceNumber}-${keyMapKey}`;
     if (!this.aesKeyInfoMap_.has(aesKeyInfoKey)) {
       // Default AES-128
       const keyInfo = {
@@ -3298,10 +3323,6 @@ shaka.hls.HlsParser = class {
       // 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(
@@ -3521,9 +3542,9 @@ shaka.hls.HlsParser = class {
   /**
    * Get the InitSegmentReference for a segment if it has a EXT-X-MAP tag.
    * @param {!shaka.hls.Playlist} playlist
-   * @param {!Array.<!shaka.hls.Tag>} tags Segment tags
-   * @param {function():!Array.<string>} getUris
-   * @param {?Map.<string, string>=} variables
+   * @param {!Array<!shaka.hls.Tag>} tags Segment tags
+   * @param {function(): !Array<string>} getUris
+   * @param {?Map<string, string>=} variables
    * @return {shaka.media.InitSegmentReference}
    * @private
    */
@@ -3568,7 +3589,7 @@ shaka.hls.HlsParser = class {
   /**
    * Create an InitSegmentReference object for the EXT-X-MAP tag in the media
    * playlist.
-   * @param {!Array.<string>} absoluteInitSegmentUris
+   * @param {!Array<string>} absoluteInitSegmentUris
    * @param {!shaka.hls.Tag} mapTag EXT-X-MAP
    * @param {shaka.hls.Tag=} byteRangeTag EXT-X-BYTERANGE
    * @param {shaka.extern.aesKey=} aesKey
@@ -3620,10 +3641,10 @@ shaka.hls.HlsParser = class {
    * @param {shaka.media.SegmentReference} previousReference
    * @param {!shaka.hls.Segment} hlsSegment
    * @param {number} startTime
-   * @param {!Map.<string, string>} variables
+   * @param {!Map<string, string>} variables
    * @param {!shaka.hls.Playlist} playlist
    * @param {string} type
-   * @param {function():!Array.<string>} getUris
+   * @param {function(): !Array<string>} getUris
    * @param {shaka.extern.aesKey=} aesKey
    * @return {shaka.media.SegmentReference}
    * @private
@@ -3837,7 +3858,7 @@ shaka.hls.HlsParser = class {
     } else if (partialSegmentRefs.length) {
       endTime = partialSegmentRefs[partialSegmentRefs.length - 1].endTime;
     } else {
-      // Skip segments without duration and without partialsegments
+      // Skip segments without duration and without partial segments
       return null;
     }
 
@@ -3941,7 +3962,7 @@ shaka.hls.HlsParser = class {
    * Parse the startByte and endByte.
    * @param {shaka.media.SegmentReference} previousReference
    * @param {?string} byterange
-   * @return {!Array.<number>} An array with the start byte and end byte.
+   * @return {!Array<number>} An array with the start byte and end byte.
    * @private
    */
   parseByteRange_(previousReference, byterange) {
@@ -3965,10 +3986,10 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.hls.Tag>} tags
+   * @param {!Array<!shaka.hls.Tag>} tags
    * @param {string} contentType
-   * @param {!Map.<string, string>} variables
-   * @param {function():!Array.<string>} getUris
+   * @param {!Map<string, string>} variables
+   * @param {function(): !Array<string>} getUris
    * @private
    */
   processDateRangeTags_(tags, contentType, variables, getUris) {
@@ -4090,7 +4111,7 @@ shaka.hls.HlsParser = class {
           'END-ON-NEXT',
         ];
 
-        /* @type {!Array.<shaka.extern.MetadataFrame>} */
+        /* @type {!Array<shaka.extern.MetadataFrame>} */
         const values = [];
         for (const attribute of tag.attributes) {
           if (excludedAttributes.includes(attribute.name)) {
@@ -4119,7 +4140,7 @@ shaka.hls.HlsParser = class {
 
         this.dateRangeIdsEmitted_.add(id);
       } catch (e) {
-        shaka.log.warning('Ignorando DATERANGE con errores', tag.toString());
+        shaka.log.warning('Ignoring DATERANGE with errors', tag.toString());
       }
     }
   }
@@ -4130,17 +4151,17 @@ shaka.hls.HlsParser = class {
    * playlist.
    *
    * @param {!shaka.hls.Playlist} playlist
-   * @param {!Map.<number, number>} mediaSequenceToStartTime
-   * @param {!Map.<string, string>} variables
-   * @param {function():!Array.<string>} getUris
+   * @param {!Map<number, number>} mediaSequenceToStartTime
+   * @param {!Map<string, string>} variables
+   * @param {function(): !Array<string>} getUris
    * @param {string} type
-   * @return {{segments: !Array.<!shaka.media.SegmentReference>,
+   * @return {{segments: !Array<!shaka.media.SegmentReference>,
    *          bandwidth: (number|undefined)}}
    * @private
    */
   createSegments_(playlist, mediaSequenceToStartTime, variables,
       getUris, type) {
-    /** @type {Array.<!shaka.hls.Segment>} */
+    /** @type {Array<!shaka.hls.Segment>} */
     const hlsSegments = playlist.segments;
     goog.asserts.assert(hlsSegments.length, 'Playlist should have segments!');
 
@@ -4175,12 +4196,12 @@ shaka.hls.HlsParser = class {
       firstStartTime = this.presentationTimeline_.getSegmentAvailabilityStart();
     }
 
-    /** @type {!Array.<!shaka.media.SegmentReference>} */
+    /** @type {!Array<!shaka.media.SegmentReference>} */
     const references = [];
 
     let previousReference = null;
 
-    /** @type {!Array.<{bitrate: number, duration: number}>} */
+    /** @type {!Array<{bitrate: number, duration: number}>} */
     const bitrates = [];
 
     for (let i = 0; i < hlsSegments.length; i++) {
@@ -4212,18 +4233,6 @@ shaka.hls.HlsParser = class {
       initSegmentRef = this.getInitSegmentReference_(playlist,
           item.tags, getUris, variables);
 
-      // If the stream is low latency and the user has not configured the
-      // lowLatencyMode, but if it has been configured to activate the
-      // lowLatencyMode if a stream of this type is detected, we automatically
-      // activate the lowLatencyMode.
-      if (!this.lowLatencyMode_) {
-        const autoLowLatencyMode = this.playerInterface_.isAutoLowLatencyMode();
-        if (autoLowLatencyMode) {
-          this.playerInterface_.enableLowLatencyMode();
-          this.lowLatencyMode_ = this.playerInterface_.isLowLatencyMode();
-        }
-      }
-
       const reference = this.createSegmentReference_(
           initSegmentRef,
           previousReference,
@@ -4430,7 +4439,7 @@ shaka.hls.HlsParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.media.SegmentReference>} segments
+   * @param {!Array<!shaka.media.SegmentReference>} segments
    * @return {{segment: !shaka.media.SegmentReference, segmentIndex: number}}
    * @private
    */
@@ -4456,8 +4465,8 @@ shaka.hls.HlsParser = class {
    *
    * @param {string} contentType
    * @param {string} codecs
-   * @param {!Array.<!shaka.media.SegmentReference>} segments
-   * @return {!Promise.<string>}
+   * @param {!Array<!shaka.media.SegmentReference>} segments
+   * @return {!Promise<string>}
    * @private
    */
   async guessMimeType_(contentType, codecs, segments) {
@@ -4528,7 +4537,7 @@ shaka.hls.HlsParser = class {
    * Returns a tag with a given name.
    * Throws an error if tag was not found.
    *
-   * @param {!Array.<shaka.hls.Tag>} tags
+   * @param {!Array<shaka.hls.Tag>} tags
    * @param {string} tagName
    * @return {!shaka.hls.Tag}
    * @private
@@ -4571,7 +4580,7 @@ shaka.hls.HlsParser = class {
    * Makes a network request for the manifest and returns a Promise
    * with the resulting data.
    *
-   * @param {!Array.<string>} uris
+   * @param {!Array<string>} uris
    * @param {boolean=} isPlaylist
    * @return {!shaka.net.NetworkingEngine.PendingRequest}
    * @private
@@ -4871,6 +4880,56 @@ shaka.hls.HlsParser = class {
           {initDataType: 'cenc', initData: pssh},
         ]);
 
+    const input = shaka.util.TXml.parseXmlString([
+      '<PLAYREADY>',
+      shaka.util.Uint8ArrayUtils.toBase64(data),
+      '</PLAYREADY>',
+    ].join('\n'));
+    if (input) {
+      drmInfo.licenseServerUri = shaka.drm.PlayReady.getLicenseUrl(input);
+    }
+
+    return drmInfo;
+  }
+
+  /**
+   * @param {!shaka.hls.Tag} drmTag
+   * @return {?shaka.extern.DrmInfo}
+   * @private
+   */
+  static wiseplayDrmParser_(drmTag) {
+    const method = drmTag.getRequiredAttrValue('METHOD');
+    const VALID_METHODS = ['SAMPLE-AES', 'SAMPLE-AES-CTR'];
+    if (!VALID_METHODS.includes(method)) {
+      shaka.log.error('WisePlay in HLS is only supported with [',
+          VALID_METHODS.join(', '), '], not', method);
+      return null;
+    }
+
+    let encryptionScheme = 'cenc';
+    if (method == 'SAMPLE-AES') {
+      encryptionScheme = 'cbcs';
+    }
+
+    const uri = drmTag.getRequiredAttrValue('URI');
+    const parsedData = shaka.net.DataUriPlugin.parseRaw(uri.split('?')[0]);
+
+    // 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.huawei.wiseplay', encryptionScheme, [
+          {initDataType: 'cenc', initData: pssh},
+        ]);
+
+    const keyId = drmTag.getAttributeValue('KEYID');
+    if (keyId) {
+      const keyIdLowerCase = keyId.toLowerCase();
+      // This value should begin with '0x':
+      goog.asserts.assert(
+          keyIdLowerCase.startsWith('0x'), 'Incorrect KEYID format!');
+      // But the output should not contain the '0x':
+      drmInfo.keyIds = new Set([keyIdLowerCase.substr(2)]);
+    }
     return drmInfo;
   }
 
@@ -4879,10 +4938,10 @@ shaka.hls.HlsParser = class {
    *
    * @param {!shaka.hls.Tag} drmTag
    * @param {string} mimeType
-   * @param {function():!Array.<string>} getUris
+   * @param {function(): !Array<string>} getUris
    * @param {?shaka.media.InitSegmentReference} initSegmentRef
-   * @param {?Map.<string, string>=} variables
-   * @return {!Promise.<?shaka.extern.DrmInfo>}
+   * @param {?Map<string, string>=} variables
+   * @return {!Promise<?shaka.extern.DrmInfo>}
    * @private
    */
   async identityDrmParser_(drmTag, mimeType, getUris, initSegmentRef,
@@ -4986,11 +5045,11 @@ shaka.hls.HlsParser = class {
  * @typedef {{
  *   stream: !shaka.extern.Stream,
  *   type: string,
- *   redirectUris: !Array.<string>,
- *   getUris: function():!Array.<string>,
+ *   redirectUris: !Array<string>,
+ *   getUris: function():!Array<string>,
  *   minTimestamp: number,
  *   maxTimestamp: number,
- *   mediaSequenceToStartTime: !Map.<number, number>,
+ *   mediaSequenceToStartTime: !Map<number, number>,
  *   canSkipSegments: boolean,
  *   canBlockReload: boolean,
  *   hasEndList: boolean,
@@ -5007,15 +5066,15 @@ shaka.hls.HlsParser = class {
  *   The Stream itself.
  * @property {string} type
  *   The type value. Could be 'video', 'audio', 'text', or 'image'.
- * @property {!Array.<string>} redirectUris
+ * @property {!Array<string>} redirectUris
  *   The redirect URIs.
- * @property {function():!Array.<string>} getUris
+ * @property {function():!Array<string>} getUris
  *   The verbatim media playlist URIs, as it appeared in the master playlist.
  * @property {number} minTimestamp
  *   The minimum timestamp found in the stream.
  * @property {number} maxTimestamp
  *   The maximum timestamp found in the stream.
- * @property {!Map.<number, number>} mediaSequenceToStartTime
+ * @property {!Map<number, number>} mediaSequenceToStartTime
  *   A map of media sequence numbers to media start times.
  *   Only used for VOD content.
  * @property {boolean} canSkipSegments
@@ -5041,19 +5100,19 @@ shaka.hls.HlsParser.StreamInfo;
 
 /**
  * @typedef {{
- *   audio: !Array.<shaka.hls.HlsParser.StreamInfo>,
- *   video: !Array.<shaka.hls.HlsParser.StreamInfo>
+ *   audio: !Array<shaka.hls.HlsParser.StreamInfo>,
+ *   video: !Array<shaka.hls.HlsParser.StreamInfo>
  * }}
  *
  * @description Audio and video stream infos.
- * @property {!Array.<shaka.hls.HlsParser.StreamInfo>} audio
- * @property {!Array.<shaka.hls.HlsParser.StreamInfo>} video
+ * @property {!Array<shaka.hls.HlsParser.StreamInfo>} audio
+ * @property {!Array<shaka.hls.HlsParser.StreamInfo>} video
  */
 shaka.hls.HlsParser.StreamInfos;
 
 
 /**
- * @const {!Object.<string, string>}
+ * @const {!Object<string, string>}
  * @private
  */
 shaka.hls.HlsParser.RAW_FORMATS_TO_MIME_TYPES_ = {
@@ -5065,7 +5124,7 @@ shaka.hls.HlsParser.RAW_FORMATS_TO_MIME_TYPES_ = {
 
 
 /**
- * @const {!Object.<string, string>}
+ * @const {!Object<string, string>}
  * @private
  */
 shaka.hls.HlsParser.AUDIO_EXTENSIONS_TO_MIME_TYPES_ = {
@@ -5083,7 +5142,7 @@ shaka.hls.HlsParser.AUDIO_EXTENSIONS_TO_MIME_TYPES_ = {
 
 
 /**
- * @const {!Object.<string, string>}
+ * @const {!Object<string, string>}
  * @private
  */
 shaka.hls.HlsParser.VIDEO_EXTENSIONS_TO_MIME_TYPES_ = {
@@ -5100,7 +5159,7 @@ shaka.hls.HlsParser.VIDEO_EXTENSIONS_TO_MIME_TYPES_ = {
 
 
 /**
- * @const {!Object.<string, string>}
+ * @const {!Object<string, string>}
  * @private
  */
 shaka.hls.HlsParser.TEXT_EXTENSIONS_TO_MIME_TYPES_ = {
@@ -5116,7 +5175,7 @@ shaka.hls.HlsParser.TEXT_EXTENSIONS_TO_MIME_TYPES_ = {
 
 
 /**
- * @const {!Object.<string, string>}
+ * @const {!Object<string, string>}
  * @private
  */
 shaka.hls.HlsParser.IMAGE_EXTENSIONS_TO_MIME_TYPES_ = {
@@ -5129,7 +5188,7 @@ shaka.hls.HlsParser.IMAGE_EXTENSIONS_TO_MIME_TYPES_ = {
 
 
 /**
- * @const {!Object.<string, !Object.<string, string>>}
+ * @const {!Object<string, !Object<string, string>>}
  * @private
  */
 shaka.hls.HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_ = {
@@ -5143,7 +5202,7 @@ shaka.hls.HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_ = {
 /**
  * MIME types without init segment.
  *
- * @const {!Set.<string>}
+ * @const {!Set<string>}
  * @private
  */
 shaka.hls.HlsParser.MIME_TYPES_WITHOUT_INIT_SEGMENT_ = new Set([
@@ -5161,7 +5220,7 @@ shaka.hls.HlsParser.DrmParser_;
 
 
 /**
- * @const {!Object.<string, shaka.hls.HlsParser.DrmParser_>}
+ * @const {!Object<string, shaka.hls.HlsParser.DrmParser_>}
  * @private
  */
 shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_ = {
@@ -5171,6 +5230,8 @@ shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_ = {
       shaka.hls.HlsParser.widevineDrmParser_,
   'com.microsoft.playready':
       shaka.hls.HlsParser.playreadyDrmParser_,
+  'urn:uuid:3d5e6d35-9b9a-41e8-b843-dd3c6e72c42c':
+      shaka.hls.HlsParser.wiseplayDrmParser_,
 };