shaka-player 3.1.3 → 3.1.4

package/lib/media/gap_jumping_controller.js

@@ -217,8 +217,10 @@ shaka.media.GapJumpingController = class {
       this.didFireLargeGap_ = true;
 
       // Event firing is synchronous.
-      const event = new shaka.util.FakeEvent(
-          'largegap', {'currentTime': currentTime, 'gapSize': jumpSize});
+      const data = new Map()
+          .set('currentTime', currentTime)
+          .set('gapSize', jumpSize);
+      const event = new shaka.util.FakeEvent('largegap', data);
       event.cancelable = true;
       this.onEvent_(event);
 

package/lib/media/media_source_engine.js

@@ -48,8 +48,7 @@ shaka.media.MediaSourceEngine = class {
    * @param {!function(!Array.<shaka.extern.ID3Metadata>, number, ?number)=}
    *    onMetadata
    */
-  constructor(video, closedCaptionParser, textDisplayer,
-      onMetadata) {
+  constructor(video, closedCaptionParser, textDisplayer, onMetadata) {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 

package/lib/media/streaming_engine.js

@@ -1662,7 +1662,8 @@ shaka.media.StreamingEngine = class {
 
         // Dispatch an event to notify the application about the emsg box.
         const eventName = shaka.Player.EventName.Emsg;
-        const event = new shaka.util.FakeEvent(eventName, {'detail': emsg});
+        const data = (new Map()).set('detail', emsg);
+        const event = new shaka.util.FakeEvent(eventName, data);
         this.playerInterface_.onEvent(event);
       }
     }

package/lib/net/networking_engine.js

@@ -544,7 +544,8 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
         }
 
         if (error.severity == shaka.util.Error.Severity.RECOVERABLE) {
-          const event = new shaka.util.FakeEvent('retry', {'error': error});
+          const data = (new Map()).set('error', error);
+          const event = new shaka.util.FakeEvent('retry', data);
           this.dispatchEvent(event);
 
           // Move to the next URI.

package/lib/player.js

@@ -596,7 +596,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       enterNode: (node, has, wants) => {
         this.dispatchEvent(this.makeEvent_(
             /* name= */ shaka.Player.EventName.OnStateChange,
-            /* data= */ {'state': node.name}));
+            /* data= */ (new Map()).set('state', node.name)));
 
         const action = actions.get(node);
         return action(has, wants);
@@ -627,7 +627,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       onIdle: (node) => {
         this.dispatchEvent(this.makeEvent_(
             /* name= */ shaka.Player.EventName.OnStateIdle,
-            /* data= */ {'state': node.name}));
+            /* data= */ (new Map()).set('state', node.name)));
       },
     };
 
@@ -647,7 +647,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
   /**
    * @param {!shaka.Player.EventName} name
-   * @param {Object=} data
+   * @param {Map.<string, Object>=} data
    * @return {!shaka.util.FakeEvent}
    * @private
    */
@@ -1155,6 +1155,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         'mpg': 'video/mpeg',
         'mpeg': 'video/mpeg',
         'm3u8': 'application/x-mpegurl',
+        'mpd': 'application/dash+xml',
         'mp3': 'audio/mpeg',
         'aac': 'audio/aac',
         'flac': 'audio/flac',
@@ -2415,12 +2416,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     goog.asserts.assert(!endTime || startTime <= endTime,
         'Metadata start time should be less or equal to the end time!');
     const eventName = shaka.Player.EventName.Metadata;
-    const data = {
-      startTime: startTime,
-      endTime: endTime,
-      metadataType: metadataType,
-      payload: payload,
-    };
+    const data = new Map()
+        .set('startTime', startTime)
+        .set('endTime', endTime)
+        .set('metadataType', metadataType)
+        .set('payload', payload);
     this.dispatchEvent(this.makeEvent_(eventName, data));
   }
 
@@ -2482,7 +2482,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.abrManager_.segmentDownloaded(deltaTimeMs, bytesDownloaded);
       }
     };
-
     return new shaka.net.NetworkingEngine(onProgressUpdated_);
   }
 
@@ -4816,7 +4815,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // Surface the buffering event so that the app knows if/when we are
     // buffering.
     const eventName = shaka.Player.EventName.Buffering;
