shaka-player 3.2.0 → 3.2.4

package/lib/player.js

@@ -598,7 +598,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);
@@ -629,7 +629,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)));
       },
     };
 
@@ -649,7 +649,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
    */
@@ -728,6 +728,9 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       await this.networkingEngine_.destroy();
       this.networkingEngine_ = null;
     }
+
+    // FakeEventTarget implements IReleasable
+    super.release();
   }
 
   /**
@@ -1270,6 +1273,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;
 
@@ -1606,18 +1614,19 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // initialize it now even through it appears a little out-of-place.
     this.regionTimeline_ =
         new shaka.media.RegionTimeline(() => this.seekRange());
-    this.regionTimeline_.setListeners(/* onRegionAdded= */ (region) => {
+    this.regionTimeline_.addEventListener('regionadd', (event) => {
+      /** @type {shaka.extern.TimelineRegionInfo} */
+      const region = event['region'];
       this.onRegionEvent_(shaka.Player.EventName.TimelineRegionAdded, region);
+
       if (this.adManager_) {
         this.adManager_.onDashTimedMetadata(region);
       }
     });
 
-    // TODO (#1391): Once filterManifest_ is async, remove this eslint disable.
-    /* eslint-disable require-await */
     const playerInterface = {
       networkingEngine: networkingEngine,
-      filter: async (manifest) => this.filterManifest_(manifest),
+      filter: (manifest) => this.filterManifest_(manifest),
       makeTextStreamsForClosedCaptions: (manifest) => {
         return this.makeTextStreamsForClosedCaptions_(manifest);
       },
@@ -1635,7 +1644,6 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.configure('streaming.lowLatencyMode', true);
       },
     };
-    /* eslint-enable require-await */
 
     const startTime = Date.now() / 1000;
 
@@ -2003,7 +2011,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     this.drmEngine_.configure(this.config_.drm);
 
-    const uri = has.uri || '';
+    const uri = wants.uri || '';
     const extension = shaka.media.ManifestParser.getExtension(uri);
     let mimeType = shaka.Player.SRC_EQUAL_EXTENSIONS_TO_MIME_TYPES_[extension];
     if (mimeType == 'application/x-mpegurl' && shaka.util.Platform.isApple()) {
@@ -2058,6 +2066,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);
@@ -2414,12 +2423,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));
   }
 
@@ -2545,21 +2553,31 @@ 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.
     const regionObserver = new shaka.media.RegionObserver(this.regionTimeline_);
-    const onEnterRegion = (region, seeking) => {
+
+    regionObserver.addEventListener('enter', (event) => {
+      /** @type {shaka.extern.TimelineRegionInfo} */
+      const region = event['region'];
       this.onRegionEvent_(shaka.Player.EventName.TimelineRegionEnter, region);
-    };
-    const onExitRegion = (region, seeking) => {
+    });
+
+    regionObserver.addEventListener('exit', (event) => {
+      /** @type {shaka.extern.TimelineRegionInfo} */
+      const region = event['region'];
       this.onRegionEvent_(shaka.Player.EventName.TimelineRegionExit, region);
-    };
-    const onSkipRegion = (region, seeking) => {
+    });
+
+    regionObserver.addEventListener('skip', (event) => {
+      /** @type {shaka.extern.TimelineRegionInfo} */
+      const region = event['region'];
+      /** @type {boolean} */
+      const seeking = event['seeking'];
       // If we are seeking, we don't want to surface the enter/exit events since
       // they didn't play through them.
       if (!seeking) {
         this.onRegionEvent_(shaka.Player.EventName.TimelineRegionEnter, region);
         this.onRegionEvent_(shaka.Player.EventName.TimelineRegionExit, region);
       }
-    };
-    regionObserver.setListeners(onEnterRegion, onExitRegion, onSkipRegion);
+    });
 
     // Now that we have all our observers, create a manager for them.
     const manager = new shaka.media.PlayheadObserverManager(this.video_);
