shaka-player 4.13.0 → 4.13.2

package/lib/dash/mpd_utils.js

@@ -37,14 +37,13 @@ shaka.dash.MpdUtils = class {
    */
   static fillUriTemplate(
       uriTemplate, representationId, number, subNumber, bandwidth, time) {
-    /** @type {!Object<string, ?number | ?string>} */
-    const valueTable = {
-      'RepresentationID': representationId,
-      'Number': number,
-      'SubNumber': subNumber,
-      'Bandwidth': bandwidth,
-      'Time': time,
-    };
+    /** @type {!Map<string, ?number | ?string>} */
+    const valueTable = new Map()
+        .set('RepresentationID', representationId)
+        .set('Number', number)
+        .set('SubNumber', subNumber)
+        .set('Bandwidth', bandwidth)
+        .set('Time', time);
 
     // cspell: disable-next-line
     const re = /\$(RepresentationID|Number|SubNumber|Bandwidth|Time)?(?:%0([0-9]+)([diouxX]))?\$/g;  // eslint-disable-line max-len
@@ -53,7 +52,7 @@ shaka.dash.MpdUtils = class {
         return '$';
       }
 
-      let value = valueTable[name];
+      let value = valueTable.get(name);
       goog.asserts.assert(value !== undefined, 'Unrecognized identifier');
 
       // Note that |value| may be 0 or ''.

package/lib/dash/segment_list.js

@@ -31,7 +31,7 @@ shaka.dash.SegmentList = class {
    * Updates the existing SegmentIndex, if any.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {!Object<string, !shaka.extern.Stream>} streamMap
+   * @param {!Map<string, !shaka.extern.Stream>} streamMap
    * @param {shaka.extern.aesKey|undefined} aesKey
    * @return {shaka.dash.DashParser.StreamInfo}
    */
@@ -52,7 +52,7 @@ shaka.dash.SegmentList = class {
     if (context.period.id && context.representation.id) {
       // Only check/store the index if period and representation IDs are set.
       const id = context.period.id + ',' + context.representation.id;
-      stream = streamMap[id];
+      stream = streamMap.get(id);
       if (stream) {
         segmentIndex = stream.segmentIndex;
       }

package/lib/dash/segment_template.js

@@ -33,11 +33,11 @@ shaka.dash.SegmentTemplate = class {
    *
    * @param {shaka.dash.DashParser.Context} context
    * @param {shaka.dash.DashParser.RequestSegmentCallback} requestSegment
-   * @param {!Object<string, !shaka.extern.Stream>} streamMap
+   * @param {!Map<string, !shaka.extern.Stream>} streamMap
    * @param {boolean} isUpdate True if the manifest is being updated.
    * @param {number} segmentLimit The maximum number of segments to generate for
    *   a SegmentTemplate with fixed duration.
-   * @param {!Object<string, number>} periodDurationMap
+   * @param {!Map<string, number>} periodDurationMap
    * @param {shaka.extern.aesKey|undefined} aesKey
    * @param {?number} lastSegmentNumber
    * @param {boolean} isPatchUpdate
@@ -92,7 +92,7 @@ shaka.dash.SegmentTemplate = class {
         const periodId = context.period.id;
         const initialPeriodDuration = context.periodInfo.duration;
         const periodDuration =
-          (periodId != null && periodDurationMap[periodId]) ||
+          (periodId != null && periodDurationMap.get(periodId)) ||
           initialPeriodDuration;
         const periodEnd = periodDuration ?
           (periodStart + periodDuration) : Infinity;
@@ -119,7 +119,7 @@ shaka.dash.SegmentTemplate = class {
       if (context.period.id && context.representation.id) {
         // Only check/store the index if period and representation IDs are set.
         id = context.period.id + ',' + context.representation.id;
-        stream = streamMap[id];
+        stream = streamMap.get(id);
         if (stream) {
           segmentIndex = stream.segmentIndex;
         }
@@ -135,7 +135,7 @@ shaka.dash.SegmentTemplate = class {
         shaka.log.debug(`Creating TSI with end ${periodEnd}`);
         segmentIndex = new TimelineSegmentIndex(
             info,
-            context.representation.id,
+            context.representation.originalId,
             context.bandwidth,
             context.representation.getBaseUris,
             context.urlParams,
@@ -348,7 +348,7 @@ shaka.dash.SegmentTemplate = class {
 
     goog.asserts.assert(info.indexTemplate, 'must be using index template');
     const filledTemplate = MpdUtils.fillUriTemplate(
-        info.indexTemplate, context.representation.id,
+        info.indexTemplate, context.representation.originalId,
         null, null, context.bandwidth || null, null);
 
     const resolvedUris = ManifestParserUtils.resolveUris(
@@ -366,7 +366,7 @@ shaka.dash.SegmentTemplate = class {
    * @param {shaka.dash.SegmentTemplate.SegmentTemplateInfo} info
    * @param {number} segmentLimit The maximum number of segments to generate.
    * @param {shaka.media.InitSegmentReference} initSegmentReference
-   * @param {!Object<string, number>} periodDurationMap
+   * @param {!Map<string, number>} periodDurationMap
    * @param {shaka.extern.aesKey|undefined} aesKey
    * @param {?number} lastSegmentNumber
    * @param {number} segmentSequenceCadence
@@ -395,7 +395,7 @@ shaka.dash.SegmentTemplate = class {
     // provides the updated period duration.
     const getPeriodEnd = () => {
       const periodDuration =
-        (periodId != null && periodDurationMap[periodId]) ||
+        (periodId != null && periodDurationMap.get(periodId)) ||
         initialPeriodDuration;
       const periodEnd = periodDuration ?
         (periodStart + periodDuration) : Infinity;
@@ -677,7 +677,7 @@ shaka.dash.SegmentTemplate = class {
     }
     initialization = shaka.util.StringUtils.htmlUnescape(initialization);
 
-    const repId = context.representation.id;
+    const repId = context.representation.originalId;
     const bandwidth = context.bandwidth || null;
     const getBaseUris = context.representation.getBaseUris;
     const urlParams = context.urlParams;

package/lib/debug/log.js

@@ -135,15 +135,14 @@ shaka.log.oneTimeWarningIssued_ = new Set();
 
 
 if (window.console) {
-  /** @private {!Object<shaka.log.Level, function(...*)>} */
-  shaka.log.logMap_ = {
-    [shaka.log.Level.ERROR]: (...args) => console.error(...args),
-    [shaka.log.Level.WARNING]: (...args) => console.warn(...args),
-    [shaka.log.Level.INFO]: (...args) => console.info(...args),
-    [shaka.log.Level.DEBUG]: (...args) => console.log(...args),
-    [shaka.log.Level.V1]: (...args) => console.debug(...args),
-    [shaka.log.Level.V2]: (...args) => console.debug(...args),
-  };
+  /** @private {!Map<shaka.log.Level, function(...*)>} */
+  shaka.log.logMap_ = new Map()
+      .set(shaka.log.Level.ERROR, (...args) => console.error(...args))
+      .set(shaka.log.Level.WARNING, (...args) => console.warn(...args))
+      .set(shaka.log.Level.INFO, (...args) => console.info(...args))
+      .set(shaka.log.Level.DEBUG, (...args) => console.log(...args))
+      .set(shaka.log.Level.V1, (...args) => console.debug(...args))
+      .set(shaka.log.Level.V2, (...args) => console.debug(...args));
 
   shaka.log.alwaysWarn = (...args) => console.warn(...args);
   shaka.log.alwaysError = (...args) => console.error(...args);
@@ -168,8 +167,8 @@ if (window.console) {
       const getLog = (curLevel) => {
         if (curLevel <= level) {
           goog.asserts.assert(
-              shaka.log.logMap_[curLevel], 'Unexpected log level');
-          return shaka.log.logMap_[curLevel];
+              shaka.log.logMap_.has(curLevel), 'Unexpected log level');
+          return shaka.log.logMap_.get(curLevel);
         } else {
           return () => {};
         }
@@ -187,22 +186,22 @@ if (window.console) {
     shaka.log.setLevel(shaka.log.MAX_LOG_LEVEL);
   } else {
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.ERROR) {
-      shaka.log.error = shaka.log.logMap_[shaka.log.Level.ERROR];
+      shaka.log.error = shaka.log.logMap_.get(shaka.log.Level.ERROR);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.WARNING) {
-      shaka.log.warning = shaka.log.logMap_[shaka.log.Level.WARNING];
+      shaka.log.warning = shaka.log.logMap_.get(shaka.log.Level.WARNING);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.INFO) {
-      shaka.log.info = shaka.log.logMap_[shaka.log.Level.INFO];
+      shaka.log.info = shaka.log.logMap_.get(shaka.log.Level.INFO);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.DEBUG) {
-      shaka.log.debug = shaka.log.logMap_[shaka.log.Level.DEBUG];
+      shaka.log.debug = shaka.log.logMap_.get(shaka.log.Level.DEBUG);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.V1) {
-      shaka.log.v1 = shaka.log.logMap_[shaka.log.Level.V1];
+      shaka.log.v1 = shaka.log.logMap_.get(shaka.log.Level.V1);
     }
     if (shaka.log.MAX_LOG_LEVEL >= shaka.log.Level.V2) {
-      shaka.log.v2 = shaka.log.logMap_[shaka.log.Level.V2];
+      shaka.log.v2 = shaka.log.logMap_.get(shaka.log.Level.V2);
     }
   }
 }

package/lib/hls/hls_parser.js

@@ -988,6 +988,31 @@ shaka.hls.HlsParser = class {
               new shaka.hls.Tag(tag.id, tag.name, newAttributes, null));
         }
         variantTags.push(...newVariantTags);
+
+        // Duplicate iFrame tags with supplementalCodecs
+        const newIFrameTags = [];
+        for (const tag of iFrameTags) {
+          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);
+          });
+          newIFrameTags.push(
+              new shaka.hls.Tag(tag.id, tag.name, newAttributes, null));
+        }
+        iFrameTags.push(...newIFrameTags);
       }
 
       this.parseCodecs_(variantTags);
@@ -1084,7 +1109,7 @@ shaka.hls.HlsParser = class {
     const segmentUri = segmentUris[0];
     const parsedUri = new goog.Uri(segmentUri);
     const extension = parsedUri.getPath().split('.').pop();
-    const rawMimeType = HlsParser.RAW_FORMATS_TO_MIME_TYPES_[extension];
+    const rawMimeType = HlsParser.RAW_FORMATS_TO_MIME_TYPES_.get(extension);
     if (rawMimeType) {
       return shaka.media.SegmentUtils.getBasicInfoFromMimeType(
           rawMimeType);
@@ -1615,7 +1640,7 @@ shaka.hls.HlsParser = class {
               /* initSegmentRef= */ null, variables);
         } else {
           const drmParser =
-              shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_[keyFormat];
+              shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_.get(keyFormat);
 
           drmInfo = drmParser ?
               drmParser(drmTag, /* mimeType= */ '') : null;
@@ -2386,12 +2411,13 @@ shaka.hls.HlsParser = class {
       return this.uriToStreamInfosMap_.get(key);
     }
 
+    const name = verbatimMediaPlaylistUris.join(',');
     const closedCaptions = this.getClosedCaptions_(tags[0], type);
     const codecs = shaka.util.ManifestParserUtils.guessCodecs(type, allCodecs);
     const streamInfo = this.createStreamInfo_(
         streamId, verbatimMediaPlaylistUris,
         codecs, type, /* language= */ null, /* primary= */ false,
-        /* name= */ null, /* channelCount= */ null, closedCaptions,
+        name, /* channelCount= */ null, closedCaptions,
         /* characteristics= */ null, /* forced= */ false,
         /* sampleRate= */ null, /* spatialAudio= */ false);
 
@@ -2438,21 +2464,11 @@ shaka.hls.HlsParser = class {
       this.setFullTypeForStream_(stream);
     }
 
-    const redirectUris = [];
-    const getUris = () => {
-      if (this.contentSteeringManager_ &&
-          verbatimMediaPlaylistUris.length > 1) {
-        return this.contentSteeringManager_.getLocations(streamId);
-      }
-      return redirectUris.concat(shaka.hls.Utils.constructUris(
-          [this.masterPlaylistUri_], verbatimMediaPlaylistUris,
-          this.globalVariables_));
-    };
     const streamInfo = {
       stream,
       type,
-      redirectUris,
-      getUris,
+      redirectUris: [],
+      getUris: () => {},
       // These values are filled out or updated after lazy-loading:
       minTimestamp: 0,
       maxTimestamp: 0,
@@ -2466,12 +2482,23 @@ shaka.hls.HlsParser = class {
       loadedOnce: false,
     };
 
+    const getUris = () => {
+      if (this.contentSteeringManager_ &&
+          verbatimMediaPlaylistUris.length > 1) {
+        return this.contentSteeringManager_.getLocations(streamId);
+      }
+      return streamInfo.redirectUris.concat(shaka.hls.Utils.constructUris(
+          [this.masterPlaylistUri_], verbatimMediaPlaylistUris,
+          this.globalVariables_));
+    };
+
+    streamInfo.getUris = getUris;
+
     /** @param {!shaka.net.NetworkingEngine.PendingRequest} pendingRequest */
     const downloadSegmentIndex = async (pendingRequest) => {
       const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
       try {
-        const uris = streamInfo.getUris();
         // Download the actual manifest.
         const response = await pendingRequest.promise;
         if (pendingRequest.aborted) {
@@ -2480,9 +2507,11 @@ shaka.hls.HlsParser = class {
 
         // Record the final URI after redirects.
         const responseUri = response.uri;
-        if (responseUri != response.originalUri &&
-            !uris.includes(responseUri)) {
-          redirectUris.push(responseUri);
+        if (responseUri != response.originalUri) {
+          const uris = streamInfo.getUris();
+          if (!uris.includes(responseUri)) {
+            streamInfo.redirectUris.push(responseUri);
+          }
         }
 
         // Record the redirected, final URI of this media playlist when we parse
@@ -3233,7 +3262,7 @@ shaka.hls.HlsParser = class {
               drmTag, mimeType, getUris, initSegmentRef, variables);
         } else {
           const drmParser =
-              shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_[keyFormat];
+              shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_.get(keyFormat);
           drmInfo = drmParser ? drmParser(drmTag, mimeType) : null;
         }
         if (drmInfo) {
@@ -3657,10 +3686,10 @@ shaka.hls.HlsParser = class {
     const getMimeType = (uri) => {
       const parsedUri = new goog.Uri(uri);
       const extension = parsedUri.getPath().split('.').pop();
-      const map = HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_[type];
-      let mimeType = map[extension];
+      const map = HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_.get(type);
+      let mimeType = map.get(extension);
       if (!mimeType) {
-        mimeType = HlsParser.RAW_FORMATS_TO_MIME_TYPES_[extension];
+        mimeType = HlsParser.RAW_FORMATS_TO_MIME_TYPES_.get(extension);
       }
       return mimeType;
     };
@@ -4434,8 +4463,9 @@ shaka.hls.HlsParser = class {
     }
     // If the HLS content is lacking in both MIME type metadata and
     // segment file extensions, we fall back to assuming it's MP4.
-    const map = shaka.hls.HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_[contentType];
-    return map['mp4'];
+    const map =
+        shaka.hls.HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_.get(contentType);
+    return map.get('mp4');
   }
 
   /**
@@ -4483,14 +4513,14 @@ shaka.hls.HlsParser = class {
 
     const parsedUri = new goog.Uri(segmentUris[0]);
     const extension = parsedUri.getPath().split('.').pop();
-    const map = HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_[contentType];
+    const map = HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_.get(contentType);
 
-    let mimeType = map[extension];
+    let mimeType = map.get(extension);
     if (mimeType) {
       return mimeType;
     }
 
-    mimeType = HlsParser.RAW_FORMATS_TO_MIME_TYPES_[extension];
+    mimeType = HlsParser.RAW_FORMATS_TO_MIME_TYPES_.get(extension);
     if (mimeType) {
       return mimeType;
     }
@@ -4763,7 +4793,7 @@ shaka.hls.HlsParser = class {
           shaka.util.Error.Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
     }
 
-    if (shaka.util.Platform.isMediaKeysPolyfilled()) {
+    if (shaka.util.Platform.isMediaKeysPolyfilled('apple')) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MANIFEST,
@@ -4953,7 +4983,7 @@ shaka.hls.HlsParser = class {
           shaka.util.Error.Code.HLS_MSE_ENCRYPTED_MP2T_NOT_SUPPORTED);
     }
 
-    if (shaka.util.Platform.isMediaKeysPolyfilled()) {
+    if (shaka.util.Platform.isMediaKeysPolyfilled('apple')) {
       throw new shaka.util.Error(
           shaka.util.Error.Severity.CRITICAL,
           shaka.util.Error.Category.MANIFEST,
@@ -5112,91 +5142,85 @@ shaka.hls.HlsParser.StreamInfos;
 
 
 /**
- * @const {!Object<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
-shaka.hls.HlsParser.RAW_FORMATS_TO_MIME_TYPES_ = {
-  'aac': 'audio/aac',
-  'ac3': 'audio/ac3',
-  'ec3': 'audio/ec3',
-  'mp3': 'audio/mpeg',
-};
+shaka.hls.HlsParser.RAW_FORMATS_TO_MIME_TYPES_ = new Map()
+    .set('aac', 'audio/aac')
+    .set('ac3', 'audio/ac3')
+    .set('ec3', 'audio/ec3')
+    .set('mp3', 'audio/mpeg');
 
 
 /**
- * @const {!Object<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
-shaka.hls.HlsParser.AUDIO_EXTENSIONS_TO_MIME_TYPES_ = {
-  'mp4': 'audio/mp4',
-  'mp4a': 'audio/mp4',
-  'm4s': 'audio/mp4',
-  'm4i': 'audio/mp4',
-  'm4a': 'audio/mp4',
-  'm4f': 'audio/mp4',
-  'cmfa': 'audio/mp4',
-  // MPEG2-TS also uses video/ for audio: https://bit.ly/TsMse
-  'ts': 'video/mp2t',
-  'tsa': 'video/mp2t',
-};
+shaka.hls.HlsParser.AUDIO_EXTENSIONS_TO_MIME_TYPES_ = new Map()
+    .set('mp4', 'audio/mp4')
+    .set('mp4a', 'audio/mp4')
+    .set('m4s', 'audio/mp4')
+    .set('m4i', 'audio/mp4')
+    .set('m4a', 'audio/mp4')
+    .set('m4f', 'audio/mp4')
+    .set('cmfa', 'audio/mp4')
+    // MPEG2-TS also uses video/ for audio: https://bit.ly/TsMse
+    .set('ts', 'video/mp2t')
+    .set('tsa', 'video/mp2t');
 
 
 /**
- * @const {!Object<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
-shaka.hls.HlsParser.VIDEO_EXTENSIONS_TO_MIME_TYPES_ = {
-  'mp4': 'video/mp4',
-  'mp4v': 'video/mp4',
-  'm4s': 'video/mp4',
-  'm4i': 'video/mp4',
-  'm4v': 'video/mp4',
-  'm4f': 'video/mp4',
-  'cmfv': 'video/mp4',
-  'ts': 'video/mp2t',
-  'tsv': 'video/mp2t',
-};
+shaka.hls.HlsParser.VIDEO_EXTENSIONS_TO_MIME_TYPES_ = new Map()
+    .set('mp4', 'video/mp4')
+    .set('mp4v', 'video/mp4')
+    .set('m4s', 'video/mp4')
+    .set('m4i', 'video/mp4')
+    .set('m4v', 'video/mp4')
+    .set('m4f', 'video/mp4')
+    .set('cmfv', 'video/mp4')
+    .set('ts', 'video/mp2t')
+    .set('tsv', 'video/mp2t');
 
 
 /**
- * @const {!Object<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
-shaka.hls.HlsParser.TEXT_EXTENSIONS_TO_MIME_TYPES_ = {
-  'mp4': 'application/mp4',
-  'm4s': 'application/mp4',
-  'm4i': 'application/mp4',
-  'm4f': 'application/mp4',
-  'cmft': 'application/mp4',
-  'vtt': 'text/vtt',
-  'webvtt': 'text/vtt',
-  'ttml': 'application/ttml+xml',
-};
+shaka.hls.HlsParser.TEXT_EXTENSIONS_TO_MIME_TYPES_ = new Map()
+    .set('mp4', 'application/mp4')
+    .set('m4s', 'application/mp4')
+    .set('m4i', 'application/mp4')
+    .set('m4f', 'application/mp4')
+    .set('cmft', 'application/mp4')
+    .set('vtt', 'text/vtt')
+    .set('webvtt', 'text/vtt')
+    .set('ttml', 'application/ttml+xml');
 
 
 /**
- * @const {!Object<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
-shaka.hls.HlsParser.IMAGE_EXTENSIONS_TO_MIME_TYPES_ = {
-  'jpg': 'image/jpeg',
-  'png': 'image/png',
-  'svg': 'image/svg+xml',
-  'webp': 'image/webp',
-  'avif': 'image/avif',
-};
+shaka.hls.HlsParser.IMAGE_EXTENSIONS_TO_MIME_TYPES_ = new Map()
+    .set('jpg', 'image/jpeg')
+    .set('png', 'image/png')
+    .set('svg', 'image/svg+xml')
+    .set('webp', 'image/webp')
+    .set('avif', 'image/avif');
 
 
 /**
- * @const {!Object<string, !Object<string, string>>}
+ * @const {!Map<string, !Map<string, string>>}
  * @private
  */
-shaka.hls.HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_ = {
-  'audio': shaka.hls.HlsParser.AUDIO_EXTENSIONS_TO_MIME_TYPES_,
-  'video': shaka.hls.HlsParser.VIDEO_EXTENSIONS_TO_MIME_TYPES_,
-  'text': shaka.hls.HlsParser.TEXT_EXTENSIONS_TO_MIME_TYPES_,
-  'image': shaka.hls.HlsParser.IMAGE_EXTENSIONS_TO_MIME_TYPES_,
-};
+shaka.hls.HlsParser.EXTENSION_MAP_BY_CONTENT_TYPE_ = new Map()
+    .set('audio', shaka.hls.HlsParser.AUDIO_EXTENSIONS_TO_MIME_TYPES_)
+    .set('video', shaka.hls.HlsParser.VIDEO_EXTENSIONS_TO_MIME_TYPES_)
+    .set('text', shaka.hls.HlsParser.TEXT_EXTENSIONS_TO_MIME_TYPES_)
+    .set('image', shaka.hls.HlsParser.IMAGE_EXTENSIONS_TO_MIME_TYPES_);
 
 
 /**
@@ -5220,19 +5244,18 @@ shaka.hls.HlsParser.DrmParser_;
 
 
 /**
- * @const {!Object<string, shaka.hls.HlsParser.DrmParser_>}
+ * @const {!Map<string, shaka.hls.HlsParser.DrmParser_>}
  * @private
  */
-shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_ = {
-  'com.apple.streamingkeydelivery':
-      shaka.hls.HlsParser.fairplayDrmParser_,
-  'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed':
-      shaka.hls.HlsParser.widevineDrmParser_,
-  'com.microsoft.playready':
-      shaka.hls.HlsParser.playreadyDrmParser_,
-  'urn:uuid:3d5e6d35-9b9a-41e8-b843-dd3c6e72c42c':
-      shaka.hls.HlsParser.wiseplayDrmParser_,
-};
+shaka.hls.HlsParser.KEYFORMATS_TO_DRM_PARSERS_ = new Map()
+    .set('com.apple.streamingkeydelivery',
+        shaka.hls.HlsParser.fairplayDrmParser_)
+    .set('urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed',
+        shaka.hls.HlsParser.widevineDrmParser_)
+    .set('com.microsoft.playready',
+        shaka.hls.HlsParser.playreadyDrmParser_)
+    .set('urn:uuid:3d5e6d35-9b9a-41e8-b843-dd3c6e72c42c',
+        shaka.hls.HlsParser.wiseplayDrmParser_);
 
 
 /**

package/lib/media/closed_caption_parser.js

@@ -143,7 +143,7 @@ shaka.media.ClosedCaptionParser = class {
    * @export
    */
   static registerParser(mimeType, plugin) {
-    shaka.media.ClosedCaptionParser.parserMap_[mimeType] = plugin;
+    shaka.media.ClosedCaptionParser.parserMap_.set(mimeType, plugin);
   }
 
   /**
@@ -151,7 +151,7 @@ shaka.media.ClosedCaptionParser = class {
    * @export
    */
   static unregisterParser(mimeType) {
-    delete shaka.media.ClosedCaptionParser.parserMap_[mimeType];
+    shaka.media.ClosedCaptionParser.parserMap_.delete(mimeType);
   }
 
   /**
@@ -160,7 +160,7 @@ shaka.media.ClosedCaptionParser = class {
    * @export
    */
   static findParser(mimeType) {
-    return shaka.media.ClosedCaptionParser.parserMap_[mimeType];
+    return shaka.media.ClosedCaptionParser.parserMap_.get(mimeType);
   }
 
   /**
@@ -187,8 +187,8 @@ shaka.media.ClosedCaptionParser = class {
   }
 };
 
-/** @private {!Object<string, shaka.extern.CeaParserPlugin>} */
-shaka.media.ClosedCaptionParser.parserMap_ = {};
+/** @private {!Map<string, shaka.extern.CeaParserPlugin>} */
+shaka.media.ClosedCaptionParser.parserMap_ = new Map();
 
 /** @private {?shaka.extern.CaptionDecoderPlugin} */
 shaka.media.ClosedCaptionParser.decoderFactory_ = null;