-    this.dispatchEvent(this.makeEvent_(eventName, {'buffering': isBuffering}));
+    const data = (new Map()).set('buffering', isBuffering);
+    this.dispatchEvent(this.makeEvent_(eventName, data));
   }
 
   /**
@@ -5198,10 +5198,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   onVariantChanged_(from, to) {
     // Delay the 'variantchanged' event so StreamingEngine has time to absorb
     // the changes before the user tries to query it.
-    const event = this.makeEvent_(shaka.Player.EventName.VariantChanged, {
-      oldTrack: from,
-      newTrack: to,
-    });
+    const data = new Map()
+        .set('oldTrack', from)
+        .set('newTrack', to);
+    const event = this.makeEvent_(shaka.Player.EventName.VariantChanged, data);
     this.delayDispatchEvent_(event);
   }
 
@@ -5224,10 +5224,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
   /** @private */
   onAbrStatusChanged_() {
-    const event = this.makeEvent_(shaka.Player.EventName.AbrStatusChanged, {
-      newStatus: this.config_.abr.enabled,
-    });
-    this.delayDispatchEvent_(event);
+    const data = (new Map()).set('newStatus', this.config_.abr.enabled);
+    this.delayDispatchEvent_(this.makeEvent_(
+        shaka.Player.EventName.AbrStatusChanged, data));
   }
 
   /**
@@ -5244,7 +5243,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     }
 
     const eventName = shaka.Player.EventName.Error;
-    const event = this.makeEvent_(eventName, {'detail': error});
+    const event = this.makeEvent_(eventName, (new Map()).set('detail', error));
     this.dispatchEvent(event);
     if (event.defaultPrevented) {
       error.handled = true;
@@ -5273,7 +5272,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       eventElement: region.eventElement,
     };
 
-    this.dispatchEvent(this.makeEvent_(eventName, {detail: clone}));
+    const data = (new Map()).set('detail', clone);
+    this.dispatchEvent(this.makeEvent_(eventName, data));
   }
 
   /**
@@ -6102,7 +6102,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v3.1.3-uncompiled';
+shaka.Player.version = 'v3.1.4-uncompiled';
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -34,8 +34,14 @@ shaka.polyfill.MediaCapabilities = class {
     // See: https://github.com/google/shaka-player/issues/3530
     // TODO: re-evaluate MediaCapabilities in the future versions of Apple
     // Browsers.
+    // Since MediaCapabilities implementation is buggy in PS5 browsers, we
+    // should always install polyfill for PS5 browsers.
+    // See: https://github.com/google/shaka-player/issues/3582
+    // TODO: re-evaluate MediaCapabilities in the future versions of PS5
+    // Browsers.
     if (!shaka.util.Platform.isChromecast() &&
       !shaka.util.Platform.isApple() &&
+      !shaka.util.Platform.isPS5() &&
       navigator.mediaCapabilities) {
       shaka.log.debug(
           'MediaCapabilities: Native mediaCapabilities support found.');
@@ -149,7 +155,7 @@ shaka.polyfill.MediaCapabilities = class {
         sessionTypes: mediaCapkeySystemConfig.sessionTypes,
       };
 
-      // Only add the audio video capablities if they have valid data.
+      // Only add the audio video capabilities if they have valid data.
       // Otherwise the query will fail.
       if (audioCapabilities.length) {
         mediaKeySystemConfig.audioCapabilities = audioCapabilities;

package/lib/polyfill/mediasource.js

@@ -208,6 +208,12 @@ shaka.polyfill.MediaSource = class {
   static patchVp09_() {
     const originalIsTypeSupported = MediaSource.isTypeSupported;
 
+    if (shaka.util.Platform.isWebOS()) {
+      // Don't do this on LG webOS as otherwise it is unable
+      // to play vp09 at all.
+      return;
+    }
+
     MediaSource.isTypeSupported = (mimeType) => {
       // Split the MIME type into its various parameters.
       const pieces = mimeType.split(/ *; */);

package/lib/polyfill/orientation.js

