shaka-player 3.3.1 → 3.3.4

package/test/ui/ad_ui_unit.js

@@ -4,17 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.ads.AdManager');
-goog.require('shaka.test.FakeAd');
-goog.require('shaka.test.FakeAdManager');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.ui.Locales');
-goog.require('shaka.util.EventManager');
-goog.requireType('shaka.ui.Localization');
-
 describe('Ad UI', () => {
   const UiUtils = shaka.test.UiUtils;
   /** @type {!HTMLLinkElement} */

package/test/ui/localization_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.ui.Localization');
-goog.requireType('shaka.util.FakeEvent');
-
 describe('Localization', () => {
   const Localization = shaka.ui.Localization;
 

package/test/ui/text_displayer_layout_unit.js

@@ -4,17 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.text.Cue');
-goog.require('shaka.text.SimpleTextDisplayer');
-goog.require('shaka.text.UITextDisplayer');
-goog.require('shaka.ui.Overlay');
-goog.require('shaka.util.EventManager');
-
 // TODO: Move this suite to the text/ folder where it belongs
 const supportsScreenshots = () => shaka.test.Util.supportsScreenshots();
 filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
@@ -34,11 +23,8 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
    */
   let beforeScreenshot;
 
-  // Legacy Edge seems to have inconsistent font kerning.  A one-pixel offset in
-  // the position of one character appears about 60% of the time, requiring us
-  // to have this change tolerance in our tests.  So far, all past bugs in our
-  // implementation that we have tests for would exceed this threshold by a lot.
-  const threshold = 160;  // px
+  // A minimum similarity score for screenshots, between 0 and 1.
+  const minSimilarity = 0.95;
 
   const originalCast = window.chrome && window.chrome.cast;
 
@@ -196,6 +182,7 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
 
         // The video must be played a little now, after the cues were appended,
         // but before the screenshot.
+        video.playbackRate = 1;
         video.play();
         await waiter.failOnTimeout(false).timeoutAfter(5)
             .waitForMovement(video);
@@ -203,10 +190,13 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
 
         // Seek to a time when cues should be showing.
         video.currentTime = time;
+        // Get into a playing state, but without movement.
+        video.playbackRate = 0;
+        video.play();
 
         // Add a short delay to ensure that the system has caught up and that
         // native text displayers have been updated by the browser.
-        await Util.shortDelay();
+        await Util.delay(0.1);
       };
     });
 
@@ -415,7 +405,7 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
       await checkScreenshot(prefix, 'flat-cue-bg');
     });
 
