shaka-player 4.11.11 → 4.11.13

package/lib/ads/interstitial_ad_manager.js

@@ -39,6 +39,9 @@ shaka.ads.InterstitialAdManager = class {
    * @param {function(!shaka.util.FakeEvent)} onEvent
    */
   constructor(adContainer, basePlayer, baseVideo, onEvent) {
+    /** @private {?shaka.extern.AdsConfiguration} */
+    this.config_ = null;
+
     /** @private {HTMLElement} */
     this.adContainer_ = adContainer;
 
@@ -93,10 +96,24 @@ shaka.ads.InterstitialAdManager = class {
     this.lastPlayedAd_ = null;
 
     this.eventManager_.listen(this.baseVideo_, 'timeupdate', () => {
-      if (this.playingAd_ || this.basePlayer_.isRemotePlayback()) {
+      if (this.playingAd_ || this.lastTime_ ||
+          this.basePlayer_.isRemotePlayback()) {
+        return;
+      }
+      this.lastTime_ = this.baseVideo_.currentTime;
+      const currentInterstitial = this.getCurrentInterstitial_(
+          /* needPreRoll= */ true, /* numberToSkip= */ 0, this.lastPlayedAd_);
+      if (currentInterstitial) {
+        this.setupAd_(currentInterstitial, /* sequenceLength= */ 1,
+            /* adPosition= */ 1, /* initialTime= */ Date.now());
+      }
+    });
+
+    const checkForInterstitials = () => {
+      if (this.playingAd_ || !this.lastTime_ ||
+          this.basePlayer_.isRemotePlayback()) {
         return;
       }
-      const needPreRoll = this.lastTime_ == null || this.lastTime_ == 0;
       this.lastTime_ = this.baseVideo_.currentTime;
       // Remove last played add when the new time is before to the ad time.
       if (this.lastPlayedAd_ &&
@@ -105,12 +122,27 @@ shaka.ads.InterstitialAdManager = class {
         this.lastPlayedAd_ = null;
       }
       const currentInterstitial = this.getCurrentInterstitial_(
-          needPreRoll, /* numberToSkip= */ 0, this.lastPlayedAd_);
+          /* needPreRoll= */ false, /* numberToSkip= */ 0, this.lastPlayedAd_);
       if (currentInterstitial) {
         this.setupAd_(currentInterstitial, /* sequenceLength= */ 1,
             /* adPosition= */ 1, /* initialTime= */ Date.now());
       }
-    });
+    };
+
+    /** @private {shaka.util.Timer} */
+    this.timeUpdateTimer_ = new shaka.util.Timer(checkForInterstitials);
+
+    if ('requestVideoFrameCallback' in this.baseVideo_ &&
+        !shaka.util.Platform.isSmartTV()) {
+      const baseVideo = /** @type {!HTMLVideoElement} */ (this.baseVideo_);
+      const videoFrameCallback = () => {
+        checkForInterstitials();
+        baseVideo.requestVideoFrameCallback(videoFrameCallback);
+      };
+      baseVideo.requestVideoFrameCallback(videoFrameCallback);
+    } else {
+      this.timeUpdateTimer_.tickEvery(/* seconds= */ 0.025);
+    }
 
     /** @private {shaka.util.Timer} */
     this.pollTimer_ = new shaka.util.Timer(async () => {
@@ -168,11 +200,27 @@ shaka.ads.InterstitialAdManager = class {
    * @param {shaka.extern.AdsConfiguration} config
    */
   configure(config) {
-    if (!this.adContainer_ ||
-        this.usingBaseVideo_ != config.supportsMultipleMediaElements) {
+    this.config_ = config;
+    this.determineIfUsingBaseVideo_();
+  }
+
+  /**
+   * @private
+   */
+  determineIfUsingBaseVideo_() {
+    if (!this.adContainer_ || !this.config_ || this.playingAd_) {
       return;
     }
-    this.usingBaseVideo_ = !config.supportsMultipleMediaElements;
+    let supportsMultipleMediaElements =
+        this.config_.supportsMultipleMediaElements;
+    const video = /** @type {HTMLVideoElement} */(this.baseVideo_);
+    if (video.webkitSupportsFullscreen && video.webkitDisplayingFullscreen) {
+      supportsMultipleMediaElements = false;
+    }
+    if (this.usingBaseVideo_ != supportsMultipleMediaElements) {
+      return;
+    }
+    this.usingBaseVideo_ = !supportsMultipleMediaElements;
     if (this.usingBaseVideo_) {
       this.video_ = this.baseVideo_;
       if (this.adVideo_) {
@@ -219,6 +267,10 @@ shaka.ads.InterstitialAdManager = class {
     if (this.adContainer_) {
       shaka.util.Dom.removeAllChildren(this.adContainer_);
     }
+    if (this.timeUpdateTimer_) {
+      this.timeUpdateTimer_.stop();
+      this.timeUpdateTimer_ = null;
+    }
     if (this.pollTimer_) {
       this.pollTimer_.stop();
       this.pollTimer_ = null;
@@ -231,13 +283,6 @@ shaka.ads.InterstitialAdManager = class {
    * @param {shaka.extern.HLSInterstitial} hlsInterstitial
    */
   async addMetadata(hlsInterstitial) {
-    if (this.basePlayer_.getLoadMode() == shaka.Player.LoadMode.SRC_EQUALS &&
-        this.usingBaseVideo_) {
-      shaka.log.alwaysWarn(
-          'Unsupported HLS interstitial when using single media element',
-          hlsInterstitial);
-      return;
-    }
     this.updatePlayerConfig_();
     const adInterstitials = await this.getInterstitialsInfo_(hlsInterstitial);
     if (adInterstitials.length) {
@@ -277,7 +322,7 @@ shaka.ads.InterstitialAdManager = class {
     const interstitial = {
       id: null,
       startTime: region.startTime,
-      endTime: isReplace ? region.endTime : null,
+      endTime: region.endTime,
       uri: alternativeMPDUri,
       isSkippable: false,
       skipOffset: null,
@@ -336,16 +381,9 @@ shaka.ads.InterstitialAdManager = class {
    * @param {!Array.<shaka.extern.AdInterstitial>} interstitials
    */
   addInterstitials(interstitials) {
-    if (this.basePlayer_.getLoadMode() == shaka.Player.LoadMode.SRC_EQUALS &&
-        this.usingBaseVideo_) {
-      shaka.log.alwaysWarn(
-          'Unsupported interstitial when using single media element',
-          interstitials);
-      return;
-    }
     let cuepointsChanged = false;
     for (const interstitial of interstitials) {
-      const interstitialId = JSON.stringify(interstitial);
+      const interstitialId = interstitial.id || JSON.stringify(interstitial);
       if (this.interstitialIds_.has(interstitialId)) {
         continue;
       }
@@ -423,8 +461,7 @@ shaka.ads.InterstitialAdManager = class {
               this.lastTime_ - roundDecimals(interstitial.startTime);
           if (difference > 0 &&
               (difference <= 1 || !interstitial.canJump)) {
-            if (difference > 1 && lastPlayedAd &&
-                !lastPlayedAd.pre && !lastPlayedAd.post &&
+            if (lastPlayedAd && !lastPlayedAd.pre && !lastPlayedAd.post &&
                 lastPlayedAd.startTime >= interstitial.startTime) {
               isValid = false;
             } else {
@@ -455,10 +492,14 @@ shaka.ads.InterstitialAdManager = class {
    */
   async setupAd_(interstitial, sequenceLength, adPosition, initialTime,
       oncePlayed = 0) {
+    this.determineIfUsingBaseVideo_();
     goog.asserts.assert(this.video_, 'Must have video');
 
     this.lastPlayedAd_ = interstitial;
 
+    shaka.log.info('Starting interstitial',
+        interstitial.startTime, 'at', this.lastTime_);
+
     const startTime = Date.now();
 
     if (!this.video_.parentElement && this.adContainer_) {
@@ -578,7 +619,10 @@ shaka.ads.InterstitialAdManager = class {
           if (!this.baseVideo_.ended) {
             this.baseVideo_.play();
           }
+        } else {
+          this.cuepointsChanged_();
         }
+        this.determineIfUsingBaseVideo_();
       }
     };
     const error = async (e) => {
@@ -750,6 +794,16 @@ shaka.ads.InterstitialAdManager = class {
     if (hlsInterstitialId) {
       id = /** @type {string} */(hlsInterstitialId.data);
     }
+    const startTime = id == null ?
+        Math.floor(hlsInterstitial.startTime * 10) / 10:
+        hlsInterstitial.startTime;
+    let endTime = hlsInterstitial.endTime;
+    if (hlsInterstitial.endTime && hlsInterstitial.endTime != Infinity &&
+        typeof(hlsInterstitial.endTime) == 'number') {
+      endTime = id == null ?
+          Math.floor(hlsInterstitial.endTime * 10) / 10:
+          hlsInterstitial.endTime;
+    }
     const restrict = hlsInterstitial.values.find((v) => v.key == 'X-RESTRICT');
     let isSkippable = true;
     let canJump = true;
@@ -804,8 +858,8 @@ shaka.ads.InterstitialAdManager = class {
       }
       interstitialsAd.push({
         id,
-        startTime: hlsInterstitial.startTime,
-        endTime: hlsInterstitial.endTime,
+        startTime,
+        endTime,
         uri,
         isSkippable,
         skipOffset: isSkippable ? 0 : null,
@@ -836,8 +890,8 @@ shaka.ads.InterstitialAdManager = class {
           if (asset['URI']) {
             interstitialsAd.push({
               id,
-              startTime: hlsInterstitial.startTime,
-              endTime: hlsInterstitial.endTime,
+              startTime,
+              endTime,
               uri: asset['URI'],
               isSkippable,
               skipOffset: isSkippable ? 0 : null,

package/lib/dash/segment_template.js

@@ -85,7 +85,9 @@ shaka.dash.SegmentTemplate = class {
         },
       };
     } else if (info.segmentDuration) {
-      if (!isUpdate && context.adaptationSet.contentType !== 'image') {
+      if (!isUpdate &&
+          context.adaptationSet.contentType !== 'image' &&
+          context.adaptationSet.contentType !== 'text') {
         const periodStart = context.periodInfo.start;
         const periodId = context.period.id;
         const initialPeriodDuration = context.periodInfo.duration;
@@ -172,7 +174,9 @@ shaka.dash.SegmentTemplate = class {
         tsi.evict(availabilityStart);
       }
 
-      if (info.timeline && context.adaptationSet.contentType !== 'image') {
+      if (info.timeline &&
+          context.adaptationSet.contentType !== 'image' &&
+          context.adaptationSet.contentType !== 'text') {
         const timeline = info.timeline;
         context.presentationTimeline.notifyTimeRange(
             timeline,

package/lib/media/adaptation_set_criteria.js

@@ -41,60 +41,36 @@ shaka.media.AdaptationSetCriteria = class {
 shaka.media.ExampleBasedCriteria = class {
   /**
    * @param {shaka.extern.Variant} example
-   * @param {shaka.config.CodecSwitchingStrategy=} codecSwitchingStrategy
-   * @param {boolean=} enableAudioGroups
+   * @param {shaka.config.CodecSwitchingStrategy} codecSwitchingStrategy
+   * @param {boolean} enableAudioGroups
    */
-  constructor(example,
-      codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.RELOAD,
-      enableAudioGroups = false) {
-    /** @private {shaka.extern.Variant} */
-    this.example_ = example;
-    /** @private {shaka.config.CodecSwitchingStrategy} */
-    this.codecSwitchingStrategy_ = codecSwitchingStrategy;
-    /** @private {boolean} */
-    this.enableAudioGroups_ = enableAudioGroups;
-
-
+  constructor(example, codecSwitchingStrategy, enableAudioGroups) {
     // We can't know if role and label are really important, so we don't use
     // role and label for this.
     const role = '';
     const audioLabel = '';
     const videoLabel = '';
-    const hdrLevel = '';
-    const spatialAudio = false;
-    const videoLayout = '';
+    const hdrLevel = example.video && example.video.hdr ?
+        example.video.hdr : '';
+    const spatialAudio = example.audio && example.audio.spatialAudio ?
+        example.audio.spatialAudio : false;
+    const videoLayout = example.video && example.video.videoLayout ?
+        example.video.videoLayout : '';
     const channelCount = example.audio && example.audio.channelsCount ?
-                         example.audio.channelsCount :
-                         0;
+        example.audio.channelsCount : 0;
+    const audioCodec = example.audio && example.audio.codecs ?
+        example.audio.codecs : '';
 
     /** @private {!shaka.media.AdaptationSetCriteria} */
-    this.fallback_ = new shaka.media.PreferenceBasedCriteria(
+    this.preferenceBasedCriteria_ = new shaka.media.PreferenceBasedCriteria(
         example.language, role, channelCount, hdrLevel, spatialAudio,
         videoLayout, audioLabel, videoLabel,
-        codecSwitchingStrategy, enableAudioGroups);
+        codecSwitchingStrategy, enableAudioGroups, audioCodec);
   }
 
   /** @override */
   create(variants) {
-    const supportsSmoothCodecTransitions = this.codecSwitchingStrategy_ ==
-      shaka.config.CodecSwitchingStrategy.SMOOTH &&
-        shaka.media.Capabilities.isChangeTypeSupported();
-    // We can't assume that the example is in |variants| because it could
-    // actually be from another period.
-    const shortList = variants.filter((variant) => {
-      return shaka.media.AdaptationSet.areAdaptable(this.example_, variant,
-          !supportsSmoothCodecTransitions, this.enableAudioGroups_);
-    });
-
-    if (shortList.length) {
-      // Use the first item in the short list as the root. It should not matter
-      // which element we use as all items in the short list should already be
-      // compatible.
-      return new shaka.media.AdaptationSet(shortList[0], shortList,
-          !supportsSmoothCodecTransitions, this.enableAudioGroups_);
-    } else {
-      return this.fallback_.create(variants);
-    }
+    return this.preferenceBasedCriteria_.create(variants);
   }
 };
 
@@ -111,16 +87,15 @@ shaka.media.PreferenceBasedCriteria = class {
    * @param {string} hdrLevel
    * @param {boolean} spatialAudio
    * @param {string} videoLayout
-   * @param {string=} audioLabel
-   * @param {string=} videoLabel
-   * @param {shaka.config.CodecSwitchingStrategy=} codecSwitchingStrategy
-   * @param {boolean=} enableAudioGroups
-   * @param {string=} audioCodec
+   * @param {string} audioLabel
+   * @param {string} videoLabel
+   * @param {shaka.config.CodecSwitchingStrategy} codecSwitchingStrategy
+   * @param {boolean} enableAudioGroups
+   * @param {string} audioCodec
    */
   constructor(language, role, channelCount, hdrLevel, spatialAudio,
-      videoLayout, audioLabel = '', videoLabel = '',
-      codecSwitchingStrategy = shaka.config.CodecSwitchingStrategy.RELOAD,
-      enableAudioGroups = false, audioCodec = '') {
+      videoLayout, audioLabel, videoLabel, codecSwitchingStrategy,
+      enableAudioGroups, audioCodec) {
     /** @private {string} */
     this.language_ = language;
     /** @private {string} */

package/lib/media/media_source_engine.js

@@ -149,8 +149,9 @@ shaka.media.MediaSourceEngine = class {
     /** @private {?number} */
     this.lastDuration_ = null;
 
-    /** @private {?shaka.util.TsParser} */
-    this.tsParser_ = null;
+    /** @private {!Object.<shaka.util.ManifestParserUtils.ContentType,
+                           !shaka.util.TsParser>} */
+    this.tsParsers_ = {};
 
     /** @private {?number} */
     this.firstVideoTimestamp_ = null;
@@ -438,7 +439,7 @@ shaka.media.MediaSourceEngine = class {
     // This object is owned by Player
     this.lcevcDec_ = null;
 
-    this.tsParser_ = null;
+    this.tsParsers_ = {};
     this.playerInterface_ = null;
   }
 
@@ -490,7 +491,7 @@ shaka.media.MediaSourceEngine = class {
         this.manifestType_ == shaka.media.ManifestParser.HLS &&
         !this.ignoreManifestTimestampsInSegmentsMode_;
 
-    this.tsParser_ = null;
+    this.tsParsers_ = {};
 
     for (const contentType of streamsByType.keys()) {
       const stream = streamsByType.get(contentType);
@@ -841,12 +842,12 @@ shaka.media.MediaSourceEngine = class {
       }
     } else if (!mimeType.includes('/mp4') && !mimeType.includes('/webm') &&
         shaka.util.TsParser.probe(uint8ArrayData)) {
-      if (!this.tsParser_) {
-        this.tsParser_ = new shaka.util.TsParser();
+      if (!this.tsParsers_[contentType]) {
+        this.tsParsers_[contentType] = new shaka.util.TsParser();
       } else {
-        this.tsParser_.clearData();
+        this.tsParsers_[contentType].clearData();
       }
-      const tsParser = this.tsParser_.parse(uint8ArrayData);
+      const tsParser = this.tsParsers_[contentType].parse(uint8ArrayData);
       const startTime = tsParser.getStartTime(contentType);
       if (startTime != null) {
         timestamp = startTime;

package/lib/media/preload_manager.js

@@ -630,7 +630,8 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
               this.config_.preferredAudioLabel,
               this.config_.preferredVideoLabel,
               this.config_.mediaSource.codecSwitchingStrategy,
-              this.config_.manifest.dash.enableAudioGroups);
+              this.config_.manifest.dash.enableAudioGroups,
+              /* audioCodec= */ '');
     }
 
     // Make the ABR manager.

package/lib/media/streaming_engine.js

@@ -1966,8 +1966,7 @@ shaka.media.StreamingEngine = class {
     const MimeUtils = shaka.util.MimeUtils;
     const StreamingEngine = shaka.media.StreamingEngine;
     const logPrefix = StreamingEngine.logPrefix_(mediaState);
-    const nullLastReferences = mediaState.lastSegmentReference == null &&
-      mediaState.lastInitSegmentReference == null;
+    const nullLastReferences = mediaState.lastSegmentReference == null;
 
     /** @type {!Array.<!Promise>} */
     const operations = [];

package/lib/net/networking_engine.js

@@ -576,12 +576,12 @@ shaka.net.NetworkingEngine = class extends shaka.util.FakeEventTarget {
         }
       };
       const headersReceived = (headers) => {
-        if (this.onHeadersReceived_) {
-          this.onHeadersReceived_(headers, request, type);
-        }
         headersReceivedCalled = true;
         request.timeToFirstByte = Date.now() -
         /** @type {number} */ (request.requestStartTime);
+        if (this.onHeadersReceived_) {
+          this.onHeadersReceived_(headers, request, type);
+        }
       };
       request.requestStartTime = Date.now();
 

package/lib/player.js

@@ -786,7 +786,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
             this.config_.preferredAudioLabel,
             this.config_.preferredVideoLabel,
             this.config_.mediaSource.codecSwitchingStrategy,
-            this.config_.manifest.dash.enableAudioGroups);
+            this.config_.manifest.dash.enableAudioGroups,
+            /* audioCodec= */ '');
 
     /** @private {string} */
     this.currentTextLanguage_ = this.config_.preferredTextLanguage;
@@ -2929,22 +2930,47 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
     if (mediaElement.textTracks) {
       this.createTextDisplayer_();
-      this.loadEventManager_.listen(
-          mediaElement, 'enterpictureinpicture', () => {
-            const track = this.getFilteredTextTracks_()
-                .find((t) => t.mode !== 'disabled');
-            if (track) {
-              track.mode = 'showing';
-            }
-          });
-      this.loadEventManager_.listen(
-          mediaElement, 'leavepictureinpicture', () => {
-            const track = this.getFilteredTextTracks_()
-                .find((t) => t.mode !== 'disabled');
-            if (track) {
-              track.mode = 'hidden';
-            }
-          });
+      const setShowingMode = () => {
+        const track = this.getFilteredTextTracks_()
+            .find((t) => t.mode !== 'disabled');
+        if (track) {
+          track.mode = 'showing';
+        }
+      };
+      const setHiddenMode = () => {
+        const track = this.getFilteredTextTracks_()
+            .find((t) => t.mode !== 'disabled');
+        if (track) {
+          track.mode = 'hidden';
+        }
+      };
+      this.loadEventManager_.listen(mediaElement, 'enterpictureinpicture',
+          () => setShowingMode());
+      this.loadEventManager_.listen(mediaElement, 'leavepictureinpicture',
+          () => setHiddenMode());
+      if (mediaElement.remote) {
+        this.loadEventManager_.listen(mediaElement.remote, 'connect',
+            () => setHiddenMode());
+        this.loadEventManager_.listen(mediaElement.remote, 'connecting',
+            () => setHiddenMode());
+        this.loadEventManager_.listen(mediaElement.remote, 'disconnect',
+            () => setHiddenMode());
+      } else if ('webkitCurrentPlaybackTargetIsWireless' in mediaElement) {
+        this.loadEventManager_.listen(mediaElement,
+            'webkitcurrentplaybacktargetiswirelesschanged',
+            () => setHiddenMode());
+      }
+      const video = /** @type {HTMLVideoElement} */(mediaElement);
+      if (video.webkitSupportsFullscreen) {
+        this.loadEventManager_.listen(video, 'webkitpresentationmodechanged',
+            () => {
+              if (video.webkitPresentationMode != 'inline') {
+                setShowingMode();
+              } else {
+                setHiddenMode();
+              }
+            });
+      }
     }
     // Add all media element listeners.
     this.addBasicMediaListeners_(mediaElement, startTimeOfLoad);
@@ -5271,7 +5297,8 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
               label,
               /* videoLabel= */ '',
               this.config_.mediaSource.codecSwitchingStrategy,
-              this.config_.manifest.dash.enableAudioGroups);
+              this.config_.manifest.dash.enableAudioGroups,
+              /* audioCodec= */ '');
 
       this.chooseVariantAndSwitch_(clearBuffer, safeMargin);
     } else if (this.video_ && this.video_.audioTracks) {
@@ -6352,7 +6379,12 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     // Because this.video_ may not be set when the config is built, the default
     // TextDisplay factory must capture a reference to "this".
     config.textDisplayFactory = () => {
-      if (this.videoContainer_) {
+      // On iOS where the Fullscreen API is not available we prefer
+      // SimpleTextDisplayer because it works with the Fullscreen API of the
+      // video element itself.
+      const Platform = shaka.util.Platform;
+      if (this.videoContainer_ &&
+          (!Platform.safariVersion() || document.fullscreenEnabled)) {
         const latestConfig = this.getConfiguration();
         return new shaka.text.UITextDisplayer(
             this.video_, this.videoContainer_, latestConfig.textDisplayer);
@@ -6707,6 +6739,11 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       return;
     }
 
+    // We don't want to block the user from pausing the stream.
+    if (this.video_.paused) {
+      return;
+    }
+
     let targetLatency;
     let maxLatency;
     let maxPlaybackRate;
@@ -8086,7 +8123,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.11.11' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.11.13' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/polyfill/media_capabilities.js

@@ -61,7 +61,8 @@ shaka.polyfill.MediaCapabilities = class {
         shaka.util.Platform.isWebOS() ||
         shaka.util.Platform.isTizen() ||
         shaka.util.Platform.isEOS() ||
-        shaka.util.Platform.isHisense()) {
+        shaka.util.Platform.isHisense() ||
+        shaka.util.Platform.isComcastX1()) {
       canUseNativeMCap = false;
     }
     if (canUseNativeMCap && navigator.mediaCapabilities) {

package/lib/polyfill/mediasource.js

@@ -87,6 +87,18 @@ shaka.polyfill.MediaSource = class {
       // the player from trying to play opus on Tizen, we will override media
       // source to always reject opus content.
       shaka.polyfill.MediaSource.rejectCodec_('opus');
+    } else if (shaka.util.Platform.isComcastX1()) {
+      // XOne look to be like safari 8 which do not correctly
+      // implement abort() on SourceBuffer.
+      // Calling abort() before appending a segment causes that segment to be
+      // incomplete in the buffer.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=165342
+      shaka.polyfill.MediaSource.stubAbort_();
+      // If you remove up to a keyframe, Webkit 601.x.x incorrectly will also
+      // remove that keyframe and the content up to the next.
+      // Offsetting the end of the removal range seems to help.
+      // Bug filed: https://bugs.webkit.org/show_bug.cgi?id=177884
+      shaka.polyfill.MediaSource.patchRemovalRange_();
     } else {
       shaka.log.info('Using native MSE as-is.');
     }

package/lib/text/cue.js

@@ -632,6 +632,7 @@ shaka.text.Cue = class {
     nestedCue.region = new shaka.text.CueRegion();
     nestedCue.position = null;
     nestedCue.size = 0;
+    nestedCue.textAlign = shaka.text.Cue.textAlign.CENTER;
 
     if (TXml.isNode(element)) {
       const bold = shaka.text.Cue.fontWeight.BOLD;

package/lib/text/ui_text_displayer.js

@@ -9,6 +9,7 @@ goog.provide('shaka.text.UITextDisplayer');
 
 goog.require('goog.asserts');
 goog.require('shaka.Deprecate');
+goog.require('shaka.log');
 goog.require('shaka.text.Cue');
 goog.require('shaka.text.CueRegion');
 goog.require('shaka.text.Utils');
@@ -35,6 +36,12 @@ shaka.text.UITextDisplayer = class {
   constructor(video, videoContainer, config) {
     goog.asserts.assert(videoContainer, 'videoContainer should be valid.');
 
+    if (!document.fullscreenEnabled) {
+      shaka.log.alwaysWarn('Using UITextDisplayer in a browser without ' +
+          'Fullscreen API support causes subtitles to not be rendered in ' +
+          'fullscreen');
+    }
+
     /** @private {boolean} */
     this.isTextVisible_ = false;
 
@@ -248,6 +255,7 @@ shaka.text.UITextDisplayer = class {
    */
   setTextVisibility(on) {
     this.isTextVisible_ = on;
+    this.updateCaptions_(/* forceUpdate= */ true);
   }
 
   /**

package/lib/util/error.js

@@ -1158,5 +1158,5 @@ shaka.util.Error.Code = {
   /**
    * The VAST contained invalid XML markup.
    */
-  'VAST_INVALID_XML': 4001,
+  'VAST_INVALID_XML': 10007,
 };

package/lib/util/mp4_generator.js

@@ -765,7 +765,7 @@ shaka.util.Mp4Generator = class {
       0x00, 0x00, 0x00, 0x01, // default_sample_description_index
       0x00, 0x00, 0x00, 0x00, // default_sample_duration
       0x00, 0x00, 0x00, 0x00, // default_sample_size
-      0x00, 0x01, 0x00, 0x01, // default_sample_flags
+      0x00, 0x00, 0x00, 0x00, // default_sample_flags
     ]);
     return Mp4Generator.box('trex', bytes);
   }

package/lib/util/platform.js

@@ -300,7 +300,7 @@ shaka.util.Platform = class {
         !shaka.util.Platform.isOrange() &&
         !shaka.util.Platform.isPS4() &&
         !shaka.util.Platform.isAmazonFireTV() &&
-        !shaka.util.Platform.isWPE() &&
+        !shaka.util.Platform.isComcastX1() &&
         !shaka.util.Platform.isZenterio() &&
         !shaka.util.Platform.isSkyQ();
   }
@@ -368,7 +368,7 @@ shaka.util.Platform = class {
    * Check if the current platform is Comcast X1.
    * @return {boolean}
    */
-  static isWPE() {
+  static isComcastX1() {
     return shaka.util.Platform.userAgentContains_('WPE');
   }
 
@@ -536,7 +536,7 @@ shaka.util.Platform = class {
         Platform.isPS5() || Platform.isAmazonFireTV() ||
         Platform.isEOS() || Platform.isAPL() ||
         Platform.isVirginMedia() || Platform.isOrange() ||
-        Platform.isWPE() || Platform.isChromecast() ||
+        Platform.isComcastX1() || Platform.isChromecast() ||
         Platform.isHisense() || Platform.isZenterio()) {
       return true;
     }