shaka-player 4.12.8 → 4.13.0

package/lib/util/functional.js

@@ -19,9 +19,9 @@ shaka.util.Functional = class {
    * e.g.:
    * Promise.reject().catch(callback(array[0])).catch(callback(array[1]));
    *
-   * @param {!Array.<ELEM>} array
-   * @param {function(ELEM):!Promise.<RESULT>} callback
-   * @return {!Promise.<RESULT>}
+   * @param {!Array<ELEM>} array
+   * @param {function(ELEM): !Promise<RESULT>} callback
+   * @return {!Promise<RESULT>}
    * @template ELEM,RESULT
    */
   static createFallbackPromiseChain(array, callback) {
@@ -35,9 +35,9 @@ shaka.util.Functional = class {
    * Returns the first array concatenated to the second; used to collapse an
    * array of arrays into a single array.
    *
-   * @param {!Array.<T>} all
-   * @param {!Array.<T>} part
-   * @return {!Array.<T>}
+   * @param {!Array<T>} all
+   * @param {!Array<T>} part
+   * @return {!Array<T>}
    * @template T
    */
   static collapseArrays(all, part) {
@@ -82,8 +82,8 @@ shaka.util.Functional = class {
    * |asyncProcess| is still allowed to complete.
    *
    * @param {number} seconds
-   * @param {!Promise.<T>} asyncProcess
-   * @return {!Promise.<T>}
+   * @param {!Promise<T>} asyncProcess
+   * @return {!Promise<T>}
    * @template T
    */
   static promiseWithTimeout(seconds, asyncProcess) {

package/lib/util/id3_utils.js

@@ -320,7 +320,7 @@ shaka.util.Id3Utils = class {
   /**
    * Returns an array of ID3 frames found in all the ID3 tags in the id3Data
    * @param {Uint8Array} id3Data - The ID3 data containing one or more ID3 tags
-   * @return {!Array.<shaka.extern.MetadataFrame>}
+   * @return {!Array<shaka.extern.MetadataFrame>}
    * @export
    */
   static getID3Frames(id3Data) {

package/lib/util/iterables.js

@@ -14,9 +14,9 @@ goog.provide('shaka.util.Iterables');
  */
 shaka.util.Iterables = class {
   /**
-   * @param {!Iterable.<FROM>} iterable
+   * @param {!Iterable<FROM>} iterable
    * @param {function(FROM):TO} mapping
-   * @return {!Iterable.<TO>}
+   * @return {!Iterable<TO>}
    * @template FROM,TO
    */
   static map(iterable, mapping) {
@@ -28,7 +28,7 @@ shaka.util.Iterables = class {
   }
 
   /**
-   * @param {!Iterable.<T>} iterable
+   * @param {!Iterable<T>} iterable
    * @param {function(T):boolean} test
    * @return {boolean}
    * @template T
@@ -43,7 +43,7 @@ shaka.util.Iterables = class {
   }
 
   /**
-   * @param {!Iterable.<T>} iterable
+   * @param {!Iterable<T>} iterable
    * @param {function(T):boolean} test
    * @return {boolean}
    * @template T
@@ -61,9 +61,9 @@ shaka.util.Iterables = class {
    * Iterate over an iterable object and return only the items that |filter|
    * returns true for.
    *
-   * @param {!Iterable.<T>} iterable
+   * @param {!Iterable<T>} iterable
    * @param {function(T):boolean} filter
-   * @return {!Array.<T>}
+   * @return {!Array<T>}
    * @template T
    */
   static filter(iterable, filter) {

package/lib/util/language_utils.js

@@ -76,9 +76,9 @@ shaka.util.LanguageUtils = class {
 
     // Get all components. This should only be language and region
     // since we do not support dialect.
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const locale1Components = LanguageUtils.disassembleLocale_(locale1);
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const locale2Components = LanguageUtils.disassembleLocale_(locale2);
 
     // We are language compatible if we have the same language.
@@ -117,10 +117,10 @@ shaka.util.LanguageUtils = class {
 
     // Get all components. This should only be language and region
     // since we do not support dialect.
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const possibleParentComponents =
         LanguageUtils.disassembleLocale_(possibleParent);
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const possibleChildComponents =
         LanguageUtils.disassembleLocale_(possibleChild);
 
@@ -162,9 +162,9 @@ shaka.util.LanguageUtils = class {
 
     // Get all components. This should only be language and region
     // since we do not support dialect.
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const localeAComponents = LanguageUtils.disassembleLocale_(localeA);
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const localeBComponents = LanguageUtils.disassembleLocale_(localeB);
 
     return localeAComponents.length == 2 &&
@@ -191,15 +191,15 @@ shaka.util.LanguageUtils = class {
   static normalize(locale) {
     const LanguageUtils = shaka.util.LanguageUtils;
 
-    const privateusePrefix = 'x-';
-    const [languageRegion = '', privateuseSuffix = ''] =
-     locale.split(`-${privateusePrefix}`);
+    const privateUsePrefix = 'x-';
+    const [languageRegion = '', privateUseSuffix = ''] =
+     locale.split(`-${privateUsePrefix}`);
     const [languageCode = '', regionCode = ''] = languageRegion.split('-');
 
-    // We are only going to use the language, the region and the "privateuse" part (as per https://datatracker.ietf.org/doc/html/rfc5646).
+    // We are only going to use the language, the region and the private use part (as per https://datatracker.ietf.org/doc/html/rfc5646).
     // Anything else is thrown away.
-    const privateuse = privateuseSuffix ?
-        `${privateusePrefix}${privateuseSuffix}` : '';
+    const privateUse = privateUseSuffix ?
+        `${privateUsePrefix}${privateUseSuffix}` : '';
 
     // Convert the language to lower case. It is standard for the language code
     // to be in lower case, but it will also make the map look-up easier.
@@ -212,7 +212,7 @@ shaka.util.LanguageUtils = class {
     const region = regionCode.toUpperCase();
 
     return `${region ? `${language}-${region}` : language}${
-        privateuse ? `-${privateuse}` : ''}`;
+        privateUse ? `-${privateUse}` : ''}`;
   }
 
   /**
@@ -367,7 +367,7 @@ shaka.util.LanguageUtils = class {
    * locale is found to be close to |target|, then |null| will be returned.
    *
    * @param {string} target
-   * @param {!Iterable.<string>} searchSpace
+   * @param {!Iterable<string>} searchSpace
    * @return {?string}
    * @export
    */
@@ -376,7 +376,7 @@ shaka.util.LanguageUtils = class {
 
     /** @type {string} */
     const safeTarget = LanguageUtils.normalize(target);
-    /** @type {!Set.<string>} */
+    /** @type {!Set<string>} */
     const safeSearchSpace = new Set();
     for (const option of searchSpace) {
       safeSearchSpace.add(LanguageUtils.normalize(option));
@@ -428,7 +428,7 @@ shaka.util.LanguageUtils = class {
    * should ONLY be used to verify locales that have been normalized.
    *
    * @param {string} locale
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    * @private
    */
   static disassembleLocale_(locale) {
@@ -451,7 +451,7 @@ shaka.util.LanguageUtils = class {
  * A map from 3-letter language codes (ISO 639-2) to 2-letter language codes
  * (ISO 639-1) for all languages which have both in the registry.
  *
- * @const {!Map.<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
 shaka.util.LanguageUtils.isoMap_ = new Map([

package/lib/util/manifest_parser_utils.js

@@ -24,10 +24,10 @@ shaka.util.ManifestParserUtils = class {
    * Note: This method is slow in SmartTVs and Consoles. It should only be
    * called when necessary.
    *
-   * @param {!Array.<string>} baseUris
-   * @param {!Array.<string>} relativeUris
+   * @param {!Array<string>} baseUris
+   * @param {!Array<string>} relativeUris
    * @param {string=} extraQueryParams
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    */
   static resolveUris(baseUris, relativeUris, extraQueryParams = '') {
     if (relativeUris.length == 0) {
@@ -69,7 +69,7 @@ shaka.util.ManifestParserUtils = class {
    *
    * @param {string} keySystem
    * @param {string} encryptionScheme
-   * @param {Array.<shaka.extern.InitDataOverride>} initData
+   * @param {Array<shaka.extern.InitDataOverride>} initData
    * @param {string} [keySystemUri]
    * @return {shaka.extern.DrmInfo}
    */
@@ -99,7 +99,7 @@ shaka.util.ManifestParserUtils = class {
   /**
    * Creates a DrmInfo object from ClearKeys.
    *
-   * @param {!Map.<string, string>} clearKeys
+   * @param {!Map<string, string>} clearKeys
    * @param {string=} encryptionScheme
    * @return {shaka.extern.DrmInfo}
    */
@@ -166,7 +166,7 @@ shaka.util.ManifestParserUtils = class {
    * Assumes that at least one codec is correct, and throws if none are.
    *
    * @param {string} contentType
-   * @param {!Array.<string>} codecs
+   * @param {!Array<string>} codecs
    * @return {string}
    */
   static guessCodecs(contentType, codecs) {
@@ -197,7 +197,7 @@ shaka.util.ManifestParserUtils = class {
    * not throw if it fails to match.
    *
    * @param {string} contentType
-   * @param {!Array.<string>} codecs
+   * @param {!Array<string>} codecs
    * @return {?string} or null if no match is found
    */
   static guessCodecsSafe(contentType, codecs) {
@@ -225,8 +225,8 @@ shaka.util.ManifestParserUtils = class {
    * content.
    *
    * @param {string} contentType
-   * @param {!Array.<string>} codecs
-   * @return {!Array.<string>}
+   * @param {!Array<string>} codecs
+   * @return {!Array<string>}
    */
   static guessAllCodecsSafe(contentType, codecs) {
     const allCodecs = [];
@@ -280,7 +280,7 @@ shaka.util.ManifestParserUtils.GAP_OVERLAP_TOLERANCE_SECONDS = 1 / 15;
 /**
  * A list of regexps to detect well-known video codecs.
  *
- * @const {!Array.<!RegExp>}
+ * @const {!Array<!RegExp>}
  * @private
  */
 shaka.util.ManifestParserUtils.VIDEO_CODEC_REGEXPS_ = [
@@ -300,7 +300,7 @@ shaka.util.ManifestParserUtils.VIDEO_CODEC_REGEXPS_ = [
 /**
  * A list of regexps to detect well-known audio codecs.
  *
- * @const {!Array.<!RegExp>}
+ * @const {!Array<!RegExp>}
  * @private
  */
 shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_ = [
@@ -321,7 +321,7 @@ shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_ = [
 /**
  * A list of regexps to detect well-known text codecs.
  *
- * @const {!Array.<!RegExp>}
+ * @const {!Array<!RegExp>}
  * @private
  */
 shaka.util.ManifestParserUtils.TEXT_CODEC_REGEXPS_ = [
@@ -332,7 +332,7 @@ shaka.util.ManifestParserUtils.TEXT_CODEC_REGEXPS_ = [
 
 
 /**
- * @const {!Object.<string, !Array.<!RegExp>>}
+ * @const {!Object<string, !Array<!RegExp>>}
  */
 shaka.util.ManifestParserUtils.CODEC_REGEXPS_BY_CONTENT_TYPE_ = {
   'audio': shaka.util.ManifestParserUtils.AUDIO_CODEC_REGEXPS_,

package/lib/util/map_utils.js

@@ -12,8 +12,8 @@ goog.provide('shaka.util.MapUtils');
  */
 shaka.util.MapUtils = class {
   /**
-   * @param {!Object.<KEY, VALUE>} object
-   * @return {!Map.<KEY, VALUE>}
+   * @param {!Object<KEY, VALUE>} object
+   * @return {!Map<KEY, VALUE>}
    * @template KEY,VALUE
    */
   static asMap(object) {
@@ -27,8 +27,8 @@ shaka.util.MapUtils = class {
 
 
   /**
-   * @param {!Map.<KEY, VALUE>} map
-   * @return {!Object.<KEY, VALUE>}
+   * @param {!Map<KEY, VALUE>} map
+   * @return {!Object<KEY, VALUE>}
    * @template KEY,VALUE
    */
   static asObject(map) {
@@ -44,8 +44,8 @@ shaka.util.MapUtils = class {
    * NOTE: This only works for simple value types and
    * will not be accurate if map values are objects!
    *
-   * @param {Map.<KEY, VALUE>} map1
-   * @param {Map.<KEY, VALUE>} map2
+   * @param {Map<KEY, VALUE>} map1
+   * @param {Map<KEY, VALUE>} map2
    * @return {boolean}
    * @template KEY,VALUE
    */

package/lib/util/media_ready_state_utils.js

@@ -31,7 +31,7 @@ shaka.util.MediaReadyState = class {
 };
 
 /**
- * @const {!shaka.util.Lazy.<!Map.<number, string>>}
+ * @const {!shaka.util.Lazy.<!Map<number, string>>}
  * @private
  */
 shaka.util.MediaReadyState.READY_STATES_TO_EVENT_NAMES_ =

package/lib/util/mime_utils.js

@@ -125,7 +125,7 @@ shaka.util.MimeUtils = class {
   /**
    * Split a list of codecs encoded in a string into a list of codecs.
    * @param {string} codecs
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    */
   static splitCodecs(codecs) {
     return codecs.split(',');
@@ -254,11 +254,22 @@ shaka.util.MimeUtils = class {
         mimeType === 'application/vnd.apple.mpegurl';
   }
 
+  /**
+   * Checks if the given MIME type is DASH MIME type.
+   *
+   * @param {string} mimeType
+   * @return {boolean}
+   */
+  static isDashType(mimeType) {
+    return mimeType === 'application/dash+xml' ||
+        mimeType === 'video/vnd.mpeg.dash.mpd';
+  }
+
   /**
    * Get the base and profile of a codec string. Where [0] will be the codec
    * base and [1] will be the profile.
    * @param {string} codecString
-   * @return {!Array.<string>}
+   * @return {!Array<string>}
    * @private
    */
   static getCodecParts_(codecString) {
@@ -281,7 +292,7 @@ shaka.util.MimeUtils = class {
  *
  * This initial set of parameters are all recognized by Chromecast.
  *
- * @const {!Map.<string, string>}
+ * @const {!Map<string, string>}
  * @private
  */
 shaka.util.MimeUtils.EXTENDED_MIME_PARAMETERS_ = new Map()
@@ -308,7 +319,7 @@ shaka.util.MimeUtils.CEA708_CLOSED_CAPTION_MIMETYPE = 'application/cea-708';
 /**
  * MIME types of raw formats.
  *
- * @const {!Array.<string>}
+ * @const {!Array<string>}
  */
 shaka.util.MimeUtils.RAW_FORMATS = [
   'audio/aac',

package/lib/util/mp4_box_parsers.js

@@ -313,7 +313,7 @@ shaka.util.Mp4BoxParsers = class {
     reader.skip(2); // Skip "data_reference_index"
     reader.skip(8); // Skip "reserved"
     const channelCount = reader.readUint16();
-    reader.skip(2); // Skip "samplesize"
+    reader.skip(2); // Skip "sample_size"
     reader.skip(2); // Skip "pre_defined"
     reader.skip(2); // Skip "reserved"
     const sampleRate = reader.readUint16() + (reader.readUint16() / 65536);
@@ -818,13 +818,13 @@ shaka.util.ParsedTREXBox;
 /**
  * @typedef {{
  *    sampleCount: number,
- *    sampleData: !Array.<shaka.util.ParsedTRUNSample>,
+ *    sampleData: !Array<shaka.util.ParsedTRUNSample>,
  *    dataOffset: ?number
  * }}
  *
  * @property {number} sampleCount
  *   As per the spec: the number of samples being added in this run;
- * @property {!Array.<shaka.util.ParsedTRUNSample>} sampleData
+ * @property {!Array<shaka.util.ParsedTRUNSample>} sampleData
  *   An array of size <sampleCount> containing data for each sample
  * @property {?number} dataOffset
  *   If specified via flags, this indicate the offset of the sample in bytes.
@@ -847,7 +847,7 @@ shaka.util.ParsedTRUNBox;
  * @property {?number} sampleCompositionTimeOffset
  *   The time since the start of the sample in timescale units. Time
  *   offset is based of the start of the sample. If this value is
- *   missing, the accumulated durations preceeding this time sample will
+ *   missing, the accumulated durations preceding this time sample will
  *   be used to create the start time.
  *
  * @exportDoc
@@ -1022,7 +1022,7 @@ shaka.util.ParsedHDLRBox;
  *   Possible values:
  *    - Rectangular: ‘rect’
  *    - Half equirectangular: ‘hequ’
- *    - Equirectanguler: ?
+ *    - Equirectangular: ?
  *    - Fisheye: ‘fish’
  *
  * @exportDoc

package/lib/util/mp4_generator.js

@@ -13,12 +13,12 @@ goog.require('shaka.util.Uint8ArrayUtils');
 
 shaka.util.Mp4Generator = class {
   /**
-   * @param {!Array.<shaka.util.Mp4Generator.StreamInfo>} streamInfos
+   * @param {!Array<shaka.util.Mp4Generator.StreamInfo>} streamInfos
    */
   constructor(streamInfos) {
     shaka.util.Mp4Generator.initStaticProperties_();
 
-    /** @private {!Array.<shaka.util.Mp4Generator.StreamInfo>} */
+    /** @private {!Array<shaka.util.Mp4Generator.StreamInfo>} */
     this.streamInfos_ = streamInfos;
   }
 
@@ -355,8 +355,8 @@ shaka.util.Mp4Generator = class {
       0x00, 0x00, 0x00, 0x00, // pre_defined
       ...this.breakNumberIntoBytes_(width, 2), // width
       ...this.breakNumberIntoBytes_(height, 2), // height
-      0x00, 0x48, 0x00, 0x00, // horizresolution
-      0x00, 0x48, 0x00, 0x00, // vertresolution
+      0x00, 0x48, 0x00, 0x00, // horizontal resolution
+      0x00, 0x48, 0x00, 0x00, // vertical resolution
       0x00, 0x00, 0x00, 0x00, // reserved
       0x00, 0x01, // frame_count
       0x13,
@@ -367,7 +367,7 @@ shaka.util.Mp4Generator = class {
       0x68, 0x6c, 0x73, 0x00,
       0x00, 0x00, 0x00, 0x00,
       0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, // compressorname
+      0x00, 0x00, 0x00, // compressor name
       0x00, 0x18, // depth = 24
       0x11, 0x11, // pre_defined = -1
     ]);
@@ -390,8 +390,8 @@ shaka.util.Mp4Generator = class {
    * @private
    */
   avcC_(streamInfo) {
-    const NALUTYPE_SPS = 7;
-    const NALUTYPE_PPS = 8;
+    const NALU_TYPE_SPS = 7;
+    const NALU_TYPE_PPS = 8;
 
     // length = 7 by default (0 SPS and 0 PPS)
     let avcCLength = 7;
@@ -406,12 +406,12 @@ shaka.util.Mp4Generator = class {
       const naluBytes = this.hexStringToBuffer_(streamInfo.videoNalus[i]);
       const naluType = naluBytes[0] & 0x1F;
       switch (naluType) {
-        case NALUTYPE_SPS:
+        case NALU_TYPE_SPS:
           sps.push(naluBytes);
           // 2 = sequenceParameterSetLength field length
           avcCLength += naluBytes.length + 2;
           break;
-        case NALUTYPE_PPS:
+        case NALU_TYPE_PPS:
           pps.push(naluBytes);
           // 2 = pictureParameterSetLength field length
           avcCLength += naluBytes.length + 2;
@@ -485,8 +485,8 @@ shaka.util.Mp4Generator = class {
       0x00, 0x00, 0x00, 0x00, // pre_defined
       ...this.breakNumberIntoBytes_(width, 2), // width
       ...this.breakNumberIntoBytes_(height, 2), // height
-      0x00, 0x48, 0x00, 0x00, // horizresolution
-      0x00, 0x48, 0x00, 0x00, // vertresolution
+      0x00, 0x48, 0x00, 0x00, // horizontal resolution
+      0x00, 0x48, 0x00, 0x00, // vertical resolution
       0x00, 0x00, 0x00, 0x00, // reserved
       0x00, 0x01, // frame_count
       0x13,
@@ -497,7 +497,7 @@ shaka.util.Mp4Generator = class {
       0x68, 0x6c, 0x73, 0x00,
       0x00, 0x00, 0x00, 0x00,
       0x00, 0x00, 0x00, 0x00,
-      0x00, 0x00, 0x00, // compressorname
+      0x00, 0x00, 0x00, // compressor name
       0x00, 0x18, // depth = 24
       0x11, 0x11, // pre_defined = -1
     ]);
@@ -550,7 +550,7 @@ shaka.util.Mp4Generator = class {
       0x00, 0x00, 0x00, 0x00,
       0x00, 0x00, 0x00, 0x00, // reserved
       0x00,
-      channelsCount, // channelcount
+      channelsCount, // channel count
       0x00, 0x10, // sampleSize:16bits
       0x00, 0x00, 0x00, 0x00, // reserved2
       ...this.breakNumberIntoBytes_(audioSamplingRate, 2), // Sample Rate
@@ -706,13 +706,13 @@ shaka.util.Mp4Generator = class {
       0x00, 0x00, 0x00, // flags
 
       // ES_Descriptor
-      0x03, // tag, ES_DescrTag
+      0x03, // tag, ES_DescriptionTag
       0x19, // length
       ...this.breakNumberIntoBytes_(id, 2), // ES_ID
       0x00, // streamDependenceFlag, URL_flag, reserved, streamPriority
 
       // DecoderConfigDescriptor
-      0x04, // tag, DecoderConfigDescrTag
+      0x04, // tag, DecoderConfigDescriptionTag
       0x11, // length
       0x40, // object type
       0x15,  // streamType
@@ -1041,9 +1041,9 @@ shaka.util.Mp4Generator = class {
 
     const samples = streamInfo.data ? streamInfo.data.samples : [];
     const samplesLength = samples.length;
-    const byteslen = 12 + 16 * samplesLength;
-    const bytes = new Uint8Array(byteslen);
-    offset += 8 + byteslen;
+    const bytesLen = 12 + 16 * samplesLength;
+    const bytes = new Uint8Array(bytesLen);
+    offset += 8 + bytesLen;
     const isVideo = streamInfo.type === ContentType.VIDEO;
     bytes.set(
         [
@@ -1081,6 +1081,7 @@ shaka.util.Mp4Generator = class {
   /**
    * Generate a MDAT box
    *
+   * @param {shaka.util.Mp4Generator.StreamInfo} streamInfo
    * @return {!Uint8Array}
    * @private
    */
@@ -1096,7 +1097,7 @@ shaka.util.Mp4Generator = class {
   /**
    * @param {number} number
    * @param {number} numBytes
-   * @return {!Array.<number>}
+   * @return {!Array<number>}
    * @private
    */
   breakNumberIntoBytes_(number, numBytes) {
@@ -1142,11 +1143,11 @@ shaka.util.Mp4Generator = class {
    */
   static initStaticProperties_() {
     const Mp4Generator = shaka.util.Mp4Generator;
-    if (Mp4Generator.initializated_) {
+    if (Mp4Generator.initialized_) {
       return;
     }
 
-    Mp4Generator.initializated_ = true;
+    Mp4Generator.initialized_ = true;
 
     const majorBrand = new Uint8Array([105, 115, 111, 109]); // isom
     const avc1Brand = new Uint8Array([97, 118, 99, 49]); // avc1
@@ -1202,7 +1203,7 @@ shaka.util.Mp4Generator = class {
 /**
  * @private {boolean}
  */
-shaka.util.Mp4Generator.initializated_ = false;
+shaka.util.Mp4Generator.initialized_ = false;
 
 
 /**
@@ -1211,7 +1212,7 @@ shaka.util.Mp4Generator.initializated_ = false;
 shaka.util.Mp4Generator.UINT32_MAX_ = Math.pow(2, 32) - 1;
 
 /**
- * @private {!Object.<string, !Array.<number>>}
+ * @private {!Object<string, !Array<number>>}
  */
 shaka.util.Mp4Generator.BOX_TYPES_ = {};
 
@@ -1288,10 +1289,10 @@ shaka.util.Mp4Generator.STSZ_ = new Uint8Array([
 shaka.util.Mp4Generator.VMHD_ = new Uint8Array([
   0x00, // version
   0x00, 0x00, 0x01, // flags
-  0x00, 0x00, // graphicsmode
+  0x00, 0x00, // graphics mode
   0x00, 0x00,
   0x00, 0x00,
-  0x00, 0x00, // opcolor
+  0x00, 0x00, // op color
 ]);
 
 /**
@@ -1344,7 +1345,7 @@ shaka.util.Mp4Generator.DINF_ = new Uint8Array([]);
  *    encrypted: boolean,
  *    timescale: number,
  *    duration: number,
- *    videoNalus: !Array.<string>,
+ *    videoNalus: !Array<string>,
  *    audioConfig: !Uint8Array,
  *    videoConfig: !Uint8Array,
  *    hSpacing: number,
@@ -1367,7 +1368,7 @@ shaka.util.Mp4Generator.DINF_ = new Uint8Array([]);
  *   The Stream's timescale.
  * @property {number} duration
  *   The Stream's duration.
- * @property {!Array.<string>} videoNalus
+ * @property {!Array<string>} videoNalus
  *   The stream's video nalus.
  * @property {!Uint8Array} audioConfig
  *   The stream's audio config.
@@ -1376,7 +1377,7 @@ shaka.util.Mp4Generator.DINF_ = new Uint8Array([]);
  * @property {number} hSpacing
  *   The stream's video horizontal spacing of pixels.
  * @property {number} vSpacing
- *   The stream's video vertial spacing of pixels.
+ *   The stream's video vertical spacing of pixels.
  * @property {?shaka.util.Mp4Generator.Data} data
  *   The stream's data.
  * @property {!shaka.extern.Stream} stream
@@ -1388,14 +1389,14 @@ shaka.util.Mp4Generator.StreamInfo;
  * @typedef {{
  *    sequenceNumber: number,
  *    baseMediaDecodeTime: number,
- *    samples: !Array.<shaka.util.Mp4Generator.Mp4Sample>
+ *    samples: !Array<shaka.util.Mp4Generator.Mp4Sample>
  * }}
  *
  * @property {number} sequenceNumber
  *   The sequence number.
  * @property {number} baseMediaDecodeTime
  *   The base media decode time.
- * @property {!Array.<shaka.util.Mp4Generator.Mp4Sample>} samples
+ * @property {!Array<shaka.util.Mp4Generator.Mp4Sample>} samples
  *   The data samples.
  */
 shaka.util.Mp4Generator.Data;

package/lib/util/mp4_parser.js

@@ -17,10 +17,10 @@ goog.require('shaka.util.DataViewReader');
 shaka.util.Mp4Parser = class {
   /** */
   constructor() {
-    /** @private {!Object.<number, shaka.util.Mp4Parser.BoxType_>} */
+    /** @private {!Object<number, shaka.util.Mp4Parser.BoxType_>} */
     this.headers_ = [];
 
-    /** @private {!Object.<number, !shaka.util.Mp4Parser.CallbackType>} */
+    /** @private {!Object<number, !shaka.util.Mp4Parser.CallbackType>} */
     this.boxDefinitions_ = [];
 
     /** @private {boolean} */