shaka-player 4.9.35 → 4.9.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.9.35",
+  "version": "4.9.36",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -43,7 +43,7 @@
     "karma-coverage": "^2.2.0",
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
-    "karma-local-wd-launcher": "^1.6.7",
+    "karma-local-wd-launcher": "^1.6.9",
     "karma-opera-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.8",
     "karma-spec-reporter": "^0.0.34",
@@ -105,7 +105,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.1.6"
+    "eme-encryption-scheme-polyfill": "^2.2.1"
   },
   "clean-package": {
     "remove": [

package/ui/controls.js

@@ -1613,12 +1613,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
     goog.asserts.assert(
         this.seekBar_, 'Caller of seek_ must check for seekBar_ first!');
 
-    this.seekBar_.changeTo(currentTime);
-
-    if (this.isOpaque()) {
-      // Only update the time and seek range if it's visible.
-      this.updateTimeAndSeekRange_();
-    }
+    this.video_.currentTime = currentTime;
+    this.updateTimeAndSeekRange_();
   }
 
   /**

package/ui/less/thumbnails.less

@@ -8,6 +8,7 @@
   visibility: hidden;
   width: 15%;
   z-index: 1;
+  pointer-events: none;
 
   #shaka-player-ui-thumbnail-image {
     position: absolute;

package/ui/statistics_button.js

@@ -119,7 +119,9 @@ shaka.ui.StatisticsButton = class extends shaka.ui.Element {
 
     const parseBytesDownloaded = (name) => {
       const bytes = parseInt(this.currentStats_[name], 10);
-      if (bytes > 1e6) {
+      if (bytes > 2 * 1e9) {
+        return (bytes / 1e9).toFixed(2) + 'GB';
+      } else if (bytes > 1e6) {
         return (bytes / 1e6).toFixed(2) + 'MB';
       } else if (bytes > 1e3) {
         return (bytes / 1e3).toFixed(2) + 'KB';

package/ui/ui.js

@@ -41,6 +41,35 @@ shaka.ui.Overlay = class {
     /** @private {!shaka.extern.UIConfiguration} */
     this.config_ = this.defaultConfig_();
 
+    // Get and configure cast app id.
+    let castAppId = '';
+
+    // Get and configure cast Android Receiver Compatibility
+    let castAndroidReceiverCompatible = false;
+
+    // Cast receiver id can be specified on either container or video.
+    // It should not be provided on both. If it was, we will use the last
+    // one we saw.
+    if (videoContainer['dataset'] &&
+        videoContainer['dataset']['shakaPlayerCastReceiverId']) {
+      const dataSet = videoContainer['dataset'];
+      castAppId = dataSet['shakaPlayerCastReceiverId'];
+      castAndroidReceiverCompatible =
+          dataSet['shakaPlayerCastAndroidReceiverCompatible'] === 'true';
+    } else if (video['dataset'] &&
+               video['dataset']['shakaPlayerCastReceiverId']) {
+      const dataSet = video['dataset'];
+      castAppId = dataSet['shakaPlayerCastReceiverId'];
+      castAndroidReceiverCompatible =
+          dataSet['shakaPlayerCastAndroidReceiverCompatible'] === 'true';
+    }
+
+    if (castAppId.length) {
+      this.config_.castReceiverAppId = castAppId;
+      this.config_.castAndroidReceiverCompatible =
+          castAndroidReceiverCompatible;
+    }
+
     // Make sure this container is discoverable and that the UI can be reached
     // through it.
     videoContainer['dataset']['shakaPlayerContainer'] = '';
@@ -55,10 +84,6 @@ shaka.ui.Overlay = class {
     this.controls_ = new shaka.ui.Controls(
         player, videoContainer, video, vrCanvas, this.config_);
 
-    // Run the initial setup so that no configure() call is required for default
-    // settings.
-    this.configure({});
-
     // If the browser's native controls are disabled, use UI TextDisplayer.
     if (!video.controls) {
       player.setVideoContainer(videoContainer);
@@ -130,18 +155,29 @@ shaka.ui.Overlay = class {
 
     goog.asserts.assert(typeof(config) == 'object', 'Should be an object!');
 
+    const newConfig = /** @type {!shaka.extern.UIConfiguration} */(
+      Object.assign({}, this.config_));
     shaka.util.ConfigUtils.mergeConfigObjects(
-        this.config_, config, this.defaultConfig_(),
+        newConfig, config, this.defaultConfig_(),
         /* overrides= */ {}, /* path= */ '');
 
     // If a cast receiver app id has been given, add a cast button to the UI
-    if (this.config_.castReceiverAppId &&
-        !this.config_.overflowMenuButtons.includes('cast')) {
-      this.config_.overflowMenuButtons.push('cast');
+    if (newConfig.castReceiverAppId &&
+        !newConfig.overflowMenuButtons.includes('cast')) {
+      newConfig.overflowMenuButtons.push('cast');
     }
 
     goog.asserts.assert(this.player_ != null, 'Should have a player!');
 
+    const diff = shaka.util.ConfigUtils.getDifferenceFromConfigObjects(
+        newConfig, this.config_);
+    if (!Object.keys(diff).length) {
+      // No changes
+      return;
+    }
+
+    this.config_ = newConfig;
+
     this.controls_.configure(this.config_);
 
     this.controls_.dispatchEvent(new shaka.util.FakeEvent('uiupdated'));
@@ -432,33 +468,6 @@ shaka.ui.Overlay = class {
     // Attach Canvas used for LCEVC Decoding
     player.attachCanvas(/** @type {HTMLCanvasElement} */(lcevcCanvas));
 
-    // Get and configure cast app id.
-    let castAppId = '';
-
-    // Get and configure cast Android Receiver Compatibility
-    let castAndroidReceiverCompatible = false;
-
-    // Cast receiver id can be specified on either container or video.
-    // It should not be provided on both. If it was, we will use the last
-    // one we saw.
-    if (container['dataset'] &&
-        container['dataset']['shakaPlayerCastReceiverId']) {
-      castAppId = container['dataset']['shakaPlayerCastReceiverId'];
-      castAndroidReceiverCompatible =
-          container['dataset']['shakaPlayerCastAndroidReceiverCompatible'] ===
-          'true';
-    } else if (video['dataset'] &&
-               video['dataset']['shakaPlayerCastReceiverId']) {
-      castAppId = video['dataset']['shakaPlayerCastReceiverId'];
-      castAndroidReceiverCompatible =
-        video['dataset']['shakaPlayerCastAndroidReceiverCompatible'] === 'true';
-    }
-
-    if (castAppId.length) {
-      ui.configure({castReceiverAppId: castAppId,
-        castAndroidReceiverCompatible: castAndroidReceiverCompatible});
-    }
-
     if (shaka.util.Dom.asHTMLMediaElement(video).controls) {
       ui.getControls().setEnabledNativeControls(true);
     }