shaka-player 4.12.8 → 4.13.0

package/lib/dash/dash_parser.js

@@ -57,7 +57,7 @@ shaka.dash.DashParser = class {
     /** @private {?shaka.extern.ManifestParser.PlayerInterface} */
     this.playerInterface_ = null;
 
-    /** @private {!Array.<string>} */
+    /** @private {!Array<string>} */
     this.manifestUris_ = [];
 
     /** @private {?shaka.extern.Manifest} */
@@ -98,20 +98,20 @@ shaka.dash.DashParser = class {
      * A map of IDs to Stream objects.
      * ID: Period@id,Representation@id
      * e.g.: '1,23'
-     * @private {!Object.<string, !shaka.extern.Stream>}
+     * @private {!Object<string, !shaka.extern.Stream>}
      */
     this.streamMap_ = {};
 
     /**
      * A map of Period IDs to Stream Map IDs.
      * Use to have direct access to streamMap key.
-     * @private {!Object.<string, !Array<string>>}
+     * @private {!Object<string, !Array<string>>}
      */
     this.indexStreamMap_ = {};
 
     /**
      * A map of period ids to their durations
-     * @private {!Object.<string, number>}
+     * @private {!Object<string, number>}
      */
     this.periodDurations_ = {};
 
@@ -155,7 +155,7 @@ shaka.dash.DashParser = class {
 
     /**
      * Period IDs seen in previous manifest.
-     * @private {!Array.<string>}
+     * @private {!Array<string>}
      */
     this.lastManifestUpdatePeriodIds_ = [];
 
@@ -193,7 +193,7 @@ shaka.dash.DashParser = class {
     /** @private {function():boolean} */
     this.isPreloadFn_ = () => false;
 
-    /** @private {?Array.<string>} */
+    /** @private {?Array<string>} */
     this.lastCalculatedBaseUris_ = [];
   }
 
@@ -382,7 +382,7 @@ shaka.dash.DashParser = class {
   /**
    * Makes a network request for the manifest and parses the resulting data.
    *
-   * @return {!Promise.<number>} Resolves with the time it took, in seconds, to
+   * @return {!Promise<number>} Resolves with the time it took, in seconds, to
    *   fulfill the request and parse the data.
    * @private
    */
@@ -525,11 +525,11 @@ shaka.dash.DashParser = class {
 
     // Get any Location elements.  This will update the manifest location and
     // the base URI.
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     let manifestBaseUris = [finalManifestUri];
-    /** @type {!Array.<string>} */
+    /** @type {!Array<string>} */
     const locations = [];
-    /** @type {!Map.<string, string>} */
+    /** @type {!Map<string, string>} */
     const locationsMapping = new Map();
     const locationsObjs = TXml.findChildren(mpd, 'Location');
     for (const locationsObj of locationsObjs) {
@@ -551,11 +551,11 @@ shaka.dash.DashParser = class {
       locations.push(finalUri);
     }
     if (this.contentSteeringManager_) {
-      const steeringlocations = this.contentSteeringManager_.getLocations(
+      const steeringLocations = this.contentSteeringManager_.getLocations(
           'Location', /* ignoreBaseUrls= */ true);
-      if (steeringlocations.length > 0) {
-        this.manifestUris_ = steeringlocations;
-        manifestBaseUris = steeringlocations;
+      if (steeringLocations.length > 0) {
+        this.manifestUris_ = steeringLocations;
+        manifestBaseUris = steeringLocations;
       }
     } else if (locations.length) {
       this.manifestUris_ = locations;
@@ -643,13 +643,6 @@ shaka.dash.DashParser = class {
     }
     this.manifestPatchContext_.availabilityTimeOffset = availabilityTimeOffset;
 
-    const ignoreMinBufferTime = this.config_.dash.ignoreMinBufferTime;
-    let minBufferTime = 0;
-    if (!ignoreMinBufferTime) {
-      minBufferTime =
-          TXml.parseAttr(mpd, 'minBufferTime', TXml.parseDuration) || 0;
-    }
-
     this.updatePeriod_ = /** @type {number} */ (TXml.parseAttr(
         mpd, 'minimumUpdatePeriod', TXml.parseDuration, -1));
 
@@ -703,23 +696,39 @@ shaka.dash.DashParser = class {
         }
       }
     } else {
+      const ignoreMinBufferTime = this.config_.dash.ignoreMinBufferTime;
+      let minBufferTime = 0;
+      if (!ignoreMinBufferTime) {
+        minBufferTime =
+            TXml.parseAttr(mpd, 'minBufferTime', TXml.parseDuration) || 0;
+      }
       // DASH IOP v3.0 suggests using a default delay between minBufferTime
       // and timeShiftBufferDepth.  This is literally the range of all
       // feasible choices for the value.  Nothing older than
       // timeShiftBufferDepth is still available, and anything less than
       // minBufferTime will cause buffering issues.
-      //
-      // We have decided that our default will be the configured value, or
-      // 1.5 * minBufferTime if not configured. This is fairly conservative.
-      // Content providers should provide a suggestedPresentationDelay whenever
-      // possible to optimize the live streaming experience.
-      const defaultPresentationDelay =
-          this.config_.defaultPresentationDelay || minBufferTime * 1.5;
-      const presentationDelay = suggestedPresentationDelay != null ?
-          suggestedPresentationDelay : defaultPresentationDelay;
+      let delay = 0;
+      if (suggestedPresentationDelay != null) {
+        // 1. If a suggestedPresentationDelay is provided by the manifest, that
+        // will be used preferentially.
+        // This is given a minimum bound of segmentAvailabilityDuration.
+        // Content providers should provide a suggestedPresentationDelay
+        // whenever possible to optimize the live streaming experience.
+        delay = Math.min(
+            suggestedPresentationDelay,
+            segmentAvailabilityDuration || Infinity);
+      } else if (this.config_.defaultPresentationDelay > 0) {
+        // 2. If the developer provides a value for
+        // "manifest.defaultPresentationDelay", that is used as a fallback.
+        delay = this.config_.defaultPresentationDelay;
+      } else {
+        // 3. Otherwise, we default to the lower of segmentAvailabilityDuration
+        // and 1.5 * minBufferTime. This is fairly conservative.
+        delay = Math.min(
+            minBufferTime * 1.5, segmentAvailabilityDuration || Infinity);
+      }
       presentationTimeline = new shaka.media.PresentationTimeline(
-          presentationStartTime, presentationDelay,
-          this.config_.dash.autoCorrectDrift);
+          presentationStartTime, delay, this.config_.dash.autoCorrectDrift);
     }
 
     presentationTimeline.setStatic(mpdType == 'static');
@@ -774,20 +783,7 @@ shaka.dash.DashParser = class {
       presentationTimeline.setDuration(duration || Infinity);
     }
 
-    // The segments are available earlier than the availability start time.
-    // If the stream is low latency and the user has not configured the
-    // lowLatencyMode, but if it has been configured to activate the
-    // lowLatencyMode if a stream of this type is detected, we automatically
-    // activate the lowLatencyMode.
-    if (this.isLowLatency_ && !this.lowLatencyMode_) {
-      const autoLowLatencyMode = this.playerInterface_.isAutoLowLatencyMode();
-      if (autoLowLatencyMode) {
-        this.playerInterface_.enableLowLatencyMode();
-        this.lowLatencyMode_ = this.playerInterface_.isLowLatencyMode();
-      }
-    }
-
-    if (this.lowLatencyMode_) {
+    if (this.isLowLatency_ && this.lowLatencyMode_) {
       presentationTimeline.setAvailabilityTimeOffset(
           this.minTotalAvailabilityTimeOffset_);
     }
@@ -800,10 +796,7 @@ shaka.dash.DashParser = class {
 
     await contentSteeringPromise;
 
-    // Set minBufferTime to 0 for low-latency DASH live stream to achieve the
-    // best latency
-    if (this.lowLatencyMode_) {
-      minBufferTime = 0;
+    if (this.isLowLatency_ && this.lowLatencyMode_) {
       const presentationDelay = suggestedPresentationDelay != null ?
           suggestedPresentationDelay : this.config_.defaultPresentationDelay;
       presentationTimeline.setDelay(presentationDelay);
@@ -819,7 +812,6 @@ shaka.dash.DashParser = class {
         textStreams: this.periodCombiner_.getTextStreams(),
         imageStreams: this.periodCombiner_.getImageStreams(),
         offlineSessionIds: [],
-        minBufferTime: minBufferTime || 0,
         sequenceMode: this.config_.dash.sequenceMode,
         ignoreManifestTimestampsInSegmentsMode: false,
         type: shaka.media.ManifestParser.DASH,
@@ -986,7 +978,7 @@ shaka.dash.DashParser = class {
 
   /**
    * Handles manifest type changes, this transition is expected to be
-   * "dyanmic" to "static".
+   * "dynamic" to "static".
    *
    * @param {!string} mpdType
    * @private
@@ -1310,11 +1302,11 @@ shaka.dash.DashParser = class {
    * children.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {function():!Array.<string>} getBaseUris
+   * @param {function(): !Array<string>} getBaseUris
    * @param {!shaka.extern.xml.Node} mpd
    * @param {!boolean} newPeriod
    * @return {{
-   *   periods: !Array.<shaka.extern.Period>,
+   *   periods: !Array<shaka.extern.Period>,
    *   duration: ?number,
    *   durationDerivedFromPeriods: boolean
    * }}
@@ -1471,8 +1463,8 @@ shaka.dash.DashParser = class {
       if (prevEnd != null) {
         const threshold =
             shaka.util.ManifestParserUtils.GAP_OVERLAP_TOLERANCE_SECONDS;
-        const diference = prevEnd - seekRangeStart - presentationDuration;
-        if (Math.abs(diference) > threshold) {
+        const difference = prevEnd - seekRangeStart - presentationDuration;
+        if (Math.abs(difference) > threshold) {
           shaka.log.warning(
               '@mediaPresentationDuration does not match the total duration ',
               'of all Periods.');
@@ -1530,7 +1522,7 @@ shaka.dash.DashParser = class {
    * was done before this was called so start and duration are valid.
    *
    * @param {shaka.dash.DashParser.Context} context
-   * @param {function():!Array.<string>} getBaseUris
+   * @param {function(): !Array<string>} getBaseUris
    * @param {shaka.dash.DashParser.PeriodInfo} periodInfo
    * @return {shaka.extern.Period}
    * @private
@@ -1662,10 +1654,10 @@ shaka.dash.DashParser = class {
    * Gets the streams from the given sets or returns an empty array if disabled
    * or no streams are found.
    * @param {boolean} disabled
-   * @param {!Array.<!shaka.dash.DashParser.AdaptationInfo>} adaptationSets
+   * @param {!Array<!shaka.dash.DashParser.AdaptationInfo>} adaptationSets
    * @param {string} contentType
-   @private
-  */
+   * @private
+   */
   getStreamsFromSets_(disabled, adaptationSets, contentType) {
     if (disabled || !adaptationSets.length) {
       return [];
@@ -1886,7 +1878,7 @@ shaka.dash.DashParser = class {
             // Some closed caption descriptions have channel number and
             // language ("CC1=eng") others may only have language ("eng,spa").
             if (!captionStr.includes('=')) {
-              // When the channel assignemnts are not explicitly provided and
+              // When the channel assignments are not explicitly provided and
               // there are only 2 values provided, it is highly likely that the
               // assignments are CC1 and CC3 (most commonly used CC streams).
               // Otherwise, cycle through all channels arbitrarily (CC1 - CC4)
@@ -1933,7 +1925,7 @@ shaka.dash.DashParser = class {
               language = captionStr;
             } else {
             // Otherwise, CEA-708 caption values take the form "
-            // 1=lang:eng;2=lang:deu" i.e. serviceNumber=lang:threelettercode.
+            // 1=lang:eng;2=lang:deu" i.e. serviceNumber=lang:threeLetterCode.
               const serviceAndLanguage = captionStr.split('=');
               service = `svc${serviceAndLanguage[0]}`;
 
@@ -1968,10 +1960,10 @@ shaka.dash.DashParser = class {
       }
     }
 
-    const contentProtectionElems =
+    const contentProtectionElements =
         TXml.findChildren(elem, 'ContentProtection');
     const contentProtection = ContentProtection.parseFromAdaptationSet(
-        contentProtectionElems,
+        contentProtectionElements,
         this.config_.dash.ignoreDrmInfo,
         this.config_.dash.keySystemsByURI);
 
@@ -1982,6 +1974,20 @@ shaka.dash.DashParser = class {
 
     // Parse Representations into Streams.
     const representations = TXml.findChildren(elem, 'Representation');
+    if (!this.config_.dash.ignoreSupplementalCodecs) {
+      const supplementalRepresentations = [];
+      for (const rep of representations) {
+        const supplementalCodecs = TXml.getAttributeNS(
+            rep, shaka.dash.DashParser.SCTE214_, 'supplementalCodecs');
+        if (supplementalCodecs) {
+          // Duplicate representations with their supplementalCodecs
+          const obj = shaka.util.ObjectUtils.cloneObject(rep);
+          obj.attributes['codecs'] = supplementalCodecs.split(' ').join(',');
+          supplementalRepresentations.push(obj);
+        }
+      }
+      representations.push(...supplementalRepresentations);
+    }
     const streams = representations.map((representation) => {
       const parsedRepresentation = this.parseRepresentation_(context,
           contentProtection, kind, language, label, main, roleValues,
@@ -2108,11 +2114,11 @@ shaka.dash.DashParser = class {
    * @param {string} language
    * @param {?string} label
    * @param {boolean} isPrimary
-   * @param {!Array.<string>} roles
-   * @param {Map.<string, string>} closedCaptions
+   * @param {!Array<string>} roles
+   * @param {Map<string, string>} closedCaptions
    * @param {!shaka.extern.xml.Node} node
-   * @param {?shaka.media.ManifestParser.AccessibilityPurpose}
-   *   accessibilityPurpose
+   * @param {?shaka.media.ManifestParser.AccessibilityPurpose
+   *        } accessibilityPurpose
    * @param {?number} lastSegmentNumber
    *
    * @return {?shaka.extern.Stream} The Stream, or null when there is a
@@ -2152,13 +2158,13 @@ shaka.dash.DashParser = class {
 
     context.roles = roles;
 
-    const supplementalPropertyElems =
+    const supplementalPropertyElements =
         TXml.findChildren(node, 'SupplementalProperty');
-    const essentialPropertyElems =
+    const essentialPropertyElements =
         TXml.findChildren(node, 'EssentialProperty');
 
     let representationUrlParams = null;
-    let urlParamsElement = essentialPropertyElems.find((element) => {
+    let urlParamsElement = essentialPropertyElements.find((element) => {
       const schemeId = element.attributes['schemeIdUri'];
       return schemeId == 'urn:mpeg:dash:urlparam:2014';
     });
@@ -2166,7 +2172,7 @@ shaka.dash.DashParser = class {
       representationUrlParams =
           this.getURLParametersFunction_(urlParamsElement);
     } else {
-      urlParamsElement = supplementalPropertyElems.find((element) => {
+      urlParamsElement = supplementalPropertyElements.find((element) => {
         const schemeId = element.attributes['schemeIdUri'];
         return schemeId == 'urn:mpeg:dash:urlparam:2014';
       });
@@ -2280,17 +2286,17 @@ shaka.dash.DashParser = class {
       throw error;
     }
 
-    const contentProtectionElems =
+    const contentProtectionElements =
         TXml.findChildren(node, 'ContentProtection');
     const keyId = shaka.dash.ContentProtection.parseFromRepresentation(
-        contentProtectionElems, contentProtection,
+        contentProtectionElements, contentProtection,
         this.config_.dash.ignoreDrmInfo,
         this.config_.dash.keySystemsByURI);
     const keyIds = new Set(keyId ? [keyId] : []);
 
     // Detect the presence of E-AC3 JOC audio content, using DD+JOC signaling.
     // See: ETSI TS 103 420 V1.2.1 (2018-10)
-    const hasJoc = supplementalPropertyElems.some((element) => {
+    const hasJoc = supplementalPropertyElements.some((element) => {
       const expectedUri = 'tag:dolby.com,2018:dash:EC3_ExtensionType:2018';
       const expectedValue = 'JOC';
       return element.attributes['schemeIdUri'] == expectedUri &&
@@ -2315,7 +2321,7 @@ shaka.dash.DashParser = class {
 
     let tilesLayout;
     if (isImage) {
-      const thumbnailTileElem = essentialPropertyElems.find((element) => {
+      const thumbnailTileElem = essentialPropertyElements.find((element) => {
         const expectedUris = [
           'http://dashif.org/thumbnail_tile',
           'http://dashif.org/guidelines/thumbnail_tile',
@@ -2546,14 +2552,13 @@ shaka.dash.DashParser = class {
    *
    * @param {!shaka.extern.xml.Node} elem
    * @param {?shaka.dash.DashParser.InheritanceFrame} parent
-   * @param {?function():!Array.<string>} getBaseUris
+   * @param {?function(): !Array<string>} getBaseUris
    * @return {shaka.dash.DashParser.InheritanceFrame}
    * @private
    */
   createFrame_(elem, parent, getBaseUris) {
     goog.asserts.assert(parent || getBaseUris,
         'Must provide either parent or getBaseUris');
-    const SCTE214 = shaka.dash.DashParser.SCTE214_;
     const SegmentUtils = shaka.media.SegmentUtils;
     const ManifestParserUtils = shaka.util.ManifestParserUtils;
     const TXml = shaka.util.TXml;
@@ -2611,11 +2616,6 @@ shaka.dash.DashParser = class {
     const allCodecs = [
       elem.attributes['codecs'] || parent.codecs,
     ];
-    const supplementalCodecs =
-        TXml.getAttributeNS(elem, SCTE214, 'supplementalCodecs');
-    if (supplementalCodecs) {
-      allCodecs.push(supplementalCodecs);
-    }
     const codecs = SegmentUtils.codecsFiltering(allCodecs).join(',');
     const frameRate =
         TXml.parseAttr(elem, 'frameRate', evalDivision) || parent.frameRate;
@@ -2711,12 +2711,12 @@ shaka.dash.DashParser = class {
    * of the ones parsed from inBandEventStreams and the ones provided in
    * emsgSchemeIdUris.
    *
-   * @param {!Array.<!shaka.extern.xml.Node>} inBandEventStreams
+   * @param {!Array<!shaka.extern.xml.Node>} inBandEventStreams
    *     Array of InbandEventStream
    *     elements to parse and add to the returned array.
-   * @param {!Array.<string>} emsgSchemeIdUris Array of parsed
+   * @param {!Array<string>} emsgSchemeIdUris Array of parsed
    *     InbandEventStream schemeIdUri attributes to add to the returned array.
-   * @return {!Array.<string>} schemeIdUris Array of parsed
+   * @return {!Array<string>} schemeIdUris Array of parsed
    *     InbandEventStream schemeIdUri attributes.
    * @private
    */
@@ -2732,7 +2732,7 @@ shaka.dash.DashParser = class {
   }
 
   /**
-   * @param {!Array.<!shaka.extern.xml.Node>} audioChannelConfigs An array of
+   * @param {!Array<!shaka.extern.xml.Node>} audioChannelConfigs An array of
    *   AudioChannelConfiguration elements.
    * @return {?number} The number of audio channels, or null if unknown.
    * @private
@@ -2899,10 +2899,10 @@ shaka.dash.DashParser = class {
   /**
    * Makes a request to the given URI and calculates the clock offset.
    *
-   * @param {function():!Array.<string>} getBaseUris
+   * @param {function(): !Array<string>} getBaseUris
    * @param {string} uri
    * @param {string} method
-   * @return {!Promise.<number>}
+   * @return {!Promise<number>}
    * @private
    */
   async requestForTiming_(getBaseUris, uri, method) {
@@ -2942,13 +2942,13 @@ shaka.dash.DashParser = class {
   /**
    * Parses an array of UTCTiming elements.
    *
-   * @param {function():!Array.<string>} getBaseUris
-   * @param {!Array.<!shaka.extern.xml.Node>} elems
-   * @return {!Promise.<number>}
+   * @param {function(): !Array<string>} getBaseUris
+   * @param {!Array<!shaka.extern.xml.Node>} elements
+   * @return {!Promise<number>}
    * @private
    */
-  async parseUtcTiming_(getBaseUris, elems) {
-    const schemesAndValues = elems.map((elem) => {
+  async parseUtcTiming_(getBaseUris, elements) {
+    const schemesAndValues = elements.map((elem) => {
       return {
         scheme: elem.attributes['schemeIdUri'],
         value: elem.attributes['value'],
@@ -3070,11 +3070,11 @@ shaka.dash.DashParser = class {
   /**
    * Makes a network request on behalf of SegmentBase.createStreamInfo.
    *
-   * @param {!Array.<string>} uris
+   * @param {!Array<string>} uris
    * @param {?number} startByte
    * @param {?number} endByte
    * @param {boolean} isInit
-   * @return {!Promise.<BufferSource>}
+   * @return {!Promise<BufferSource>}
    * @private
    */
   async requestSegment_(uris, startByte, endByte, isInit) {
@@ -3125,7 +3125,7 @@ shaka.dash.DashParser = class {
    * @param {shaka.extern.Request} request
    * @param {shaka.net.NetworkingEngine.RequestType} type
    * @param {shaka.extern.RequestContext=} context
-   * @return {!Promise.<shaka.extern.Response>}
+   * @return {!Promise<shaka.extern.Response>}
    * @private
    */
   makeNetworkRequest_(request, type, context) {
@@ -3180,9 +3180,9 @@ shaka.dash.DashParser = class {
  *   mpdId: string,
  *   type: string,
  *   mediaPresentationDuration: ?number,
- *   profiles: !Array.<string>,
+ *   profiles: !Array<string>,
  *   availabilityTimeOffset: number,
- *   getBaseUris: ?function():!Array.<string>,
+ *   getBaseUris: ?function():!Array<string>,
  *   publishTime: number
  * }}
  *
@@ -3192,12 +3192,12 @@ shaka.dash.DashParser = class {
  *   Specifies the type of the dash manifest i.e. "static"
  * @property {?number} mediaPresentationDuration
  *   Media presentation duration, or null if unknown.
- * @property {!Array.<string>} profiles
+ * @property {!Array<string>} profiles
  *   Profiles of DASH are defined to enable interoperability and the
  *   signaling of the use of features.
  * @property {number} availabilityTimeOffset
  *   Specifies the total availabilityTimeOffset of the segment.
- * @property {?function():!Array.<string>} getBaseUris
+ * @property {?function():!Array<string>} getBaseUris
  *   An array of absolute base URIs.
  * @property {number} publishTime
  *   Time when manifest has been published, in seconds.
@@ -3221,8 +3221,8 @@ shaka.dash.DashParser.UP_NAMESPACE_ = 'urn:mpeg:dash:schema:urlparam:2014';
 
 /**
  * @typedef {
- *   function(!Array.<string>, ?number, ?number, boolean):
- *     !Promise.<BufferSource>
+ *   function(!Array<string>, ?number, ?number, boolean):
+ *     !Promise<BufferSource>
  * }
  */
 shaka.dash.DashParser.RequestSegmentCallback;
@@ -3233,7 +3233,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   segmentBase: ?shaka.extern.xml.Node,
  *   segmentList: ?shaka.extern.xml.Node,
  *   segmentTemplate: ?shaka.extern.xml.Node,
- *   getBaseUris: function():!Array.<string>,
+ *   getBaseUris: function():!Array<string>,
  *   width: (number|undefined),
  *   height: (number|undefined),
  *   contentType: string,
@@ -3241,7 +3241,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   codecs: string,
  *   frameRate: (number|undefined),
  *   pixelAspectRatio: (string|undefined),
- *   emsgSchemeIdUris: !Array.<string>,
+ *   emsgSchemeIdUris: !Array<string>,
  *   id: ?string,
  *   position: (number|undefined),
  *   language: ?string,
@@ -3264,7 +3264,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   The XML node for SegmentList.
  * @property {?shaka.extern.xml.Node} segmentTemplate
  *   The XML node for SegmentTemplate.
- * @property {function():!Array.<string>} getBaseUris
+ * @property {function():!Array<string>} getBaseUris
  *   Function than returns an array of absolute base URIs for the frame.
  * @property {(number|undefined)} width
  *   The inherited width value.
@@ -3280,7 +3280,7 @@ shaka.dash.DashParser.RequestSegmentCallback;
  *   The inherited framerate value.
  * @property {(string|undefined)} pixelAspectRatio
  *   The inherited pixel aspect ratio value.
- * @property {!Array.<string>} emsgSchemeIdUris
+ * @property {!Array<string>} emsgSchemeIdUris
  *   emsg registered schemeIdUris.
  * @property {?string} id
  *   The ID of the element.
@@ -3319,8 +3319,8 @@ shaka.dash.DashParser.InheritanceFrame;
  *   indexRangeWarningGiven: boolean,
  *   availabilityTimeOffset: number,
  *   mediaPresentationDuration: ?number,
- *   profiles: !Array.<string>,
- *   roles: ?Array.<string>,
+ *   profiles: !Array<string>,
+ *   roles: ?Array<string>,
  *   urlParams: function():string
  * }}
  *
@@ -3347,7 +3347,7 @@ shaka.dash.DashParser.InheritanceFrame;
  *   True if the warning about SegmentURL@indexRange has been printed.
  * @property {number} availabilityTimeOffset
  *   The sum of the availabilityTimeOffset values that apply to the element.
- * @property {!Array.<string>} profiles
+ * @property {!Array<string>} profiles
  *   Profiles of DASH are defined to enable interoperability and the signaling
  *   of the use of features.
  * @property {?number} mediaPresentationDuration
@@ -3388,10 +3388,10 @@ shaka.dash.DashParser.PeriodInfo;
  *   contentType: ?string,
  *   language: string,
  *   main: boolean,
- *   streams: !Array.<shaka.extern.Stream>,
- *   drmInfos: !Array.<shaka.extern.DrmInfo>,
+ *   streams: !Array<shaka.extern.Stream>,
+ *   drmInfos: !Array<shaka.extern.DrmInfo>,
  *   trickModeFor: ?string,
- *   representationIds: !Array.<string>
+ *   representationIds: !Array<string>
  * }}
  *
  * @description
@@ -3405,22 +3405,22 @@ shaka.dash.DashParser.PeriodInfo;
  *   The language of the AdaptationSet.
  * @property {boolean} main
  *   Whether the AdaptationSet has the 'main' type.
- * @property {!Array.<shaka.extern.Stream>} streams
+ * @property {!Array<shaka.extern.Stream>} streams
  *   The streams this AdaptationSet contains.
- * @property {!Array.<shaka.extern.DrmInfo>} drmInfos
+ * @property {!Array<shaka.extern.DrmInfo>} drmInfos
  *   The DRM info for the AdaptationSet.
  * @property {?string} trickModeFor
  *   If non-null, this AdaptationInfo represents trick mode tracks.  This
  *   property is the ID of the normal AdaptationSet these tracks should be
  *   associated with.
- * @property {!Array.<string>} representationIds
+ * @property {!Array<string>} representationIds
  *   An array of the IDs of the Representations this AdaptationSet contains.
  */
 shaka.dash.DashParser.AdaptationInfo;
 
 
 /**
- * @typedef {function():!Promise.<shaka.media.SegmentIndex>}
+ * @typedef {function(): !Promise<shaka.media.SegmentIndex>}
  * @description
  * An async function which generates and returns a SegmentIndex.
  */
@@ -3436,8 +3436,8 @@ shaka.dash.DashParser.GenerateSegmentIndexFunction;
  * Contains information about a Stream. This is passed from the createStreamInfo
  * methods.
  *
- * @property {shaka.dash.DashParser.GenerateSegmentIndexFunction}
- *     generateSegmentIndex
+ * @property {shaka.dash.DashParser.GenerateSegmentIndexFunction
+ *           } generateSegmentIndex
  *   An async function to create the SegmentIndex for the stream.
  */
 shaka.dash.DashParser.StreamInfo;