shaka-player 3.1.0 → 3.1.4

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',
@@ -1285,6 +1286,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       has.mediaElement = null;
     }
 
+    if (this.adManager_) {
+      // The ad manager is specific to the video, so detach it too.
+      this.adManager_.release();
+    }
+
     // Clear our cached copy of the media element.
     this.video_ = null;
 
@@ -1843,6 +1849,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
             this.config_.preferredAudioChannelCount);
 
     this.currentTextLanguage_ = this.config_.preferredTextLanguage;
+    this.currentTextRole_ = this.config_.preferredTextRole;
+    this.currentTextForced_ = this.config_.preferForcedSubs;
 
     shaka.Player.applyPlayRange_(this.manifest_.presentationTimeline,
         this.config_.playRangeStart,
@@ -1882,36 +1890,55 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.dispatchEvent(this.makeEvent_(shaka.Player.EventName.Streaming));
 
     // Pick the initial streams to play.
-    const initialVariant = this.chooseVariant_();
-    goog.asserts.assert(initialVariant, 'Must choose an initial variant!');
-    this.addVariantToSwitchHistory_(
-        initialVariant, /* fromAdaptation= */ true);
-    this.streamingEngine_.switchVariant(
-        initialVariant, /* clearBuffer= */ false, /* safeMargin= */ 0);
+    // however, we would skip switch to initial variant
+    // if user already pick variant track (via selectVariantTrack api)
+    let initialVariant = null;
+    const activeVariantTrack = this.getVariantTracks().find((t) => t.active);
+
+    if (!activeVariantTrack) {
+      initialVariant = this.chooseVariant_();
+      goog.asserts.assert(initialVariant, 'Must choose an initial variant!');
+      this.switchVariant_(initialVariant, /* fromAdaptation= */ true,
+          /* clearBuffer= */ false, /* safeMargin= */ 0);
+
+      // Now that we have initial streams, we may adjust the start time to align
+      // to a segment boundary.
+      if (this.config_.streaming.startAtSegmentBoundary) {
+        const startTime = this.playhead_.getTime();
+        const adjustedTime =
+            await this.adjustStartTime_(initialVariant, startTime);
+
+        this.playhead_.setStartTime(adjustedTime);
+      }
 
-    // Decide if text should be shown automatically.
-    const initialTextStream = this.chooseTextStream_();
-    if (initialTextStream) {
-      this.addTextStreamToSwitchHistory_(
-          initialTextStream, /* fromAdaptation= */ true);
+      // Since the first streams just became active, send an adaptation event.
+      this.onAdaptation_();
     }
 
-    this.setInitialTextState_(initialVariant, initialTextStream);
-    // Don't initialize with a text stream unless we should be streaming text.
-    if (initialTextStream && this.shouldStreamText_()) {
-      this.streamingEngine_.switchTextStream(initialTextStream);
-    }
+    // Decide if text should be shown automatically.
+    // similar to video/audio track, we would skip switch initial text track
+    // if user already pick text track (via selectTextTrack api)
+    const activeTextTrack = this.getTextTracks().find((t) => t.active);
+
+    if (!activeTextTrack) {
+      const initialTextStream = this.chooseTextStream_();
 
-    // Now that we have initial streams, we may adjust the start time to align
-    // to a segment boundary.
-    if (this.config_.streaming.startAtSegmentBoundary) {
-      const startTime = this.playhead_.getTime();
-      const adjustedTime =
-          await this.adjustStartTime_(initialVariant, startTime);
+      if (initialTextStream) {
+        this.addTextStreamToSwitchHistory_(
+            initialTextStream, /* fromAdaptation= */ true);
+      }
 
-      this.playhead_.setStartTime(adjustedTime);
+      if (initialVariant) {
+        this.setInitialTextState_(initialVariant, initialTextStream);
+      }
+
+      // Don't initialize with a text stream unless we should be streaming text.
+      if (initialTextStream && this.shouldStreamText_()) {
+        this.streamingEngine_.switchTextStream(initialTextStream);
+      }
     }
 
+
     // Start streaming content. This will start the flow of content down to
     // media source.
     await this.streamingEngine_.start();
@@ -1925,8 +1952,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.filterManifestByCurrentVariant_();
     // Dispatch a 'trackschanged' event now that all initial filtering is done.
     this.onTracksChanged_();
-    // Since the first streams just became active, send an adaptation event.
-    this.onAdaptation_();
 
     // Now that we've filtered out variants that aren't compatible with the
     // active one, update abr manager with filtered variants.
@@ -2019,8 +2044,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         originalId: null,
         createSegmentIndex: () => Promise.resolve(),
         segmentIndex: null,
-        mimeType: 'video/mp4',
-        codecs: '',
+        mimeType: wants.mimeType ?
+            shaka.util.MimeUtils.getBasicType(wants.mimeType) : 'video/mp4',
+        codecs: wants.mimeType ?
+            shaka.util.MimeUtils.getCodecs(wants.mimeType) : '',
         encrypted: true,
         drmInfos: [],  // Filled in by DrmEngine config.
         keyIds: new Set(),
@@ -2043,6 +2070,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       decodingInfos: [],
     };
 
+    this.drmEngine_.setSrcEquals(/* srcEquals= */ true);
     await this.drmEngine_.initForPlayback(
         [variant], /* offlineSessionIds= */ []);
     await this.drmEngine_.attach(has.mediaElement);
@@ -2388,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));
   }
 
