shaka-player 4.12.2 → 4.12.3

package/externs/managedmediasource.js

@@ -22,3 +22,9 @@ function ManagedMediaSource() {}
  * @return {boolean}
  */
 ManagedMediaSource.isTypeSupported = function(type) {};
+
+/**
+ * @constructor
+ * @extends {SourceBuffer}
+ */
+function ManagedSourceBuffer() {}

package/externs/shaka/ads.js

@@ -63,6 +63,7 @@ shaka.extern.AdCuePoint;
  *   startTime: number,
  *   endTime: ?number,
  *   uri: string,
+ *   mimeType: ?string,
  *   isSkippable: boolean,
  *   skipOffset: ?number,
  *   skipFor: ?number,
@@ -87,6 +88,8 @@ shaka.extern.AdCuePoint;
  * @property {string} uri
  *   The uri of the interstitial, can be any type that
  *   ShakaPlayer supports (either in MSE or src=)
+ * @property {?string} mimeType
+ *   The mimeType of the interstitial if known.
  * @property {boolean} isSkippable
  *   Indicate if the interstitial is skippable.
  * @property {?number} skipOffset

package/lib/ads/ad_utils.js

@@ -80,6 +80,7 @@ shaka.ads.Utils = class {
             startTime: startTime,
             endTime: null,
             uri: adUrl,
+            mimeType: media.attributes['type'] || null,
             isSkippable: skipOffset != null,
             skipOffset,
             skipFor: null,

package/lib/ads/interstitial_ad_manager.js

@@ -102,7 +102,7 @@ shaka.ads.InterstitialAdManager = class {
       }
       this.lastTime_ = this.baseVideo_.currentTime;
       const currentInterstitial = this.getCurrentInterstitial_(
-          /* needPreRoll= */ true, /* numberToSkip= */ 0, this.lastPlayedAd_);
+          /* needPreRoll= */ true);
       if (currentInterstitial) {
         this.setupAd_(currentInterstitial, /* sequenceLength= */ 1,
             /* adPosition= */ 1, /* initialTime= */ Date.now());
@@ -121,14 +121,17 @@ shaka.ads.InterstitialAdManager = class {
           this.lastTime_ < this.lastPlayedAd_.startTime) {
         this.lastPlayedAd_ = null;
       }
-      const currentInterstitial = this.getCurrentInterstitial_(
-          /* needPreRoll= */ false, /* numberToSkip= */ 0, this.lastPlayedAd_);
+      const currentInterstitial = this.getCurrentInterstitial_();
       if (currentInterstitial) {
         this.setupAd_(currentInterstitial, /* sequenceLength= */ 1,
             /* adPosition= */ 1, /* initialTime= */ Date.now());
       }
     };
 
+    this.eventManager_.listen(this.baseVideo_, 'ended', () => {
+      checkForInterstitials();
+    });
+
     /** @private {shaka.util.Timer} */
     this.timeUpdateTimer_ = new shaka.util.Timer(checkForInterstitials);
 
@@ -181,7 +184,10 @@ shaka.ads.InterstitialAdManager = class {
             if (difference > 0 && difference <= 10) {
               if (!this.preloadManagerInterstitials_.has(interstitial)) {
                 this.preloadManagerInterstitials_.set(
-                    interstitial, this.player_.preload(interstitial.uri));
+                    interstitial, this.player_.preload(
+                        interstitial.uri,
+                        /* startTime= */ null,
+                        interstitial.mimeType || undefined));
               }
             }
           }