-    // https://github.com/google/shaka-player/issues/2761
+    // https://github.com/shaka-project/shaka-player/issues/2761
     it('deeply-nested cues', async () => {
       const makeCue = (text, fg = '', bg = '', nestedCues = []) => {
         const cue = new shaka.text.Cue(0, 1, text);
@@ -475,6 +465,6 @@ filterDescribe('TextDisplayer layout', supportsScreenshots, () => {
     return Util.checkScreenshot(
         /* element= */ videoContainer,
         prefix + '-' + baseName,
-        threshold);
+        minSimilarity);
   }
 });

package/test/ui/ui_customization_unit.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.util.EventManager');
-goog.requireType('shaka.ui.Overlay');
-
 describe('UI Customization', () => {
   const UiUtils = shaka.test.UiUtils;
   /** @type {!HTMLLinkElement} */

package/test/ui/ui_integration.js

@@ -4,22 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('mozilla.LanguageMapping');
-goog.require('shaka.test.Loader');
-goog.require('shaka.test.TestScheme');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.test.Waiter');
-goog.require('shaka.ui.Element');
-goog.require('shaka.util.Dom');
-goog.require('shaka.util.EventManager');
-goog.require('shaka.util.Iterables');
-goog.requireType('shaka.Player');
-goog.requireType('shaka.ui.Controls');
-goog.requireType('shaka.ui.Overlay');
-
-
 describe('UI', () => {
   const Util = shaka.test.Util;
   const UiUtils = shaka.test.UiUtils;

package/test/ui/ui_unit.js

@@ -4,21 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.media.ManifestParser');
-goog.require('shaka.test.FakeManifestParser');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.test.Util');
-goog.require('shaka.ui.OverflowMenu');
-goog.require('shaka.ui.ResolutionSelection');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.Platform');
-goog.requireType('shaka.Player');
-goog.requireType('shaka.ui.Controls');
-goog.requireType('shaka.ui.Overlay');
-
 describe('UI', () => {
   const UiUtils = shaka.test.UiUtils;
   const Util = shaka.test.Util;
@@ -137,8 +122,7 @@ describe('UI', () => {
         // Four is just a random number I (ismena) came up with to test a
         // multi-video use case. It could be replaces with any other
         // (reasonable) number.
-        for (const _ of shaka.util.Iterables.range(4)) {
-          shaka.util.Functional.ignored(_);
+        for (let i = 0; i < 4; i++) {
           const video = /** @type {!HTMLVideoElement} */
               (document.createElement('video'));
 

package/test/util/abortable_operation_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.AbortableOperation');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.PublicPromise');
-
 describe('AbortableOperation', () => {
   const Util = shaka.test.Util;
 
@@ -392,10 +387,10 @@ describe('AbortableOperation', () => {
         expect(value).toBe(500);
       }).finally((ok) => {
         expect(ok).toBe(true);
-        // The bug https://github.com/google/shaka-player/issues/1260 makes this
-        // expectation fail because some stages were skipped.  Without this
-        // check, the test would pass, even though the bug shows up first in the
-        // basic functionality of 'chain'.
+        // The bug https://github.com/shaka-project/shaka-player/issues/1260
+        // makes this expectation fail because some stages were skipped.
+        // Without this check, the test would pass, even though the bug shows
+        // up first in the basic functionality of 'chain'.
         expect(values).toEqual([100, 200, 300, 400, 500]);
       });
       await op.promise;

package/test/util/array_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ArrayUtils');
-
 describe('ArrayUtils', () => {
   const ArrayUtils = shaka.util.ArrayUtils;
 

package/test/util/buffer_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.BufferUtils');
-
 describe('BufferUtils', () => {
   const BufferUtils = shaka.util.BufferUtils;
 

package/test/util/cmcd_manager_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.CmcdManager');
-goog.require('shaka.util.ObjectUtils');
-
 describe('CmcdManager', () => {
   const CmcdManager = shaka.util.CmcdManager;
   const uuidRegex =

package/test/util/data_view_reader_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.DataViewReader');
-goog.require('shaka.util.Error');
-
 describe('DataViewReader', () => {
   const Util = shaka.test.Util;
 

package/test/util/ebml_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.EbmlParser');
-goog.require('shaka.util.Error');
-
 describe('EbmlParser', /** @suppress {accessControls} */ () => {
   const Util = shaka.test.Util;
 

package/test/util/event_manager_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.EventManager');
-
 describe('EventManager', () => {
   const Util = shaka.test.Util;
 

package/test/util/fake_event_target_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.log');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.FakeEvent');
-goog.require('shaka.util.FakeEventTarget');
-
 describe('FakeEventTarget', () => {
   const Util = shaka.test.Util;
   const originalLogError = shaka.log.error;

package/test/util/functional_unit.js

@@ -73,7 +73,7 @@ describe('Functional', () => {
       expect(obj.val).toBe(1);
     });
 
-    // Regression test for https://github.com/google/shaka-player/issues/2958
+    // Regression test for https://github.com/shaka-project/shaka-player/issues/2958
     it('supports ES6 classes', () => {
       const obj = Functional.callFactory(Es6Class);
       expect(obj.val).toBe(1);

package/test/util/iterables_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.Iterables');
-
 describe('Iterables', () => {
   const Iterables = shaka.util.Iterables;
 
@@ -67,66 +65,4 @@ describe('Iterables', () => {
       expect(Iterables.filter(input, (x) => x < 0)).toEqual([]);
     });
   });
-
-  describe('enumerate', () => {
-    function enumerate(it) {
-      return Array.from(Iterables.enumerate(it));
-    }
-
-    it('works with no items', () => {
-      expect(enumerate([])).toEqual([]);
-    });
-
-    it('works with one item', () => {
-      expect(enumerate([999]))
-          .toEqual([{i: 0, item: 999, prev: undefined, next: undefined}]);
-    });
-
-    it('works with special values', () => {
-      expect(enumerate([[]]))
-          .toEqual([{i: 0, item: [], prev: undefined, next: undefined}]);
-      expect(enumerate([0]))
-          .toEqual([{i: 0, item: 0, prev: undefined, next: undefined}]);
-      expect(enumerate([null]))
-          .toEqual([{i: 0, item: null, prev: undefined, next: undefined}]);
-      expect(enumerate([undefined]))
-          .toEqual([{i: 0, item: undefined, prev: undefined, next: undefined}]);
-    });
-
-    it('works with two items', () => {
-      expect(enumerate([888, 999]))
-          .toEqual([
-            {i: 0, item: 888, prev: undefined, next: 999},
-            {i: 1, item: 999, prev: 888, next: undefined},
-          ]);
-    });
-
-    it('works with three items', () => {
-      expect(enumerate([777, 888, 999]))
-          .toEqual([
-            {i: 0, item: 777, prev: undefined, next: 888},
-            {i: 1, item: 888, prev: 777, next: 999},
-            {i: 2, item: 999, prev: 888, next: undefined},
-          ]);
-    });
-
-    it('keeps references', () => {
-      const expected = [
-        {a: 'x'},
-        {b: 'y'},
-        {c: 'z'},
-      ];
-      const actual = enumerate(expected);
-
-      expect(actual[0].item).toBe(expected[0]);
-      expect(actual[0].next).toBe(expected[1]);
-
-      expect(actual[1].prev).toBe(expected[0]);
-      expect(actual[1].item).toBe(expected[1]);
-      expect(actual[1].next).toBe(expected[2]);
-
-      expect(actual[2].prev).toBe(expected[1]);
-      expect(actual[2].item).toBe(expected[2]);
-    });
-  });
 });

package/test/util/language_utils_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.LanguageUtils');
-goog.require('shaka.util.ManifestParserUtils');
-
 describe('LanguageUtils', () => {
   const LanguageUtils = shaka.util.LanguageUtils;
 

package/test/util/manifest_parser_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ManifestParserUtils');
-
 describe('ManifestParserUtils', () => {
   const ManifestParserUtils = shaka.util.ManifestParserUtils;
 

package/test/util/mp4_box_parsers_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Mp4BoxParsers');
-goog.require('shaka.util.Mp4Parser');
-
 describe('Mp4BoxParsers', () => {
   const videoInitSegmentUri = '/base/test/test/assets/sintel-video-init.mp4';
   const videoSegmentUri = '/base/test/test/assets/sintel-video-segment.mp4';

package/test/util/mp4_parser_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Mp4Parser');
-
 describe('Mp4Parser', () => {
   const Util = shaka.test.Util;
 

package/test/util/multi_map_unit.js

@@ -4,9 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.MultiMap');
-
 describe('MultiMap', () => {
   /** @type {shaka.util.MultiMap<number>} */
   let map;

package/test/util/object_utils_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.ObjectUtils');
-
 describe('ObjectUtils', () => {
   const ObjectUtils = shaka.util.ObjectUtils;
 

package/test/util/periods_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.PeriodCombiner');
-
 describe('PeriodCombiner', () => {
   // These test cases don't really read well as "it" statements.  Phrasing them
   // that way would make the names very long, so here we break with that
@@ -477,7 +473,7 @@ describe('PeriodCombiner', () => {
     a3.originalId = 'a3';
     a3.bandwidth = 97065;
     a3.roles = ['role1', 'role2'];
-    a2.codecs = 'mp4a.40.2';
+    a3.codecs = 'mp4a.40.2';
 
     // a4 has a different label from a3, and should not
     // be filtered out.
@@ -500,14 +496,24 @@ describe('PeriodCombiner', () => {
     const t1 = makeTextStream('en');
     t1.originalId = 't1';
     t1.roles = ['role1'];
+    t1.bandwidth = 1158;
 
     const t2 = makeTextStream('en');
     t2.originalId = 't2';
     t2.roles = ['role1', 'role2'];
+    t2.bandwidth = 1172;
 
     const t3 = makeTextStream('en');
     t3.originalId = 't3';
     t3.roles = ['role1'];
+    t3.bandwidth = 1158;
+
+    // t4 has a different bandwidth from t3, and should not
+    // be filtered out.
+    const t4 = makeTextStream('en');
+    t4.originalId = 't4';
+    t4.roles = ['role1'];
+    t4.bandwidth = 1186;
 
     // i1 and i3 are duplicates.
     const i1 = makeImageStream(240);
@@ -539,6 +545,7 @@ describe('PeriodCombiner', () => {
           t1,
           t2,
           t3,
+          t4,
         ],
         imageStreams: [
           i1,
@@ -565,7 +572,7 @@ describe('PeriodCombiner', () => {
     }
 
     const textStreams = combiner.getTextStreams();
-    expect(textStreams.length).toBe(2);
+    expect(textStreams.length).toBe(3);
 
     // t3 should've been filtered out
     const textIds = textStreams.map((t) => t.originalId);
@@ -1059,7 +1066,7 @@ describe('PeriodCombiner', () => {
   it('The number of variants stays stable after many periods ' +
       'when going between similar content and varying ads', async () => {
     // This test is based on the content from
-    // https://github.com/google/shaka-player/issues/2716
+    // https://github.com/shaka-project/shaka-player/issues/2716
     // that used to cause our period flattening logic to keep
     // creating new variants for every new period added.
     // It's ok to create a few additional varinats/streams,

package/test/util/pssh_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Pssh');
-goog.require('shaka.util.Uint8ArrayUtils');
-
 describe('Pssh', () => {
   const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
 

package/test/util/state_history_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.StateHistory');
-
 describe('StateHistory', () => {
   const oldDateNow = Date.now;
 

package/test/util/stream_utils_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.FakeDrmEngine');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.StreamUtils');
-
 describe('StreamUtils', () => {
   const StreamUtils = shaka.util.StreamUtils;
 
@@ -184,7 +179,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one role, even if none is preferred', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';
@@ -223,7 +218,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one role, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/949
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/949
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';
@@ -269,7 +264,7 @@ describe('StreamUtils', () => {
     });
 
     it('chooses only one language, even if all are primary', () => {
-      // Regression test for https://github.com/google/shaka-player/issues/918
+      // Regression test for https://github.com/shaka-project/shaka-player/issues/918
       manifest = shaka.test.ManifestGenerator.generate((manifest) => {
         manifest.addTextStream(0, (stream) => {
           stream.language = 'en';

package/test/util/string_utils_unit.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.test.Util');
-goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.ManifestParserUtils');
-goog.require('shaka.util.StringUtils');
-
 describe('StringUtils', () => {
   const StringUtils = shaka.util.StringUtils;
 

package/test/util/text_parser_unit.js

@@ -4,8 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.util.TextParser');
-
 describe('TextParser', () => {
   const TextParser = shaka.util.TextParser;
 

package/test/util/xml_utils_unit.js

@@ -4,10 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('goog.asserts');
-goog.require('shaka.util.XmlUtils');
-
-
 describe('XmlUtils', () => {
   // A number that cannot be represented as a Javascript number.
   const HUGE_NUMBER_STRING = new Array(500).join('7');

package/ui/controls.js

@@ -254,6 +254,9 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
 
     this.localization_ = null;
     this.pressedKeys_.clear();
+
+    // FakeEventTarget implements IReleasable
+    super.release();
   }
 
 

package/ui/less/ad_controls.less

@@ -78,11 +78,11 @@
 
   /* This math is determining how far the button is from the right edge.
    * Ad panel's parent is centered and @bottom-controls-width wide, so
-   * 100 - @bottom-controls-width = margins from both sides of the container.
+   * 100% - @bottom-controls-width = margins from both sides of the container.
    * That divided by 2 is margin on one side, so we take that, and move the
    * button from its normal position to the right by that percentage.
    */
-  right: (100 - @bottom-controls-width) / 2 * -1;
+  right: calc((100% - @bottom-controls-width) / 2 * -1);
   display: flex;
   flex-direction: row;
   margin: 0;
@@ -90,18 +90,18 @@
 
 .shaka-skip-ad-button {
   padding: 5px 15px;
-  background: rgba(0, 0, 0, 0.7);
+  background: rgba(0 0 0 / 70%);
   border: none;
 
   &:disabled {
-    background: rgba(0, 0, 0, 0.3);
+    background: rgba(0 0 0 / 30%);
   }
 
   cursor: pointer;
 }
 
 .shaka-skip-ad-counter {
-  padding: 5px 5px;
-  background: rgba(0, 0, 0, 0.7);
+  padding: 5px;
+  background: rgba(0 0 0 / 70%);
   margin: 0;
 }