@@ -2455,7 +2482,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.abrManager_.segmentDownloaded(deltaTimeMs, bytesDownloaded);
       }
     };
-
     return new shaka.net.NetworkingEngine(onProgressUpdated_);
   }
 
@@ -3214,6 +3240,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
       const tracks = [];
 
+      let activeTracks = 0;
+
       // Convert each variant to a track.
       for (const variant of this.manifest_.variants) {
         if (!shaka.util.StreamUtils.isPlayable(variant)) {
@@ -3222,10 +3250,22 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
         const track = shaka.util.StreamUtils.variantToTrack(variant);
         track.active = variant == currentVariant;
+        if (!track.active && activeTracks != 1 && currentVariant != null &&
+          variant.video == currentVariant.video &&
+          variant.audio == currentVariant.audio) {
+          track.active = true;
+        }
+
+        if (track.active) {
+          activeTracks++;
+        }
 
         tracks.push(track);
       }
 
+      goog.asserts.assert(activeTracks <= 1,
+          'It should only have one active track');
+
       return tracks;
     } else if (this.video_ && this.video_.audioTracks) {
       // Safari's native HLS always shows a single element in videoTracks.
@@ -3330,9 +3370,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       const rows = parseInt(match[2], 10);
       const width = fullImageWidth / columns;
       const height = fullImageHeight / rows;
+      const totalImages = columns * rows;
+      const segmentDuration = reference.trueEndTime - reference.startTime;
+      const thumbnailDuration = segmentDuration / totalImages;
+      let thumbnailTime = reference.startTime;
       let positionX = 0;
       let positionY = 0;
-      const totalImages = columns * rows;
       // If the number of images in the segment is greater than 1, we have to
       // find the correct image. For that we will return to the app the
       // coordinates of the position of the correct image.
@@ -3340,21 +3383,23 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // Note: The time between images within the segment is always
       // equidistant.
       //
-      // Eg: Total images 5, tileLayout 5x1, segmentTime 5, thumbnailTime 2
+      // Eg: Total images 5, tileLayout 5x1, segmentDuration 5, thumbnailTime 2
       // positionX = 0.4 * fullImageWidth
       // positionY = 0
       if (totalImages > 1) {
-        const thumbnailTime = time - reference.startTime;
-        const segmentTime = reference.endTime - reference.startTime;
         const thumbnailPosition =
-            Math.floor(thumbnailTime * totalImages / segmentTime);
-        positionX = (thumbnailPosition % columns) / columns * fullImageWidth;
-        positionY = (thumbnailPosition % rows) / rows * fullImageHeight;
+            Math.floor((time - reference.startTime) / thumbnailDuration);
+        thumbnailTime = reference.startTime +
+            (thumbnailPosition * thumbnailDuration);
+        positionX = (thumbnailPosition % columns) * width;
+        positionY = Math.floor(thumbnailPosition / columns) * height;
       }
       return {
         height: height,
         positionX: positionX,
         positionY: positionY,
+        startTime: thumbnailTime,
+        duration: thumbnailDuration,
         uris: reference.getUris(),
         width: width,
       };
@@ -4770,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));
   }
 
   /**
@@ -4955,6 +5001,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const currentVariant = this.streamingEngine_.getCurrentVariant();
     if (variant == currentVariant) {
       shaka.log.debug('Variant already selected.');
+      // If you want to clear the buffer, we force to reselect the same variant
+      if (clearBuffer) {
+        this.streamingEngine_.switchVariant(variant, clearBuffer, safeMargin,
+            /* force= */ true);
+      }
       return;
     }
 
