shaka-player 4.13.0 → 4.13.2

package/lib/player.js

@@ -54,6 +54,7 @@ goog.require('shaka.util.Functional');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.MapUtils');
 goog.require('shaka.util.MediaReadyState');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mutex');
@@ -698,7 +699,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     /** @private {shaka.media.BufferingObserver} */
     this.bufferObserver_ = null;
 
-    /** @private {shaka.media.RegionTimeline} */
+    /**
+     * @private {shaka.media.RegionTimeline<
+     *     shaka.extern.TimelineRegionInfo>}
+     */
     this.regionTimeline_ = null;
 
     /** @private {shaka.util.CmcdManager} */
@@ -1083,7 +1087,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @export
    */
   static registerSupportPlugin(name, callback) {
-    shaka.Player.supportPlugins_[name] = callback;
+    shaka.Player.supportPlugins_.set(name, callback);
   }
 
   /**
@@ -1172,9 +1176,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     };
 
     const plugins = shaka.Player.supportPlugins_;
-    for (const name in plugins) {
-      ret[name] = plugins[name]();
-    }
+    plugins.forEach((value, key) => {
+      ret[key] = value();
+    });
 
     return ret;
   }
@@ -3591,6 +3595,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // Create the region observer. This will allow us to notify the app when we
     // move in and out of timeline regions.
+    /** @type {!shaka.media.RegionObserver<shaka.extern.TimelineRegionInfo>} */
     const regionObserver = new shaka.media.RegionObserver(
         this.regionTimeline_, startsPastZero);
 
@@ -3808,10 +3813,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       netEngine: this.networkingEngine_,
       onError: (error) => this.onError_(error),
       onEvent: (event) => this.dispatchEvent(event),
-      onSegmentAppended: (reference, stream) => {
+      onSegmentAppended: (reference, stream, isMuxed) => {
         this.onSegmentAppended_(
-            reference.startTime, reference.endTime, stream.type,
-            stream.codecs.includes(','));
+            reference.startTime, reference.endTime, stream.type, isMuxed);
       },
       onInitSegmentAppended: (position, initSegment) => {
         const mediaQuality = initSegment.getMediaQuality();
@@ -4723,7 +4727,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       shaka.log.alwaysWarn('A trick play rate of 0 is unsupported!');
       return;
     }
-    this.trickPlayEventManager_.removeAll();
 
     this.playRateController_.set(rate);
 
@@ -4732,26 +4735,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       this.streamingEngine_.setTrickPlay(
           useTrickPlayTrack && Math.abs(rate) > 1);
     }
