shaka-player 3.3.0 → 3.3.3

package/lib/util/cmcd_manager.js

@@ -6,6 +6,7 @@
 
 goog.provide('shaka.util.CmcdManager');
 
+goog.require('goog.Uri');
 goog.require('shaka.log');
 
 
@@ -31,7 +32,7 @@ shaka.util.CmcdManager = class {
      *
      * @private {string}
      */
-    this.sid_ = config.sessionId || window.crypto.randomUUID();
+    this.sid_ = '';
 
     /**
      * Streaming format
@@ -118,10 +119,11 @@ shaka.util.CmcdManager = class {
 
       data.ot = this.getObjectType_(segmentInfo);
 
-      const isMedia = data.ot === shaka.util.CmcdManager.ObjectType.VIDEO ||
-                      data.ot === shaka.util.CmcdManager.ObjectType.AUDIO ||
-                      data.ot === shaka.util.CmcdManager.ObjectType.MUXED ||
-                      data.ot === shaka.util.CmcdManager.ObjectType.TIMED_TEXT;
+      const ObjectType = shaka.util.CmcdManager.ObjectType;
+      const isMedia = data.ot === ObjectType.VIDEO ||
+                      data.ot === ObjectType.AUDIO ||
+                      data.ot === ObjectType.MUXED ||
+                      data.ot === ObjectType.TIMED_TEXT;
 
       if (isMedia) {
         data.bl = this.getBufferLength_(segmentInfo.type);
@@ -131,7 +133,9 @@ shaka.util.CmcdManager = class {
         data.br = segmentInfo.bandwidth / 1000;
       }
 
-      data.tb = this.getTopBandwidth_(segmentInfo.type) / 1000;
+      if (isMedia && data.ot !== ObjectType.TIMED_TEXT) {
+        data.tb = this.getTopBandwidth_(data.ot) / 1000;
+      }
 
       this.apply_(request, data);
     } catch (error) {
@@ -147,6 +151,10 @@ shaka.util.CmcdManager = class {
    */
   applyTextData(request) {
     try {
+      if (!this.config_.enabled) {
+        return;
+      }
+
       this.apply_(request, {
         ot: shaka.util.CmcdManager.ObjectType.CAPTION,
         su: true,
@@ -213,10 +221,13 @@ shaka.util.CmcdManager = class {
   /**
    * Create baseline CMCD data
    *
-   * @return {shaka.util.CmcdManager.Data}
+   * @return {CmcdData}
    * @private
    */
   createData_() {
+    if (!this.sid_) {
+      this.sid_ = this.config_.sessionId || window.crypto.randomUUID();
+    }
     return {
       v: shaka.util.CmcdManager.Version,
       sf: this.sf_,
@@ -230,7 +241,7 @@ shaka.util.CmcdManager = class {
    * Apply CMCD data to a request.
    *
    * @param {!shaka.extern.Request} request The request to apply CMCD data to
-   * @param {!shaka.util.CmcdManager.Data} data The data object
+   * @param {!CmcdData} data The data object
    * @param {boolean} useHeaders Send data via request headers
    * @private
    */
@@ -380,23 +391,31 @@ shaka.util.CmcdManager = class {
    * @private
    */
   getTopBandwidth_(type) {
-    const manifest = this.playerInterface_.getManifest();
-    if (!manifest) {
+    const variants = this.playerInterface_.getVariantTracks();
+    if (!variants.length) {
       return NaN;
     }
 
-    const variants = (type === 'text') ?
-      manifest.textStreams : manifest.variants;
-    let top = variants[0][type] || variants[0];
+    let top = variants[0];
 
     for (const variant of variants) {
-      const stream = variant[type] || variant;
-      if (stream.bandwidth > top.bandwidth) {
-        top = stream;
+      if (variant.type === 'variant' && variant.bandwidth > top.bandwidth) {
+        top = variant;
       }
     }
 
-    return top.bandwidth;
+    const ObjectType = shaka.util.CmcdManager.ObjectType;
+
+    switch (type) {
+      case ObjectType.VIDEO:
+        return top.videoBandwidth || NaN;
+
+      case ObjectType.AUDIO:
+        return top.audioBandwidth || NaN;
+
+      default:
+        return top.bandwidth;
+    }
   }
 
   /**
@@ -404,7 +423,7 @@ shaka.util.CmcdManager = class {
    * section 3.2 of
    * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
    *
-   * @param {shaka.util.CmcdManager.Data} data The CMCD data object
+   * @param {CmcdData} data The CMCD data object
    * @return {string}
    */
   static serialize(data) {
@@ -456,7 +475,7 @@ shaka.util.CmcdManager = class {
       let result;
 
       if (type === 'string' && key !== 'ot' && key !== 'sf' && key !== 'st') {
-        result = `${key}="${value.replace(/"/g, '"')}"`;
+        result = `${key}=${JSON.stringify(value)}`;
       } else if (type === 'boolean') {
         result = key;
       } else if (type === 'symbol') {
@@ -476,7 +495,7 @@ shaka.util.CmcdManager = class {
    * defined in the section 2.1 and 3.2 of
    * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
    *
-   * @param {shaka.util.CmcdManager.Data} data The CMCD data object
+   * @param {CmcdData} data The CMCD data object
    * @return {!Object}
    */
   static toHeaders(data) {
@@ -512,11 +531,11 @@ shaka.util.CmcdManager = class {
    * defined in the section 2.2 and 3.2 of
    * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
    *
-   * @param {shaka.util.CmcdManager.Data} data The CMCD data object
+   * @param {CmcdData} data The CMCD data object
    * @return {string}
    */
   static toQuery(data) {
-    return `CMCD=${encodeURIComponent(shaka.util.CmcdManager.serialize(data))}`;
+    return shaka.util.CmcdManager.serialize(data);
   }
 
   /**
@@ -535,8 +554,9 @@ shaka.util.CmcdManager = class {
       return uri;
     }
 
-    const separator = uri.includes('?') ? '&' : '?';
-    return `${uri}${separator}${query}`;
+    const url = new goog.Uri(uri);
+    url.getQueryData().set('CMCD', query);
+    return url.toString();
   }
 };
 
@@ -546,7 +566,7 @@ shaka.util.CmcdManager = class {
  *   getBandwidthEstimate: function():number,
  *   getBufferedInfo: function():shaka.extern.BufferedInfo,
  *   getCurrentTime: function():number,
- *   getManifest: function():shaka.extern.Manifest,
+ *   getVariantTracks: function():Array.<shaka.extern.Track>,
  *   getPlaybackRate: function():number,
  *   isLive: function():boolean
  * }}
@@ -557,8 +577,8 @@ shaka.util.CmcdManager = class {
  *   Get information about what the player has buffered.
  * @property {function():number} getCurrentTime
  *   Get the current time
- * @property {function():shaka.extern.Manifest} getManifest
- *   Get the manifest
+ * @property {function():Array.<shaka.extern.Track>} getVariantTracks
+ *   Get the variant tracks
  * @property {function():number} getPlaybackRate
  *   Get the playback rate
  * @property {function():boolean} isLive
@@ -608,180 +628,6 @@ shaka.util.CmcdManager.SegmentInfo;
 shaka.util.CmcdManager.ManifestInfo;
 
 
-/**
- * @typedef {{
- *   br: (number|undefined),
- *   d: (number|undefined),
- *   ot: (shaka.util.CmcdManager.ObjectType|undefined),
- *   tb: (number|undefined),
- *   bl: (number|undefined),
- *   dl: (number|undefined),
- *   mtp: (number|undefined),
- *   nor: (string|undefined),
- *   nrr: (string|undefined),
- *   su: (boolean|undefined),
- *   cid: (string|undefined),
- *   pr: (number|undefined),
- *   sf: (shaka.util.CmcdManager.StreamingFormat|undefined),
- *   sid: (string|undefined),
- *   st: (shaka.util.CmcdManager.StreamType|undefined),
- *   v: (number|undefined),
- *   bs: (boolean|undefined),
- *   rtp: (number|undefined)
- * }}
- *
- * @description
- *   Client Media Common Data (CMCD) data.
- *
- * @property {number} br
- *   The encoded bitrate of the audio or video object being requested. This may
- *   not be known precisely by the player; however, it MAY be estimated based
- *   upon playlist/manifest declarations. If the playlist declares both peak and
- *   average bitrate values, the peak value should be transmitted.
- *
- * @property {number} d
- *   The playback duration in milliseconds of the object being requested. If a
- *   partial segment is being requested, then this value MUST indicate the
- *   playback duration of that part and not that of its parent segment. This
- *   value can be an approximation of the estimated duration if the explicit
- *   value is not known.
- *
- * @property {shaka.util.CmcdManager.ObjectType} ot
- *   The media type of the current object being requested:
- *   - `m` = text file, such as a manifest or playlist
- *   - `a` = audio only
- *   - `v` = video only
- *   - `av` = muxed audio and video
- *   - `i` = init segment
- *   - `c` = caption or subtitle
- *   - `tt` = ISOBMFF timed text track
- *   - `k` = cryptographic key, license or certificate.
- *   - `o` = other
- *
- *   If the object type being requested is unknown, then this key MUST NOT be
- *   used.
- *
- * @property {number} tb
- *   The highest bitrate rendition in the manifest or playlist that the client
- *   is allowed to play, given current codec, licensing and sizing constraints.
- *
- * @property {number} bl
- *   The buffer length associated with the media object being requested. This
- *   value MUST be rounded to the nearest 100 ms. This key SHOULD only be sent
- *   with an object type of ‘a’, ‘v’ or ‘av’.
- *
- * @property {number} dl
- *   Deadline from the request time until the first sample of this
- *   Segment/Object needs to be available in order to not create a buffer
- *   underrun or any other playback problems. This value MUST be rounded to the
- *   nearest 100ms. For a playback rate of 1, this may be equivalent to the
- *   player’s remaining buffer length.
- *
- * @property {number} mtp
- *   The throughput between client and server, as measured by the client and
- *   MUST be rounded to the nearest 100 kbps. This value, however derived,
- *   SHOULD be the value that the client is using to make its next Adaptive
- *   Bitrate switching decision. If the client is connected to multiple
- *   servers concurrently, it must take care to report only the throughput
- *   measured against the receiving server. If the client has multiple
- *   concurrent connections to the server, then the intent is that this value
- *   communicates the aggregate throughput the client sees across all those
- *   connections.
- *
- * @property {string} nor
- *   Relative path of the next object to be requested. This can be used to
- *   trigger pre-fetching by the CDN. This MUST be a path relative to the
- *   current request. This string MUST be URLEncoded. The client SHOULD NOT
- *   depend upon any pre-fetch action being taken - it is merely a request for
- *   such a pre-fetch to take place.
- *
- * @property {string} nrr
- *   If the next request will be a partial object request, then this string
- *   denotes the byte range to be requested. If the ‘nor’ field is not set, then
- *   the object is assumed to match the object currently being requested. The
- *   client SHOULD NOT depend upon any pre-fetch action being taken – it is
- *   merely a request for such a pre-fetch to take place. Formatting is similar
- *   to the HTTP Range header, except that the unit MUST be ‘byte’, the ‘Range:’
- *   prefix is NOT required and specifying multiple ranges is NOT allowed. Valid
- *   combinations are:
- *
- *   - `"\<range-start\>-"`
- *   - `"\<range-start\>-\<range-end\>"`
- *   - `"-\<suffix-length\>"`
- *
- * @property {boolean} su
- *   Key is included without a value if the object is needed urgently due to
- *   startup, seeking or recovery after a buffer-empty event. The media SHOULD
- *   not be rendering when this request is made. This key MUST not be sent if it
- *   is FALSE.
- *
- * @property {string} cid
- *   A unique string identifying the current content. Maximum length is 64
- *   characters. This value is consistent across multiple different sessions and
- *   devices and is defined and updated at the discretion of the service
- *   provider.
- *
- * @property {number} pr
- *   The playback rate. `1` if real-time, `2` if double speed, `0` if not
- *   playing. SHOULD only be sent if not equal to `1`.
- *
- * @property {shaka.util.CmcdManager.StreamingFormat} sf
- *   The streaming format that defines the current request.
- *
- *   - `d` = MPEG DASH
- *   - `h` = HTTP Live Streaming (HLS)
- *   - `s` = Smooth Streaming
- *   - `o` = other
- *
- *   If the streaming format being requested is unknown, then this key MUST NOT
- *   be used.
- *
- * @property {string} sid
- *   A GUID identifying the current playback session. A playback session
- *   typically ties together segments belonging to a single media asset. Maximum
- *   length is 64 characters. It is RECOMMENDED to conform to the UUID
- *   specification.
- *
- * @property {shaka.util.CmcdManager.StreamType} st
- *   Stream type
- *   - `v` = all segments are available – e.g., VOD
- *   - `l` = segments become available over time – e.g., LIVE
- *
- * @property {number} v
- *   The version of this specification used for interpreting the defined key
- *   names and values. If this key is omitted, the client and server MUST
- *   interpret the values as being defined by version 1. Client SHOULD omit this
- *   field if the version is 1.
- *
- * @property {boolean} bs
- *   Buffer starvation key is included without a value if the buffer was starved
- *   at some point between the prior request and this object request, resulting
- *   in the player being in a rebuffering state and the video or audio playback
- *   being stalled. This key MUST NOT be sent if the buffer was not starved
- *   since the prior request.
- *
- *   If the object type `ot` key is sent along with this key, then the `bs` key
- *   refers to the buffer associated with the particular object type. If no
- *   object type is communicated, then the buffer state applies to the current
- *   session.
- *
- * @property {number} rtp
- *   Requested maximum throughput
- *
- *   The requested maximum throughput that the client considers sufficient for
- *   delivery of the asset. Values MUST be rounded to the nearest 100kbps. For
- *   example, a client would indicate that the current segment, encoded at
- *   2Mbps, is to be delivered at no more than 10Mbps, by using rtp=10000.
- *
- *   Note: This can benefit clients by preventing buffer saturation through
- *   over-delivery and can also deliver a community benefit through fair-share
- *   delivery. The concept is that each client receives the throughput necessary
- *   for great performance, but no more. The CDN may not support the rtp
- *   feature.
- */
-shaka.util.CmcdManager.Data;
-
-
 /**
  * @enum {string}
  */

package/lib/util/ebml_parser.js

@@ -11,7 +11,6 @@ goog.require('goog.asserts');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.DataViewReader');
 goog.require('shaka.util.Error');
-goog.require('shaka.util.Iterables');
 
 
 /**
@@ -157,7 +156,8 @@ shaka.util.EbmlParser = class {
     }
 
     let value = 0;
-    for (const {item, i} of shaka.util.Iterables.enumerate(vint)) {
+    for (let i = 0; i < vint.length; i++) {
+      const item = vint[i];
       if (i == 0) {
         // Mask out the first few bits of |vint|'s first byte to get the most
         // significant bits of |vint|'s value. If |vint| is 8 bytes wide then
@@ -267,7 +267,7 @@ shaka.util.EbmlElement = class {
 
     let value = 0;
 
-    for (const i of shaka.util.Iterables.range(this.dataView_.byteLength)) {
+    for (let i = 0; i < this.dataView_.byteLength; i++) {
       const chunk = this.dataView_.getUint8(i);
       value = (256 * value) + chunk;
     }

package/lib/util/error.js

@@ -467,7 +467,7 @@ shaka.util.Error.Code = {
    * Content transformations required by the platform could not be performed for
    * some reason (unsupported container, etc.)
    *
-   * @see https://github.com/google/shaka-player/issues/2759
+   * @see https://github.com/shaka-project/shaka-player/issues/2759
    */
   'CONTENT_TRANSFORMATION_FAILED': 3019,
 

package/lib/util/fake_event_target.js

@@ -9,6 +9,7 @@ goog.provide('shaka.util.FakeEventTarget');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.IReleasable');
 goog.require('shaka.util.MultiMap');
 
 
@@ -18,13 +19,14 @@ goog.require('shaka.util.MultiMap');
  * to non-DOM classes.  Only FakeEvents should be dispatched.
  *
  * @implements {EventTarget}
+ * @implements {shaka.util.IReleasable}
  * @exportInterface
  */
 shaka.util.FakeEventTarget = class {
   /** */
   constructor() {
     /**
-     * @private {!shaka.util.MultiMap.<shaka.util.FakeEventTarget.ListenerType>}
+     * @private {shaka.util.MultiMap.<shaka.util.FakeEventTarget.ListenerType>}
      */
     this.listeners_ = new shaka.util.MultiMap();
 
@@ -46,6 +48,9 @@ shaka.util.FakeEventTarget = class {
    * @exportInterface
    */
   addEventListener(type, listener, options) {
+    if (!this.listeners_) {
+      return;
+    }
     this.listeners_.push(type, listener);
   }
 
@@ -73,6 +78,9 @@ shaka.util.FakeEventTarget = class {
    * @exportInterface
    */
   removeEventListener(type, listener, options) {
+    if (!this.listeners_) {
+      return;
+    }
     this.listeners_.remove(type, listener);
   }
 
@@ -90,6 +98,10 @@ shaka.util.FakeEventTarget = class {
     goog.asserts.assert(event instanceof shaka.util.FakeEvent,
         'FakeEventTarget can only dispatch FakeEvents!');
 
+    if (!this.listeners_) {
+      return true;
+    }
+
     let listeners = this.listeners_.get(event.type) || [];
     const universalListeners =
       this.listeners_.get(shaka.util.FakeEventTarget.ALL_EVENTS_);
@@ -129,6 +141,14 @@ shaka.util.FakeEventTarget = class {
 
     return event.defaultPrevented;
   }
+
+  /**
+   * @override
+   * @exportInterface
+   */
+  release() {
+    this.listeners_ = null;
+  }
 };
 
 /**

package/lib/util/iterables.js

@@ -75,50 +75,4 @@ shaka.util.Iterables = class {
     }
     return out;
   }
-
-  /**
-   * Returns an iterable that contains numbers in the range [0, end).
-   *
-   * @param {number} end The exclusive end of the list.
-   * @return {!Iterable.<number>}
-   */
-  static* range(end) {
-    for (let i = 0; i < end; i++) {
-      yield i;
-    }
-  }
-
-  /**
-   * Iterates over an iterable object and includes additional info about each
-   * item:
-   * - The zero-based index of the element.
-   * - The next item in the list, if it exists.
-   * - The previous item in the list, if it exists.
-   *
-   * @param {!Iterable.<T>} iterable
-   * @return {!Iterable.<
-   *     {i: number, item: T, prev: (T|undefined), next: (T|undefined)}>}
-   * @template T
-   */
-  static* enumerate(iterable) {
-    // Since we want the "next" item, we need to skip the first item and return
-    // elements one in the past.  So as we iterate, we are getting the "next"
-    // element and yielding the one from the previous iteration.
-    let i = -1;
-    let prev = undefined;
-    let item = undefined;
-    for (const next of iterable) {
-      if (i >= 0) {
-        yield {i, item, prev, next};
-      }
-      i++;
-      prev = item;
-      item = next;
-    }
-    if (i != -1) {
-      // If it's still -1, there were no items.  Otherwise we need to yield
-      // the last item.
-      yield {i, prev, item, next: undefined};
-    }
-  }
 };

package/lib/util/mp4_box_parsers.js

@@ -7,8 +7,6 @@
 goog.provide('shaka.util.Mp4BoxParsers');
 
 goog.require('shaka.util.DataViewReader');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 
 shaka.util.Mp4BoxParsers = class {
   /**
@@ -125,8 +123,7 @@ shaka.util.Mp4BoxParsers = class {
       reader.skip(4);
     }
 
-    for (const _ of shaka.util.Iterables.range(sampleCount)) {
-      shaka.util.Functional.ignored(_);
+    for (let i = 0; i < sampleCount; i++) {
       /** @type {shaka.util.ParsedTRUNSample} */
       const sample = {
         sampleDuration: null,

package/lib/util/mp4_parser.js

@@ -9,8 +9,6 @@ goog.provide('shaka.util.Mp4Parser');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.util.DataViewReader');
-goog.require('shaka.util.Functional');
-goog.require('shaka.util.Iterables');
 
 
 /**
@@ -229,8 +227,7 @@ shaka.util.Mp4Parser = class {
     // start position.  The header size varies.
     const headerSize = shaka.util.Mp4Parser.headerSize(box);
     const count = box.reader.readUint32();
-    for (const _ of shaka.util.Iterables.range(count)) {
-      shaka.util.Functional.ignored(_);
+    for (let i = 0; i < count; i++) {
       box.parser.parseNext(box.start + headerSize, box.reader, box.partialOkay);
       if (box.parser.done_) {
         break;
@@ -302,9 +299,10 @@ shaka.util.Mp4Parser = class {
    * @export
    */
   static headerSize(box) {
-    return /* basic header */ 8
-        + /* additional 64-bit size field */ (box.has64BitSize ? 8 : 0)
-        + /* version and flags for a "full" box */ (box.flags != null ? 4 : 0);
+    const basicHeaderSize = 8;
+    const _64BitFieldSize = box.has64BitSize ? 8 : 0;
+    const versionAndFlagsSize = box.flags != null ? 4 : 0;
+    return basicHeaderSize + _64BitFieldSize + versionAndFlagsSize;
   }
 };
 

package/lib/util/periods.js

@@ -14,7 +14,6 @@ goog.require('shaka.media.SegmentIndex');
 goog.require('shaka.util.ArrayUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.IReleasable');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.LanguageUtils');
 goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MapUtils');
@@ -98,7 +97,6 @@ shaka.util.PeriodCombiner = class {
    */
   async combinePeriods(periods, isDynamic) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
-    const Iterables = shaka.util.Iterables;
 
     shaka.util.PeriodCombiner.filterOutAudioStreamDuplicates_(periods);
     shaka.util.PeriodCombiner.filterOutVideoStreamDuplicates_(periods);
@@ -118,7 +116,8 @@ shaka.util.PeriodCombiner = class {
       // Find the first period we haven't seen before.  Tag all the periods we
       // see now as "used".
       let firstNewPeriodIndex = -1;
-      for (const {i, item: period} of Iterables.enumerate(periods)) {
+      for (let i = 0; i < periods.length; i++) {
+        const period = periods[i];
         if (this.usedPeriodIds_.has(period.id)) {
           // This isn't new.
         } else {
@@ -301,6 +300,7 @@ shaka.util.PeriodCombiner = class {
             t1.label == t2.label &&
             t1.codecs == t2.codecs &&
             t1.mimeType == t2.mimeType &&
+            t1.bandwidth == t2.bandwidth &&
             ArrayUtils.hasSameElements(t1.roles, t2.roles)) {
             duplicate = true;
           }
@@ -510,13 +510,12 @@ shaka.util.PeriodCombiner = class {
   static async combine_(
       outputStreams, streamsPerPeriod, firstNewPeriodIndex, clone, concat) {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
-    const Iterables = shaka.util.Iterables;
 
     const unusedStreamsPerPeriod = [];
-    for (const {i, item: streams} of Iterables.enumerate(streamsPerPeriod)) {
+    for (let i = 0; i < streamsPerPeriod.length; i++) {
       if (i >= firstNewPeriodIndex) {
         // This periods streams are all new.
-        unusedStreamsPerPeriod.push(new Set(streams));
+        unusedStreamsPerPeriod.push(new Set(streamsPerPeriod[i]));
       } else {
         // This period's streams have all been used already.
         unusedStreamsPerPeriod.push(new Set());
@@ -668,12 +667,12 @@ shaka.util.PeriodCombiner = class {
 
     // Concatenate the new matches onto the stream, starting at the first new
     // period.
-    const Iterables = shaka.util.Iterables;
     // Satisfy the compiler about the type.
     // Also checks if the segmentIndex is still valid after the async
     // operations, to make sure we stop if the active stream has changed.
     if (outputStream.segmentIndex instanceof shaka.media.MetaSegmentIndex) {
-      for (const {i, item: match} of Iterables.enumerate(streams)) {
+      for (let i = 0; i < streams.length; i++) {
+        const match = streams[i];
         if (match.segmentIndex && i >= firstNewPeriodIndex) {
           goog.asserts.assert(match.segmentIndex,
               'stream should have a segmentIndex.');
@@ -768,9 +767,9 @@ shaka.util.PeriodCombiner = class {
 
     // Concatenate the new matches onto the stream, starting at the first new
     // period.
-    const Iterables = shaka.util.Iterables;
-    for (const {i, item: match} of Iterables.enumerate(matches)) {
+    for (let i = 0; i < matches.length; i++) {
       if (i >= firstNewPeriodIndex) {
+        const match = matches[i];
         concat(outputStream, match);
 
         // We only consider an audio stream "used" if its language is related to
@@ -1210,7 +1209,7 @@ shaka.util.PeriodCombiner = class {
         // [r1, r2, r3, r4].
         // If we match stream1 with stream3 due to the same role overlap,
         // stream2 is likely to be left unmatched and error out later.
-        // See https://github.com/google/shaka-player/issues/2542 for
+        // See https://github.com/shaka-project/shaka-player/issues/2542 for
         // more details.
         return candidate.roles.length < best.roles.length;
       }

package/lib/util/platform.js

@@ -174,8 +174,8 @@ shaka.util.Platform = class {
    * @return {boolean}
    */
   static isApple() {
-    return !!navigator.vendor && navigator.vendor.includes('Apple')
-            && !shaka.util.Platform.isTizen();
+    return !!navigator.vendor && navigator.vendor.includes('Apple') &&
+        !shaka.util.Platform.isTizen();
   }
 
   /**
@@ -312,7 +312,7 @@ shaka.util.Platform = class {
    * initialization segments.
    *
    * @return {boolean}
-   * @see https://github.com/google/shaka-player/issues/2759
+   * @see https://github.com/shaka-project/shaka-player/issues/2759
    */
   static requiresEncryptionInfoInAllInitSegments() {
     const Platform = shaka.util.Platform;