shaka-player 4.11.12 → 4.11.13

package/lib/ads/interstitial_ad_manager.js

@@ -322,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,
@@ -461,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 {
@@ -620,6 +619,8 @@ shaka.ads.InterstitialAdManager = class {
           if (!this.baseVideo_.ended) {
             this.baseVideo_.play();
           }
+        } else {
+          this.cuepointsChanged_();
         }
         this.determineIfUsingBaseVideo_();
       }

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

@@ -6379,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);
@@ -6734,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;
@@ -8113,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.12' + '-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/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.11.12",
+  "version": "4.11.13",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

package/ui/playback_rate_selection.js

@@ -120,8 +120,12 @@ shaka.ui.PlaybackRateSelection = class extends shaka.ui.SettingsMenu {
       button.appendChild(span);
 
       this.eventManager.listen(button, 'click', () => {
-        this.video.playbackRate = this.playbackRates_.get(rateStr);
-        this.video.defaultPlaybackRate = this.playbackRates_.get(rateStr);
+        const rate = this.playbackRates_.get(rateStr);
+        if (rate == 1) {
+          this.player.cancelTrickPlay();
+        } else {
+          this.player.trickPlay(rate, /* useTrickPlayTrack= */ false);
+        }
       });
 
       this.menu.appendChild(button);