shaka-player 3.3.1 → 3.3.4

package/lib/polyfill/symbol.js

@@ -0,0 +1,46 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+goog.provide('shaka.polyfill.Symbol');
+
+goog.require('shaka.log');
+goog.require('shaka.polyfill');
+
+/**
+ * @summary A polyfill to provide Symbol.prototype.description in all browsers.
+ * See: https://caniuse.com/mdn-javascript_builtins_symbol_description
+ * @export
+ */
+shaka.polyfill.Symbol = class {
+  /**
+   * Install the polyfill if needed.
+   * @export
+   */
+  static install() {
+    shaka.log.debug('Symbol.install');
+
+    // eslint-disable-next-line no-restricted-syntax
+    const proto = Symbol.prototype;
+
+    if (!('description' in proto)) {
+      Object.defineProperty(proto, 'description', {
+        get: shaka.polyfill.Symbol.getSymbolDescription_,
+      });
+    }
+  }
+
+  /**
+   * @this {Symbol}
+   * @return {(string|undefined)}
+   * @private
+   */
+  static getSymbolDescription_() {
+    const m = /\((.*)\)/.exec(this.toString());
+    return m ? m[1] : undefined;
+  }
+};
+
+
+shaka.polyfill.register(shaka.polyfill.Symbol.install);

package/lib/text/cue.js

