shaka-player 4.6.7 → 4.6.9

package/test/text/ttml_text_parser_unit.js

@@ -638,8 +638,8 @@ describe('TtmlTextParser', () => {
             id: 'subtitleArea',
             viewportAnchorX: 50,
             viewportAnchorY: 16,
-            width: 100,
-            height: 100,
+            width: 50,
+            height: 84,
           },
           startTime: 62.05,
           endTime: 3723.2,
@@ -666,8 +666,8 @@ describe('TtmlTextParser', () => {
           region: {
             viewportAnchorX: 50,
             viewportAnchorY: 16,
-            width: 100,
-            height: 100,
+            width: 50,
+            height: 84,
           },
           startTime: 62.05,
           endTime: 3723.2,
@@ -694,8 +694,8 @@ describe('TtmlTextParser', () => {
           region: {
             viewportAnchorX: 50,
             viewportAnchorY: 16,
-            width: 100,
-            height: 100,
+            width: 50,
+            height: 84,
           },
           startTime: 62.05,
           endTime: 3723.2,
@@ -872,8 +872,8 @@ describe('TtmlTextParser', () => {
             viewportAnchorY: 16,
             regionAnchorX: 0,
             regionAnchorY: 0,
-            width: 100,
-            height: 100,
+            width: 50,
+            height: 84,
             heightUnits: CueRegion.units.PERCENTAGE,
             widthUnits: CueRegion.units.PERCENTAGE,
             viewportAnchorUnits: CueRegion.units.PERCENTAGE,
@@ -945,8 +945,8 @@ describe('TtmlTextParser', () => {
             id: 'subtitleArea',
             viewportAnchorX: 50,
             viewportAnchorY: 16,
-            width: 100,
-            height: 100,
+            width: 50,
+            height: 84,
           },
           startTime: 62.05,
           endTime: 3723.2,
@@ -973,8 +973,8 @@ describe('TtmlTextParser', () => {
           region: {
             viewportAnchorX: 50,
             viewportAnchorY: 16,
-            width: 100,
-            height: 100,
+            width: 50,
+            height: 84,
           },
           startTime: 62.05,
           endTime: 3723.2,
@@ -1001,8 +1001,8 @@ describe('TtmlTextParser', () => {
           region: {
             viewportAnchorX: 50,
             viewportAnchorY: 16,
-            width: 100,
-            height: 100,
+            width: 50,
+            height: 84,
           },
           startTime: 62.05,
           endTime: 3723.2,
@@ -1032,8 +1032,8 @@ describe('TtmlTextParser', () => {
             id: 'subtitleArea',
             viewportAnchorX: 12.2,
             viewportAnchorY: 50.005,
-            width: 100,
-            height: 100,
+            width: 87.8,
+            height: 49.995,
           },
           startTime: 62.05,
           endTime: 3723.2,

package/ui/play_button.js

@@ -72,6 +72,11 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
       this.updateIcon();
     });
 
+    this.eventManager.listen(this.adManager, AdManager.AD_STOPPED, () => {
+      this.updateAriaLabel();
+      this.updateIcon();
+    });
+
     this.eventManager.listen(this.button, 'click', () => {
       if (this.ad && this.ad.isLinear()) {
         this.controls.playPauseAd();
@@ -99,6 +104,18 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
     return this.controls.presentationIsPaused();
   }
 
+  /**
+   * @return {boolean}
+   * @protected
+   */
+  isEnded() {
+    if (this.ad && this.ad.isLinear()) {
+      return false;
+    }
+
+    return this.video.ended;
+  }
+
   /**
    * Called when the button's aria label needs to change.
    * To be overridden by subclasses.

package/ui/playback_rate_selection.js

@@ -44,6 +44,10 @@ shaka.ui.PlaybackRateSelection = class extends shaka.ui.SettingsMenu {
           this.updateLocalizedStrings_();
         });
 
+    this.eventManager.listen(this.player, 'loaded', () => {
+      this.updatePlaybackRateSelection_(this.player.getPlaybackRate());
+    });
+
     this.eventManager.listen(this.player, 'ratechange', () => {
       this.updatePlaybackRateSelection_(this.player.getPlaybackRate());
     });

package/ui/small_play_button.js

@@ -38,7 +38,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateIcon() {
     const Icons = shaka.ui.Enums.MaterialDesignIcons;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.textContent = Icons.REPLAY;
     } else {
       this.button.textContent = this.isPaused() ? Icons.PLAY : Icons.PAUSE;
@@ -48,7 +48,7 @@ shaka.ui.SmallPlayButton = class extends shaka.ui.PlayButton {
   /** @override */
   updateAriaLabel() {
     const LocIds = shaka.ui.Locales.Ids;
-    if (this.video.ended) {
+    if (this.isEnded()) {
       this.button.ariaLabel = this.localization.resolve(LocIds.REPLAY);
     } else {
       const label = this.isPaused() ? LocIds.PLAY : LocIds.PAUSE;