@@ -4983,6 +5034,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // This will reset the "enabled" of other tracks to false.
     track.enabled = true;
 
+    // AirPlay does not reset the "enabled" of other tracks to false, so
+    // it must be changed by hand.
+    if (track.id !== currentTrack.id) {
+      currentTrack.enabled = false;
+    }
+
     const oldTrack =
       shaka.util.StreamUtils.html5AudioTrackToTrack(currentTrack);
     const newTrack =
@@ -5141,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);
   }
 
@@ -5167,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));
   }
 
   /**
@@ -5187,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;
@@ -5216,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));
   }
 
   /**
@@ -6045,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.0-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/encryption_scheme.js

@@ -13,12 +13,14 @@ goog.require('shaka.polyfill');
  * @see https://wicg.github.io/encrypted-media-encryption-scheme/
  * @see https://github.com/w3c/encrypted-media/pull/457
  * @see https://github.com/google/eme-encryption-scheme-polyfill
+ * @export
  */
 shaka.polyfill.EncryptionScheme = class {
   /**
    * Install the polyfill if needed.
    *
    * @suppress {missingRequire}
+   * @export
    */
   static install() {
     EncryptionSchemePolyfills.install();

package/lib/polyfill/fullscreen.js

@@ -14,10 +14,12 @@ goog.require('shaka.polyfill');
  * Many browsers have prefixed fullscreen methods on Element and document.
  * See {@link https://mzl.la/2K0xcHo Using fullscreen mode} on MDN for more
  * information.
+ * @export
  */
 shaka.polyfill.Fullscreen = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.Document) {

package/lib/polyfill/mathround.js

@@ -11,10 +11,12 @@ goog.require('shaka.polyfill');
 /**
  * @summary A polyfill to patch math round bug on some browsers.
  * @see https://stackoverflow.com/q/12830742
+ * @export
  */
 shaka.polyfill.MathRound = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     shaka.log.debug('mathRound.install');

package/lib/polyfill/media_capabilities.js

@@ -15,10 +15,13 @@ goog.require('shaka.util.Platform');
  * @summary A polyfill to provide navigator.mediaCapabilities on all browsers.
  * This is necessary for Tizen 3, Xbox One and possibly others we have yet to
  * discover.
+ * @export
  */
 shaka.polyfill.MediaCapabilities = class {
   /**
    * Install the polyfill if needed.
+   * @suppress {const}
+   * @export
    */
   static install() {
     shaka.log.debug('MediaCapabilities: install');
@@ -26,20 +29,32 @@ shaka.polyfill.MediaCapabilities = class {
     // Since MediaCapabilities is not fully supported on Chromecast yet, we
     // should always install polyfill for Chromecast.
     // TODO: re-evaluate MediaCapabilities in the future versions of Chromecast.
-    if (!shaka.util.Platform.isChromecast() && navigator.mediaCapabilities) {
+    // Since MediaCapabilities implementation is buggy in Apple browsers, we
+    // should always install polyfill for Apple browsers.
+    // 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.');
-      return;
-    } else if (!window.MediaSource) {
-      shaka.log.debug(
-          'MediaSource must be available to install mediaCapabilities ',
-          'polyfill.');
-      return;
+    } else {
+      if (!navigator.mediaCapabilities) {
+        navigator.mediaCapabilities = /** @type {!MediaCapabilities} */ ({});
+      }
+      navigator.mediaCapabilities.decodingInfo =
+          shaka.polyfill.MediaCapabilities.decodingInfo_;
     }
-
-    navigator.mediaCapabilities = /** @type {!MediaCapabilities} */ ({});
-    navigator.mediaCapabilities.decodingInfo =
-        shaka.polyfill.MediaCapabilities.decodingInfo_;
+    // Workaround because in Apple browsers there is no way to overwrite
+    // MediaCapabilities.
+    window.shakaMediaCapabilities = navigator.mediaCapabilities;
   }
 
   /**
@@ -60,21 +75,45 @@ shaka.polyfill.MediaCapabilities = class {
       return res;
     }
 
-    // Use 'MediaSource.isTypeSupported' to check if the stream is supported.
-    if (mediaDecodingConfig['video']) {
-      const contentType = mediaDecodingConfig['video'].contentType;
-      const isSupported = MediaSource.isTypeSupported(contentType);
-      if (!isSupported) {
+    if (mediaDecodingConfig.type == 'media-source') {
+      if (!shaka.util.Platform.supportsMediaSource()) {
         return res;
       }
-    }
+      // Use 'MediaSource.isTypeSupported' to check if the stream is supported.
+      if (mediaDecodingConfig['video']) {
+        const contentType = mediaDecodingConfig['video'].contentType;
+        const isSupported = MediaSource.isTypeSupported(contentType);
+        if (!isSupported) {
+          return res;
+        }
+      }
 
-    if (mediaDecodingConfig['audio']) {
-      const contentType = mediaDecodingConfig['audio'].contentType;
-      const isSupported = MediaSource.isTypeSupported(contentType);
-      if (!isSupported) {
-        return res;
+      if (mediaDecodingConfig['audio']) {
+        const contentType = mediaDecodingConfig['audio'].contentType;
+        const isSupported = MediaSource.isTypeSupported(contentType);
+        if (!isSupported) {
+          return res;
+        }
+      }
+    } else if (mediaDecodingConfig.type == 'file') {
+      if (mediaDecodingConfig['video']) {
+        const contentType = mediaDecodingConfig['video'].contentType;
+        const isSupported = shaka.util.Platform.supportsMediaType(contentType);
+        if (!isSupported) {
+          return res;
+        }
+      }
+
+      if (mediaDecodingConfig['audio']) {
+        const contentType = mediaDecodingConfig['audio'].contentType;
+        const isSupported = shaka.util.Platform.supportsMediaType(contentType);
+        if (!isSupported) {
+          return res;
+        }
       }
+    } else {
+      // Otherwise not supported.
+      return res;
     }
 
     if (!mediaDecodingConfig.keySystemConfiguration) {
@@ -116,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

@@ -13,10 +13,12 @@ goog.require('shaka.util.Platform');
 
 /**
  * @summary A polyfill to patch MSE bugs.
+ * @export
  */
 shaka.polyfill.MediaSource = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     shaka.log.debug('MediaSource.install');
@@ -206,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

@@ -15,10 +15,12 @@ goog.require('shaka.polyfill');
  * @summary A polyfill for systems that do not implement screen.orientation.
  * For now, this only handles systems that implement the deprecated
  * window.orientation feature... e.g. iPad.
+ * @export
  */
 shaka.polyfill.Orientation = class {
   /**
    * Install the polyfill if needed.
+   * @export
    */
   static install() {
     if (screen.orientation) {
@@ -90,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

@@ -22,10 +22,12 @@ goog.require('shaka.util.StringUtils');
 /**
  * @summary A polyfill to implement modern, standardized EME on top of Apple's
  * prefixed EME in Safari.
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysApple = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement || !window.WebKitMediaKeys) {
@@ -565,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

@@ -24,10 +24,12 @@ goog.require('shaka.util.PublicPromise');
  * {@link https://bit.ly/EmeMar15 EME draft 12 March 2015}
  * on top of ms-prefixed
  * {@link https://www.w3.org/TR/2014/WD-encrypted-media-20140218/ EME v20140218}
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysMs = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement || !window.MSMediaKeys ||
@@ -510,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_nop.js

@@ -16,10 +16,12 @@ goog.require('shaka.polyfill');
  * {@link https://bit.ly/EmeMar15 EME draft 12 March 2015} on browsers without
  * EME.
  * All methods will fail.
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysNop = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     if (!window.HTMLVideoElement ||

package/lib/polyfill/patchedmediakeys_webkit.js

@@ -24,10 +24,12 @@ goog.require('shaka.util.Uint8ArrayUtils');
  * @summary A polyfill to implement
  * {@link https://bit.ly/EmeMar15 EME draft 12 March 2015} on top of
  * webkit-prefixed {@link https://bit.ly/Eme01b EME v0.1b}.
+ * @export
  */
 shaka.polyfill.PatchedMediaKeysWebkit = class {
   /**
    * Installs the polyfill if needed.
+   * @export
    */
   static install() {
     // Alias.
@@ -449,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);