@@ -294,7 +294,7 @@ shaka.text.Cue = class {
     // Compare the start time, end time and payload of the cues first for
     // performance optimization.  We can avoid the more expensive recursive
     // checks if the top-level properties don't match.
-    // See: https://github.com/google/shaka-player/issues/3018
+    // See: https://github.com/shaka-project/shaka-player/issues/3018
     if (cue1.startTime != cue2.startTime || cue1.endTime != cue2.endTime ||
       cue1.payload != cue2.payload) {
       return false;

package/lib/text/simple_text_displayer.js

@@ -178,7 +178,8 @@ shaka.text.SimpleTextDisplayer = class {
         // The browser will display cues with identical time ranges from the
         // bottom up.  Reversing the order of equal cues means the first one
         // parsed will be at the top, as you would expect.
-        // See https://github.com/google/shaka-player/issues/848 for more info.
+        // See https://github.com/shaka-project/shaka-player/issues/848 for
+        // more info.
         // However, this ordering behavior is part of VTTCue's "line" field.
         // Some platforms don't have a real VTTCue and use a polyfill instead.
         // When VTTCue is polyfilled or does not support "line", we should _not_

package/lib/text/ttml_text_parser.js

@@ -536,8 +536,10 @@ shaka.text.TtmlTextParser = class {
 
       cue.textAlign = Cue.textAlign[align.toUpperCase()];
     } else {
-      // Default value is START: https://bit.ly/32OGmvo
-      cue.textAlign = Cue.textAlign.START;
+      // Default value is START in the TTML spec: https://bit.ly/32OGmvo
+      // But to make the subtitle render consitent with other players and the
+      // shaka.text.Cue we use CENTER
+      cue.textAlign = Cue.textAlign.CENTER;
     }
 
     const displayAlign = TtmlTextParser.getStyleAttribute_(
@@ -558,7 +560,7 @@ shaka.text.TtmlTextParser = class {
     // Background color should not be set on a container.  If this is a nested
     // cue, you can set the background.  If it's a top-level that happens to
     // also be a leaf, you can set the background.
-    // See https://github.com/google/shaka-player/issues/2623
+    // See https://github.com/shaka-project/shaka-player/issues/2623
     // This used to be handled in the displayer, but that is confusing.  The Cue
     // structure should reflect what you want to happen in the displayer, and
     // the displayer shouldn't have to know about TTML.
@@ -942,8 +944,9 @@ shaka.text.TtmlTextParser = class {
     let ret = null;
     const XmlUtils = shaka.util.XmlUtils;
     while (element) {
-      ret = nsName ? XmlUtils.getAttributeNS(element, nsName, attributeName)
-                   : element.getAttribute(attributeName);
+      ret = nsName ?
+          XmlUtils.getAttributeNS(element, nsName, attributeName) :
+          element.getAttribute(attributeName);
       if (ret) {
         break;
       }

package/lib/text/ui_text_displayer.js

@@ -108,7 +108,7 @@ shaka.text.UITextDisplayer = class {
   append(cues) {
     // Clone the cues list for performace optimization. We can avoid the cues
     // list growing during the comparisons for duplicate cues.
-    // See: https://github.com/google/shaka-player/issues/3018
+    // See: https://github.com/shaka-project/shaka-player/issues/3018
     const cuesList = [...this.cues_];
     for (const cue of cues) {
       // When a VTT cue spans a segment boundary, the cue will be duplicated

package/lib/util/buffer_utils.js

@@ -6,8 +6,6 @@
 
 goog.provide('shaka.util.BufferUtils');
 
-goog.require('shaka.util.Iterables');
-
 
 /**
  * @summary A set of BufferSource utility functions.
@@ -45,7 +43,7 @@ shaka.util.BufferUtils = class {
 
     const uint8A = shaka.util.BufferUtils.toUint8(arr1);
     const uint8B = shaka.util.BufferUtils.toUint8(arr2);
-    for (const i of shaka.util.Iterables.range(arr1.byteLength)) {
+    for (let i = 0; i < arr1.byteLength; i++) {
       if (uint8A[i] != uint8B[i]) {
         return false;
       }

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;

package/lib/util/pssh.js

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

package/lib/util/stream_utils.js

@@ -425,7 +425,7 @@ shaka.util.StreamUtils = class {
     await shaka.util.StreamUtils.getDecodingInfosForVariants(
         manifest.variants, usePersistentLicenses, /* srcEquals= */ false);
     manifest.variants = manifest.variants.filter((variant) => {
-      // See: https://github.com/google/shaka-player/issues/3860
+      // See: https://github.com/shaka-project/shaka-player/issues/3860
       const video = variant.video;
       const ContentType = shaka.util.ManifestParserUtils.ContentType;
       if (video) {
@@ -461,7 +461,7 @@ shaka.util.StreamUtils = class {
         }
       }
 
-      // See: https://github.com/google/shaka-player/issues/3380
+      // See: https://github.com/shaka-project/shaka-player/issues/3380
       if (shaka.util.Platform.isXboxOne() && video &&
           ((video.width && video.width > 1920) ||
           (video.height && video.height > 1080)) &&
@@ -720,7 +720,8 @@ shaka.util.StreamUtils = class {
   static getCorrectAudioCodecs_(codecs) {
     // Some Tizen devices seem to misreport AC-3 support, but correctly
     // report EC-3 support.  So query EC-3 as a fallback for AC-3.
-    // See https://github.com/google/shaka-player/issues/2989 for details.
+    // See https://github.com/shaka-project/shaka-player/issues/2989 for
+    // details.
     if (shaka.util.Platform.isTizen()) {
       return codecs.toLowerCase() == 'ac-3' ? 'ec-3' : codecs;
     } else {

package/lib/util/string_utils.js

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

package/lib/util/uint8array_utils.js

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

package/lib/util/xml_utils.js

@@ -57,9 +57,13 @@ shaka.util.XmlUtils = class {
    * @return {!Array.<!Element>} The child XML elements.
    */
   static findChildren(elem, name) {
-    return Array.from(elem.childNodes).filter((child) => {
-      return child instanceof Element && child.tagName == name;
-    });
+    const found = [];
+    for (const child of elem.childNodes) {
+      if (child instanceof Element && child.tagName == name) {
+        found.push(child);
+      }
+    }
+    return found;
   }
 
 
@@ -82,10 +86,14 @@ shaka.util.XmlUtils = class {
    * @return {!Array.<!Element>} The child XML elements.
    */
   static findChildrenNS(elem, ns, name) {
-    return Array.from(elem.childNodes).filter((child) => {
-      return child instanceof Element && child.localName == name &&
-          child.namespaceURI == ns;
-    });
+    const found = [];
+    for (const child of elem.childNodes) {
+      if (child instanceof Element && child.localName == name &&
+          child.namespaceURI == ns) {
+        found.push(child);
+      }
+    }
+    return found;
   }