shaka-player 4.13.0 → 4.13.2

package/eslint.config.mjs

@@ -81,7 +81,6 @@ export default [
     },
     rules: {
       // Things the compiler already takes care of, with more precision: {{{
-      'no-console': 'off',
       'no-eq-null': 'off',
       'no-eval': 'off',
       'no-undef': 'off',
@@ -132,6 +131,7 @@ export default [
       'guard-for-in': 'off',
       'no-alert': 'error',
       'no-caller': 'error',
+      'no-console': 'error',
       'no-div-regex': 'error',
       'no-extend-native': 'error', // May conflict with future polyfills
       'no-extra-label': 'error',
@@ -340,4 +340,17 @@ export default [
       'jsdoc/require-jsdoc': 'off',
     },
   },
+  {
+    files: [
+      'karma.conf.js',
+      'build/**/*.js',
+      'demo/**/*.js',
+      'lib/debug/asserts.js',
+      'lib/debug/log.js',
+      'test/**/**.js',
+    ],
+    rules: {
+      'no-console': 'off',
+    },
+  },
 ];

package/lib/cast/cast_proxy.js

@@ -81,17 +81,21 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     this.compiledToExternNames_ = new Map();
 
     /** @private {shaka.cast.CastSender} */
-    this.sender_ = new shaka.cast.CastSender(
-        receiverAppId,
-        () => this.onCastStatusChanged_(),
-        () => this.onFirstCastStateUpdate_(),
-        (targetName, event) => this.onRemoteEvent_(targetName, event),
-        () => this.onResumeLocal_(),
-        () => this.getInitState_(),
-        androidReceiverCompatible);
-
+    this.sender_ = null;
 
-    this.init_();
+    if (window.chrome) {
+      this.sender_ = new shaka.cast.CastSender(
+          receiverAppId,
+          () => this.onCastStatusChanged_(),
+          () => this.onFirstCastStateUpdate_(),
+          (targetName, event) => this.onRemoteEvent_(targetName, event),
+          () => this.onResumeLocal_(),
+          () => this.getInitState_(),
+          androidReceiverCompatible);
+      this.init_();
+    } else {
+      this.initWithoutSender_();
+    }
   }
 
   /**
@@ -163,6 +167,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   canCast() {
+    if (!this.sender_) {
+      return false;
+    }
     return this.sender_.apiReady() && this.sender_.hasReceivers();
   }
 
@@ -171,6 +178,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   isCasting() {
+    if (!this.sender_) {
+      return false;
+    }
     return this.sender_.isCasting();
   }
 
@@ -179,6 +189,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   receiverName() {
+    if (!this.sender_) {
+      return '';
+    }
     return this.sender_.receiverName();
   }
 
@@ -188,6 +201,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   async cast() {
+    if (!this.sender_) {
+      return;
+    }
     // TODO: transfer manually-selected tracks?
     // TODO: transfer side-loaded text tracks?
 
@@ -208,6 +224,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   setAppData(appData) {
+    if (!this.sender_) {
+      return;
+    }
     this.sender_.setAppData(appData);
   }
 
@@ -216,6 +235,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   suggestDisconnect() {
+    if (!this.sender_) {
+      return;
+    }
     this.sender_.showDisconnectDialog();
   }
 
@@ -224,6 +246,9 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
    * @export
    */
   forceDisconnect() {
+    if (!this.sender_) {
+      return;
+    }
     this.sender_.forceDisconnect();
   }
 
@@ -243,6 +268,10 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     this.receiverAppId_ = newAppId;
     this.androidReceiverCompatible_ = newCastAndroidReceiver;
 
+    if (!this.sender_) {
+      return;
+    }
+
     // Destroy the old sender
     this.sender_.forceDisconnect();
     await this.sender_.destroy();
@@ -262,6 +291,15 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     this.sender_.init();
   }
 
+  /**
+   * Initialize the Proxies without Cast sender.
+   * @private
+   */
+  initWithoutSender_() {
+    this.videoProxy_ = /** @type {Object} */(this.localVideo_);
+    this.playerProxy_ = /** @type {Object} */(this.localPlayer_);
+  }
+
   /**
    * Initialize the Proxies and the Cast sender.
    * @private
@@ -721,8 +759,8 @@ shaka.cast.CastProxy = class extends shaka.util.FakeEventTarget {
     // If we are casting, but the first update has not come in yet, use local
     // getters, but not local methods.
     if (this.sender_.isCasting() && !this.sender_.hasRemoteProperties()) {
-      if (shaka.cast.CastUtils.PlayerGetterMethods[name] ||
-          shaka.cast.CastUtils.LargePlayerGetterMethods[name]) {
+      if (shaka.cast.CastUtils.PlayerGetterMethods.has(name) ||
+          shaka.cast.CastUtils.LargePlayerGetterMethods.has(name)) {
         const value = /** @type {Object} */(this.localPlayer_)[name];
         goog.asserts.assert(typeof value == 'function',
             'only methods on Player');

