shaka-player 4.0.0 → 4.1.0

package/test/util/periods_unit.js

@@ -996,6 +996,85 @@ describe('PeriodCombiner', () => {
     expect(audio2.originalId).toBe('2,4');
   });
 
+  it('Matches streams with related codecs', async () => {
+    const stream1 = makeVideoStream(1080);
+    stream1.originalId = '1';
+    stream1.bandwidth = 120000;
+    stream1.codecs = 'hvc1.1.4.L126.B0';
+
+    const stream2 = makeVideoStream(1080);
+    stream2.originalId = '2';
+    stream2.bandwidth = 120000;
+    stream2.codecs = 'hev1.2.4.L123.B0';
+
+    const stream3 = makeVideoStream(1080);
+    stream3.originalId = '3';
+    stream3.bandwidth = 120000;
+    stream3.codecs = 'dvhe.05.01';
+
+    const stream4 = makeVideoStream(1080);
+    stream4.originalId = '4';
+    stream4.bandwidth = 120000;
+    stream4.codecs = 'dvh1.05.01';
+
+    const stream5 = makeVideoStream(1080);
+    stream5.originalId = '5';
+    stream5.bandwidth = 120000;
+    stream5.codecs = 'avc1.42001f';
+
+    const stream6 = makeVideoStream(1080);
+    stream6.originalId = '6';
+    stream6.bandwidth = 120000;
+    stream6.codecs = 'avc3.42001f';
+
+    const stream7 = makeVideoStream(1080);
+    stream7.originalId = '7';
+    stream7.bandwidth = 120000;
+    stream7.codecs = 'vp09.00.10.08';
+
+    const stream8 = makeVideoStream(1080);
+    stream8.originalId = '8';
+    stream8.bandwidth = 120000;
+    stream8.codecs = 'vp09.01.20.08.01';
+
+    /** @type {!Array.<shaka.util.PeriodCombiner.Period>} */
+    const periods = [
+      {
+        id: '0',
+        videoStreams: [
+          stream1, stream3, stream5, stream7,
+        ],
+        audioStreams: [],
+        textStreams: [],
+        imageStreams: [],
+      },
+      {
+        id: '1',
+        videoStreams: [
+          stream2, stream4, stream6, stream8,
+        ],
+        audioStreams: [],
+        textStreams: [],
+        imageStreams: [],
+      },
+    ];
+
+    await combiner.combinePeriods(periods, /* isDynamic= */ true);
+    const variants = combiner.getVariants();
+    expect(variants.length).toBe(4);
+    // We can use the originalId field to see what each track is composed of.
+    const video1 = variants[0].video;
+    expect(video1.originalId).toBe('1,2');
+
+    const video2 = variants[1].video;
+    expect(video2.originalId).toBe('3,4');
+
+    const video3 = variants[2].video;
+    expect(video3.originalId).toBe('5,6');
+
+    const video4 = variants[3].video;
+    expect(video4.originalId).toBe('7,8');
+  });
 
   it('Matches streams with most roles in common', async () => {
     const makeAudioStreamWithRoles = (roles) => {

package/test/util/stream_utils_unit.js

@@ -902,4 +902,112 @@ describe('StreamUtils', () => {
       expect(manifest.variants[0].video.id).toBe(2);
     });
   });
+
+  describe('meetsRestrictions', () => {
+    const oldDateNow = Date.now;
+    /* @param {shaka.extern.Restrictions} */
+    const restrictions = {
+      minWidth: 10,
+      maxWidth: 20,
+      minHeight: 10,
+      maxHeight: 20,
+      minPixels: 10,
+      maxPixels: 20,
+      minFrameRate: 21,
+      maxFrameRate: 25,
+      minBandwidth: 1000,
+      maxBandwidth: 3000,
+    };
+    /* @param {{width: number, height: number}} */
+    const maxHwRes = {width: 123, height: 456};
+    /* @param {shaka.extern.Variant} */
+    let variant;
+    /* @param {boolean} */
+    let meetsRestrictionsResult;
+
+    beforeEach(() => {
+      Date.now = () => 123 * 1000;
+    });
+
+    afterEach(() => {
+      Date.now = oldDateNow;
+    });
+
+    /*
+     * @param {number} disabledUntilTime
+     */
+    const checkRestrictions = ({disabledUntilTime = 0}) => {
+      /* @param {shaka.extern.Variant} */
+      variant = {
+        id: 1,
+        language: 'es',
+        disabledUntilTime,
+        video: null,
+        audio: null,
+        primary: false,
+        bandwidth: 2000,
+        allowedByApplication: true,
+        allowedByKeySystem: true,
+        decodingInfos: [],
+      };
+      meetsRestrictionsResult = StreamUtils.meetsRestrictions(variant,
+          restrictions, maxHwRes);
+    };
+
+    describe('when disabledUntilTime > now', () => {
+      beforeEach(() => {
+        checkRestrictions({disabledUntilTime: 124});
+      });
+
+      it('does not meet the restrictions', () => {
+        expect(meetsRestrictionsResult).toBeFalsy();
+      });
+
+      it('does not reset disabledUntilTime', () => {
+        expect(variant.disabledUntilTime).toBe(124);
+      });
+    });
+
+    describe('when disabledUntilTime == now', () => {
+      beforeEach(() => {
+        checkRestrictions({disabledUntilTime: 123});
+      });
+
+      it('meets the restrictions', () => {
+        expect(meetsRestrictionsResult).toBeTruthy();
+      });
+
+      it('resets disabledUntilTime', () => {
+        expect(variant.disabledUntilTime).toBe(0);
+      });
+    });
+
+    describe('when disabledUntilTime == now', () => {
+      beforeEach(() => {
+        checkRestrictions({disabledUntilTime: 122});
+      });
+
+      it('meets the restrictions', () => {
+        expect(meetsRestrictionsResult).toBeTruthy();
+      });
+
+      it('resets disabledUntilTime', () => {
+        expect(variant.disabledUntilTime).toBe(0);
+      });
+    });
+
+    describe('when disabledUntilTime == 0', () => {
+      beforeEach(() => {
+        checkRestrictions({disabledUntilTime: 0});
+      });
+
+      it('meets the restrictions', () => {
+        expect(meetsRestrictionsResult).toBeTruthy();
+      });
+
+      it('leaves disabledUntilTime = 0', () => {
+        expect(variant.disabledUntilTime).toBe(0);
+      });
+    });
+  });
 });

