shaka-player 3.3.2 → 4.0.0

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

@@ -142,6 +142,18 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('Web0S');
   }
 
+  /**
+   * Check if the current platform is a WebOS 3.
+   *
+   * @return {boolean}
+   */
+  static isWebOS3() {
+    // See: http://webostv.developer.lge.com/discover/specifications/web-engine/
+    return shaka.util.Platform.userAgentContains_('Web0S') &&
+        shaka.util.Platform.userAgentContains_(
+            'Chrome/38.0.2125.122 Safari/537.36');
+  }
+
   /**
    * Check if the current platform is a Google Chromecast.
    *
@@ -151,6 +163,16 @@ shaka.util.Platform = class {
     return shaka.util.Platform.userAgentContains_('CrKey');
   }
 
+  /**
+   * Check if the current platform is a Android-based Cast devices.
+   *
+   * @return {boolean}
+   */
+  static isAndroidCastDevice() {
+    return shaka.util.Platform.isChromecast() &&
+        shaka.util.Platform.userAgentContains_('Android');
+  }
+
   /**
    * Check if the current platform is Google Chrome.
    *
@@ -174,8 +196,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();
   }
 
   /**
@@ -228,6 +250,16 @@ shaka.util.Platform = class {
     return null;
   }
 
+  /**
+   * Check if the current platform is Apple Safari
+   * or Safari-based iOS browsers.
+   *
+   * @return {boolean}
+   */
+  static isSafari() {
+    return !!shaka.util.Platform.safariVersion();
+  }
+
   /**
    * Guesses if the platform is a mobile one (iOS or Android).
    *
@@ -312,12 +344,25 @@ 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;
     return Platform.isTizen() || Platform.isXboxOne();
   }
+
+  /**
+   * Returns true if MediaKeys is polyfilled
+   *
+   * @return {boolean}
+   */
+  static isMediaKeysPolyfilled() {
+    if (window.shakaMediaKeysPolyfill) {
+      return true;
+    }
+
+    return false;
+  }
 };
 
 /** @private {shaka.util.Timer} */

package/lib/util/player_configuration.js

@@ -9,7 +9,6 @@ goog.provide('shaka.util.PlayerConfiguration');
 goog.require('goog.asserts');
 goog.require('shaka.abr.SimpleAbrManager');
 goog.require('shaka.log');
-goog.require('shaka.media.DrmEngine');
 goog.require('shaka.net.NetworkingEngine');
 goog.require('shaka.util.ConfigUtils');
 goog.require('shaka.util.LanguageUtils');
