shaka-player 4.8.10 → 4.9.1

package/ui/controls.js

@@ -21,6 +21,7 @@ goog.require('shaka.ui.HiddenRewindButton');
 goog.require('shaka.ui.Locales');
 goog.require('shaka.ui.Localization');
 goog.require('shaka.ui.SeekBar');
+goog.require('shaka.ui.SkipAdButton');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.ui.VRManager');
 goog.require('shaka.util.Dom');
@@ -968,6 +969,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
 
     const adCounter = new shaka.ui.AdCounter(this.adPanel_, this);
     this.elements_.push(adCounter);
+
+    const skipButton = new shaka.ui.SkipAdButton(this.adPanel_, this);
+    this.elements_.push(skipButton);
   }
 
   /** @private */

package/ui/less/ad_controls.less

@@ -61,7 +61,7 @@
     font-size: initial;
   }
 
-  div:not(.shaka-skip-ad-counter) {
+  div:not(.shaka-skip-ad-counter):not(.shaka-skip-ad-container) {
     .bottom-panels-elements-margin();
   }
 }
@@ -90,6 +90,7 @@
   display: flex;
   flex-direction: row;
   margin: 0;
+  margin-left: auto;
 }
 
 .shaka-skip-ad-button {

package/ui/resolution_selection.js

@@ -113,7 +113,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
     // Remove duplicate entries with the same resolution or quality depending
     // on content type.  Pick an arbitrary one.
     tracks = tracks.filter((track, idx) => {
-      // Keep the first one with the same height and framrate or bandwidth.
+      // Keep the first one with the same height and framerate or bandwidth.
       let otherIdx = -1;
       if (this.player.isAudioOnly()) {
         otherIdx = tracks.findIndex((t) => t.bandwidth == track.bandwidth);
@@ -168,7 +168,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
       if (this.player.isAudioOnly() && track.bandwidth) {
         span.textContent = Math.round(track.bandwidth / 1000) + ' kbits/s';
       } else if (track.height && track.width) {
-        span.textContent = this.getResolutionLabel_(track);
+        span.textContent = this.getResolutionLabel_(track, tracks);
       } else {
         span.textContent = 'Unknown';
       }
@@ -226,10 +226,11 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
 
   /**
    * @param {!shaka.extern.Track} track
+   * @param {!Array.<!shaka.extern.Track>} tracks
    * @return {string}
    * @private
    */
-  getResolutionLabel_(track) {
+  getResolutionLabel_(track, tracks) {
     const trackHeight = track.height || 0;
     const trackWidth = track.width || 0;
     let height = trackHeight;
@@ -251,6 +252,14 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
     if (track.videoLayout == 'CH-STEREO') {
       text += ' (3D)';
     }
+    if (track.videoBandwidth) {
+      const hasDuplicateResolution = tracks.some((otherTrack) => {
+        return otherTrack != track && otherTrack.height == track.height;
+      });
+      if (hasDuplicateResolution) {
+        text += ' (' + Math.round(track.videoBandwidth / 1000) + ' kbits/s)';
+      }
+    }
     return text;
   }