shaka-player 4.11.11 → 4.11.13

package/package.json

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

package/ui/controls.js

@@ -1265,7 +1265,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
           callback(details);
         });
       } catch (error) {
-        shaka.log.warning(
+        shaka.log.debug(
             `The "${type}" media session action is not supported.`);
       }
     };
@@ -1290,7 +1290,7 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
           });
         }
       } catch (error) {
-        shaka.log.warning(
+        shaka.log.v2(
             'setPositionState in media session is not supported.');
       }
     };
@@ -1360,9 +1360,15 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
       if (payload['key'] == 'APIC' && payload['mimeType'] == '-->') {
         imageUrl = payload['data'];
       }
-      if (navigator.mediaSession.metadata && title) {
-        const metadata = navigator.mediaSession.metadata;
-        metadata.title = title;
+      if (title) {
+        let metadata = {
+          title: title,
+          artwork: [],
+        };
+        if (navigator.mediaSession.metadata) {
+          metadata = navigator.mediaSession.metadata;
+          metadata.title = title;
+        }
         navigator.mediaSession.metadata = new MediaMetadata(metadata);
       }
       if (imageUrl) {
@@ -1370,11 +1376,15 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
         if (imageUrl != video.poster) {
           video.poster = imageUrl;
         }
+        let metadata = {
+          title: '',
+          artwork: [{src: imageUrl}],
+        };
         if (navigator.mediaSession.metadata) {
-          const metadata = navigator.mediaSession.metadata;
+          metadata = navigator.mediaSession.metadata;
           metadata.artwork = [{src: imageUrl}];
-          navigator.mediaSession.metadata = new MediaMetadata(metadata);
         }
+        navigator.mediaSession.metadata = new MediaMetadata(metadata);
       }
     });
   }

package/ui/language_utils.js

@@ -105,8 +105,10 @@ shaka.ui.LanguageUtils = class {
       audioCodec = audioCodec.toLowerCase();
       if (audioCodec.startsWith('mp4a')) {
         name = 'AAC';
-      } else if (audioCodec === 'ec-3' || audioCodec === 'ac-3') {
+      } else if (audioCodec === 'ac-3') {
         name = 'Dolby';
+      } else if (audioCodec === 'ec-3') {
+        name = 'DD+';
       } else if (audioCodec === 'opus') {
         name = 'Opus';
       } else if (audioCodec === 'flac') {

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);

package/ui/remote_button.js

@@ -33,6 +33,9 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
   constructor(parent, controls) {
     super(parent, controls);
 
+    /** @private {boolean} */
+    this.isAirPlay_ = shaka.util.Platform.isSafari();
+
     /** @private {!HTMLButtonElement} */
     this.remoteButton_ = shaka.util.Dom.createButton();
     this.remoteButton_.classList.add('shaka-remote-button');
@@ -42,12 +45,9 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
     /** @private {!HTMLElement} */
     this.remoteIcon_ = shaka.util.Dom.createHTMLElement('i');
     this.remoteIcon_.classList.add('material-icons-round');
-    let icon = shaka.ui.Enums.MaterialDesignIcons.CAST;
-    const safariVersion = shaka.util.Platform.safariVersion();
-    if (safariVersion && safariVersion >= 13) {
-      icon = shaka.ui.Enums.MaterialDesignIcons.AIRPLAY;
-    }
-    this.remoteIcon_.textContent = icon;
+    this.remoteIcon_.textContent = this.isAirPlay_ ?
+        shaka.ui.Enums.MaterialDesignIcons.AIRPLAY :
+        shaka.ui.Enums.MaterialDesignIcons.CAST;
     this.remoteButton_.appendChild(this.remoteIcon_);
 
     const label = shaka.util.Dom.createHTMLElement('label');
@@ -95,21 +95,25 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
 
       this.eventManager.listen(this.video.remote, 'connect', () => {
         this.updateRemoteState_();
+        this.updateIcon_();
       });
 
       this.eventManager.listen(this.video.remote, 'connecting', () => {
         this.updateRemoteState_();
+        this.updateIcon_();
       });
 
       this.eventManager.listen(this.video.remote, 'disconnect', () => {
         this.updateRemoteState_();
+        this.updateIcon_();
       });
 
       this.eventManager.listen(this.player, 'loaded', () => {
         this.updateRemoteState_();
       });
 
-      this.updateRemoteState_();
+      this.updateRemoteState_(/* force= */ true);
+      this.updateIcon_();
     }
   }
 
