shaka-player 4.12.8 → 4.13.0

package/lib/util/stream_utils.js

@@ -17,7 +17,7 @@ goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.MultiMap');
 goog.require('shaka.util.ObjectUtils');
 goog.require('shaka.util.Platform');
-goog.requireType('shaka.media.DrmEngine');
+goog.requireType('shaka.drm.DrmEngine');
 
 
 /**
@@ -30,10 +30,10 @@ shaka.util.StreamUtils = class {
    * bandwidth and filter out the rest.
    * Also filters out variants that have too many audio channels.
    * @param {!shaka.extern.Manifest} manifest
-   * @param {!Array.<string>} preferredVideoCodecs
-   * @param {!Array.<string>} preferredAudioCodecs
-   * @param {!Array.<string>} preferredDecodingAttributes
-   * @param {!Array.<string>} preferredTextFormats
+   * @param {!Array<string>} preferredVideoCodecs
+   * @param {!Array<string>} preferredAudioCodecs
+   * @param {!Array<string>} preferredDecodingAttributes
+   * @param {!Array<string>} preferredTextFormats
    */
   static chooseCodecsAndFilterManifest(manifest, preferredVideoCodecs,
       preferredAudioCodecs, preferredDecodingAttributes, preferredTextFormats) {
@@ -67,7 +67,7 @@ shaka.util.StreamUtils = class {
 
     if (preferredDecodingAttributes.length) {
       // group variants by resolution and choose preferred variants only
-      /** @type {!shaka.util.MultiMap.<shaka.extern.Variant>} */
+      /** @type {!shaka.util.MultiMap<shaka.extern.Variant>} */
       const variantsByResolutionMap = new shaka.util.MultiMap();
       for (const variant of variants) {
         variantsByResolutionMap
@@ -243,8 +243,8 @@ shaka.util.StreamUtils = class {
    * Choose the codecs by configured preferred audio and video codecs.
    *
    * @param {!Array<shaka.extern.Variant>} variants
-   * @param {!Array.<string>} preferredVideoCodecs
-   * @param {!Array.<string>} preferredAudioCodecs
+   * @param {!Array<string>} preferredVideoCodecs
+   * @param {!Array<string>} preferredAudioCodecs
    * @return {!Array<shaka.extern.Variant>}
    */
   static choosePreferredCodecs(variants, preferredVideoCodecs,
@@ -366,7 +366,7 @@ shaka.util.StreamUtils = class {
 
 
   /**
-   * @param {!Array.<shaka.extern.Variant>} variants
+   * @param {!Array<shaka.extern.Variant>} variants
    * @param {shaka.extern.Restrictions} restrictions
    * @param {shaka.extern.Resolution} maxHwRes
    * @return {boolean} Whether the tracks changed.
@@ -391,10 +391,10 @@ shaka.util.StreamUtils = class {
   /**
    * Alters the given Manifest to filter out any unplayable streams.
    *
-   * @param {shaka.media.DrmEngine} drmEngine
+   * @param {shaka.drm.DrmEngine} drmEngine
    * @param {shaka.extern.Manifest} manifest
    * @param {!Array<string>=} preferredKeySystems
-   * @param {!Object.<string, string>=} keySystemsMapping
+   * @param {!Object<string, string>=} keySystemsMapping
    */
   static async filterManifest(drmEngine, manifest, preferredKeySystems = [],
       keySystemsMapping = {}) {
@@ -410,11 +410,11 @@ shaka.util.StreamUtils = class {
    * Alters the given Manifest to filter out any streams unsupported by the
    * platform via MediaCapabilities.decodingInfo() API.
    *
-   * @param {shaka.media.DrmEngine} drmEngine
+   * @param {shaka.drm.DrmEngine} drmEngine
    * @param {shaka.extern.Manifest} manifest
    * @param {boolean} usePersistentLicenses
    * @param {!Array<string>} preferredKeySystems
-   * @param {!Object.<string, string>} keySystemsMapping
+   * @param {!Object<string, string>} keySystemsMapping
    */
   static async filterManifestByMediaCapabilities(
       drmEngine, manifest, usePersistentLicenses, preferredKeySystems,
@@ -491,7 +491,7 @@ shaka.util.StreamUtils = class {
   /**
    * @param {!shaka.extern.Variant} variant
    * @param {?string} keySystem
-   * @param {!Object.<string, string>} keySystemsMapping
+   * @param {!Object<string, string>} keySystemsMapping
    * @return {boolean}
    * @private
    */
@@ -553,7 +553,7 @@ shaka.util.StreamUtils = class {
    * and assigns it to the given variant.
    * If that query has been done before, instead return a cached result.
    * @param {!shaka.extern.Variant} variant
-   * @param {!Array.<!MediaDecodingConfiguration>} decodingConfigs
+   * @param {!Array<!MediaDecodingConfiguration>} decodingConfigs
    * @private
    */
   static async getDecodingInfosForVariant_(variant, decodingConfigs) {
@@ -620,7 +620,7 @@ shaka.util.StreamUtils = class {
 
   /**
    * @param {!MediaDecodingConfiguration} decodingConfig
-   * @return {!Promise.<?Array.<!MediaCapabilitiesDecodingInfo>>}
+   * @return {!Promise<?Array<!MediaCapabilitiesDecodingInfo>>}
    * @private
    */
   static checkEachDecodingConfigCombination_(decodingConfig) {
@@ -677,7 +677,7 @@ shaka.util.StreamUtils = class {
    * This should be called after the DrmEngine is created and configured, and
    * before DrmEngine sets the mediaKeys.
    *
-   * @param {!Array.<shaka.extern.Variant>} variants
+   * @param {!Array<shaka.extern.Variant>} variants
    * @param {boolean} usePersistentLicenses
    * @param {boolean} srcEquals
    * @param {!Array<string>} preferredKeySystems
@@ -696,7 +696,7 @@ shaka.util.StreamUtils = class {
     for (const preferredKeySystem of preferredKeySystems) {
       let keySystemSatisfied = false;
       for (const variant of variants) {
-        /** @type {!Array.<!Array.<!MediaDecodingConfiguration>>} */
+        /** @type {!Array<!Array<!MediaDecodingConfiguration>>} */
         const decodingConfigs = shaka.util.StreamUtils.getDecodingConfigs_(
             variant, usePersistentLicenses, srcEquals)
             .filter((configs) => {
@@ -726,7 +726,7 @@ shaka.util.StreamUtils = class {
     } // for (const preferredKeySystem of preferredKeySystems)
 
     for (const variant of variants) {
-      /** @type {!Array.<!Array.<!MediaDecodingConfiguration>>} */
+      /** @type {!Array<!Array<!MediaDecodingConfiguration>>} */
       const decodingConfigs = shaka.util.StreamUtils.getDecodingConfigs_(
           variant, usePersistentLicenses, srcEquals)
           .filter((configs) => {
@@ -758,7 +758,7 @@ shaka.util.StreamUtils = class {
    * @param {!shaka.extern.Variant} variant
    * @param {boolean} usePersistentLicenses
    * @param {boolean} srcEquals
-   * @return {!Array.<!Array.<!MediaDecodingConfiguration>>}
+   * @return {!Array<!Array<!MediaDecodingConfiguration>>}
    * @private
    */
   static getDecodingConfigs_(variant, usePersistentLicenses, srcEquals) {
@@ -865,7 +865,7 @@ shaka.util.StreamUtils = class {
 
     // Generate each combination of video and audio config as a separate
     // MediaDecodingConfiguration, inside the main "batch".
-    /** @type {!Array.<!MediaDecodingConfiguration>} */
+    /** @type {!Array<!MediaDecodingConfiguration>} */
     const mediaDecodingConfigBatch = [];
     if (videoConfigs.length == 0) {
       videoConfigs.push(null);
@@ -917,101 +917,117 @@ shaka.util.StreamUtils = class {
         usePersistentLicenses ? ['persistent-license'] : ['temporary'];
 
     for (const keySystem of drmInfoByKeySystems.keys()) {
-      const modifiedMediaDecodingConfigBatch = [];
-      for (const base of mediaDecodingConfigBatch) {
-        // Create a copy of the mediaDecodingConfig.
-        const config = /** @type {!MediaDecodingConfiguration} */
-            (Object.assign({}, base));
-
-        const drmInfos = drmInfoByKeySystems.get(keySystem);
-
-        /** @type {!MediaCapabilitiesKeySystemConfiguration} */
-        const keySystemConfig = {
-          keySystem: keySystem,
-          initDataType: 'cenc',
-          persistentState: persistentState,
-          distinctiveIdentifier: 'optional',
-          sessionTypes: sessionTypes,
-        };
+      const drmInfos = drmInfoByKeySystems.get(keySystem);
+
+      // Get all the robustness info so that we can avoid using nested
+      // loops when we just need the robustness.
+      const drmInfosByRobustness = new Map();
+      for (const info of drmInfos) {
+        const keyName = `${info.videoRobustness},${info.audioRobustness}`;
+        if (!drmInfosByRobustness.get(keyName)) {
+          drmInfosByRobustness.set(keyName, []);
+        }
+        drmInfosByRobustness.get(keyName).push(info);
+      }
 
-        for (const info of drmInfos) {
-          if (info.initData && info.initData.length) {
-            const initDataTypes = new Set();
-            for (const initData of info.initData) {
-              initDataTypes.add(initData.initDataType);
-            }
-            if (initDataTypes.size > 1) {
-              shaka.log.v2('DrmInfo contains more than one initDataType,',
-                  'and we use the initDataType of the first initData.',
-                  info);
+      for (const drmInfosRobustness of drmInfosByRobustness.values()) {
+        const modifiedMediaDecodingConfigBatch = [];
+        for (const base of mediaDecodingConfigBatch) {
+          // Create a copy of the mediaDecodingConfig.
+          const config = /** @type {!MediaDecodingConfiguration} */
+              (Object.assign({}, base));
+
+
+          /** @type {!MediaCapabilitiesKeySystemConfiguration} */
+          const keySystemConfig = {
+            keySystem: keySystem,
+            initDataType: 'cenc',
+            persistentState: persistentState,
+            distinctiveIdentifier: 'optional',
+            sessionTypes: sessionTypes,
+          };
+
+          for (const info of drmInfosRobustness) {
+            if (info.initData && info.initData.length) {
+              const initDataTypes = new Set();
+              for (const initData of info.initData) {
+                initDataTypes.add(initData.initDataType);
+              }
+              if (initDataTypes.size > 1) {
+                shaka.log.v2('DrmInfo contains more than one initDataType,',
+                    'and we use the initDataType of the first initData.',
+                    info);
+              }
+              keySystemConfig.initDataType = info.initData[0].initDataType;
             }
-            keySystemConfig.initDataType = info.initData[0].initDataType;
-          }
 
-          if (info.distinctiveIdentifierRequired) {
-            keySystemConfig.distinctiveIdentifier = 'required';
-          }
-          if (info.persistentStateRequired) {
-            keySystemConfig.persistentState = 'required';
-          }
-          if (info.sessionType) {
-            keySystemConfig.sessionTypes = [info.sessionType];
-          }
+            if (info.distinctiveIdentifierRequired) {
+              keySystemConfig.distinctiveIdentifier = 'required';
+            }
+            if (info.persistentStateRequired) {
+              keySystemConfig.persistentState = 'required';
+            }
+            if (info.sessionType) {
+              keySystemConfig.sessionTypes = [info.sessionType];
+            }
 
-          if (audio) {
-            if (!keySystemConfig.audio) {
-              // KeySystemTrackConfiguration
-              keySystemConfig.audio = {
-                robustness: info.audioRobustness,
-              };
-              if (info.encryptionScheme) {
-                keySystemConfig.audio.encryptionScheme = info.encryptionScheme;
+            if (audio) {
+              if (!keySystemConfig.audio) {
+                // KeySystemTrackConfiguration
+                keySystemConfig.audio = {
+                  robustness: info.audioRobustness,
+                };
+                if (info.encryptionScheme) {
+                  keySystemConfig.audio.encryptionScheme =
+                      info.encryptionScheme;
+                }
+              } else {
+                if (info.encryptionScheme) {
+                  keySystemConfig.audio.encryptionScheme =
+                      keySystemConfig.audio.encryptionScheme ||
+                      info.encryptionScheme;
+                }
+                keySystemConfig.audio.robustness =
+                    keySystemConfig.audio.robustness ||
+                    info.audioRobustness;
               }
-            } else {
-              if (info.encryptionScheme) {
-                keySystemConfig.audio.encryptionScheme =
-                    keySystemConfig.audio.encryptionScheme ||
-                    info.encryptionScheme;
+              // See: https://github.com/shaka-project/shaka-player/issues/4659
+              if (keySystemConfig.audio.robustness == '') {
+                delete keySystemConfig.audio.robustness;
               }
-              keySystemConfig.audio.robustness =
-                  keySystemConfig.audio.robustness ||
-                  info.audioRobustness;
             }
-            // See: https://github.com/shaka-project/shaka-player/issues/4659
-            if (keySystemConfig.audio.robustness == '') {
-              delete keySystemConfig.audio.robustness;
-            }
-          }
 
-          if (video) {
-            if (!keySystemConfig.video) {
-              // KeySystemTrackConfiguration
-              keySystemConfig.video = {
-                robustness: info.videoRobustness,
-              };
-              if (info.encryptionScheme) {
-                keySystemConfig.video.encryptionScheme = info.encryptionScheme;
+            if (video) {
+              if (!keySystemConfig.video) {
+                // KeySystemTrackConfiguration
+                keySystemConfig.video = {
+                  robustness: info.videoRobustness,
+                };
+                if (info.encryptionScheme) {
+                  keySystemConfig.video.encryptionScheme =
+                      info.encryptionScheme;
+                }
+              } else {
+                if (info.encryptionScheme) {
+                  keySystemConfig.video.encryptionScheme =
+                      keySystemConfig.video.encryptionScheme ||
+                      info.encryptionScheme;
+                }
+                keySystemConfig.video.robustness =
+                    keySystemConfig.video.robustness ||
+                    info.videoRobustness;
               }
-            } else {
-              if (info.encryptionScheme) {
-                keySystemConfig.video.encryptionScheme =
-                    keySystemConfig.video.encryptionScheme ||
-                    info.encryptionScheme;
+              // See: https://github.com/shaka-project/shaka-player/issues/4659
+              if (keySystemConfig.video.robustness == '') {
+                delete keySystemConfig.video.robustness;
               }
-              keySystemConfig.video.robustness =
-                  keySystemConfig.video.robustness ||
-                  info.videoRobustness;
-            }
-            // See: https://github.com/shaka-project/shaka-player/issues/4659
-            if (keySystemConfig.video.robustness == '') {
-              delete keySystemConfig.video.robustness;
             }
           }
+          config.keySystemConfiguration = keySystemConfig;
+          modifiedMediaDecodingConfigBatch.push(config);
         }
-        config.keySystemConfiguration = keySystemConfig;
-        modifiedMediaDecodingConfigBatch.push(config);
+        configs.push(modifiedMediaDecodingConfigBatch);
       }
-      configs.push(modifiedMediaDecodingConfigBatch);
     }
     return configs;
   }
@@ -1066,12 +1082,12 @@ shaka.util.StreamUtils = class {
       // Convert avc1 codec string from RFC-4281 to RFC-6381 for
       // MediaSource.isTypeSupported
       // Example, convert avc1.66.30 to avc1.42001e (0x42 == 66 and 0x1e == 30)
-      const avcdata = codec.split('.');
-      if (avcdata.length == 3) {
-        let result = avcdata.shift() + '.';
-        result += parseInt(avcdata.shift(), 10).toString(16);
+      const avcData = codec.split('.');
+      if (avcData.length == 3) {
+        let result = avcData.shift() + '.';
+        result += parseInt(avcData.shift(), 10).toString(16);
         result +=
-            ('000' + parseInt(avcdata.shift(), 10).toString(16)).slice(-4);
+            ('000' + parseInt(avcData.shift(), 10).toString(16)).slice(-4);
         return result;
       }
     } else if (codec == 'vp9') {
@@ -1097,7 +1113,7 @@ shaka.util.StreamUtils = class {
 
 
   /**
-   * Alters the given Manifest to filter out any streams uncompatible with the
+   * Alters the given Manifest to filter out any streams incompatible with the
    * current variant.
    *
    * @param {?shaka.extern.Variant} currentVariant
@@ -1196,7 +1212,7 @@ shaka.util.StreamUtils = class {
 
   /**
    * @param {string} minImage
-   * @return {!Promise.<boolean>}
+   * @return {!Promise<boolean>}
    * @private
    */
   static isImageSupported_(minImage) {
@@ -1261,7 +1277,7 @@ shaka.util.StreamUtils = class {
     /** @type {?string} */
     const videoCodec = video ? video.codecs : null;
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const codecs = [];
     if (videoCodec) {
       codecs.push(videoCodec);
@@ -1270,7 +1286,7 @@ shaka.util.StreamUtils = class {
       codecs.push(audioCodec);
     }
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const mimeTypes = [];
     if (video) {
       mimeTypes.push(video.mimeType);
@@ -1281,7 +1297,7 @@ shaka.util.StreamUtils = class {
     /** @type {?string} */
     const mimeType = mimeTypes[0] || null;
 
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const kinds = [];
     if (audio) {
       kinds.push(audio.kind);
@@ -1292,7 +1308,7 @@ shaka.util.StreamUtils = class {
     /** @type {?string} */
     const kind = kinds[0] || null;
 
-    /** @type {!Set.<string>} */
+    /** @type {!Set<string>} */
     const roles = new Set();
     if (audio) {
       for (const role of audio.roles) {
@@ -1657,8 +1673,8 @@ shaka.util.StreamUtils = class {
 
   /**
    * Filters out unplayable variants.
-   * @param {!Array.<!shaka.extern.Variant>} variants
-   * @return {!Array.<!shaka.extern.Variant>}
+   * @param {!Array<!shaka.extern.Variant>} variants
+   * @return {!Array<!shaka.extern.Variant>}
    */
   static getPlayableVariants(variants) {
     return variants.filter((variant) => {
@@ -1801,7 +1817,7 @@ shaka.util.StreamUtils = class {
    * Get all non-null streams in the variant as an array.
    *
    * @param {shaka.extern.Variant} variant
-   * @return {!Array.<shaka.extern.Stream>}
+   * @return {!Array<shaka.extern.Stream>}
    */
   static getVariantStreams(variant) {
     const streams = [];
@@ -1838,7 +1854,7 @@ shaka.util.StreamUtils = class {
    * Set the best iframe stream to the original stream.
    *
    * @param {!shaka.extern.Stream} stream
-   * @param {!Array.<!shaka.extern.Stream>} iFrameStreams
+   * @param {!Array<!shaka.extern.Stream>} iFrameStreams
    */
   static setBetterIFrameStream(stream, iFrameStreams) {
     if (!iFrameStreams.length) {
@@ -1929,7 +1945,7 @@ shaka.util.StreamUtils = class {
  * A cache of results from mediaCapabilities.decodingInfo, indexed by the
  * (stringified) decodingConfig.
  *
- * @type {Object.<(!string), (!MediaCapabilitiesDecodingInfo)>}
+ * @type {Object<(!string), (!MediaCapabilitiesDecodingInfo)>}
  * @private
  */
 shaka.util.StreamUtils.decodingConfigCache_ = {};
@@ -1947,7 +1963,7 @@ shaka.util.StreamUtils.DecodingAttributes = {
 };
 
 /**
- * @private {!Map.<string, boolean>}
+ * @private {!Map<string, boolean>}
  */
 shaka.util.StreamUtils.supportedImageMimeTypes_ = new Map()
     .set('image/svg+xml', true)
@@ -1959,6 +1975,7 @@ shaka.util.StreamUtils.supportedImageMimeTypes_ = new Map()
  * @const {string}
  * @private
  */
+// cspell: disable-next-line
 shaka.util.StreamUtils.minWebPImage_ = 'data:image/webp;base64,UklGRjoAAABXRU' +
     'JQVlA4IC4AAACyAgCdASoCAAIALmk0mk0iIiIiIgBoSygABc6WWgAA/veff/0PP8bA//LwY' +
     'AAA';
@@ -1967,6 +1984,7 @@ shaka.util.StreamUtils.minWebPImage_ = 'data:image/webp;base64,UklGRjoAAABXRU' +
  * @const {string}
  * @private
  */
+// cspell: disable-next-line
 shaka.util.StreamUtils.minAvifImage_ = 'data:image/avif;base64,AAAAIGZ0eXBhdm' +
     'lmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAADybWV0YQAAAAAAAAAoaGRscgAAAAAAAAAAcGljd' +
     'AAAAAAAAAAAAAAAAGxpYmF2aWYAAAAADnBpdG0AAAAAAAEAAAAeaWxvYwAAAABEAAABAAEA' +
@@ -1976,7 +1994,7 @@ shaka.util.StreamUtils.minAvifImage_ = 'data:image/avif;base64,AAAAIGZ0eXBhdm' +
     'CVtZGF0EgAKCBgANogQEAwgMg8f8D///8WfhwB8+ErK42A=';
 
 /**
- * @const {!Map.<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
 shaka.util.StreamUtils.minImage_ = new Map()

package/lib/util/string_utils.js

@@ -334,7 +334,10 @@ shaka.util.StringUtils = class {
 
 /** @private {!shaka.util.Lazy.<function(!TypedArray):string>} */
 shaka.util.StringUtils.fromCharCodeImpl_ = new shaka.util.Lazy(() => {
-  /** @param {number} size @return {boolean} */
+  /**
+   * @param {number} size
+   * @return {boolean}
+   */
   const supportsChunkSize = (size) => {
     try {
       // The compiler will complain about suspicious value if this isn't
@@ -344,7 +347,6 @@ shaka.util.StringUtils.fromCharCodeImpl_ = new shaka.util.Lazy(() => {
       // This can't use the spread operator, or it blows up on Xbox One.
       // So we use apply() instead, which is normally not allowed.
       // See issue #2186 for more details.
-      // eslint-disable-next-line no-restricted-syntax
       const foo = String.fromCharCode.apply(null, buffer);
       goog.asserts.assert(foo, 'Should get value');
       return foo.length > 0; // Actually use "foo", so it's not compiled out.
@@ -367,7 +369,6 @@ shaka.util.StringUtils.fromCharCodeImpl_ = new shaka.util.Lazy(() => {
           // This can't use the spread operator, or it blows up on Xbox One.
           // So we use apply() instead, which is normally not allowed.
           // See issue #2186 for more details.
-          // eslint-disable-next-line no-restricted-syntax
           ret += String.fromCharCode.apply(null, subArray);  // Issue #2186
         }
         return ret;

package/lib/util/switch_history.js

@@ -22,7 +22,7 @@ shaka.util.SwitchHistory = class {
     /** @private {?shaka.extern.Stream} */
     this.currentText_ = null;
 
-    /** @private {!Array.<shaka.extern.TrackChoice>} */
+    /** @private {!Array<shaka.extern.TrackChoice>} */
     this.history_ = [];
   }
 
@@ -74,7 +74,7 @@ shaka.util.SwitchHistory = class {
    * Get a copy of the switch history. This will make sure to expose no internal
    * references.
    *
-   * @return {!Array.<shaka.extern.TrackChoice>}
+   * @return {!Array<shaka.extern.TrackChoice>}
    */
   getCopy() {
     const copy = [];

package/lib/util/tXml.js

@@ -13,7 +13,7 @@ goog.require('shaka.log');
 /**
  * This code is a modified version of the tXml library.
  *
- * @author: Tobias Nickel
+ * @author Tobias Nickel
  * created: 06.04.2015
  * https://github.com/TobiasNickel/tXml
  */
@@ -57,6 +57,7 @@ shaka.util.TXml = class {
    * Parse some data
    * @param {string} xmlString
    * @param {string=} expectedRootElemName
+   * @param {boolean=} includeParent
    * @return {shaka.extern.xml.Node | null}
    */
   static parseXmlString(xmlString, expectedRootElemName,
@@ -114,7 +115,7 @@ shaka.util.TXml = class {
    * with no validation and some failure tolerance
    * @param {string} S your XML to parse
    * @param {boolean} includeParent
-   * @return {Array.<shaka.extern.xml.Node>}
+   * @return {Array<shaka.extern.xml.Node>}
    */
   static parse(S, includeParent) {
     let pos = 0;
@@ -132,9 +133,12 @@ shaka.util.TXml = class {
 
     /**
      * parsing a list of entries
+     * @param {string} tagName
+     * @param {boolean=} preserveSpace
+     * @return {!Array<shaka.extern.xml.Node | string>}
      */
     function parseChildren(tagName, preserveSpace = false) {
-      /** @type {Array.<shaka.extern.xml.Node | string>} */
+      /** @type {!Array<shaka.extern.xml.Node | string>} */
       const children = [];
       while (S[pos]) {
         if (S.charCodeAt(pos) == openBracketCC) {
@@ -152,7 +156,6 @@ shaka.util.TXml = class {
                 indexOfCloseTag = closeTag.indexOf(shortTag);
               }
             }
-            // eslint-disable-next-line no-restricted-syntax
             if (indexOfCloseTag == -1) {
               const parsedText = S.substring(0, pos).split('\n');
               throw new Error(
@@ -229,7 +232,8 @@ shaka.util.TXml = class {
     }
 
     /**
-     *    returns the text outside of texts until the first '<'
+     * returns the text outside of texts until the first '<'
+     * @return {string}
      */
     function parseText() {
       const start = pos;
@@ -305,9 +309,9 @@ shaka.util.TXml = class {
             pos--;
           }
           if (name.startsWith('xmlns:')) {
-            const segs = name.split(':');
+            const segments = name.split(':');
             shaka.util.TXml.setKnownNameSpace(
-                /** @type {string} */ (value), segs[1]);
+                /** @type {string} */ (value), segments[1]);
           }
           if (tagName === 'tt' &&
               name === 'xml:space' &&
@@ -353,9 +357,9 @@ shaka.util.TXml = class {
      */
     function parseString() {
       const startChar = S[pos];
-      const startpos = pos + 1;
-      pos = S.indexOf(startChar, startpos);
-      return S.slice(startpos, pos);
+      const startPos = pos + 1;
+      pos = S.indexOf(startChar, startPos);
+      return S.slice(startPos, pos);
     }
 
     return parseChildren('');
@@ -382,7 +386,7 @@ shaka.util.TXml = class {
   /**
    * gets child XML elements.
    * @param {!shaka.extern.xml.Node} elem The parent XML element.
-   * @return {!Array.<!shaka.extern.xml.Node>} The child XML elements.
+   * @return {!Array<!shaka.extern.xml.Node>} The child XML elements.
    */
   static getChildNodes(elem) {
     const found = [];
@@ -401,7 +405,7 @@ shaka.util.TXml = class {
    * Finds child XML elements.
    * @param {!shaka.extern.xml.Node} elem The parent XML element.
    * @param {string} name The child XML element's tag name.
-   * @return {!Array.<!shaka.extern.xml.Node>} The child XML elements.
+   * @return {!Array<!shaka.extern.xml.Node>} The child XML elements.
    */
   static findChildren(elem, name) {
     const found = [];
@@ -459,8 +463,8 @@ shaka.util.TXml = class {
    * Finds child XML elements recursively.
    * @param {!shaka.extern.xml.Node} elem The parent XML element.
    * @param {string} name The child XML element's tag name.
-   * @param {!Array.<!shaka.extern.xml.Node>} found accumulator for found nodes
-   * @return {!Array.<!shaka.extern.xml.Node>} The child XML elements.
+   * @param {!Array<!shaka.extern.xml.Node>} found accumulator for found nodes
+   * @return {!Array<!shaka.extern.xml.Node>} The child XML elements.
    */
   static getElementsByTagName(elem, name, found = []) {
     if (elem.tagName === name) {
@@ -516,7 +520,7 @@ shaka.util.TXml = class {
    * @param {function(string): (T|null)} parseFunction A function that parses
    *   the attribute.
    * @param {(T|null)=} defaultValue The attribute's default value, if not
-   *   specified, the attibute's default value is null.
+   *   specified, the attribute's default value is null.
    * @return {(T|null)} The parsed attribute on success, or the attribute's
    *   default value if the attribute does not exist or could not be parsed.
    * @template T
@@ -550,7 +554,7 @@ shaka.util.TXml = class {
    * @param {!shaka.extern.xml.Node} elem The parent XML element.
    * @param {string} ns The child XML element's namespace URI.
    * @param {string} name The child XML element's local name.
-   * @return {!Array.<!shaka.extern.xml.Node>} The child XML elements.
+   * @return {!Array<!shaka.extern.xml.Node>} The child XML elements.
    */
   static findChildrenNS(elem, ns, name) {
     const schemaNS = shaka.util.TXml.getKnownNameSpace(ns);
@@ -569,7 +573,7 @@ shaka.util.TXml = class {
   /**
    * Gets a namespace-qualified attribute.
    * @param {!shaka.extern.xml.Node} elem The element to get from.
-   * @param {!Array.<string>} nsList The lis of namespace URIs.
+   * @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.
    */
@@ -859,6 +863,7 @@ shaka.util.TXml = class {
    * @param {!Array<shaka.extern.xml.Node>} nodes
    * @param {!string} attribute
    * @param {!number} value
+   * @return {?number}
    * @private
    */
   static nodePositionByAttribute_(nodes, attribute, value) {