@@ -3318,6 +3336,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)) {
@@ -3326,10 +3346,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.
@@ -3438,7 +3470,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       const height = fullImageHeight / rows;
       const totalImages = columns * rows;
       const segmentDuration = reference.trueEndTime - reference.startTime;
-      const thumbnailDuration = segmentDuration / totalImages;
+      const thumbnailDuration =
+          reference.getTileDuration() || (segmentDuration / totalImages);
       let thumbnailTime = reference.startTime;
       let positionX = 0;
       let positionY = 0;
@@ -3461,6 +3494,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         positionY = Math.floor(thumbnailPosition / columns) * height;
       }
       return {
+        imageHeight: fullImageHeight,
+        imageWidth: fullImageWidth,
         height: height,
         positionX: positionX,
         positionY: positionY,
@@ -3862,20 +3897,24 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const LanguageUtils = shaka.util.LanguageUtils;
     const inputlanguage = LanguageUtils.normalize(language);
     const chaptersTracks = this.getChaptersTracks_();
-    const chaptersTrack = chaptersTracks
-        .find((t) => LanguageUtils.normalize(t.language) == inputlanguage);
-    if (!chaptersTrack || !chaptersTrack.cues) {
+    const chaptersTracksWithLanguage = chaptersTracks
+        .filter((t) => LanguageUtils.normalize(t.language) == inputlanguage);
+    if (!chaptersTracksWithLanguage || !chaptersTracksWithLanguage.length) {
       return [];
     }
     const chapters = [];
-    for (const cue of chaptersTrack.cues) {
-      /** @type {shaka.extern.Chapter} */
-      const chapter = {
-        title: cue.text,
-        startTime: cue.startTime,
-        endTime: cue.endTime,
-      };
-      chapters.push(chapter);
+    for (const chaptersTrack of chaptersTracksWithLanguage) {
+      if (chaptersTrack && chaptersTrack.cues) {
+        for (const cue of chaptersTrack.cues) {
+          /** @type {shaka.extern.Chapter} */
+          const chapter = {
+            title: cue.text,
+            startTime: cue.startTime,
+            endTime: cue.endTime,
+          };
+          chapters.push(chapter);
+        }
+      }
     }
     return chapters;
   }
@@ -4373,12 +4412,20 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       mimeType = await this.getTextMimetype_(uri);
     }
 
+    let adCuePoints = [];
+    if (this.adManager_) {
+      try {
+        adCuePoints = this.adManager_.getServerSideCuePoints();
+      } catch (error) {}
+    }
+
     if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {
       if (forced) {
         // See: https://github.com/whatwg/html/issues/4472
         kind = 'forced';
       }
-      await this.addSrcTrackElement_(uri, language, kind, mimeType, label);
+      await this.addSrcTrackElement_(uri, language, kind, mimeType, label || '',
+          adCuePoints);
       const textTracks = this.getTextTracks();
       const srcTrack = textTracks.find((t) => {
         return t.language == language &&
@@ -4408,6 +4455,18 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           shaka.util.Error.Code.CANNOT_ADD_EXTERNAL_TEXT_TO_LIVE_STREAM);
     }
 
+    if (adCuePoints.length) {
+      goog.asserts.assert(
+          this.networkingEngine_, 'Need networking engine.');
+      const data = await this.getTextData_(uri,
+          this.networkingEngine_,
+          this.config_.streaming.retryParameters);
+      const vvtText = this.convertToWebVTT_(data, mimeType, adCuePoints);
+      const blob = new Blob([vvtText], {type: 'text/vtt'});
+      uri = shaka.media.MediaSourceEngine.createObjectURL(blob);
+      mimeType = 'text/vtt';
+    }
+
     /** @type {shaka.extern.Stream} */
     const stream = {
       id: this.nextExternalStreamId_++,
@@ -4480,8 +4539,14 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     if (!mimeType) {
       mimeType = await this.getTextMimetype_(uri);
     }
+    let adCuePoints = [];
+    if (this.adManager_) {
+      try {
+        adCuePoints = this.adManager_.getServerSideCuePoints();
+      } catch (error) {}
+    }
     await this.addSrcTrackElement_(uri, language, /* kind= */ 'chapters',
-        mimeType);
+        mimeType, /* label= */ '', adCuePoints);
     const chaptersTracks = this.getChaptersTracks();
     const chaptersTrack = chaptersTracks.find((t) => {
       return t.language == language;
@@ -4544,17 +4609,19 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    * @param {string} language
    * @param {string} kind
    * @param {string} mimeType
-   * @param {string=} label
+   * @param {string} label
+   * @param {!Array.<!shaka.extern.AdCuePoint>} adCuePoints
    * @private
    */
-  async addSrcTrackElement_(uri, language, kind, mimeType, label) {
-    if (mimeType != 'text/vtt') {
+  async addSrcTrackElement_(uri, language, kind, mimeType, label,
+      adCuePoints) {
+    if (mimeType != 'text/vtt' || adCuePoints.length) {
       goog.asserts.assert(
           this.networkingEngine_, 'Need networking engine.');
       const data = await this.getTextData_(uri,
           this.networkingEngine_,
           this.config_.streaming.retryParameters);
-      const vvtText = this.convertToWebVTT_(data, mimeType);
+      const vvtText = this.convertToWebVTT_(data, mimeType, adCuePoints);
       const blob = new Blob([vvtText], {type: 'text/vtt'});
       uri = shaka.media.MediaSourceEngine.createObjectURL(blob);
       mimeType = 'text/vtt';
@@ -4562,7 +4629,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     const trackElement =
       /** @type {!HTMLTrackElement} */(document.createElement('track'));
     trackElement.src = uri;
-    trackElement.label = label || '';
+    trackElement.label = label;
     trackElement.kind = kind;
     trackElement.srclang = language;
     // Because we're pulling in the text track file via Javascript, the
@@ -4601,10 +4668,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
    *
    * @param {BufferSource} buffer
    * @param {string} mimeType
+   * @param {!Array.<!shaka.extern.AdCuePoint>} adCuePoints
    * @return {string}
    * @private
    */
-  convertToWebVTT_(buffer, mimeType) {
+  convertToWebVTT_(buffer, mimeType, adCuePoints) {
     const factory = shaka.text.TextEngine.findParser(mimeType);
     if (factory) {
       const obj = factory();
@@ -4615,7 +4683,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       };
       const data = shaka.util.BufferUtils.toUint8(buffer);
       const cues = obj.parseMedia(data, time);
-      return shaka.text.WebVttGenerator.convert(cues);
+      return shaka.text.WebVttGenerator.convert(cues, adCuePoints);
     }
     throw new shaka.util.Error(
         shaka.util.Error.Severity.CRITICAL,
@@ -4992,7 +5060,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));
   }
 
   /**
@@ -5354,10 +5423,10 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
   onAdaptation_(from, to) {
     // Delay the 'adaptation' event so that StreamingEngine has time to absorb
     // the changes before the user tries to query it.
-    const event = this.makeEvent_(shaka.Player.EventName.Adaptation, {
-      oldTrack: from,
-      newTrack: to,
-    });
+    const data = new Map()
+        .set('oldTrack', from)
+        .set('newTrack', to);
+    const event = this.makeEvent_(shaka.Player.EventName.Adaptation, data);
     this.delayDispatchEvent_(event);
   }
 
@@ -5381,10 +5450,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);
   }
 
@@ -5407,10 +5476,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));
   }
 
   /**
@@ -5427,7 +5495,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;
@@ -5456,7 +5524,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));
   }
 
   /**
@@ -6285,7 +6354,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @define {string} A version number taken from git at compile time.
  * @export
  */
-shaka.Player.version = 'v3.2.0-uncompiled';
+shaka.Player.version = 'v3.2.4-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.
@@ -6329,6 +6398,7 @@ shaka.Player.SRC_EQUAL_EXTENSIONS_TO_MIME_TYPES_ = {
   'mpg': 'video/mpeg',
   'mpeg': 'video/mpeg',
   'm3u8': 'application/x-mpegurl',
+  'mpd': 'application/dash+xml',
   'mp3': 'audio/mpeg',
   'aac': 'audio/aac',
   'flac': 'audio/flac',

package/lib/polyfill/aria.js

@@ -16,9 +16,13 @@ goog.require('shaka.polyfill');
  * for that platform, as it relies on getters and setters.
  * @see https://w3c.github.io/aria/#ARIAMixin
  * @see https://developer.mozilla.org/en-US/docs/Web/API/Element
+ * @export
  */
 shaka.polyfill.Aria = class {
-  /** Install the polyfill if needed. */
+  /**
+   * Install the polyfill if needed.
+   * @export
+   */
   static install() {
     // eslint-disable-next-line no-restricted-syntax
     if (Object.getOwnPropertyDescriptor(Element.prototype, 'ariaHidden')) {
@@ -48,7 +52,13 @@ shaka.polyfill.Aria = class {
    * @private
    */
   static addARIAMixinAttribute_(name) {
-    const snakeCaseName = name.toLowerCase().replace('aria', 'aria-');
+    const baseName = name.toLowerCase().replace(/^aria/, '');
+    // NOTE: All the attributes listed in the method above begin with "aria".
+    // However, to add extra protection against the possibility of XSS attacks
+    // through this method, this enforces "aria-" at the beginning of the
+    // snake-case name, even if somehow "aria" were missing from the input.
+    const snakeCaseName = `aria-${baseName}`;
+
     /* eslint-disable no-restricted-syntax */
     Object.defineProperty(Element.prototype, name, {
       get() {

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,31 +15,49 @@ 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');
-
     // 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) {
-      shaka.log.debug(
+    // 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.info(
           'MediaCapabilities: Native mediaCapabilities support found.');
       return;
-    } else if (!window.MediaSource) {
-      shaka.log.debug(
-          'MediaSource must be available to install mediaCapabilities ',
-          'polyfill.');
-      return;
     }
 
+    shaka.log.info('MediaCapabilities: install');
+
     if (!navigator.mediaCapabilities) {
       navigator.mediaCapabilities = /** @type {!MediaCapabilities} */ ({});
     }
+
+    // Keep the patched MediaCapabilities object from being garbage-collected in
+    // Safari.
+    // See https://github.com/google/shaka-player/issues/3696#issuecomment-1009472718
+    shaka.polyfill.MediaCapabilities.originalMcap =
+        navigator.mediaCapabilities;
+
     navigator.mediaCapabilities.decodingInfo =
         shaka.polyfill.MediaCapabilities.decodingInfo_;
   }
@@ -62,21 +80,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) {
@@ -118,7 +160,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;
@@ -145,6 +187,16 @@ shaka.polyfill.MediaCapabilities = class {
   }
 };
 
+/**
+ * A copy of the MediaCapabilities instance, to prevent Safari from
+ * garbage-collecting the polyfilled method on it.  We make it public and export
+ * it to ensure that it is not stripped out by the compiler.
+ *
+ * @type {MediaCapabilities}
+ * @export
+ */
+shaka.polyfill.MediaCapabilities.originalMcap = null;
+
 // Install at a lower priority than MediaSource polyfill, so that we have
 // MediaSource available first.
 shaka.polyfill.register(shaka.polyfill.MediaCapabilities.install, -1);

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(/ *; */);