@@ -322,10 +328,11 @@ shaka.ads.InterstitialAdManager = class {
 
     /** @type {!shaka.extern.AdInterstitial} */
     const interstitial = {
-      id: null,
+      id: region.id,
       startTime: region.startTime,
       endTime: region.endTime,
       uri: alternativeMPDUri,
+      mimeType: null,
       isSkippable: false,
       skipOffset: null,
       skipFor: null,
@@ -407,7 +414,10 @@ shaka.ads.InterstitialAdManager = class {
       if (shouldPreload) {
         if (!this.preloadManagerInterstitials_.has(interstitial)) {
           this.preloadManagerInterstitials_.set(
-              interstitial, this.player_.preload(interstitial.uri));
+              interstitial, this.player_.preload(
+                  interstitial.uri,
+                  /* startTime= */ null,
+                  interstitial.mimeType || undefined));
         }
       }
     }
@@ -436,13 +446,12 @@ shaka.ads.InterstitialAdManager = class {
 
 
   /**
-   * @param {boolean} needPreRoll
-   * @param {number} numberToSkip
-   * @param {?shaka.extern.AdInterstitial=} lastPlayedAd
+   * @param {boolean=} needPreRoll
+   * @param {?number=} numberToSkip
    * @return {?shaka.extern.AdInterstitial}
    * @private
    */
-  getCurrentInterstitial_(needPreRoll, numberToSkip, lastPlayedAd) {
+  getCurrentInterstitial_(needPreRoll = false, numberToSkip = null) {
     let skipped = 0;
     let currentInterstitial = null;
     if (this.interstitials_.size && this.lastTime_ != null) {
@@ -453,7 +462,15 @@ shaka.ads.InterstitialAdManager = class {
       const roundDecimals = (number) => {
         return Math.round(number * 1000) / 1000;
       };
-      for (const interstitial of interstitials) {
+      let interstitialsToCheck = interstitials;
+      if (needPreRoll) {
+        interstitialsToCheck = interstitials.filter((i) => i.pre);
+      } else if (isEnded) {
+        interstitialsToCheck = interstitials.filter((i) => i.post);
+      } else {
+        interstitialsToCheck = interstitials.filter((i) => !i.pre && !i.post);
+      }
+      for (const interstitial of interstitialsToCheck) {
         let isValid = false;
         if (needPreRoll) {
           isValid = interstitial.pre;
@@ -464,18 +481,28 @@ shaka.ads.InterstitialAdManager = class {
               this.lastTime_ - roundDecimals(interstitial.startTime);
           if (difference > 0 &&
               (difference <= 1 || !interstitial.canJump)) {
-            if (lastPlayedAd && !lastPlayedAd.pre && !lastPlayedAd.post &&
-                lastPlayedAd.startTime >= interstitial.startTime) {
+            if (numberToSkip == null && this.lastPlayedAd_ &&
+                !this.lastPlayedAd_.pre && !this.lastPlayedAd_.post &&
+                this.lastPlayedAd_.startTime >= interstitial.startTime) {
               isValid = false;
             } else {
               isValid = true;
             }
           }
         }
-        if (isValid) {
-          if (skipped == numberToSkip) {
+        if (isValid && (!this.lastPlayedAd_ ||
+            interstitial.startTime >= this.lastPlayedAd_.startTime)) {
+          if (skipped == (numberToSkip || 0)) {
             currentInterstitial = interstitial;
-            break;
+          } else if (currentInterstitial && !interstitial.canJump) {
+            const currentStartTime =
+                roundDecimals(currentInterstitial.startTime);
+            const newStartTime =
+                roundDecimals(interstitial.startTime);
+            if (newStartTime - currentStartTime > 0.001) {
+              currentInterstitial = interstitial;
+              skipped = 0;
+            }
           }
           skipped++;
         }
@@ -520,7 +547,7 @@ shaka.ads.InterstitialAdManager = class {
       }).length;
     }
 
-    if (interstitial.once || interstitial.pre) {
+    if (interstitial.once) {
       oncePlayed++;
       this.interstitials_.delete(interstitial);
       this.cuepointsChanged_();
@@ -594,6 +621,10 @@ shaka.ads.InterstitialAdManager = class {
         this.setupAd_(nextCurrentInterstitial, sequenceLength,
             ++adPosition, initialTime, oncePlayed);
       } else {
+        if (interstitial.post) {
+          this.lastTime_ = null;
+          this.lastPlayedAd_ = null;
+        }
         if (this.usingBaseVideo_) {
           await this.player_.detach();
         } else {
@@ -754,10 +785,16 @@ shaka.ads.InterstitialAdManager = class {
         if (preloadManager) {
           await this.player_.load(preloadManager);
         } else {
-          await this.player_.load(interstitial.uri);
+          await this.player_.load(
+              interstitial.uri,
+              /* startTime= */ null,
+              interstitial.mimeType || undefined);
         }
       } else {
-        await this.player_.load(interstitial.uri);
+        await this.player_.load(
+            interstitial.uri,
+            /* startTime= */ null,
+            interstitial.mimeType || undefined);
       }
       if (interstitial.playoutLimit) {
         if (playoutLimitTimer) {
@@ -887,6 +924,7 @@ shaka.ads.InterstitialAdManager = class {
         startTime,
         endTime,
         uri,
+        mimeType: null,
         isSkippable,
         skipOffset,
         skipFor,
@@ -916,27 +954,29 @@ shaka.ads.InterstitialAdManager = class {
         const skipControl = dataAsJson['SKIP-CONTROL'];
         if (skipControl) {
           const enableSkipAfterValue = skipControl['ENABLE-SKIP-AFTER'];
-          if (enableSkipAfterValue instanceof Number) {
+          if ((typeof enableSkipAfterValue) == 'number') {
             skipOffset = parseFloat(enableSkipAfterValue);
             if (isNaN(enableSkipAfterValue)) {
               skipOffset = isSkippable ? 0 : null;
             }
           }
-          const enableSkipForValue = skipControl['X-ENABLE-SKIP-FOR'];
-          if (enableSkipForValue instanceof Number) {
+          const enableSkipForValue = skipControl['ENABLE-SKIP-FOR'];
+          if ((typeof enableSkipForValue) == 'number') {
             skipFor = parseFloat(enableSkipForValue);
             if (isNaN(enableSkipForValue)) {
               skipFor = null;
             }
           }
         }
-        for (const asset of dataAsJson['ASSETS']) {
+        for (let i = 0; i < dataAsJson['ASSETS'].length; i++) {
+          const asset = dataAsJson['ASSETS'][i];
           if (asset['URI']) {
             interstitialsAd.push({
-              id,
+              id: id + '_asset_' + i,
               startTime,
               endTime,
               uri: asset['URI'],
+              mimeType: null,
               isSkippable,
               skipOffset,
               skipFor,

package/lib/cast/cast_utils.js

@@ -66,10 +66,12 @@ shaka.cast.CastUtils = class {
         return shaka.cast.CastUtils.unpackTimeRanges_(value);
       }
 
-      if (value instanceof Uint8Array) {
+      if (ArrayBuffer.isView(value) &&
+      /** @type {TypedArray} */(value).BYTES_PER_ELEMENT === 1) {
         // Some of our code cares about Uint8Arrays actually being Uint8Arrays,
         // so this gives them special treatment.
-        return shaka.cast.CastUtils.unpackUint8Array_(value);
+        return shaka.cast.CastUtils.unpackUint8Array_(
+            /** @type {!Uint8Array} */(value));
       }
 
       if (typeof value == 'number') {

package/lib/media/media_source_capabilities.js

@@ -23,12 +23,9 @@ shaka.media.Capabilities = class {
     if (supportMap.has(type)) {
       return supportMap.get(type);
     }
-    if (window.ManagedMediaSource) {
-      const currentSupport = ManagedMediaSource.isTypeSupported(type);
-      supportMap.set(type, currentSupport);
-      return currentSupport;
-    } else if (window.MediaSource) {
-      const currentSupport = MediaSource.isTypeSupported(type);
+    const mediaSource = window.ManagedMediaSource || window.MediaSource;
+    if (mediaSource) {
+      const currentSupport = mediaSource.isTypeSupported(type);
       supportMap.set(type, currentSupport);
       return currentSupport;
     }
@@ -40,9 +37,10 @@ shaka.media.Capabilities = class {
    * @return {boolean}
    */
   static isChangeTypeSupported() {
-    return !!window.SourceBuffer &&
+    const sourceBuffer = window.ManagedSourceBuffer || window.SourceBuffer;
+    return !!sourceBuffer &&
         // eslint-disable-next-line no-restricted-syntax
-        !!SourceBuffer.prototype && !!SourceBuffer.prototype.changeType;
+        !!sourceBuffer.prototype && !!sourceBuffer.prototype.changeType;
   }
 };
 

package/lib/media/media_source_engine.js

@@ -271,7 +271,7 @@ shaka.media.MediaSourceEngine = class {
    * @param {string} mimeType
    */
   addSecondarySource(uri, mimeType) {
-    if (!this.video_ || !(this.mediaSource_ instanceof ManagedMediaSource)) {
+    if (!this.video_ || !window.ManagedMediaSource || !this.mediaSource_) {
       shaka.log.warning(
           'Secondary source is used only with ManagedMediaSource');
       return;
@@ -882,7 +882,7 @@ shaka.media.MediaSourceEngine = class {
           return frame.description ===
               'com.apple.streaming.transportStreamTimestamp';
         });
-        if (metadataTimestamp && metadataTimestamp.data) {
+        if (metadataTimestamp) {
           timestamp = Math.round(metadataTimestamp.data) / 1000;
         }
         /** @private {shaka.extern.ID3Metadata} */
@@ -1139,8 +1139,7 @@ shaka.media.MediaSourceEngine = class {
     const ContentType = shaka.util.ManifestParserUtils.ContentType;
 
     if (contentType == ContentType.TEXT) {
-      if (this.manifestType_ == shaka.media.ManifestParser.HLS &&
-          reference.discontinuitySequence >= 0) {
+      if (this.manifestType_ == shaka.media.ManifestParser.HLS) {
         // This won't be known until the first video segment is appended.
         const offset = await this.textSequenceModeOffset_;
         this.textEngine_.setTimestampOffset(offset);

package/lib/media/segment_utils.js

@@ -417,9 +417,13 @@ shaka.media.SegmentUtils = class {
       if (initData) {
         captionParser.init(initData);
       }
-      captionParser.parseFrom(data);
-      for (const stream of captionParser.getStreams()) {
-        closedCaptions.set(stream, stream);
+      try {
+        captionParser.parseFrom(data);
+        for (const stream of captionParser.getStreams()) {
+          closedCaptions.set(stream, stream);
+        }
+      } catch (e) {
+        shaka.log.debug('Error detecting CC streams', e);
       }
       captionParser.reset();
     }

package/lib/net/http_xhr_plugin.js

@@ -64,6 +64,7 @@ shaka.net.HttpXHRPlugin = class {
       };
       xhr.onload = (event) => {
         const headers = shaka.net.HttpXHRPlugin.headersToGenericObject_(xhr);
+        // eslint-disable-next-line shaka-rules/buffersource-no-instanceof
         goog.asserts.assert(xhr.response instanceof ArrayBuffer,
             'XHR should have a response by now!');
         const xhrResponse = xhr.response;

package/lib/player.js

@@ -58,6 +58,7 @@ goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MediaReadyState');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mutex');
+goog.require('shaka.util.NumberUtils');
 goog.require('shaka.util.ObjectUtils');
 goog.require('shaka.util.Platform');
 goog.require('shaka.util.PlayerConfiguration');
@@ -752,7 +753,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     this.externalSrcEqualsThumbnailsStreams_ = [];
 
     /** @private {number} */
-    this.completionPercent_ = NaN;
+    this.completionPercent_ = -1;
 
     /** @private {?shaka.extern.PlayerConfiguration} */
     this.config_ = this.defaultConfig_();
@@ -1522,7 +1523,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
 
       this.externalSrcEqualsThumbnailsStreams_ = [];
 
-      this.completionPercent_ = NaN;
+      this.completionPercent_ = -1;
 
       // Make sure that the app knows of the new buffering state.
       this.updateBufferState_();
@@ -7016,41 +7017,46 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
     if (!this.video_) {
       return;
     }
-    let hasNewCompletionPercent = false;
-    const completionRatio = this.video_.currentTime / this.video_.duration;
-    if (!isNaN(completionRatio)) {
-      const percent = Math.round(100 * completionRatio);
-      if (isNaN(this.completionPercent_)) {
-        this.completionPercent_ = percent;
-        hasNewCompletionPercent = true;
-      } else {
-        const newCompletionPercent = Math.max(this.completionPercent_, percent);
-        if (this.completionPercent_ != newCompletionPercent) {
-          this.completionPercent_ = newCompletionPercent;
-          hasNewCompletionPercent = true;
-        }
+
+    const isQuartile = (quartilePercent, currentPercent) => {
+      const NumberUtils = shaka.util.NumberUtils;
+
+      if ((NumberUtils.isFloatEqual(quartilePercent, currentPercent) ||
+          currentPercent > quartilePercent) &&
+          this.completionPercent_ < quartilePercent) {
+        this.completionPercent_ = quartilePercent;
+        return true;
       }
+      return false;
+    };
+
+    const completionRatio = this.video_.currentTime / this.video_.duration;
+
+    if (isNaN(completionRatio)) {
+      return;
     }
-    if (hasNewCompletionPercent) {
-      let event;
-      if (this.completionPercent_ == 0) {
-        event = shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.Started);
-      } else if (this.completionPercent_ == 25) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.FirstQuartile);
-      } else if (this.completionPercent_ == 50) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.Midpoint);
-      } else if (this.completionPercent_ == 75) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.ThirdQuartile);
-      } else if (this.completionPercent_ == 100) {
-        event = shaka.Player.makeEvent_(
-            shaka.util.FakeEvent.EventName.Complete);
-      }
-      if (event) {
-        this.dispatchEvent(event);
-      }
+
+    const percent = completionRatio * 100;
+
+    let event;
+    if (isQuartile(0, percent)) {
+      event = shaka.Player.makeEvent_(shaka.util.FakeEvent.EventName.Started);
+    } else if (isQuartile(25, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.FirstQuartile);
+    } else if (isQuartile(50, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.Midpoint);
+    } else if (isQuartile(75, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.ThirdQuartile);
+    } else if (isQuartile(100, percent)) {
+      event = shaka.Player.makeEvent_(
+          shaka.util.FakeEvent.EventName.Complete);
+    }
+
+    if (event) {
+      this.dispatchEvent(event);
     }
   }
 
@@ -8269,7 +8275,7 @@ shaka.Player.TYPICAL_BUFFERING_THRESHOLD_ = 0.5;
  * @export
  */
 // eslint-disable-next-line no-useless-concat, max-len
-shaka.Player.version = 'v4.12.2' + '-uncompiled';  // x-release-please-version
+shaka.Player.version = 'v4.12.3' + '-uncompiled';  // x-release-please-version
 
 // Initialize the deprecation system using the version string we just set
 // on the player.

package/lib/text/vtt_text_parser.js

@@ -83,10 +83,15 @@ shaka.text.VttTextParser = class {
     // HLS content, which should use X-TIMESTAMP-MAP and periodStart instead.
     let offset = time.vttOffset;
 
-    // Only use 'X-TIMESTAMP-MAP' with HLS.  This overrides offset above.
-    if (blocks[0].includes('X-TIMESTAMP-MAP') &&
-        this.manifestType_ == shaka.media.ManifestParser.HLS) {
-      offset = this.computeHlsOffset_(blocks[0], time);
+    if (this.manifestType_ == shaka.media.ManifestParser.HLS) {
+      // Only use 'X-TIMESTAMP-MAP' with HLS.
+      if (blocks[0].includes('X-TIMESTAMP-MAP')) {
+        offset = this.computeHlsOffset_(blocks[0], time);
+      } else if (time.periodStart && time.vttOffset == time.periodStart) {
+        // In the case where X-TIMESTAMP-MAP is not used and it is HLS, we
+        // should not use offset unless segment-relative times are used.
+        offset = 0;
+      }
     }
 
     // Parse VTT regions.

package/lib/util/abortable_operation.js

@@ -166,6 +166,9 @@ shaka.util.AbortableOperation = class {
    */
   chain(onSuccess, onError) {
     const newPromise = new shaka.util.PublicPromise();
+    // Silence uncaught rejection errors, which may otherwise occur any place
+    // we don't explicitly handle aborted operations.
+    newPromise.catch(() => {});
     const abortError = shaka.util.AbortableOperation.abortError();
 
     // If called before "this" completes, just abort "this".

package/lib/util/buffer_utils.js

@@ -62,10 +62,10 @@ shaka.util.BufferUtils = class {
    * @private
    */
   static unsafeGetArrayBuffer_(view) {
-    if (view instanceof ArrayBuffer) {
-      return view;
+    if (!ArrayBuffer.isView(view)) {
+      return /** @type {!ArrayBuffer} */(view);
     } else {
-      return view.buffer;
+      return /** @type {!ArrayBufferView} */(view).buffer;
     }
   }
 
@@ -79,17 +79,19 @@ shaka.util.BufferUtils = class {
    * @export
    */
   static toArrayBuffer(view) {
-    if (view instanceof ArrayBuffer) {
-      return view;
+    if (!ArrayBuffer.isView(view)) {
+      return /** @type {!ArrayBuffer} */(view);
     } else {
-      if (view.byteOffset == 0 && view.byteLength == view.buffer.byteLength) {
+      const aView = /** @type {!ArrayBufferView} */(view);
+      if (aView.byteOffset == 0 &&
+          aView.byteLength == aView.buffer.byteLength) {
         // This is a TypedArray over the whole buffer.
-        return view.buffer;
+        return aView.buffer;
       }
       // This is a "view" on the buffer.  Create a new buffer that only contains
       // the data.  Note that since this isn't an ArrayBuffer, the "new" call
       // will allocate a new buffer to hold the copy.
-      return new Uint8Array(view).buffer;
+      return new Uint8Array(aView).buffer;
     }
   }
 

package/lib/util/mime_utils.js

@@ -166,6 +166,8 @@ shaka.util.MimeUtils = class {
         return 'dtsx'; // DTS:X
       case base === 'mp4a' && profile === 'a9':
         return 'dtsc'; // DTS Digital Surround
+      case base === 'vp09':
+        return 'vp9';
       case base === 'avc1':
       case base === 'avc3':
         return 'avc'; // H264

package/lib/util/number_utils.js

@@ -0,0 +1,37 @@
+/*! @license
+ * Shaka Player
+ * Copyright 2016 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+goog.provide('shaka.util.NumberUtils');
+
+
+shaka.util.NumberUtils = class {
+  /**
+   * Compare two float numbers, taking a configurable tolerance margin into
+   * account.
+   *
+   * @param {number} a
+   * @param {number} b
+   * @param {number=} tolerance
+   * @return {boolean}
+   */
+  static isFloatEqual(a, b, tolerance = Number.EPSILON) {
+    if (a === b) {
+      return true;
+    }
+
+    const error = Math.abs(a - b);
+
+    if (error <= tolerance) {
+      return true;
+    }
+
+    if (tolerance !== Number.EPSILON) {
+      return Math.abs(error - tolerance) <= Number.EPSILON;
+    }
+
+    return false;
+  }
+};

package/lib/util/object_utils.js

@@ -41,7 +41,7 @@ shaka.util.ObjectUtils = class {
 
           // This covers Uint8Array and friends, even without a TypedArray
           // base-class constructor.
-          const isTypedArray = val.buffer instanceof ArrayBuffer;
+          const isTypedArray = ArrayBuffer.isView(val);
           if (isTypedArray) {
             return val;
           }

package/lib/util/uint8array_utils.js

@@ -119,8 +119,9 @@ shaka.util.Uint8ArrayUtils = class {
 
     for (let i = 0; i < varArgs.length; ++i) {
       const value = varArgs[i];
-      if (value instanceof Uint8Array) {
-        result.set(value, offset);
+      if (ArrayBuffer.isView(value) &&
+      /** @type {TypedArray} */ (value).BYTES_PER_ELEMENT === 1) {
+        result.set(/** @type {!Uint8Array} */(value), offset);
       } else {
         result.set(BufferUtils.toUint8(value), offset);
       }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.12.2",
+  "version": "4.12.3",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [
@@ -105,7 +105,7 @@
     "prepublishOnly": "python build/checkversion.py && python build/all.py --force"
   },
   "dependencies": {
-    "eme-encryption-scheme-polyfill": "^2.1.5"
+    "eme-encryption-scheme-polyfill": "^2.1.6"
   },
   "clean-package": {
     "remove": [

package/ui/language_utils.js

@@ -14,6 +14,7 @@ goog.require('shaka.ui.Overlay.TrackLabelFormat');
 goog.require('shaka.ui.Utils');
 goog.require('shaka.util.Dom');
 goog.require('shaka.util.LanguageUtils');
+goog.require('shaka.util.MimeUtils');
 goog.requireType('shaka.ui.Localization');
 
 
@@ -48,7 +49,8 @@ shaka.ui.LanguageUtils = class {
       if (!codecsByLanguage.has(track.language)) {
         codecsByLanguage.set(track.language, new Set());
       }
-      codecsByLanguage.get(track.language).add(track.audioCodec);
+      codecsByLanguage.get(track.language).add(
+          shaka.util.MimeUtils.getNormalizedCodec(track.audioCodec));
     }
     const hasDifferentAudioCodecs = (language) =>
       codecsByLanguage.has(language) && codecsByLanguage.get(language).size > 1;