package/ui/controls.js

@@ -53,7 +53,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
 
     /** @private {shaka.cast.CastProxy} */
     this.castProxy_ = new shaka.cast.CastProxy(
-        video, player, this.config_.castReceiverAppId);
+        video, player, this.config_.castReceiverAppId,
+        this.config_.castAndroidReceiverCompatible);
 
     /** @private {boolean} */
     this.castAllowed_ = true;
@@ -315,7 +316,8 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
   configure(config) {
     this.config_ = config;
 
-    this.castProxy_.changeReceiverId(config.castReceiverAppId);
+    this.castProxy_.changeReceiverId(config.castReceiverAppId,
+        config.castAndroidReceiverCompatible);
 
     // Deconstruct the old layout if applicable
     if (this.seekBar_) {
@@ -1258,21 +1260,23 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
       return;
     }
 
+    const keyboardSeekDistance = this.config_.keyboardSeekDistance;
+
     switch (event.key) {
       case 'ArrowLeft':
         // If it's not focused on the volume bar, move the seek time backward
-        // for 5 sec. Otherwise, the volume will be adjusted automatically.
-        if (this.seekBar_ && !isVolumeBar) {
+        // for a few sec. Otherwise, the volume will be adjusted automatically.
+        if (this.seekBar_ && !isVolumeBar && keyboardSeekDistance > 0) {
           event.preventDefault();
-          this.seek_(this.seekBar_.getValue() - 5);
+          this.seek_(this.seekBar_.getValue() - keyboardSeekDistance);
         }
         break;
       case 'ArrowRight':
         // If it's not focused on the volume bar, move the seek time forward
-        // for 5 sec. Otherwise, the volume will be adjusted automatically.
-        if (this.seekBar_ && !isVolumeBar) {
+        // for a few sec. Otherwise, the volume will be adjusted automatically.
+        if (this.seekBar_ && !isVolumeBar && keyboardSeekDistance > 0) {
           event.preventDefault();
-          this.seek_(this.seekBar_.getValue() + 5);
+          this.seek_(this.seekBar_.getValue() + keyboardSeekDistance);
         }
         break;
       // Jump to the beginning of the video's seek range.

package/ui/externs/ui.js

@@ -72,6 +72,7 @@ shaka.extern.UIVolumeBarColors;
  *   addBigPlayButton: boolean,
  *   customContextMenu: boolean,
  *   castReceiverAppId: string,
+ *   castAndroidReceiverCompatible: boolean,
  *   clearBufferOnQualityChange: boolean,
  *   showUnbufferedStart: boolean,
  *   seekBarColors: shaka.extern.UISeekBarColors,
@@ -83,7 +84,8 @@ shaka.extern.UIVolumeBarColors;
  *   enableKeyboardPlaybackControls: boolean,
  *   enableFullscreenOnRotation: boolean,
  *   forceLandscapeOnFullscreen: boolean,
- *   enableTooltips: boolean
+ *   enableTooltips: boolean,
+ *   keyboardSeekDistance: number
  * }}
  *
  * @property {!Array.<string>} controlPanelElements
@@ -109,6 +111,8 @@ shaka.extern.UIVolumeBarColors;
  *   Whether or not a custom context menu replaces the default.
  * @property {string} castReceiverAppId
  *   Receiver app id to use for the Chromecast support.
+ * @property {boolean} castAndroidReceiverCompatible
+ *   Indicates if the app is compatible with an Android Cast Receiver.
  * @property {boolean} clearBufferOnQualityChange
  *   Only applicable if the resolution selection is part of the UI.
  *   Whether buffer should be cleared when changing resolution
@@ -174,6 +178,11 @@ shaka.extern.UIVolumeBarColors;
  *   Whether or not buttons in the control panel display tooltips that contain
  *   information about their function.
  *   Defaults to false.
+ * @property {number} keyboardSeekDistance
+ *   The time interval, in seconds, to seek when the user presses the left or
+ *   right keyboard keys when the video is selected. If less than or equal to 0,
+ *   no seeking will occur.
+ *   Defaults to 5 seconds.
  * @exportDoc
  */
 shaka.extern.UIConfiguration;

package/ui/less/containers.less

@@ -161,7 +161,7 @@
     /* Consistent margins (external) and padding (internal) between controls. */
     .bottom-panels-elements-margin();
 
-    padding: 0;
+    padding: 0 5px;
 
     /* Transparent backgrounds, no borders, and a pointer when you mouse over
      * them. */

package/ui/less/general.less

@@ -37,7 +37,7 @@
 }
 
 .bottom-panels-elements-margin() {
-  margin: 1px 6px;
+  margin: 1px;
 }
 
 /* For containers which host elements overlaying other things. */

package/ui/less/range_elements.less

@@ -140,6 +140,7 @@
 
 .shaka-volume-bar-container {
   width: 100px;
+  padding: 0;
 }
 
 .shaka-range-element {

package/ui/resolution_selection.js

@@ -90,7 +90,7 @@ shaka.ui.ResolutionSelection = class extends shaka.ui.SettingsMenu {
       return otherIdx == idx;
     });
 
-    // Sort the tracks by height or bandwith depending on content type.
+    // Sort the tracks by height or bandwidth depending on content type.
     if (this.player.isAudioOnly()) {
       tracks.sort((t1, t2) => {
         goog.asserts.assert(t1.bandwidth != null, 'Null bandwidth');

package/ui/statistics_button.js

@@ -109,6 +109,14 @@ shaka.ui.StatisticsButton = class extends shaka.ui.Element {
           this.currentStats_[name], false) + ' (m)';
     };
 
+    const parseGaps = (name) => {
+      return this.currentStats_[name] + ' (gaps)';
+    };
+
+    const parseStalls = (name) => {
+      return this.currentStats_[name] + ' (stalls)';
+    };
+
     /** @private {!Object.<string, function(string):string>} */
     this.parseFrom_ = {
       'width': parsePx,
@@ -128,6 +136,8 @@ shaka.ui.StatisticsButton = class extends shaka.ui.Element {
       'corruptedFrames': parseFrames,
       'decodedFrames': parseFrames,
       'droppedFrames': parseFrames,
+      'stallsDetected': parseStalls,
+      'gapsJumped': parseGaps,
     };
 
     /** @private {shaka.util.Timer} */

package/ui/ui.js

@@ -218,6 +218,7 @@ shaka.ui.Overlay = class {
       addBigPlayButton: false,
       customContextMenu: false,
       castReceiverAppId: '',
+      castAndroidReceiverCompatible: false,
       clearBufferOnQualityChange: true,
       showUnbufferedStart: false,
       seekBarColors: {
@@ -238,6 +239,7 @@ shaka.ui.Overlay = class {
       enableFullscreenOnRotation: true,
       forceLandscapeOnFullscreen: true,
       enableTooltips: false,
+      keyboardSeekDistance: 5,
     };
 
     // Check AirPlay support
@@ -388,19 +390,28 @@ shaka.ui.Overlay = class {
     // 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});
+      ui.configure({castReceiverAppId: castAppId,
+        castAndroidReceiverCompatible: castAndroidReceiverCompatible});
     }
 
     if (shaka.util.Dom.asHTMLMediaElement(video).controls) {

package/.github/pull_request_template.md

@@ -1,10 +0,0 @@
-<!--
-Please remember to:
-
-1. Use Conventional Commits syntax (fix: ..., feat: ..., etc.) in commits and
-   PR title (https://www.conventionalcommits.org/)
-2. Tag any related or fixed issues ("Issue #123", "Closes #420")
-3. Sign the Google CLA if you haven't (https://cla.developers.google.com)
-
-You may delete this comment from the PR description.
--->

package/docs/tutorials/gsoc-ideas-list.md

@@ -1,3 +0,0 @@
-# Google Summer of Code Ideas List
-
-Please see the latest project ideas list [here](https://storage.googleapis.com/wvtemp/shaka/Shaka%20Player%20GSoC%20Projects%20List.pdf).