@@ -92,7 +92,7 @@ class extends shaka.util.FakeEventTarget {
 
   /** Dispatch a 'change' event. */
   dispatchChangeEvent() {
-    const event = new shaka.util.FakeEvent('change', {});
+    const event = new shaka.util.FakeEvent('change');
     this.dispatchEvent(event);
   }
 

package/lib/polyfill/patchedmediakeys_apple.js

@@ -567,10 +567,10 @@ class extends shaka.util.FakeEventTarget {
 
     const isNew = this.keyStatuses.getStatus() == undefined;
 
-    const event2 = new shaka.util.FakeEvent('message', {
-      messageType: isNew ? 'license-request' : 'license-renewal',
-      message: shaka.util.BufferUtils.toArrayBuffer(event.message),
-    });
+    const data = new Map()
+        .set('messageType', isNew ? 'license-request' : 'license-renewal')
+        .set('message', shaka.util.BufferUtils.toArrayBuffer(event.message));
+    const event2 = new shaka.util.FakeEvent('message', data);
 
     this.dispatchEvent(event2);
   }

package/lib/polyfill/patchedmediakeys_ms.js

@@ -512,10 +512,10 @@ class extends shaka.util.FakeEventTarget {
 
     const isNew = this.keyStatuses.getStatus() == undefined;
 
-    const event2 = new shaka.util.FakeEvent('message', {
-      messageType: isNew ? 'license-request' : 'license-renewal',
-      message: shaka.util.BufferUtils.toArrayBuffer(event.message),
-    });
+    const data = new Map()
+        .set('messageType', isNew ? 'license-request' : 'license-renewal')
+        .set('message', shaka.util.BufferUtils.toArrayBuffer(event.message));
+    const event2 = new shaka.util.FakeEvent('message', data);
 
     this.dispatchEvent(event2);
   }

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -451,10 +451,10 @@ shaka.polyfill.PatchedMediaKeysWebkit.MediaKeys = class {
 
     const isNew = session.keyStatuses.getStatus() == undefined;
 
-    const event2 = new shaka.util.FakeEvent('message', {
-      messageType: isNew ? 'licenserequest' : 'licenserenewal',
-      message: event.message,
-    });
+    const data = new Map()
+        .set('messageType', isNew ? 'licenserequest' : 'licenserenewal')
+        .set('message', event.message);
+    const event2 = new shaka.util.FakeEvent('message', data);
 
     session.generated();
     session.dispatchEvent(event2);

package/lib/text/mp4_ttml_parser.js

@@ -88,6 +88,9 @@ shaka.text.Mp4TtmlParser = class {
 
 shaka.text.TextEngine.registerParser(
     'application/mp4; codecs="stpp"', () => new shaka.text.Mp4TtmlParser());
+shaka.text.TextEngine.registerParser(
+    'application/mp4; codecs="stpp.ttml"',
+    () => new shaka.text.Mp4TtmlParser());
 shaka.text.TextEngine.registerParser(
     'application/mp4; codecs="stpp.ttml.im1t"',
     () => new shaka.text.Mp4TtmlParser());

package/lib/text/text_engine.js

@@ -345,6 +345,19 @@ shaka.text.TextEngine = class {
     return cues;
   }
 
+  /**
+   * @param {!shaka.text.Cue} cue the cue to apply the timestamp to recursively
+   * @param {number} videoTimestampOffset the timestamp offset of the video
+   * @private
+   */
+  applyVideoTimestampOffsetRecursive_(cue, videoTimestampOffset) {
+    cue.startTime += videoTimestampOffset;
+    cue.endTime += videoTimestampOffset;
+    for (const nested of cue.nestedCues) {
+      this.applyVideoTimestampOffsetRecursive_(nested, videoTimestampOffset);
+    }
+  }
+
   /**
    * Store the closed captions in the text engine, and append the cues to the
    * text displayer.  This is a side-channel used for embedded text only.
@@ -373,8 +386,7 @@ shaka.text.TextEngine = class {
 
       // Adjust CEA captions with respect to the timestamp offset of the video
       // stream in which they were embedded.
-      cue.startTime += videoTimestampOffset;
-      cue.endTime += videoTimestampOffset;
+      this.applyVideoTimestampOffsetRecursive_(cue, videoTimestampOffset);
 
       const keepThisCue =
           cue.startTime >= this.appendWindowStart_ &&

package/lib/text/ttml_text_parser.js

@@ -199,6 +199,11 @@ shaka.text.TtmlTextParser = class {
     /** @type {Element} */
     let parentElement = /** @type {Element} */(cueNode.parentNode);
 
+    if (cueNode.nodeType == Node.COMMENT_NODE) {
+      // The comments do not contain information that interests us here.
+      return null;
+    }
+
     if (cueNode.nodeType == Node.TEXT_NODE) {
       // This should generate an "anonymous span" according to the TTML spec.
       // So pretend the element was a <span>.  parentElement was set above, so

package/lib/text/ui_text_displayer.js

@@ -167,9 +167,14 @@ shaka.text.UITextDisplayer = class {
     }
 
     // Remove the cues out of the time range.
+    const oldNumCues = this.cues_.length;
     this.cues_ = this.cues_.filter(
         (cue) => cue.startTime < start || cue.endTime >= end);
-    this.updateCaptions_();
+    // If anything was actually removed in this process, force the captions to
+    // update. This makes sure that the currently-displayed cues will stop
+    // displaying if removed (say, due to the user changing languages).
+    const forceUpdate = oldNumCues > this.cues_.length;
+    this.updateCaptions_(forceUpdate);
 
     return true;
   }
@@ -192,13 +197,13 @@ shaka.text.UITextDisplayer = class {
   }
 
   /**
-   * @param {!Array.<!shaka.text.Cue>} cues
+   * @param {!Array.<!shaka.extern.Cue>} cues
    * @param {!HTMLElement} container
    * @param {number} currentTime
-   * @param {boolean} isNested
+   * @param {!Array.<!shaka.extern.Cue>} parents
    * @private
    */
-  updateCuesRecursive_(cues, container, currentTime, isNested) {
+  updateCuesRecursive_(cues, container, currentTime, parents) {
     // Set to true if the cues have changed in some way, which will require
     // DOM changes. E.g. if a cue was added or removed.
     let updateDOM = false;
@@ -214,10 +219,12 @@ shaka.text.UITextDisplayer = class {
      * The cues whose corresponding elements should be in the DOM.
      * Some of these might be new, some might have been displayed beforehand.
      * These will only be added if updateDOM is true.
-     * @type {!Array.<!shaka.text.Cue>}
+     * @type {!Array.<!shaka.extern.Cue>}
      */
     const toPlant = [];
     for (const cue of cues) {
+      parents.push(cue);
+
       let cueRegistry = this.currentCuesMap_.get(cue);
       const shouldBeDisplayed =
           cue.startTime <= currentTime && cue.endTime > currentTime;
@@ -241,7 +248,7 @@ shaka.text.UITextDisplayer = class {
         toPlant.push(cue);
         if (!cueRegistry) {
           // The cue has to be made!
-          this.createCue_(cue, isNested);
+          this.createCue_(cue, parents);
           cueRegistry = this.currentCuesMap_.get(cue);
           wrapper = cueRegistry.wrapper;
           updateDOM = true;
@@ -255,8 +262,11 @@ shaka.text.UITextDisplayer = class {
       // guaranteed that the children will neither need to be added nor removed.
       if (cue.nestedCues.length > 0 && wrapper) {
         this.updateCuesRecursive_(
-            cue.nestedCues, wrapper, currentTime, /* isNested= */ true);
+            cue.nestedCues, wrapper, currentTime, parents);
       }
+
+      const topCue = parents.pop();
+      goog.asserts.assert(topCue == cue, 'Parent cues should be kept in order');
     }
     if (updateDOM) {
       for (const cueElement of toUproot) {
@@ -304,7 +314,7 @@ shaka.text.UITextDisplayer = class {
 
       // Update the cues.
       this.updateCuesRecursive_(
-          this.cues_, this.textContainer_, currentTime, false);
+          this.cues_, this.textContainer_, currentTime, /* parents= */ []);
 
       if (goog.DEBUG) {
         // Previously, we had an issue (#2076) where cues sometimes were not
@@ -327,10 +337,11 @@ shaka.text.UITextDisplayer = class {
    * Creates the object for a cue.
    *
    * @param {!shaka.extern.Cue} cue
-   * @param {boolean} isNested
+   * @param {!Array.<!shaka.extern.Cue>} parents
    * @private
    */
-  createCue_(cue, isNested) {
+  createCue_(cue, parents) {
+    const isNested = parents.length > 1;
     let type = isNested ? 'span' : 'div';
     if (cue.lineBreak || cue.spacer) {
       if (cue.spacer) {
@@ -344,7 +355,7 @@ shaka.text.UITextDisplayer = class {
     // Nested cues are inline elements.  Top-level cues are block elements.
     const cueElement = shaka.util.Dom.createHTMLElement(type);
     if (type != 'br') {
-      this.setCaptionStyles_(cueElement, cue, isNested);
+      this.setCaptionStyles_(cueElement, cue, parents);
     }
 
     let wrapper = cueElement;
@@ -363,13 +374,16 @@ shaka.text.UITextDisplayer = class {
   /**
    * @param {!HTMLElement} cueElement
    * @param {!shaka.extern.Cue} cue
-   * @param {boolean} isNested
+   * @param {!Array.<!shaka.extern.Cue>} parents
    * @private
    */
-  setCaptionStyles_(cueElement, cue, isNested) {
+  setCaptionStyles_(cueElement, cue, parents) {
     const Cue = shaka.text.Cue;
-    let style = cueElement.style;
+    const inherit =
+        (cb) => shaka.text.UITextDisplayer.inheritProperty_(parents, cb);
+    const style = cueElement.style;
     const isLeaf = cue.nestedCues.length == 0;
+    const isNested = parents.length > 1;
 
     // TODO: wrapLine is not yet supported.  Lines always wrap.
 
@@ -388,16 +402,6 @@ shaka.text.UITextDisplayer = class {
       const nonBreakingSpace = '\xa0';
       return nonBreakingSpace.repeat(match.length);
     });
-    if (isNested) {
-      cueElement.textContent = text;
-    } else if (text.length) {
-      // If a top-level cue has text, move to a <span> so the background is
-      // styled correctly.
-      const span = shaka.util.Dom.createHTMLElement('span');
-      span.textContent = text;
-      cueElement.appendChild(span);
-      style = span.style;
-    }
 
     style.backgroundColor = cue.backgroundColor;
     style.border = cue.border;
@@ -406,20 +410,40 @@ shaka.text.UITextDisplayer = class {
     style.opacity = cue.opacity;
     style.paddingLeft = shaka.text.UITextDisplayer.convertLengthValue_(
         cue.linePadding, cue, this.videoContainer_);
-    style.paddingRight = shaka.text.UITextDisplayer.convertLengthValue_(
-        cue.linePadding, cue, this.videoContainer_);
+    style.paddingRight =
+        shaka.text.UITextDisplayer.convertLengthValue_(
+            cue.linePadding, cue, this.videoContainer_);
 
     if (cue.backgroundImage) {
       style.backgroundImage = 'url(\'' + cue.backgroundImage + '\')';
       style.backgroundRepeat = 'no-repeat';
       style.backgroundSize = 'contain';
       style.backgroundPosition = 'center';
+    } else {
+      // If we have both text and nested cues, then style everything; otherwise
+      // place the text in its own <span> so the background doesn't fill the
+      // whole region.
+      let elem;
+      if (cue.nestedCues.length) {
+        elem = cueElement;
+      } else {
+        elem = shaka.util.Dom.createHTMLElement('span');
+        cueElement.appendChild(elem);
+      }
 
-      if (cue.backgroundColor == '') {
-        // In text-based cues, background color can default in CSS.
-        // In bitmap-based cues, we default to a transparent background color,
-        // so that the bitmap can be the only background.
-        style.backgroundColor = 'transparent';
+      if (cue.border) {
+        elem.style.border = cue.border;
+      }
+      const bgColor = inherit((c) => c.backgroundColor);
+      if (bgColor) {
+        elem.style.backgroundColor = bgColor;
+      } else if (text) {
+        // If there is no background, default to a semi-transparent black.
+        // Only do this for the text itself.
+        elem.style.backgroundColor = 'rgba(0, 0, 0, 0.8)';
+      }
+      if (text) {
+        elem.textContent = text;
       }
     }
 
@@ -472,20 +496,28 @@ shaka.text.UITextDisplayer = class {
     // TODO: Implement lineAlignment of 'CENTER'.
     if (cue.line) {
       if (cue.lineInterpretation == Cue.lineInterpretation.PERCENTAGE) {
+        // When setting absolute positioning, you need to set x/y/width/height
+        // so the element is positioned correctly.  Set these as default and
+        // other settings will override them.
         style.position = 'absolute';
+        style.left = '0';
+        style.top = '0';
         if (cue.writingMode == Cue.writingMode.HORIZONTAL_TOP_TO_BOTTOM) {
+          style.width = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.top = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
             style.bottom = cue.line + '%';
           }
         } else if (cue.writingMode == Cue.writingMode.VERTICAL_LEFT_TO_RIGHT) {
+          style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.left = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
             style.right = cue.line + '%';
           }
         } else {
+          style.height = '100%';
           if (cue.lineAlign == Cue.lineAlign.START) {
             style.right = cue.line + '%';
           } else if (cue.lineAlign == Cue.lineAlign.END) {
@@ -493,12 +525,7 @@ shaka.text.UITextDisplayer = class {
           }
         }
       }
-    } else if (cue.region && cue.region.id &&
-      ((!isNested && !isLeaf) || (cue.backgroundImage))) {
-      // In text-base cues, regions are only applied to block container
-      // (!isNested && !isLeaf).
-      // In bitmap-based cues, region settings are used to specify the size and
-      // position of the backgroundImage.
+    } else if (cue.region && cue.region.id) {
       const percentageUnit = shaka.text.CueRegion.units.PERCENTAGE;
       const heightUnit = cue.region.heightUnits == percentageUnit ? '%' : 'px';
       const widthUnit = cue.region.widthUnits == percentageUnit ? '%' : 'px';
@@ -631,4 +658,25 @@ shaka.text.UITextDisplayer = class {
 
     return (containerHeight * value / cue.cellResolution.rows) + 'px';
   }
+
+  /**
+   * Inherits a property from the parent Cue elements.  If the value is falsy,
+   * it is assumed to be inherited from the parent. This returns null if the
+   * value isn't found.
+   *
+   * @param {!Array.<!shaka.extern.Cue>} parents
+   * @param {function(!shaka.extern.Cue):?T} cb
+   * @return {?T}
+   * @template T
+   * @private
+   */
+  static inheritProperty_(parents, cb) {
+    for (let i = parents.length - 1; i >= 0; i--) {
+      const val = cb(parents[i]);
+      if (val || val === 0) {
+        return val;
+      }
+    }
+    return null;
+  }
 };

package/lib/util/fake_event.js

@@ -6,6 +6,8 @@
 
 goog.provide('shaka.util.FakeEvent');
 
+goog.require('goog.asserts');
+
 
 /**
  * @summary Create an Event work-alike object based on the provided dictionary.
@@ -16,18 +18,62 @@ goog.provide('shaka.util.FakeEvent');
  */
 shaka.util.FakeEvent = class {
   /**
-   * @param {string} type
-   * @param {Object=} dict
+   * @param {!Event} event
+   * @return {!shaka.util.FakeEvent}
    */
-  constructor(type, dict = {}) {
-    // Take properties from dict if present.
-    for (const key in dict) {
-      Object.defineProperty(this, key, {
-        value: dict[key],
+  static fromRealEvent(event) {
+    const fakeEvent = new shaka.util.FakeEvent(event.type);
+    for (const key in event) {
+      Object.defineProperty(fakeEvent, key, {
+        value: event[key],
         writable: true,
         enumerable: true,
       });
     }
+    return fakeEvent;
+  }
+
+  /**
+   * Allows us to tell the compiler that the dictionary "map" is actually a
+   * generic object, for backwards compatibility.
+   * @param {!Map.<string, Object>} dict
+   * @return {!Object}
+   * @suppress {invalidCasts}
+   * @private
+   */
+  static recastDictAsObject_(dict) {
+    goog.asserts.assert(!(dict instanceof Map), 'dict should not be a map');
+    return /** @type {!Object} */ (dict);
+  }
+
+  /**
+   * @param {string} type
+   * @param {Map.<string, Object>=} dict
+   */
+  constructor(type, dict) {
+    if (dict) {
+      if (dict instanceof Map) {
+        // Take properties from dict if present.
+        for (const key of dict.keys()) {
+          Object.defineProperty(this, key, {
+            value: dict.get(key),
+            writable: true,
+            enumerable: true,
+          });
+        }
+      } else {
+        // For backwards compatibility with external apps that may make use of
+        // this public constructor, this should still accept generic objects.
+        const obj = shaka.util.FakeEvent.recastDictAsObject_(dict);
+        for (const key in obj) {
+          Object.defineProperty(this, key, {
+            value: obj[key],
+            writable: true,
+            enumerable: true,
+          });
+        }
+      }
+    }
 
     // The properties below cannot be set by the dict.  They are all provided
     // for compatibility with native events.

package/lib/util/periods.js

@@ -80,7 +80,10 @@ shaka.util.PeriodCombiner = class {
 
   /** @return {!Array.<shaka.extern.Stream>} */
   getTextStreams() {
-    return this.textStreams_;
+    // Return a copy of the array because makeTextStreamsForClosedCaptions
+    // may make changes to the contents of the array. Those changes should not
+    // propagate back to the PeriodCombiner.
+    return this.textStreams_.slice();
   }
 
   /** @return {!Array.<shaka.extern.Stream>} */