package/lib/cast/cast_receiver.js

@@ -484,19 +484,17 @@ shaka.cast.CastReceiver = class extends shaka.util.FakeEventTarget {
     if (this.player_.isLive()) {
       const PlayerGetterMethodsThatRequireLive =
           shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive;
-      for (const name in PlayerGetterMethodsThatRequireLive) {
-        const frequency = PlayerGetterMethodsThatRequireLive[name];
+      PlayerGetterMethodsThatRequireLive.forEach((frequency, name) => {
         if (this.updateNumber_ % frequency == 0) {
           update['player'][name] = /** @type {Object} */ (this.player_)[name]();
         }
-      }
+      });
     }
-    for (const name in shaka.cast.CastUtils.PlayerGetterMethods) {
-      const frequency = shaka.cast.CastUtils.PlayerGetterMethods[name];
+    shaka.cast.CastUtils.PlayerGetterMethods.forEach((frequency, name) => {
       if (this.updateNumber_ % frequency == 0) {
         update['player'][name] = /** @type {Object} */ (this.player_)[name]();
       }
-    }
+    });
 
     // Volume attributes are tied to the system volume.
     const manager = cast.receiver.CastReceiverManager.getInstance();
@@ -512,8 +510,7 @@ shaka.cast.CastReceiver = class extends shaka.util.FakeEventTarget {
     }, this.shakaBus_);
 
     // Getters with large outputs each get sent in their own update message.
-    for (const name in shaka.cast.CastUtils.LargePlayerGetterMethods) {
-      const frequency = shaka.cast.CastUtils.LargePlayerGetterMethods[name];
+    shaka.cast.CastUtils.LargePlayerGetterMethods.forEach((frequency, name) => {
       if (this.updateNumber_ % frequency == 0) {
         const update = {'player': {}};
         update['player'][name] = /** @type {Object} */ (this.player_)[name]();
@@ -523,7 +520,7 @@ shaka.cast.CastReceiver = class extends shaka.util.FakeEventTarget {
           'update': update,
         }, this.shakaBus_);
       }
-    }
+    });
 
     // Only start progressing the update number once data is loaded,
     // just in case any of the "rarely changing" properties with less frequent

package/lib/cast/cast_sender.js