-    if (this.isLive()) {
-      this.trickPlayEventManager_.listen(this.video_, 'timeupdate', () => {
-        const currentTime = this.video_.currentTime;
-        const seekRange = this.seekRange();
-        const safeSeekOffset = this.config_.streaming.safeSeekOffset;
-
-        // Cancel trick play if we hit the beginning or end of the seekable
-        // (Sub-second accuracy not required here)
-        if (rate > 0) {
-          if (Math.floor(currentTime) >= Math.floor(seekRange.end)) {
-            this.cancelTrickPlay();
-          }
-        } else {
-          if (Math.floor(currentTime) <=
-              Math.floor(seekRange.start + safeSeekOffset)) {
-            this.cancelTrickPlay();
-          }
-        }
-      });
-    }
+    this.setupTrickPlayEventListeners_(rate);
   }
 
   /**
@@ -5187,7 +5171,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       if (this.config_.abr.enabled && (active.video != variant.video ||
           (active.audio && variant.audio &&
           active.audio.language == variant.audio.language &&
-          active.audio.channelsCount == variant.audio.channelsCount))) {
+          active.audio.channelsCount == variant.audio.channelsCount &&
+          active.audio.label == variant.audio.label))) {
         shaka.log.alwaysWarn('Changing tracks while abr manager is enabled ' +
                              'will likely result in the selected track ' +
                              'being overridden. Consider disabling abr ' +
@@ -5296,10 +5281,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {number=} safeMargin
    * @param {string=} codec
    * @param {boolean=} spatialAudio
+   * @param {string=} label
    * @export
    */
   selectAudioLanguage(language, role, channelsCount = 0, safeMargin = 0,
-      codec = '', spatialAudio = false) {
+      codec = '', spatialAudio = false, label = '') {
     const selectMediaSourceMode = () => {
       this.currentAdaptationSetCriteria_ =
           this.config_.adaptationSetCriteriaFactory();
@@ -5310,7 +5296,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         hdrLevel: '',
         spatialAudio: spatialAudio || false,
         videoLayout: '',
-        audioLabel: '',
+        audioLabel: label || '',
         videoLabel: '',
         codecSwitchingStrategy:
             this.config_.mediaSource.codecSwitchingStrategy,
@@ -5823,12 +5809,13 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * is playing.
    */
   getLiveLatency() {
-    if (!this.video_) {
+    if (!this.video_ || !this.video_.currentTime) {
       return null;
     }
     const now = this.getPresentationStartTimeAsDate().getTime() +
       this.video_.currentTime * 1000;
-    return Date.now() - now;
+
+    return Math.floor(Date.now() - now);
   }
 
   /**
@@ -6865,6 +6852,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // The playback rate has changed. This could be us or someone else.
       // If this was us, setting the rate again will be a no-op.
       this.playRateController_.set(newRate);
+
+      if (this.loadMode_ == shaka.Player.LoadMode.MEDIA_SOURCE) {
+        this.abrManager_.playbackRateChanged(newRate);
+      }
+      this.setupTrickPlayEventListeners_(newRate);
     }
 
     const event = shaka.Player.makeEvent_(
@@ -6872,6 +6864,36 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.dispatchEvent(event);
   }
 
+  /**
+   * Configures all the necessary listeners when trick play is being performed.
+   *
+   * @param {number} rate
+   * @private
+   */
+  setupTrickPlayEventListeners_(rate) {
+    this.trickPlayEventManager_.removeAll();
+    if (this.isLive()) {
+      this.trickPlayEventManager_.listen(this.video_, 'timeupdate', () => {
+        const currentTime = this.video_.currentTime;
+        const seekRange = this.seekRange();
+        const safeSeekOffset = this.config_.streaming.safeSeekOffset;
+
+        // Cancel trick play if we hit the beginning or end of the seekable
+        // (Sub-second accuracy not required here)
+        if (rate > 0) {
+          if (Math.floor(currentTime) >= Math.floor(seekRange.end)) {
+            this.cancelTrickPlay();
+          }
+        } else {
+          if (Math.floor(currentTime) <=
+              Math.floor(seekRange.start + safeSeekOffset)) {
+            this.cancelTrickPlay();
+          }
+        }
+      });
+    }
+  }
+
   /**
    * Try updating the state history. If the player has not finished
    * initializing, this will be a no-op.
@@ -8040,6 +8062,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     // Only filter tracks for keys if we have some key statuses to look at.
     if (keyIds.length) {
+      const currentKeySystem = this.keySystem();
+      const clearKeys = shaka.util.MapUtils.asMap(this.config_.drm.clearKeys);
+
       for (const variant of this.manifest_.variants) {
         const streams = shaka.util.StreamUtils.getVariantStreams(variant);
 
@@ -8049,16 +8074,42 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           // Only update if we have key IDs for the stream.  If the keys aren't
           // all present, then the track should be restricted.
           if (stream.keyIds.size) {
-            variant.allowedByKeySystem = true;
-
-            for (const keyId of stream.keyIds) {
-              const keyStatus = keyStatusMap[isGlobalStatus ? '00' : keyId];
-              if (keyStatus || this.drmEngine_.hasManifestInitData()) {
-                variant.allowedByKeySystem = variant.allowedByKeySystem &&
-                    !!keyStatus && !restrictedStatuses.includes(keyStatus);
-              }
-            }
-          }
+            // If we are not using clearkeys, and the stream has drmInfos we
+            // only want to check the keyIds of the keySystem we are using.
+            // Other keySystems might have other keyIds that might not be
+            // valid in this case. This can happen in HLS if the manifest
+            // has Widevine with keyIds and PlayReady without keyIds and we are
+            // using PlayReady.
+            if (stream.drmInfos.length && !clearKeys.size) {
+              for (const drmInfo of stream.drmInfos) {
+                if (drmInfo.keyIds.size &&
+                    drmInfo.keySystem == currentKeySystem) {
+                  variant.allowedByKeySystem = true;
+
+                  for (const keyId of drmInfo.keyIds) {
+                    const keyStatus =
+                        keyStatusMap[isGlobalStatus ? '00' : keyId];
+                    if (keyStatus || this.drmEngine_.hasManifestInitData()) {
+                      variant.allowedByKeySystem =
+                          variant.allowedByKeySystem &&
+                          !!keyStatus &&
+                          !restrictedStatuses.includes(keyStatus);
+                    } // if (keyStatus || this.drmEngine_.hasManifestInitData())
+                  } // for (const keyId of drmInfo.keyIds)
+                } // if (drmInfo.keyIds.size && ...
+              } // for (const drmInfo of stream.drmInfos
+            } else {
+              variant.allowedByKeySystem = true;
+
+              for (const keyId of stream.keyIds) {
+                const keyStatus = keyStatusMap[isGlobalStatus ? '00' : keyId];
+                if (keyStatus || this.drmEngine_.hasManifestInitData()) {
+                  variant.allowedByKeySystem = variant.allowedByKeySystem &&
+                      !!keyStatus && !restrictedStatuses.includes(keyStatus);
+                }
+              } // for (const keyId of stream.keyIds)
+            } // if (stream.drmInfos.length && !clearKeys.size)
+          } // if (stream.keyIds.size)
 
           if (originalAllowed != variant.allowedByKeySystem) {
             tracksChanged = true;
@@ -8384,15 +8435,15 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat
-shaka.Player.version = 'v4.13.0' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.13.2' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.
 shaka.Deprecate.init(shaka.Player.version);
 
 
-/** @private {!Object<string, function(): *>} */
-shaka.Player.supportPlugins_ = {};
+/** @private {!Map<string, function(): *>} */
+shaka.Player.supportPlugins_ = new Map();
 
 
 /** @private {?shaka.extern.IAdManager.Factory} */

package/lib/polyfill/media_capabilities.js

@@ -378,14 +378,13 @@ shaka.polyfill.MediaCapabilities = class {
     }
 
     let result = false;
-    if (displayType in shaka.polyfill.MediaCapabilities
-        .memoizedCanDisplayTypeRequests_) {
-      result = shaka.polyfill.MediaCapabilities
-          .memoizedCanDisplayTypeRequests_[displayType];
+    const memoizedCanDisplayTypeRequests =
+        shaka.polyfill.MediaCapabilities.memoizedCanDisplayTypeRequests_;
+    if (memoizedCanDisplayTypeRequests.has(displayType)) {
+      result = memoizedCanDisplayTypeRequests.get(displayType);
     } else {
       result = await cast.__platform__.canDisplayType(displayType);
-      shaka.polyfill.MediaCapabilities
-          .memoizedCanDisplayTypeRequests_[displayType] = result;
+      memoizedCanDisplayTypeRequests.set(displayType, result);
     }
     return result;
   }
@@ -405,10 +404,10 @@ shaka.polyfill.MediaCapabilities.originalMcap = null;
  * A cache that stores the canDisplayType result of calling
  * `cast.__platform__.canDisplayType`.
  *
- * @type {(Object<(!string), (!boolean)>)}
- * @export
+ * @type {Map<string, boolean>}
+ * @private
  */
-shaka.polyfill.MediaCapabilities.memoizedCanDisplayTypeRequests_ = {};
+shaka.polyfill.MediaCapabilities.memoizedCanDisplayTypeRequests_ = new Map();
 
 // Install at a lower priority than MediaSource polyfill, so that we have
 // MediaSource available first.

package/lib/text/cue.js

@@ -371,8 +371,12 @@ shaka.text.Cue = class {
     // performance optimization.  We can avoid the more expensive recursive
     // checks if the top-level properties don't match.
     // See: https://github.com/shaka-project/shaka-player/issues/3018
-    if (cue1.startTime != cue2.startTime || cue1.endTime != cue2.endTime ||
-      cue1.payload != cue2.payload) {
+    if (cue1.payload != cue2.payload) {
+      return false;
+    }
+    const isDiffNegligible = (a, b) => Math.abs(a - b) < 0.001;
+    if (!isDiffNegligible(cue1.startTime, cue2.startTime) ||
+        !isDiffNegligible(cue1.endTime, cue2.endTime)) {
       return false;
     }
     for (const k in cue1) {

package/lib/text/text_engine.js

@@ -74,7 +74,7 @@ shaka.text.TextEngine = class {
    * @export
    */
   static registerParser(mimeType, plugin) {
-    shaka.text.TextEngine.parserMap_[mimeType] = plugin;
+    shaka.text.TextEngine.parserMap_.set(mimeType, plugin);
   }
 
   /**
@@ -82,7 +82,7 @@ shaka.text.TextEngine = class {
    * @export
    */
   static unregisterParser(mimeType) {
-    delete shaka.text.TextEngine.parserMap_[mimeType];
+    shaka.text.TextEngine.parserMap_.delete(mimeType);
   }
 
   /**
@@ -90,7 +90,7 @@ shaka.text.TextEngine = class {
    * @export
    */
   static findParser(mimeType) {
-    return shaka.text.TextEngine.parserMap_[mimeType];
+    return shaka.text.TextEngine.parserMap_.get(mimeType);
   }
 
   /**
@@ -98,7 +98,7 @@ shaka.text.TextEngine = class {
    * @return {boolean}
    */
   static isTypeSupported(mimeType) {
-    if (shaka.text.TextEngine.parserMap_[mimeType]) {
+    if (shaka.text.TextEngine.parserMap_.has(mimeType)) {
       // An actual parser is available.
       return true;
     }
@@ -147,7 +147,7 @@ shaka.text.TextEngine = class {
       return;
     }
 
-    const factory = shaka.text.TextEngine.parserMap_[mimeType];
+    const factory = shaka.text.TextEngine.parserMap_.get(mimeType);
     goog.asserts.assert(
         factory, 'Text type negotiation should have happened already');
     this.parser_ = factory();
@@ -469,5 +469,5 @@ shaka.text.TextEngine = class {
   }
 };
 
-/** @private {!Object<string, !shaka.extern.TextParserPlugin>} */
-shaka.text.TextEngine.parserMap_ = {};
+/** @private {!Map<string, !shaka.extern.TextParserPlugin>} */
+shaka.text.TextEngine.parserMap_ = new Map();

package/lib/text/ttml_text_parser.js

@@ -589,8 +589,8 @@ shaka.text.TtmlTextParser = class {
     const align = TtmlTextParser.getStyleAttribute_(
         cueElement, region, styles, 'textAlign', true);
     if (align) {
-      cue.positionAlign = TtmlTextParser.textAlignToPositionAlign_[align];
-      cue.lineAlign = TtmlTextParser.textAlignToLineAlign_[align];
+      cue.positionAlign = TtmlTextParser.textAlignToPositionAlign_.get(align);
+      cue.lineAlign = TtmlTextParser.textAlignToLineAlign_.get(align);
 
       goog.asserts.assert(align.toUpperCase() in Cue.textAlign,
           align.toUpperCase() + ' Should be in Cue.textAlign values!');
@@ -1402,25 +1402,23 @@ shaka.text.TtmlTextParser.timeHMSFormat_ =
 
 /**
  * @const
- * @private {!Object<string, shaka.text.Cue.lineAlign>}
+ * @private {!Map<string, shaka.text.Cue.lineAlign>}
  */
-shaka.text.TtmlTextParser.textAlignToLineAlign_ = {
-  'left': shaka.text.Cue.lineAlign.START,
-  'center': shaka.text.Cue.lineAlign.CENTER,
-  'right': shaka.text.Cue.lineAlign.END,
-  'start': shaka.text.Cue.lineAlign.START,
-  'end': shaka.text.Cue.lineAlign.END,
-};
+shaka.text.TtmlTextParser.textAlignToLineAlign_ = new Map()
+    .set('left', shaka.text.Cue.lineAlign.START)
+    .set('center', shaka.text.Cue.lineAlign.CENTER)
+    .set('right', shaka.text.Cue.lineAlign.END)
+    .set('start', shaka.text.Cue.lineAlign.START)
+    .set('end', shaka.text.Cue.lineAlign.END);
 
 /**
  * @const
- * @private {!Object<string, shaka.text.Cue.positionAlign>}
+ * @private {!Map<string, shaka.text.Cue.positionAlign>}
  */
-shaka.text.TtmlTextParser.textAlignToPositionAlign_ = {
-  'left': shaka.text.Cue.positionAlign.LEFT,
-  'center': shaka.text.Cue.positionAlign.CENTER,
-  'right': shaka.text.Cue.positionAlign.RIGHT,
-};
+shaka.text.TtmlTextParser.textAlignToPositionAlign_ = new Map()
+    .set('left', shaka.text.Cue.positionAlign.LEFT)
+    .set('center', shaka.text.Cue.positionAlign.CENTER)
+    .set('right', shaka.text.Cue.positionAlign.RIGHT);
 
 /**
  * The namespace URL for TTML parameters.  Can be assigned any name in the TTML

package/lib/text/ui_text_displayer.js

@@ -55,6 +55,9 @@ shaka.text.UITextDisplayer = class {
     /** @private {?number} */
     this.aspectRatio_ = null;
 
+    /** @private {?shaka.extern.TextDisplayerConfiguration} */
+    this.config_ = null;
+
     /** @type {HTMLElement} */
     this.textContainer_ = shaka.util.Dom.createHTMLElement('div');
     this.textContainer_.classList.add('shaka-text-container');
@@ -77,7 +80,8 @@ shaka.text.UITextDisplayer = class {
       if (!this.video_.paused) {
         this.updateCaptions_();
       }
-    }).tickEvery(/* seconds= */ 0.25);
+    });
+    this.configureCaptionsTimer_();
 
     /**
      * Maps cues to cue elements. Specifically points out the wrapper element of
@@ -101,6 +105,10 @@ shaka.text.UITextDisplayer = class {
       this.updateCaptions_(/* forceUpdate= */ true);
     });
 
+    this.eventManager_.listen(this.video_, 'ratechange', () => {
+      this.configureCaptionsTimer_();
+    });
+
     // From: https://html.spec.whatwg.org/multipage/media.html#dom-video-videowidth
     // Whenever the natural width or natural height of the video changes
     // (including, for example, because the selected video track was changed),
@@ -137,9 +145,8 @@ shaka.text.UITextDisplayer = class {
    * @export
    */
   configure(config) {
-    if (this.captionsTimer_) {
-      this.captionsTimer_.tickEvery(config.captionsUpdatePeriod);
-    }
+    this.config_ = config;
+    this.configureCaptionsTimer_();
   }
 
 
@@ -186,6 +193,7 @@ shaka.text.UITextDisplayer = class {
     this.cues_ = [];
     if (this.captionsTimer_) {
       this.captionsTimer_.stop();
+      this.captionsTimer_ = null;
     }
 
     this.currentCuesMap_.clear();
@@ -265,6 +273,19 @@ shaka.text.UITextDisplayer = class {
   enableTextDisplayer() {
   }
 
+  /**
+   * @private
+   */
+  configureCaptionsTimer_() {
+    if (this.captionsTimer_) {
+      const captionsUpdatePeriod = this.config_ ?
+          this.config_.captionsUpdatePeriod : 0.25;
+      const updateTime = captionsUpdatePeriod /
+          Math.max(1, Math.abs(this.video_.playbackRate));
+      this.captionsTimer_.tickEvery(updateTime);
+    }
+  }
+
   /**
    * @private
    */

package/lib/transmuxer/ac3_transmuxer.js

@@ -14,6 +14,7 @@ goog.require('shaka.util.Error');
 goog.require('shaka.util.Id3Utils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.Mp4Generator');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Uint8ArrayUtils');
 
 
@@ -86,7 +87,11 @@ shaka.transmuxer.Ac3Transmuxer = class {
    */
   convertCodecs(contentType, mimeType) {
     if (this.isAc3Container_(mimeType)) {
-      return 'audio/mp4; codecs="ac-3"';
+      if (shaka.util.Platform.requiresEC3InitSegments()) {
+        return 'audio/mp4; codecs="ec-3"';
+      } else {
+        return 'audio/mp4; codecs="ac-3"';
+      }
     }
     return mimeType;
   }

package/lib/transmuxer/transmuxer_engine.js

@@ -33,10 +33,10 @@ shaka.transmuxer.TransmuxerEngine = class {
     const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;
     const normalizedMimetype = TransmuxerEngine.normalizeMimeType_(mimeType);
     const key = normalizedMimetype + '-' + priority;
-    TransmuxerEngine.transmuxerMap_[key] = {
+    TransmuxerEngine.transmuxerMap_.set(key, {
       priority: priority,
       plugin: plugin,
-    };
+    });
   }
 
   /**
@@ -48,7 +48,7 @@ shaka.transmuxer.TransmuxerEngine = class {
     const TransmuxerEngine = shaka.transmuxer.TransmuxerEngine;
     const normalizedMimetype = TransmuxerEngine.normalizeMimeType_(mimeType);
     const key = normalizedMimetype + '-' + priority;
-    delete TransmuxerEngine.transmuxerMap_[key];
+    TransmuxerEngine.transmuxerMap_.delete(key);
   }
 
   /**
@@ -68,7 +68,7 @@ shaka.transmuxer.TransmuxerEngine = class {
     ];
     for (const priority of priorities) {
       const key = normalizedMimetype + '-' + priority;
-      const object = TransmuxerEngine.transmuxerMap_[key];
+      const object = TransmuxerEngine.transmuxerMap_.get(key);
       if (object) {
         const transmuxer = object.plugin();
         const isSupported = transmuxer.isSupported(mimeType, contentType);
@@ -139,9 +139,9 @@ shaka.transmuxer.TransmuxerEngine.PluginObject;
 
 
 /**
- * @private {!Object<string, !shaka.transmuxer.TransmuxerEngine.PluginObject>}
+ * @private {!Map<string, !shaka.transmuxer.TransmuxerEngine.PluginObject>}
  */
-shaka.transmuxer.TransmuxerEngine.transmuxerMap_ = {};
+shaka.transmuxer.TransmuxerEngine.transmuxerMap_ = new Map();
 
 
 /**

package/lib/util/manifest_parser_utils.js

@@ -202,7 +202,7 @@ shaka.util.ManifestParserUtils = class {
    */
   static guessCodecsSafe(contentType, codecs) {
     const formats = shaka.util.ManifestParserUtils
-        .CODEC_REGEXPS_BY_CONTENT_TYPE_[contentType];
+        .CODEC_REGEXPS_BY_CONTENT_TYPE_.get(contentType);
     for (const format of formats) {
       for (const codec of codecs) {
         if (format.test(codec.trim())) {
@@ -231,7 +231,7 @@ shaka.util.ManifestParserUtils = class {
   static guessAllCodecsSafe(contentType, codecs) {
     const allCodecs = [];
     const formats = shaka.util.ManifestParserUtils
-        .CODEC_REGEXPS_BY_CONTENT_TYPE_[contentType];
+        .CODEC_REGEXPS_BY_CONTENT_TYPE_.get(contentType);
     for (const format of formats) {
       for (const codec of codecs) {
         if (format.test(codec.trim())) {
@@ -332,10 +332,9 @@ shaka.util.ManifestParserUtils.TEXT_CODEC_REGEXPS_ = [
 
 
 /**
- * @const {!Object<string, !Array<!RegExp>>}
+ * @const {!Map<string, !Array<!RegExp>>}
  */
-shaka.util.ManifestParserUtils.CODEC_REGEXPS_BY_CONTENT_TYPE_ = {
-  'audio': shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_,
-  'video': shaka.util.ManifestParserUtils.VIDEO_CODEC_REGEXPS_,
-  'text': shaka.util.ManifestParserUtils.TEXT_CODEC_REGEXPS_,
-};
+shaka.util.ManifestParserUtils.CODEC_REGEXPS_BY_CONTENT_TYPE_ = new Map()
+    .set('audio', shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_)
+    .set('video', shaka.util.ManifestParserUtils.VIDEO_CODEC_REGEXPS_)
+    .set('text', shaka.util.ManifestParserUtils.TEXT_CODEC_REGEXPS_);

package/lib/util/mp4_generator.js

@@ -8,6 +8,7 @@ goog.provide('shaka.util.Mp4Generator');
 
 goog.require('goog.asserts');
 goog.require('shaka.util.ManifestParserUtils');
+goog.require('shaka.util.Platform');
 goog.require('shaka.util.Uint8ArrayUtils');
 
 
@@ -298,6 +299,20 @@ shaka.util.Mp4Generator = class {
   stsd_(streamInfo) {
     const Mp4Generator = shaka.util.Mp4Generator;
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
+    let audioCodec = 'aac';
+    if (streamInfo.codecs.includes('mp3')) {
+      audioCodec = 'mp3';
+    } else if (streamInfo.codecs.includes('ac-3')) {
+      if (shaka.util.Platform.requiresEC3InitSegments()) {
+        audioCodec = 'ec-3';
+      } else {
+        audioCodec = 'ac-3';
+      }
+    } else if (streamInfo.codecs.includes('ec-3')) {
+      audioCodec = 'ec-3';
+    } else if (streamInfo.codecs.includes('opus')) {
+      audioCodec = 'opus';
+    }
     let bytes = new Uint8Array([]);
     switch (streamInfo.type) {
       case ContentType.VIDEO:
@@ -308,13 +323,13 @@ shaka.util.Mp4Generator = class {
         }
         break;
       case ContentType.AUDIO:
-        if (streamInfo.codecs.includes('mp3')) {
+        if (audioCodec == 'mp3') {
           bytes = this.mp3_(streamInfo);
-        } else if (streamInfo.codecs.includes('ac-3')) {
+        } else if (audioCodec == 'ac-3') {
           bytes = this.ac3_(streamInfo);
-        } else if (streamInfo.codecs.includes('ec-3')) {
+        } else if (audioCodec == 'ec-3') {
           bytes = this.ec3_(streamInfo);
-        } else if (streamInfo.codecs.includes('opus')) {
+        } else if (audioCodec == 'opus') {
           bytes = this.opus_(streamInfo);
         } else {
           bytes = this.mp4a_(streamInfo);
@@ -1167,7 +1182,7 @@ shaka.util.Mp4Generator = class {
    * @return {!Uint8Array}
    */
   static box(boxName, ...payload) {
-    let type = shaka.util.Mp4Generator.BOX_TYPES_[boxName];
+    let type = shaka.util.Mp4Generator.BOX_TYPES_.get(boxName);
     if (!type) {
       type = [
         boxName.charCodeAt(0),
@@ -1175,7 +1190,7 @@ shaka.util.Mp4Generator = class {
         boxName.charCodeAt(2),
         boxName.charCodeAt(3),
       ];
-      shaka.util.Mp4Generator.BOX_TYPES_[boxName] = type;
+      shaka.util.Mp4Generator.BOX_TYPES_.set(boxName, type);
     }
     // make the header for the box
     let size = 8;
@@ -1212,9 +1227,9 @@ shaka.util.Mp4Generator.initialized_ = false;
 shaka.util.Mp4Generator.UINT32_MAX_ = Math.pow(2, 32) - 1;
 
 /**
- * @private {!Object<string, !Array<number>>}
+ * @private {!Map<string, !Array<number>>}
  */
-shaka.util.Mp4Generator.BOX_TYPES_ = {};
+shaka.util.Mp4Generator.BOX_TYPES_ = new Map();
 
 /**
  * @private {{video: !Uint8Array, audio: !Uint8Array}}