@@ -30,7 +29,10 @@ goog.require('shaka.util.Platform');
  * @export
  */
 shaka.util.PlayerConfiguration = class {
-  /** @return {shaka.extern.PlayerConfiguration} */
+  /**
+   * @return {shaka.extern.PlayerConfiguration}
+   * @export
+   */
   static createDefault() {
     // This is a relatively safe default in the absence of clues from the
     // browser.  For slower connections, the default estimate may be too high.
@@ -72,7 +74,6 @@ shaka.util.PlayerConfiguration = class {
       clearKeys: {},  // key is arbitrary key system ID, value must be string
       advanced: {},    // key is arbitrary key system ID, value is a record type
       delayLicenseRequestUntilPlayed: false,
-      initDataTransform: shaka.media.DrmEngine.defaultInitDataTransform,
       logLicenseExchange: false,
       updateExpirationTime: 1,
       preferredKeySystems: [],
@@ -86,6 +87,7 @@ shaka.util.PlayerConfiguration = class {
       disableText: false,
       disableThumbnails: false,
       defaultPresentationDelay: 0,
+      segmentRelativeVttTiming: false,
       dash: {
         clockSyncUri: '',
         ignoreDrmInfo: false,
@@ -100,6 +102,8 @@ shaka.util.PlayerConfiguration = class {
         keySystemsByURI: {
           'urn:uuid:1077efec-c0b2-4d02-ace3-3c1e52e2fb4b':
             'org.w3.clearkey',
+          'urn:uuid:e2719d58-a985-b3c9-781a-b030af78d30e':
+            'org.w3.clearkey',
           'urn:uuid:edef8ba9-79d6-4ace-a3c8-27dcd51d21ed':
             'com.widevine.alpha',
           'urn:uuid:9a04f079-9840-4286-ab92-e65be0885f95':
@@ -119,9 +123,11 @@ shaka.util.PlayerConfiguration = class {
       hls: {
         ignoreTextStreamFailures: false,
         ignoreImageStreamFailures: false,
-        useFullSegmentsForStartTime: false,
         defaultAudioCodec: 'mp4a.40.2',
         defaultVideoCodec: 'avc1.42E01E',
+        ignoreManifestProgramDateTime: false,
+        mediaPlaylistFullMimeType:
+            'video/mp2t; codecs="avc1.42E01E, mp4a.40.2"',
       },
     };
 
@@ -143,8 +149,6 @@ shaka.util.PlayerConfiguration = class {
       alwaysStreamText: false,
       startAtSegmentBoundary: false,
       gapDetectionThreshold: 0.1,
-      smallGapLimit: 0.5,
-      jumpLargeGaps: false,
       durationBackoff: 1,
       forceTransmuxTS: false,
       // Offset by 5 seconds since Chromecast takes a few seconds to start
@@ -218,6 +222,8 @@ shaka.util.PlayerConfiguration = class {
       // unexpected behaviours when someone tries to plays downloaded content
       // without a persistent license.
       usePersistentLicense: true,
+
+      numberOfParallelDownloads: 5,
     };
 
     const abr = {

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);
@@ -93,16 +90,21 @@ shaka.util.Pssh = class {
   }
 
   /**
-   * Creates a pssh blob from the given system ID and data.
+   * Creates a pssh blob from the given system ID, data, keyIds and version.
    *
    * @param {!Uint8Array} data
    * @param {!Uint8Array} systemId
+   * @param {!Set.<string>} keyIds
+   * @param {number} version
    * @return {!Uint8Array}
    */
-  static createPssh(data, systemId) {
+  static createPssh(data, systemId, keyIds, version) {
     goog.asserts.assert(systemId.byteLength == 16, 'Invalid system ID length');
     const dataLength = data.length;
-    const psshSize = 0x4 + 0x4 + 0x4 + systemId.length + 0x4 + dataLength;
+    let psshSize = 0x4 + 0x4 + 0x4 + systemId.length + 0x4 + dataLength;
+    if (version > 0) {
+      psshSize += 0x4 + (16 * keyIds.size);
+    }
 
     /** @type {!Uint8Array} */
     const psshBox = new Uint8Array(psshSize);
@@ -114,10 +116,24 @@ shaka.util.Pssh = class {
     byteCursor += 0x4;
     psshData.setUint32(byteCursor, 0x70737368);  // 'pssh'
     byteCursor += 0x4;
-    psshData.setUint32(byteCursor, 0);  // flags
+    (version < 1) ? psshData.setUint32(byteCursor, 0) :
+        psshData.setUint32(byteCursor, 0x01000000); // version + flags
     byteCursor += 0x4;
     psshBox.set(systemId, byteCursor);
     byteCursor += systemId.length;
+
+    // if version > 0, add KID count and kid values.
+    if (version > 0) {
+      psshData.setUint32(byteCursor, keyIds.size); // KID_count
+      byteCursor += 0x4;
+      const Uint8ArrayUtils = shaka.util.Uint8ArrayUtils;
+      for (const keyId of keyIds) {
+        const KID = Uint8ArrayUtils.fromHex(keyId);
+        psshBox.set(KID, byteCursor);
+        byteCursor += KID.length;
+      }
+    }
+
     psshData.setUint32(byteCursor, dataLength);
     byteCursor += 0x4;
     psshBox.set(data, byteCursor);

package/lib/util/stream_utils.js

@@ -406,7 +406,7 @@ shaka.util.StreamUtils = class {
     shaka.util.StreamUtils.filterManifestByCurrentVariant(
         currentVariant, manifest);
     shaka.util.StreamUtils.filterTextStreams_(manifest);
-    shaka.util.StreamUtils.filterImageStreams_(manifest);
+    await shaka.util.StreamUtils.filterImageStreams_(manifest);
   }
 
 
@@ -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 {
@@ -812,37 +813,57 @@ shaka.util.StreamUtils = class {
    * @param {shaka.extern.Manifest} manifest
    * @private
    */
-  static filterImageStreams_(manifest) {
-    // Filter image streams.
-    manifest.imageStreams = manifest.imageStreams.filter((stream) => {
-      // TODO: re-examine this and avoid allow-listing the MIME types we can
-      // accept.
-      const validMimeTypes = [
-        'image/svg+xml',
-        'image/png',
-        'image/jpeg',
-      ];
-      const Platform = shaka.util.Platform;
-      // Add webp support to popular platforms that support it.
-      const webpSupport = Platform.isWebOS() ||
-                          Platform.isTizen() ||
-                          Platform.isChromecast();
-      if (webpSupport) {
-        validMimeTypes.push('image/webp');
+  static async filterImageStreams_(manifest) {
+    const imageStreams = [];
+    for (const stream of manifest.imageStreams) {
+      const mimeType = stream.mimeType;
+      if (!shaka.util.StreamUtils.supportedImageMimeTypes_.has(mimeType)) {
+        const minImage = shaka.util.StreamUtils.minImage_.get(mimeType);
+        if (minImage) {
+          // eslint-disable-next-line no-await-in-loop
+          const res = await shaka.util.StreamUtils.isImageSupported_(minImage);
+          shaka.util.StreamUtils.supportedImageMimeTypes_.set(mimeType, res);
+        } else {
+          shaka.util.StreamUtils.supportedImageMimeTypes_.set(mimeType, false);
+        }
       }
-      // TODO: add support to image/webp and image/avif
-      const keep = validMimeTypes.includes(stream.mimeType);
+
+      const keep =
+          shaka.util.StreamUtils.supportedImageMimeTypes_.get(mimeType);
 
       if (!keep) {
         shaka.log.debug('Dropping image stream. Is not supported by the ' +
                         'platform.', stream);
+      } else {
+        imageStreams.push(stream);
       }
+    }
+    manifest.imageStreams = imageStreams;
+  }
 
-      return keep;
+  /**
+   * @param {string} minImage
+   * @return {!Promise.<boolean>}
+   * @private
+   */
+  static isImageSupported_(minImage) {
+    return new Promise((resolve) => {
+      const imageElement = /** @type {HTMLImageElement} */(new Image());
+      imageElement.src = minImage;
+      if ('decode' in imageElement) {
+        imageElement.decode().then(() => {
+          resolve(true);
+        }).catch(() => {
+          resolve(false);
+        });
+      } else {
+        imageElement.onload = imageElement.onerror = () => {
+          resolve(imageElement.height === 2);
+        };
+      }
     });
   }
 
-
   /**
    * @param {shaka.extern.Stream} s0
    * @param {shaka.extern.Stream} s1
@@ -877,6 +898,11 @@ shaka.util.StreamUtils = class {
     /** @type {?shaka.extern.Stream} */
     const video = variant.video;
 
+    /** @type {?string} */
+    const audioMimeType = audio ? audio.mimeType : null;
+    /** @type {?string} */
+    const videoMimeType = video ? video.mimeType : null;
+
     /** @type {?string} */
     const audioCodec = audio ? audio.codecs : null;
     /** @type {?string} */
@@ -941,6 +967,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: mimeType,
+      audioMimeType: audioMimeType,
+      videoMimeType: videoMimeType,
       codecs: codecs.join(', '),
       audioCodec: audioCodec,
       videoCodec: videoCodec,
@@ -1008,6 +1036,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: stream.mimeType,
+      audioMimeType: null,
+      videoMimeType: null,
       codecs: stream.codecs || null,
       audioCodec: null,
       videoCodec: null,
@@ -1080,6 +1110,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: stream.mimeType,
+      audioMimeType: null,
+      videoMimeType: null,
       codecs: null,
       audioCodec: null,
       videoCodec: null,
@@ -1198,6 +1230,8 @@ shaka.util.StreamUtils = class {
       pixelAspectRatio: null,
       hdr: null,
       mimeType: null,
+      audioMimeType: null,
+      videoMimeType: null,
       codecs: null,
       audioCodec: null,
       videoCodec: null,
@@ -1502,3 +1536,40 @@ shaka.util.StreamUtils.DecodingAttributes = {
   POWER: 'powerEfficient',
   BANDWIDTH: 'bandwidth',
 };
+
+/**
+ * @private {!Map.<string, boolean>}
+ */
+shaka.util.StreamUtils.supportedImageMimeTypes_ = new Map()
+    .set('image/svg+xml', true)
+    .set('image/png', true)
+    .set('image/jpeg', true)
+    .set('image/jpg', true);
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.util.StreamUtils.minWebPImage_ = 'data:image/webp;base64,UklGRjoAAABXRU' +
+    'JQVlA4IC4AAACyAgCdASoCAAIALmk0mk0iIiIiIgBoSygABc6WWgAA/veff/0PP8bA//LwY' +
+    'AAA';
+
+/**
+ * @const {string}
+ * @private
+ */
+shaka.util.StreamUtils.minAvifImage_ = 'data:image/avif;base64,AAAAIGZ0eXBhdm' +
+    'lmAAAAAGF2aWZtaWYxbWlhZk1BMUIAAADybWV0YQAAAAAAAAAoaGRscgAAAAAAAAAAcGljd' +
+    'AAAAAAAAAAAAAAAAGxpYmF2aWYAAAAADnBpdG0AAAAAAAEAAAAeaWxvYwAAAABEAAABAAEA' +
+    'AAABAAABGgAAAB0AAAAoaWluZgAAAAAAAQAAABppbmZlAgAAAAABAABhdjAxQ29sb3IAAAA' +
+    'AamlwcnAAAABLaXBjbwAAABRpc3BlAAAAAAAAAAIAAAACAAAAEHBpeGkAAAAAAwgICAAAAA' +
+    'xhdjFDgQ0MAAAAABNjb2xybmNseAACAAIAAYAAAAAXaXBtYQAAAAAAAAABAAEEAQKDBAAAA' +
+    'CVtZGF0EgAKCBgANogQEAwgMg8f8D///8WfhwB8+ErK42A=';
+
+/**
+ * @const {!Map.<string, string>}
+ * @private
+ */
+shaka.util.StreamUtils.minImage_ = new Map()
+    .set('image/webp', shaka.util.StreamUtils.minWebPImage_)
+    .set('image/avif', shaka.util.StreamUtils.minAvifImage_);

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

@@ -6,9 +6,7 @@
 
 goog.provide('shaka.util.Uint8ArrayUtils');
 
-goog.require('shaka.Deprecate');
 goog.require('shaka.util.BufferUtils');
-goog.require('shaka.util.Iterables');
 goog.require('shaka.util.StringUtils');
 
 
@@ -18,21 +16,6 @@ goog.require('shaka.util.StringUtils');
  * @export
  */
 shaka.util.Uint8ArrayUtils = class {
-  /**
-   * Compare two Uint8Arrays for equality.
-   * @param {Uint8Array} arr1
-   * @param {Uint8Array} arr2
-   * @return {boolean}
-   * @deprecated
-   * @export
-   */
-  static equal(arr1, arr2) {
-    shaka.Deprecate.deprecateFeature(4,
-        'shaka.util.Uint8ArrayUtils.equal',
-        'Please use shaka.util.BufferUtils.equal instead.');
-    return shaka.util.BufferUtils.equal(arr1, arr2);
-  }
-
   /**
    * Convert a buffer to a base64 string. The output will be standard
    * alphabet as opposed to base64url safe alphabet.
@@ -74,9 +57,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 +73,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;
   }
 
 
@@ -191,7 +199,7 @@ shaka.util.XmlUtils = class {
     }
 
     const result = Date.parse(dateString);
-    return (!isNaN(result) ? Math.floor(result / 1000.0) : null);
+    return isNaN(result) ? null : (result / 1000.0);
   }