@@ -91,8 +91,8 @@ shaka.cast.CastSender = class {
     /** @private {number} */
     this.nextAsyncCallId_ = 0;
 
-    /** @private {Object<string, !shaka.util.PublicPromise>} */
-    this.asyncCallPromises_ = {};
+    /** @private {Map<string, !shaka.util.PublicPromise>} */
+    this.asyncCallPromises_ = new Map();
 
     /** @private {shaka.util.PublicPromise} */
     this.castPromise_ = null;
@@ -350,7 +350,7 @@ shaka.cast.CastSender = class {
         return (...args) => this.remoteCall_(targetName, property, ...args);
       }
     } else if (targetName == 'player') {
-      if (CastUtils.PlayerGetterMethodsThatRequireLive[property]) {
+      if (CastUtils.PlayerGetterMethodsThatRequireLive.has(property)) {
         const isLive = this.get('player', 'isLive')();
         goog.asserts.assert(isLive,
             property + ' should be called on a live stream!');
@@ -367,8 +367,8 @@ shaka.cast.CastSender = class {
         return (...args) =>
           this.remoteAsyncCall_(targetName, property, ...args);
       }
-      if (CastUtils.PlayerGetterMethods[property] ||
-          CastUtils.LargePlayerGetterMethods[property]) {
+      if (CastUtils.PlayerGetterMethods.has(property) ||
+          CastUtils.LargePlayerGetterMethods.has(property)) {
         return () => this.propertyGetter_(targetName, property);
       }
     }
@@ -491,7 +491,7 @@ shaka.cast.CastSender = class {
     const p = new shaka.util.PublicPromise();
     const id = this.nextAsyncCallId_.toString();
     this.nextAsyncCallId_++;
-    this.asyncCallPromises_[id] = p;
+    this.asyncCallPromises_.set(id, p);
 
     try {
       this.sendMessage_({
@@ -618,9 +618,12 @@ shaka.cast.CastSender = class {
    * @private
    */
   rejectAllPromises_() {
-    for (const id in this.asyncCallPromises_) {
-      const p = this.asyncCallPromises_[id];
-      delete this.asyncCallPromises_[id];
+    if (!this.asyncCallPromises_) {
+      return;
+    }
+    for (const id of this.asyncCallPromises_.keys()) {
+      const p = this.asyncCallPromises_.get(id);
+      this.asyncCallPromises_.delete(id);
 
       // Reject pending async operations as if they were interrupted.
       // At the moment, load() is the only async operation we are worried about.
@@ -669,8 +672,8 @@ shaka.cast.CastSender = class {
       case 'asyncComplete': {
         const id = message['id'];
         const error = message['error'];
-        const p = this.asyncCallPromises_[id];
-        delete this.asyncCallPromises_[id];
+        const p = this.asyncCallPromises_.get(id);
+        this.asyncCallPromises_.delete(id);
 
         goog.asserts.assert(p, 'Unexpected async id');
         if (!p) {

package/lib/cast/cast_utils.js

@@ -300,54 +300,52 @@ shaka.cast.CastUtils.VideoVoidMethods = [
  * Player getter methods that are proxied while casting.
  * The key is the method, the value is the frequency of updates.
  * Frequency 1 translates to every update; frequency 2 to every 2 updates, etc.
- * @const {!Object<string, number>}
+ * @const {!Map<string, number>}
  */
-shaka.cast.CastUtils.PlayerGetterMethods = {
-  // NOTE: The 'drmInfo' property is not proxied, as it is very large.
-  'getAssetUri': 2,
-  'getAudioLanguages': 4,
-  'getAudioLanguagesAndRoles': 4,
-  'getBufferFullness': 1,
-  'getBufferedInfo': 2,
-  'getExpiration': 2,
-  'getKeyStatuses': 2,
-  // NOTE: The 'getManifest' property is not proxied, as it is very large.
-  // NOTE: The 'getManifestParserFactory' property is not proxied, as it would
-  // not serialize.
-  'getPlaybackRate': 2,
-  'getTextLanguages': 4,
-  'getTextLanguagesAndRoles': 4,
-  'getImageTracks': 2,
-  'getThumbnails': 2,
-  'isAudioOnly': 10,
-  'isBuffering': 1,
-  'isInProgress': 1,
-  'isLive': 10,
-  'isTextTrackVisible': 1,
-  'keySystem': 10,
-  'seekRange': 1,
-  'getLoadMode': 10,
-  'getManifestType': 10,
-  'isFullyLoaded': 1,
-  'isEnded': 1,
-};
+shaka.cast.CastUtils.PlayerGetterMethods = new Map()
+    // NOTE: The 'drmInfo' property is not proxied, as it is very large.
+    .set('getAssetUri', 2)
+    .set('getAudioLanguages', 4)
+    .set('getAudioLanguagesAndRoles', 4)
+    .set('getBufferFullness', 1)
+    .set('getBufferedInfo', 2)
+    .set('getExpiration', 2)
+    .set('getKeyStatuses', 2)
+    // NOTE: The 'getManifest' property is not proxied, as it is very large.
+    // NOTE: The 'getManifestParserFactory' property is not proxied, as it would
+    // not serialize.
+    .set('getPlaybackRate', 2)
+    .set('getTextLanguages', 4)
+    .set('getTextLanguagesAndRoles', 4)
+    .set('getImageTracks', 2)
+    .set('getThumbnails', 2)
+    .set('isAudioOnly', 10)
+    .set('isBuffering', 1)
+    .set('isInProgress', 1)
+    .set('isLive', 10)
+    .set('isTextTrackVisible', 1)
+    .set('keySystem', 10)
+    .set('seekRange', 1)
+    .set('getLoadMode', 10)
+    .set('getManifestType', 10)
+    .set('isFullyLoaded', 1)
+    .set('isEnded', 1);
 
 
 /**
  * Player getter methods with data large enough to be sent in their own update
  * messages, to reduce the size of each message.  The format of this is
  * identical to PlayerGetterMethods.
- * @const {!Object<string, number>}
+ * @const {!Map<string, number>}
  */
-shaka.cast.CastUtils.LargePlayerGetterMethods = {
-  // NOTE: The 'getSharedConfiguration' property is not proxied as it would
-  //       not be possible to share a reference.
-  'getConfiguration': 4,
-  'getConfigurationForLowLatency': 4,
-  'getStats': 5,
-  'getTextTracks': 2,
-  'getVariantTracks': 2,
-};
+shaka.cast.CastUtils.LargePlayerGetterMethods = new Map()
+    // NOTE: The 'getSharedConfiguration' property is not proxied as it would
+    //       not be possible to share a reference.
+    .set('getConfiguration', 4)
+    .set('getConfigurationForLowLatency', 4)
+    .set('getStats', 5)
+    .set('getTextTracks', 2)
+    .set('getVariantTracks', 2);
 
 
 /**
@@ -355,13 +353,12 @@ shaka.cast.CastUtils.LargePlayerGetterMethods = {
  * a livestream.
  * The key is the method, the value is the frequency of updates.
  * Frequency 1 translates to every update; frequency 2 to every 2 updates, etc.
- * @const {!Object<string, number>}
+ * @const {!Map<string, number>}
  */
-shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive = {
-  'getPlayheadTimeAsDate': 1,
-  'getPresentationStartTimeAsDate': 20,
-  'getSegmentAvailabilityDuration': 20,
-};
+shaka.cast.CastUtils.PlayerGetterMethodsThatRequireLive = new Map()
+    .set('getPlayheadTimeAsDate', 1)
+    .set('getPresentationStartTimeAsDate', 20)
+    .set('getSegmentAvailabilityDuration', 20);
 
 
 /**

package/lib/cea/mp4_cea_parser.js

@@ -389,8 +389,9 @@ shaka.cea.Mp4CeaParser = class {
    * @private
    */
   setBitstreamFormat_(codec) {
-    if (codec in shaka.cea.Mp4CeaParser.CodecBitstreamMap_) {
-      this.bitstreamFormat_ = shaka.cea.Mp4CeaParser.CodecBitstreamMap_[codec];
+    if (shaka.cea.Mp4CeaParser.CodecBitstreamMap_.has(codec)) {
+      this.bitstreamFormat_ =
+          shaka.cea.Mp4CeaParser.CodecBitstreamMap_.get(codec);
     }
   }
 };
@@ -403,27 +404,26 @@ shaka.cea.Mp4CeaParser.BitstreamFormat = {
   H266: 3,
 };
 
-/** @private {Object<string, shaka.cea.Mp4CeaParser.BitstreamFormat>} */
-shaka.cea.Mp4CeaParser.CodecBitstreamMap_ = {
-  // AVC
-  'avc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
-  'avc3': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
-  // Dolby Vision based in AVC
-  'dvav': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
-  'dva1': shaka.cea.Mp4CeaParser.BitstreamFormat.H264,
-  // HEVC
-  'hev1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
-  'hvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
-  // Dolby Vision based in HEVC
-  'dvh1': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
-  'dvhe': shaka.cea.Mp4CeaParser.BitstreamFormat.H265,
-  // VVC
-  'vvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
-  'vvi1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
-  // Dolby Vision based in VVC
-  'dvc1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
-  'dvi1': shaka.cea.Mp4CeaParser.BitstreamFormat.H266,
-};
+/** @private {Map<string, shaka.cea.Mp4CeaParser.BitstreamFormat>} */
+shaka.cea.Mp4CeaParser.CodecBitstreamMap_ = new Map()
+    // AVC
+    .set('avc1', shaka.cea.Mp4CeaParser.BitstreamFormat.H264)
+    .set('avc3', shaka.cea.Mp4CeaParser.BitstreamFormat.H264)
+    // Dolby Vision based in AVC
+    .set('dvav', shaka.cea.Mp4CeaParser.BitstreamFormat.H264)
+    .set('dva1', shaka.cea.Mp4CeaParser.BitstreamFormat.H264)
+    // HEVC
+    .set('hev1', shaka.cea.Mp4CeaParser.BitstreamFormat.H265)
+    .set('hvc1', shaka.cea.Mp4CeaParser.BitstreamFormat.H265)
+    // Dolby Vision based in HEVC
+    .set('dvh1', shaka.cea.Mp4CeaParser.BitstreamFormat.H265)
+    .set('dvhe', shaka.cea.Mp4CeaParser.BitstreamFormat.H265)
+    // VVC
+    .set('vvc1', shaka.cea.Mp4CeaParser.BitstreamFormat.H266)
+    .set('vvi1', shaka.cea.Mp4CeaParser.BitstreamFormat.H266)
+    // Dolby Vision based in VVC
+    .set('dvc1', shaka.cea.Mp4CeaParser.BitstreamFormat.H266)
+    .set('dvi1', shaka.cea.Mp4CeaParser.BitstreamFormat.H266);
 
 /**
  * @typedef {{

package/lib/dash/content_protection.js

@@ -203,7 +203,7 @@ shaka.dash.ContentProtection = class {
    * @return {string}
    */
   static getFairPlayLicenseUrl(element) {
-    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,

package/lib/dash/dash_parser.js

@@ -98,22 +98,22 @@ shaka.dash.DashParser = class {
      * A map of IDs to Stream objects.
      * ID: Period@id,Representation@id
      * e.g.: '1,23'
-     * @private {!Object<string, !shaka.extern.Stream>}
+     * @private {!Map<string, !shaka.extern.Stream>}
      */
-    this.streamMap_ = {};
+    this.streamMap_ = new Map();
 
     /**
      * A map of Period IDs to Stream Map IDs.
      * Use to have direct access to streamMap key.
-     * @private {!Object<string, !Array<string>>}
+     * @private {!Map<string, !Array<string>>}
      */
-    this.indexStreamMap_ = {};
+    this.indexStreamMap_ = new Map();
 
     /**
      * A map of period ids to their durations
-     * @private {!Object<string, number>}
+     * @private {!Map<string, number>}
      */
-    this.periodDurations_ = {};
+    this.periodDurations_ = new Map();
 
     /** @private {shaka.util.PeriodCombiner} */
     this.periodCombiner_ = new shaka.util.PeriodCombiner();
@@ -265,7 +265,7 @@ shaka.dash.DashParser = class {
   stop() {
     // When the parser stops, release all segment indexes, which stops their
     // timers, as well.
-    for (const stream of Object.values(this.streamMap_)) {
+    for (const stream of this.streamMap_.values()) {
       if (stream.segmentIndex) {
         stream.segmentIndex.release();
       }
@@ -279,8 +279,8 @@ shaka.dash.DashParser = class {
     this.config_ = null;
     this.manifestUris_ = [];
     this.manifest_ = null;
-    this.streamMap_ = {};
-    this.indexStreamMap_ = {};
+    this.streamMap_.clear();
+    this.indexStreamMap_.clear();
     this.contextCache_.clear();
     this.manifestPatchContext_ = {
       mpdId: '',
@@ -690,7 +690,7 @@ shaka.dash.DashParser = class {
       // https://github.com/shaka-project/shaka-player/issues/3169#issuecomment-823580634
       const availabilityStart =
           presentationTimeline.getSegmentAvailabilityStart();
-      for (const stream of Object.values(this.streamMap_)) {
+      for (const stream of this.streamMap_.values()) {
         if (stream.segmentIndex) {
           stream.segmentIndex.evict(availabilityStart);
         }
@@ -1178,7 +1178,7 @@ shaka.dash.DashParser = class {
     /** @type {shaka.dash.DashParser.Context} */
     const context = this.contextCache_.get(contextId);
 
-    const currentStream = this.streamMap_[contextId];
+    const currentStream = this.streamMap_.get(contextId);
     goog.asserts.assert(currentStream, 'stream should exist');
 
     if (currentStream.segmentIndex) {
@@ -1426,7 +1426,7 @@ shaka.dash.DashParser = class {
       periods.push(period);
 
       if (context.period.id && periodDuration) {
-        this.periodDurations_[context.period.id] = periodDuration;
+        this.periodDurations_.set(context.period.id, periodDuration);
       }
 
       if (periodDuration == null) {
@@ -1490,14 +1490,14 @@ shaka.dash.DashParser = class {
    * @private
    */
   cleanStreamMap_() {
-    const oldPeriodIds = Object.keys(this.indexStreamMap_);
+    const oldPeriodIds = Array.from(this.indexStreamMap_.keys());
     const diffPeriodsIDs = oldPeriodIds.filter((pId) => {
       return !this.lastManifestUpdatePeriodIds_.includes(pId);
     });
     for (const pId of diffPeriodsIDs) {
       let shouldDeleteIndex = true;
-      for (const contextId of this.indexStreamMap_[pId]) {
-        const stream = this.streamMap_[contextId];
+      for (const contextId of this.indexStreamMap_.get(pId)) {
+        const stream = this.streamMap_.get(contextId);
         if (!stream) {
           continue;
         }
@@ -1506,12 +1506,12 @@ shaka.dash.DashParser = class {
           continue;
         }
         if (this.periodCombiner_) {
-          this.periodCombiner_.deleteStream(this.streamMap_[contextId], pId);
+          this.periodCombiner_.deleteStream(stream, pId);
         }
-        delete this.streamMap_[contextId];
+        this.streamMap_.delete(contextId);
       }
       if (shouldDeleteIndex) {
-        delete this.indexStreamMap_[pId];
+        this.indexStreamMap_.delete(pId);
       }
     }
   }
@@ -1983,6 +1983,10 @@ shaka.dash.DashParser = class {
           // Duplicate representations with their supplementalCodecs
           const obj = shaka.util.ObjectUtils.cloneObject(rep);
           obj.attributes['codecs'] = supplementalCodecs.split(' ').join(',');
+          if (obj.attributes['id']) {
+            obj.attributes['supplementalId'] =
+                obj.attributes['id'] + '_supplementalCodecs';
+          }
           supplementalRepresentations.push(obj);
         }
       }
@@ -2048,8 +2052,9 @@ shaka.dash.DashParser = class {
     }
 
     const repIds = representations
-        .map((node) => { return node.attributes['id']; })
-        .filter(shaka.util.Functional.isNotNull);
+        .map((node) => {
+          return node.attributes['supplementalId'] || node.attributes['id'];
+        }).filter(shaka.util.Functional.isNotNull);
 
     return {
       id: adaptationId,
@@ -2305,7 +2310,7 @@ shaka.dash.DashParser = class {
     const codecs = context.representation.codecs;
     // Detect the presence of Dolby Atmos audio content based on the codec and
     // bandwidth. Bandwidth above 384 kbps is a good indicator of Atmos content.
-    const isAtmos = codecs.includes('ec-3') && context.bandwidth >= 384000;
+    const isAtmos = codecs.includes('ec-3') && context.bandwidth > 384000;
     let spatialAudio = false;
     if (hasJoc || isAtmos) {
       spatialAudio = true;
@@ -2357,8 +2362,8 @@ shaka.dash.DashParser = class {
     /** @type {shaka.extern.Stream} */
     let stream;
 
-    if (contextId && this.streamMap_[contextId]) {
-      stream = this.streamMap_[contextId];
+    if (contextId && this.streamMap_.has(contextId)) {
+      stream = this.streamMap_.get(contextId);
     } else {
       stream = {
         id: this.globalId_++,
@@ -2416,13 +2421,13 @@ shaka.dash.DashParser = class {
       }
     };
 
-    if (contextId && context.dynamic && !this.streamMap_[contextId]) {
+    if (contextId && context.dynamic && !this.streamMap_.has(contextId)) {
       const periodId = context.period.id || '';
-      if (!this.indexStreamMap_[periodId]) {
-        this.indexStreamMap_[periodId] = [];
+      if (!this.indexStreamMap_.has(periodId)) {
+        this.indexStreamMap_.set(periodId, []);
       }
-      this.streamMap_[contextId] = stream;
-      this.indexStreamMap_[periodId].push(contextId);
+      this.streamMap_.set(contextId, stream);
+      this.indexStreamMap_.get(periodId).push(contextId);
     }
 
     return stream;
@@ -2580,6 +2585,7 @@ shaka.dash.DashParser = class {
     const evalDivision = TXml.evalDivision;
 
     const id = elem.attributes['id'];
+    const supplementalId = elem.attributes['supplementalId'];
     const uriObjs = TXml.findChildren(elem, 'BaseURL');
     let calculatedBaseUris;
     let someLocationValid = false;
@@ -2694,7 +2700,8 @@ shaka.dash.DashParser = class {
       frameRate: frameRate,
       pixelAspectRatio: pixelAspectRatio,
       emsgSchemeIdUris: emsgSchemeIdUris,
-      id: id,
+      id: supplementalId || id,
+      originalId: id,
       language: elem.attributes['lang'],
       numChannels: numChannels,
       audioSamplingRate: audioSamplingRate,
@@ -3243,6 +3250,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   pixelAspectRatio: (string|undefined),
  *   emsgSchemeIdUris: !Array<string>,
  *   id: ?string,
+ *   originalId: ?string,
  *   position: (number|undefined),
  *   language: ?string,
  *   numChannels: ?number,
@@ -3284,6 +3292,8 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   emsg registered schemeIdUris.
  * @property {?string} id
  *   The ID of the element.
+ * @property {?string} originalId
+ *   The original ID of the element.
  * @property {number|undefined} position
  *   Position of the element used for indexing in case of no id
  * @property {?string} language