shaka-player 3.3.0 → 3.3.3

package/lib/util/pssh.js

@@ -9,8 +9,6 @@ goog.provide('shaka.util.Pssh');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.Mp4Parser');
 goog.require('shaka.util.Uint8ArrayUtils');
 
@@ -83,8 +81,7 @@ shaka.util.Pssh = class {
         shaka.util.Uint8ArrayUtils.toHex(box.reader.readBytes(16)));
     if (box.version > 0) {
       const numKeyIds = box.reader.readUint32();
-      for (const _ of shaka.util.Iterables.range(numKeyIds)) {
-        shaka.util.Functional.ignored(_);
+      for (let i = 0; i < numKeyIds; i++) {
         const keyId =
             shaka.util.Uint8ArrayUtils.toHex(box.reader.readBytes(16));
         this.cencKeyIds.push(keyId);

package/lib/util/stream_utils.js

@@ -419,14 +419,49 @@ shaka.util.StreamUtils = class {
    */
   static async filterManifestByMediaCapabilities(
       manifest, usePersistentLicenses) {
-    goog.asserts.assert(window.shakaMediaCapabilities,
+    goog.asserts.assert(navigator.mediaCapabilities,
         'MediaCapabilities should be valid.');
 
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
         manifest.variants, usePersistentLicenses, /* srcEquals= */ false);
     manifest.variants = manifest.variants.filter((variant) => {
+      // See: https://github.com/shaka-project/shaka-player/issues/3860
       const video = variant.video;
-      // See: https://github.com/google/shaka-player/issues/3380
+      const ContentType = shaka.util.ManifestParserUtils.ContentType;
+      if (video) {
+        let videoCodecs = shaka.util.StreamUtils.patchVp9(video.codecs);
+        // For multiplexed streams. Here we must check the audio of the
+        // stream to see if it is compatible.
+        if (video.codecs.includes(',')) {
+          const allCodecs = video.codecs.split(',');
+          videoCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+              ContentType.VIDEO, allCodecs);
+          const audioCodecs = shaka.util.ManifestParserUtils.guessCodecs(
+              ContentType.AUDIO, allCodecs);
+          const audioFullType = shaka.util.MimeUtils.getFullOrConvertedType(
+              video.mimeType, audioCodecs, ContentType.AUDIO);
+          if (!MediaSource.isTypeSupported(audioFullType)) {
+            return false;
+          }
+        }
+        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+            video.mimeType, videoCodecs, ContentType.VIDEO);
+        if (!MediaSource.isTypeSupported(fullType)) {
+          return false;
+        }
+      }
+      const audio = variant.audio;
+      if (audio) {
+        const codecs =
+            shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
+        const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
+            audio.mimeType, codecs, ContentType.AUDIO);
+        if (!MediaSource.isTypeSupported(fullType)) {
+          return false;
+        }
+      }
+
+      // See: https://github.com/shaka-project/shaka-player/issues/3380
       if (shaka.util.Platform.isXboxOne() && video &&
           ((video.width && video.width > 1920) ||
           (video.height && video.height > 1080)) &&
@@ -468,7 +503,7 @@ shaka.util.StreamUtils = class {
       return;
     }
 
-    const mediaCapabilities = window.shakaMediaCapabilities;
+    const mediaCapabilities = navigator.mediaCapabilities;
 
     const operations = [];
     const getVariantDecodingInfos = (async (variant, decodingConfig) => {
@@ -562,12 +597,8 @@ shaka.util.StreamUtils = class {
       }
     }
     if (audio) {
-      // Some Tizen devices seem to misreport AC-3 support, but correctly
-      // report EC-3 support.  So query EC-3 as a fallback for AC-3.
-      // See https://github.com/google/shaka-player/issues/2989 for details.
       const codecs =
-          (audio.codecs.toLowerCase() == 'ac-3' &&
-          shaka.util.Platform.isTizen()) ? 'ec-3' : audio.codecs;
+          shaka.util.StreamUtils.getCorrectAudioCodecs_(audio.codecs);
       const fullType = shaka.util.MimeUtils.getFullOrConvertedType(
           audio.mimeType, codecs, ContentType.AUDIO);
 
@@ -678,6 +709,27 @@ shaka.util.StreamUtils = class {
     return configs;
   }
 
+
+  /**
+   * Generates the correct audio codec for MediaDecodingConfiguration and
+   * for MediaSource.isTypeSupported.
+   * @param {string} codecs
+   * @return {string}
+   * @private
+   */
+  static getCorrectAudioCodecs_(codecs) {
+    // Some Tizen devices seem to misreport AC-3 support, but correctly
+    // report EC-3 support.  So query EC-3 as a fallback for AC-3.
+    // See https://github.com/shaka-project/shaka-player/issues/2989 for
+    // details.
+    if (shaka.util.Platform.isTizen()) {
+      return codecs.toLowerCase() == 'ac-3' ? 'ec-3' : codecs;
+    } else {
+      return codecs;
+    }
+  }
+
+
   /**
    * MediaCapabilities supports 'vp09...' codecs, but not 'vp9'. Translate vp9
    * codec strings into 'vp09...', to allow such content to play with
@@ -989,6 +1041,31 @@ shaka.util.StreamUtils = class {
   static imageStreamToTrack(stream) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
+    let width = stream.width || null;
+    let height = stream.height || null;
+
+    // The stream width and height represent the size of the entire thumbnail
+    // sheet, so divide by the layout.
+    let reference = null;
+    // Note: segmentIndex is built by default for HLS, but not for DASH, but
+    // in DASH this information comes at the stream level and not at the
+    // segment level.
+    if (stream.segmentIndex) {
+      reference = stream.segmentIndex.get(0);
+    }
+    let layout = stream.tilesLayout;
+    if (reference) {
+      layout = reference.getTilesLayout() || layout;
+    }
+    if (layout && width != null) {
+      width /= Number(layout.split('x')[0]);
+    }
+    if (layout && height != null) {
+      height /= Number(layout.split('x')[1]);
+    }
+    // TODO: What happens if there are multiple grids, with different
+    // layout sizes, inside this image stream?
+
     /** @type {shaka.extern.Track} */
     const track = {
       id: stream.id,
@@ -998,8 +1075,8 @@ shaka.util.StreamUtils = class {
       language: '',
       label: null,
       kind: null,
-      width: stream.width || null,
-      height: stream.height || null,
+      width,
+      height,
       frameRate: null,
       pixelAspectRatio: null,
       hdr: null,
@@ -1016,7 +1093,7 @@ shaka.util.StreamUtils = class {
       channelsCount: null,
       audioSamplingRate: null,
       spatialAudio: false,
-      tilesLayout: stream.tilesLayout || null,
+      tilesLayout: layout || null,
       audioBandwidth: null,
       videoBandwidth: null,
       originalVideoId: null,

package/lib/util/string_utils.js

@@ -10,7 +10,6 @@ goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Error');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.Lazy');
 
 
@@ -81,7 +80,7 @@ shaka.util.StringUtils = class {
     const length = Math.floor(data.byteLength / 2);
     const arr = new Uint16Array(length);
     const dataView = shaka.util.BufferUtils.toDataView(data);
-    for (const i of shaka.util.Iterables.range(length)) {
+    for (let i = 0; i < length; i++) {
       arr[i] = dataView.getUint16(i * 2, littleEndian);
     }
     return shaka.util.StringUtils.fromCharCode(arr);
@@ -158,9 +157,8 @@ shaka.util.StringUtils = class {
   static toUTF16(str, littleEndian) {
     const result = new ArrayBuffer(str.length * 2);
     const view = new DataView(result);
-    const enumerate = (it) => shaka.util.Iterables.enumerate(it);
-    for (const {i, item} of enumerate(str)) {
-      const value = item.charCodeAt(0);
+    for (let i = 0; i < str.length; ++i) {
+      const value = str.charCodeAt(i);
       view.setUint16(/* position= */ i * 2, value, littleEndian);
     }
     return result;

package/lib/util/uint8array_utils.js

@@ -8,7 +8,6 @@ goog.provide('shaka.util.Uint8ArrayUtils');
 
 goog.require('shaka.Deprecate');
 goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.StringUtils');
 
 
@@ -74,9 +73,8 @@ shaka.util.Uint8ArrayUtils = class {
     // byte.
     const bytes = window.atob(str.replace(/-/g, '+').replace(/_/g, '/'));
     const result = new Uint8Array(bytes.length);
-    const enumerate = (it) => shaka.util.Iterables.enumerate(it);
-    for (const {i, item} of enumerate(bytes)) {
-      result[i] = item.charCodeAt(0);
+    for (let i = 0; i < bytes.length; ++i) {
+      result[i] = bytes.charCodeAt(i);
     }
     return result;
   }
@@ -91,7 +89,7 @@ shaka.util.Uint8ArrayUtils = class {
   static fromHex(str) {
     const size = str.length / 2;
     const arr = new Uint8Array(size);
-    for (const i of shaka.util.Iterables.range(size)) {
+    for (let i = 0; i < size; i++) {
       arr[i] = window.parseInt(str.substr(i * 2, 2), 16);
     }
     return arr;

package/lib/util/xml_utils.js

@@ -57,9 +57,13 @@ shaka.util.XmlUtils = class {
    * @return {!Array.<!Element>} The child XML elements.
    */
   static findChildren(elem, name) {
-    return Array.from(elem.childNodes).filter((child) => {
-      return child instanceof Element && child.tagName == name;
-    });
+    const found = [];
+    for (const child of elem.childNodes) {
+      if (child instanceof Element && child.tagName == name) {
+        found.push(child);
+      }
+    }
+    return found;
   }
 
 
@@ -82,10 +86,14 @@ shaka.util.XmlUtils = class {
    * @return {!Array.<!Element>} The child XML elements.
    */
   static findChildrenNS(elem, ns, name) {
-    return Array.from(elem.childNodes).filter((child) => {
-      return child instanceof Element && child.localName == name &&
-          child.namespaceURI == ns;
-    });
+    const found = [];
+    for (const child of elem.childNodes) {
+      if (child instanceof Element && child.localName == name &&
+          child.namespaceURI == ns) {
+        found.push(child);
+      }
+    }
+    return found;
   }
 
 
@@ -103,6 +111,25 @@ shaka.util.XmlUtils = class {
   }
 
 
+  /**
+   * Gets a namespace-qualified attribute.
+   * @param {!Element} elem The element to get from.
+   * @param {!Array.<string>} nsList The lis of namespace URIs.
+   * @param {string} name The local name of the attribute.
+   * @return {?string} The attribute's value, or null if not present.
+   */
+  static getAttributeNSList(elem, nsList, name) {
+    // Some browsers return the empty string when the attribute is missing,
+    // so check if it exists first.  See: https://mzl.la/2L7F0UK
+    for (const ns of nsList) {
+      if (elem.hasAttributeNS(ns, name)) {
+        return elem.getAttributeNS(ns, name);
+      }
+    }
+    return null;
+  }
+
+
   /**
    * Gets the text contents of a node.
    * @param {!Node} elem The XML element.

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "3.3.0",
-  "homepage": "https://github.com/google/shaka-player",
+  "version": "3.3.3",
+  "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
     {
@@ -11,63 +11,85 @@
     }
   ],
   "devDependencies": {
-    "@chiragrupani/karma-chromium-edge-launcher": "^2.1.0",
+    "@babel/core": "^7.17.5",
+    "@babel/polyfill": "^7.12.1",
+    "@babel/preset-env": "^7.16.11",
     "@teppeis/clutz": "^1.0.29-4c95e12.v20190929",
-    "awesomplete": "^1.1.4",
-    "babel-core": "^6.26.3",
-    "babel-plugin-istanbul": "^4.1.6",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.7.0",
+    "awesomplete": "^1.1.5",
+    "babel-plugin-istanbul": "^6.1.1",
     "cajon": "^0.4.4",
-    "core-js": "^3.6.5",
-    "dialog-polyfill": "^0.5.0",
+    "code-prettify": "^0.1.0",
+    "color-themes-for-google-code-prettify": "^2.0.4",
+    "core-js": "^3.21.1",
+    "dialog-polyfill": "^0.5.6",
     "es6-promise-polyfill": "^1.2.0",
-    "eslint": "^7.18.0",
-    "eslint-config-google": "^0.13.0",
+    "eslint": "^8.9.0",
+    "eslint-config-google": "^0.14.0",
     "eslint-plugin-shaka-rules": "file:./build/eslint-plugin-shaka-rules",
     "esprima": "^4.0.1",
     "fastestsmallesttextencoderdecoder": "^1.0.22",
     "fontfaceonload": "^1.0.2",
-    "google-closure-compiler-java": "^20210505.0.0",
-    "google-closure-library": "^20210406.0.0",
-    "htmlhint": "^0.11.0",
+    "google-closure-compiler-java": "^20220301.0.0",
+    "google-closure-deps": "https://gitpkg.now.sh/google/closure-library/closure-deps?d7736da6",
+    "google-closure-library": "^20220301.0.0",
+    "htmlhint": "^1.1.3",
     "jasmine-ajax": "^4.0.0",
-    "jimp": "^0.11.0",
-    "jsdoc": "github:joeyparrish/jsdoc#45c271fa",
-    "karma": "^6.2.0",
-    "karma-babel-preprocessor": "^7.0.0",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-coverage": "^1.1.2",
-    "karma-edge-launcher": "^0.4.2",
-    "karma-firefox-launcher": "^1.1.0",
-    "karma-ie-launcher": "^1.0.0",
-    "karma-jasmine": "^3.3.1",
+    "jimp": "^0.16.1",
+    "js-yaml": "^4.1.0",
+    "jsdoc": "github:joeyparrish/jsdoc#2ca85bb6",
+    "karma": "^6.3.16",
+    "karma-babel-preprocessor": "^8.0.2",
+    "karma-coverage": "^2.2.0",
+    "karma-jasmine": "^4.0.1",
     "karma-jasmine-ajax": "^0.1.13",
+    "karma-local-wd-launcher": "^1.6.1",
     "karma-opera-launcher": "^1.0.0",
-    "karma-safari-launcher": "^1.0.0",
-    "karma-sourcemap-loader": "^0.3.7",
-    "karma-spec-reporter": "0.0.32",
+    "karma-sourcemap-loader": "^0.3.8",
+    "karma-spec-reporter": "^0.0.34",
     "karma-webdriver-launcher": "^1.0.8",
-    "less": "^3.13.1",
-    "less-plugin-clean-css": "^1.5.1",
+    "less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
+    "less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
     "material-design-lite": "^1.3.0",
-    "mux.js": "^5.7.0",
-    "pwacompat": "^2.0.10",
-    "rimraf": "^2.6.3",
+    "mux.js": "^5.14.1",
+    "open-sans-fonts": "^1.6.2",
+    "postcss-less": "^6.0.0",
+    "pwacompat": "^2.0.17",
+    "rimraf": "^3.0.2",
     "sprintf-js": "^1.1.2",
-    "stylelint": "^13.8.0",
-    "stylelint-config-standard": "^20.0.0",
-    "tippy.js": "^4.3.1",
-    "ua-parser-js": "^0.7.24",
-    "which": "^1.3.1"
+    "ssim.js": "^3.5.0",
+    "stylelint": "^14.5.1",
+    "stylelint-config-standard": "^25.0.0",
+    "tippy.js": "^4.3.5",
+    "which": "^2.0.2"
+  },
+  "shakaCustom": {
+    "purposeOfDemoDeps": "These are the files from node_modules that need to be deployed with the demo app.",
+    "demoDeps": [
+      "awesomplete/awesomplete.css",
+      "awesomplete/awesomplete.min.js",
+      "dialog-polyfill/dialog-polyfill.css",
+      "dialog-polyfill/dist/dialog-polyfill.js",
+      "eme-encryption-scheme-polyfill/index.js",
+      "es6-promise-polyfill/promise.min.js",
+      "fastestsmallesttextencoderdecoder/EncoderDecoderTogether.min.js",
+      "google-closure-library/closure/goog/base.js",
+      "less/dist/less.js",
+      "material-design-lite/dist/material.indigo-blue.min.css",
+      "material-design-lite/dist/material.min.js",
+      "mux.js/dist/mux.min.js",
+      "popper.js/dist/umd/popper.min.js",
+      "pwacompat/pwacompat.min.js",
+      "tippy.js/umd/index.min.js",
+      "tippy.js/index.css"
+    ]
   },
   "main": "dist/shaka-player.compiled.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/google/shaka-player.git"
+    "url": "https://github.com/shaka-project/shaka-player.git"
   },
   "bugs": {
-    "url": "https://github.com/google/shaka-player/issues"
+    "url": "https://github.com/shaka-project/shaka-player/issues"
   },
   "license": "Apache-2.0",
   "scripts": {

package/roadmap.md

@@ -10,49 +10,49 @@ so the exact milestone for future features is not pre-determined.
 
 Priority features up next:
  - Support containerless formats
-   https://github.com/google/shaka-player/issues/2337
+   https://github.com/shaka-project/shaka-player/issues/2337
  - Preload API
-   https://github.com/google/shaka-player/issues/880
+   https://github.com/shaka-project/shaka-player/issues/880
  - Codec-switching and order preference
-   https://github.com/google/shaka-player/issues/1528
-   https://github.com/google/shaka-player/issues/2179
+   https://github.com/shaka-project/shaka-player/issues/1528
+   https://github.com/shaka-project/shaka-player/issues/2179
 
 Candidate features for future release cycles:
  - HLS interstitial support
-   https://github.com/google/shaka-player/issues/3364
+   https://github.com/shaka-project/shaka-player/issues/3364
  - Support ID3 tags in mp4
-   https://github.com/google/shaka-player/issues/3351
+   https://github.com/shaka-project/shaka-player/issues/3351
  - MSE support for FairPlay
-   https://github.com/google/shaka-player/issues/3346
+   https://github.com/shaka-project/shaka-player/issues/3346
  - Smaller, more modular binary
  - Official TypeScript defs, generated from source
-   https://github.com/google/shaka-player/issues/1030
+   https://github.com/shaka-project/shaka-player/issues/1030
  - Shaka Analytics Component and an integration with BigQuery Analytics
-   https://github.com/google/shaka-player/issues/3359
+   https://github.com/shaka-project/shaka-player/issues/3359
  - Integration with Google Video ML/Cloud AI
 
 v3.3 - 2021 Q3 or Q4
  - Background fetch for offline storage
-   https://github.com/google/shaka-player/issues/879
+   https://github.com/shaka-project/shaka-player/issues/879
  - HLS performance improvements
-   https://github.com/google/shaka-player/issues/3363
+   https://github.com/shaka-project/shaka-player/issues/3363
 
 =====
 
 v3.2 - 2021 Q3
  - MediaCapabilities to make performance-based decisions
-   https://github.com/google/shaka-player/issues/1391
+   https://github.com/shaka-project/shaka-player/issues/1391
  - Configurable key-system priority
-   https://github.com/google/shaka-player/issues/3002
+   https://github.com/shaka-project/shaka-player/issues/3002
 
 v3.1 - 2021 Q2
  - Low-latency live (LL-HLS, LL-DASH)
-   https://github.com/google/shaka-player/issues/1525
+   https://github.com/shaka-project/shaka-player/issues/1525
  - Own CEA parser, use mux.js only for TS
-   https://github.com/google/shaka-player/issues/2648
+   https://github.com/shaka-project/shaka-player/issues/2648
  - Thumbnail tracks
-   DASH: https://github.com/google/shaka-player/issues/559
-   HLS: https://github.com/google/shaka-player/issues/2429
+   DASH: https://github.com/shaka-project/shaka-player/issues/559
+   HLS: https://github.com/shaka-project/shaka-player/issues/2429
 
 v3.0 - 2020 Q2
  - Code health improvements

package/shaka-player.uncompiled.js

@@ -45,6 +45,7 @@ goog.require('shaka.polyfill.PatchedMediaKeysNop');
 goog.require('shaka.polyfill.PatchedMediaKeysWebkit');
 goog.require('shaka.polyfill.PiPWebkit');
 goog.require('shaka.polyfill.RandomUUID');
+goog.require('shaka.polyfill.Symbol');
 goog.require('shaka.polyfill.VTTCue');
 goog.require('shaka.polyfill.VideoPlayPromise');
 goog.require('shaka.polyfill.VideoPlaybackQuality');

package/test/abr/simple_abr_manager_unit.js

@@ -4,11 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.abr.SimpleAbrManager');
-goog.require('shaka.test.ManifestGenerator');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.PlayerConfiguration');
-
 describe('SimpleAbrManager', () => {
   const sufficientBWMultiplier = 1.06;
   const defaultBandwidthEstimate = 500e3; // 500kbps
@@ -91,7 +86,7 @@ describe('SimpleAbrManager', () => {
     config.defaultBandwidthEstimate = 3e6;
     abrManager.configure(config);
     const chosen = abrManager.chooseVariant();
-    expect(chosen.id).toBe(104);
+    expect(chosen.id).toBe(103);
   });
 
   it('can handle empty variants', () => {
@@ -170,7 +165,7 @@ describe('SimpleAbrManager', () => {
   it('can handle 0 duration segments', () => {
     // Makes sure bandwidth estimate doesn't get set to NaN
     // when a 0 duration segment is encountered.
-    // https://github.com/google/shaka-player/issues/582
+    // https://github.com/shaka-project/shaka-player/issues/582
     const bandwidth = 5e5;
     const bytesPerSecond = sufficientBWMultiplier * bandwidth / 8.0;
 
@@ -208,7 +203,7 @@ describe('SimpleAbrManager', () => {
     abrManager.segmentDownloaded(1000, bytesPerSecond);
 
     // Expect variants 4 to be chosen
-    const expectedVariant = variants[4];
+    const expectedVariant = variants[3];
 
     expect(switchCallback).toHaveBeenCalledWith(expectedVariant);
   });

package/test/ads/ad_manager_unit.js

@@ -4,12 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.ads.AdManager');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-
 describe('Ad manager', () => {
   /** @type {!shaka.test.FakeVideo} */
   let mockVideo;

package/test/cast/cast_proxy_unit.js

@@ -4,14 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.cast.CastProxy');
-goog.require('shaka.cast.CastSender');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.FakeEvent');
-goog.require('shaka.util.PublicPromise');
-
 describe('CastProxy', () => {
   const CastProxy = shaka.cast.CastProxy;
   const FakeEvent = shaka.util.FakeEvent;

package/test/cast/cast_receiver_integration.js

@@ -4,22 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.Player');
-goog.require('shaka.cast.CastReceiver');
-goog.require('shaka.cast.CastUtils');
-goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
-goog.require('shaka.media.ManifestParser');
-goog.require('shaka.media.StreamingEngine');
-goog.require('shaka.net.NetworkingEngine');
-goog.require('shaka.test.TestScheme');
-goog.require('shaka.test.UiUtils');
-goog.require('shaka.util.EventManager');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PublicPromise');
-
 // The receiver is only meant to run on the Chromecast, so we have the
 // ability to use modern APIs there that may not be available on all of the
 // browsers our library supports.  Because of this, CastReceiver tests will
@@ -198,8 +182,7 @@ filterDescribe('CastReceiver', castReceiverIntegrationSupport, () => {
       // the average length is expected to be lower than the length of the first
       // update message.
       let totalLength = 0;
-      for (const _ of shaka.util.Iterables.range(50)) {
-        shaka.util.Functional.ignored(_);
+      for (let i = 0; i < 50; i++) {
         // eslint-disable-next-line no-await-in-loop
         const message = await waitForUpdateMessage();
         totalLength += message.length;

package/test/cast/cast_receiver_unit.js

@@ -4,14 +4,6 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-goog.require('shaka.cast.CastReceiver');
-goog.require('shaka.cast.CastUtils');
-goog.require('shaka.test.FakeVideo');
-goog.require('shaka.test.Util');
-goog.require('shaka.util.Error');
-goog.require('shaka.util.Platform');
-goog.require('shaka.util.PublicPromise');
-
 // The receiver is only meant to run on the Chromecast, so we have the
 // ability to use modern APIs there that may not be available on all of the
 // browsers our library supports.  Because of this, CastReceiver tests will
@@ -756,7 +748,7 @@ filterDescribe('CastReceiver', castReceiverSupport, () => {
       expect(mockGenericMessageBus.broadcast).toHaveBeenCalledTimes(1);
 
       // This covers the lack of scrubber in the Google Home app, as described
-      // in https://github.com/google/shaka-player/issues/2606
+      // in https://github.com/shaka-project/shaka-player/issues/2606
       expectMediaInfo('URI A', 1);
     });
 

package/test/cast/cast_sender_unit.js

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