@@ -125,9 +129,10 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
   }
 
   /**
+   * @param {boolean=} force
    * @private
    */
-  async updateRemoteState_() {
+  async updateRemoteState_(force = false) {
     if (this.controls.getCastProxy().canCast() &&
         this.controls.isCastAllowed()) {
       shaka.ui.Utils.setDisplay(this.remoteButton_, false);
@@ -135,14 +140,20 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
         this.video.remote.cancelWatchAvailability(this.callbackId_);
         this.callbackId_ = -1;
       }
-    } else if (this.video.remote.state == 'disconnected') {
+    } else if (this.video.remote.state == 'disconnected' || force) {
       const handleAvailabilityChange = (availability) => {
         if (this.player) {
           const disableRemote = this.video.disableRemotePlayback;
-          const loadMode = this.player.getLoadMode();
-          const srcMode = loadMode == shaka.Player.LoadMode.SRC_EQUALS;
+          let canCast = true;
+          if (shaka.util.Platform.isSafari()) {
+            const loadMode = this.player.getLoadMode();
+            const mseMode = loadMode == shaka.Player.LoadMode.MEDIA_SOURCE;
+            if (mseMode && this.player.getManifestType() != 'HLS') {
+              canCast = false;
+            }
+          }
           shaka.ui.Utils.setDisplay(
-              this.remoteButton_, srcMode && availability && !disableRemote);
+              this.remoteButton_, canCast && availability && !disableRemote);
         } else {
           shaka.ui.Utils.setDisplay(this.remoteButton_, false);
         }
@@ -175,14 +186,28 @@ shaka.ui.RemoteButton = class extends shaka.ui.Element {
    */
   updateLocalizedStrings_() {
     const LocIds = shaka.ui.Locales.Ids;
-    let text = this.localization.resolve(LocIds.CAST);
-    const safariVersion = shaka.util.Platform.safariVersion();
-    if (safariVersion && safariVersion >= 13) {
-      text = this.localization.resolve(LocIds.AIRPLAY);
-    }
+    const text = this.isAirPlay_ ?
+        this.localization.resolve(LocIds.AIRPLAY) :
+        this.localization.resolve(LocIds.CAST);
     this.remoteButton_.ariaLabel = text;
     this.remoteNameSpan_.textContent = text;
   }
+
+  /**
+   * @private
+   */
+  updateIcon_() {
+    if (this.isAirPlay_) {
+      return;
+    }
+    if (this.video.remote.state == 'disconnected') {
+      this.remoteIcon_.textContent =
+          shaka.ui.Enums.MaterialDesignIcons.CAST;
+    } else {
+      this.remoteIcon_.textContent =
+          shaka.ui.Enums.MaterialDesignIcons.EXIT_CAST;
+    }
+  }
 };
 
 

package/ui/seek_bar.js

@@ -513,6 +513,7 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
     const leftPosition = Math.min(this.bar.offsetWidth - width,
         Math.max(0, pixelPosition - (width / 2)));
     this.timeContainer_.style.left = leftPosition + 'px';
+    this.timeContainer_.style.right = '';
     this.timeContainer_.style.visibility = 'visible';
     const seekRange = this.player.seekRange();
     if (this.player.isLive()) {
@@ -520,6 +521,8 @@ shaka.ui.SeekBar = class extends shaka.ui.RangeElement {
       if (totalSeconds < 1) {
         this.timeContainer_.textContent =
             this.localization.resolve(shaka.ui.Locales.Ids.LIVE);
+        this.timeContainer_.style.left = '';
+        this.timeContainer_.style.right = '0px';
       } else {
         this.timeContainer_.textContent =
             '-' + this.timeFormatter_(totalSeconds);