shaka-player 4.12.2 → 4.12.4

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_();
@@ -1507,7 +1508,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       // after several playbacks, and they are not able anymore to properly
       // create MediaKeys objects. To prevent it, clear the cache after
       // each playback.
-      if (this.config_.streaming.clearDecodingCache) {
+      if (this.config_ && this.config_.streaming.clearDecodingCache) {
         shaka.util.StreamUtils.clearDecodingConfigCache();
         shaka.util.DrmUtils.clearMediaKeySystemAccessMap();
       }
@@ -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_();
@@ -6983,7 +6984,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
           's). Updating playbackRate to ' + minPlaybackRate);
         this.trickPlay(minPlaybackRate, /* useTrickPlayTrack= */ false);
       }
-    } else if (maxLatency && maxPlaybackRate &&
+    } else if (maxLatency != undefined && maxPlaybackRate &&
       (latency - offset) > maxLatency) {
       if (playbackRate != maxPlaybackRate) {
         shaka.log.debug('Latency (' + latency + 's) is greater than ' +
@@ -6992,7 +6993,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         this.trickPlay(maxPlaybackRate, /* useTrickPlayTrack= */ false);
       }
       this.targetLatencyReached_ = null;
-    } else if (minLatency && minPlaybackRate &&
+    } else if (minLatency != undefined && minPlaybackRate &&
         (latency - offset) < minLatency) {
       if (playbackRate != minPlaybackRate) {
         shaka.log.debug('Latency (' + latency + 's) is smaller than ' +
@@ -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.4' + '-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/functional.js

@@ -6,6 +6,8 @@
 
 goog.provide('shaka.util.Functional');
 
+goog.require('shaka.util.Timer');
+
 /**
  * @summary A set of functional utility functions.
  */
@@ -67,4 +69,29 @@ shaka.util.Functional = class {
   static isNotNull(value) {
     return value != null;
   }
+
+  /**
+   * Returns a Promise which is resolved only if |asyncProcess| is resolved, and
+   * only if it is resolved in less than |seconds| seconds.
+   *
+   * If the returned Promise is resolved, it returns the same value as
+   * |asyncProcess|.
+   *
+   * If |asyncProcess| fails, the returned Promise is rejected.
+   * If |asyncProcess| takes too long, the returned Promise is rejected, but
+   * |asyncProcess| is still allowed to complete.
+   *
+   * @param {number} seconds
+   * @param {!Promise.<T>} asyncProcess
+   * @return {!Promise.<T>}
+   * @template T
+   */
+  static promiseWithTimeout(seconds, asyncProcess) {
+    return Promise.race([
+      asyncProcess,
+      new Promise(((_, reject) => {
+        new shaka.util.Timer(reject).tickAfter(seconds);
+      })),
+    ]);
+  }
 };

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/stream_utils.js

@@ -727,7 +727,14 @@ shaka.util.StreamUtils = class {
               mimeType, audioCodec);
         }
         promises.push(new Promise((resolve, reject) => {
-          navigator.mediaCapabilities.decodingInfo(copy).then((res) => {
+          // On some (Android) WebView environments, decodingInfo will
+          // not resolve or reject, at least if RESOURCE_PROTECTED_MEDIA_ID
+          // is not set.  This is a workaround for that issue.
+          const TIMEOUT_FOR_DECODING_INFO_IN_SECONDS = 1;
+          shaka.util.Functional.promiseWithTimeout(
+              TIMEOUT_FOR_DECODING_INFO_IN_SECONDS,
+              navigator.mediaCapabilities.decodingInfo(copy),
+          ).then((res) => {
             resolve(res);
           }).catch(reject);
         }));

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.4",
   "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/ad_position.js

@@ -91,9 +91,9 @@ shaka.ui.AdPosition = class extends shaka.ui.Element {
    */
   setPosition_() {
     const adsInAdPod = this.ad.getSequenceLength();
-    if (adsInAdPod > 1) {
+    if (adsInAdPod > 1 && this.ad.isLinear()) {
       // If it's a single ad, showing 'Ad 1 of 1' isn't helpful.
-      // Only show this element if there's more than 1 ad.
+      // Only show this element if there's more than 1 ad and it's a linear ad.
       const LocIds = shaka.ui.Locales.Ids;
       const adPosition = this.ad.getPositionInSequence();
       this.span_.textContent = this.localization.resolve(LocIds.AD_PROGRESS)

package/ui/controls.js

@@ -1638,11 +1638,13 @@ shaka.ui.Controls = class extends shaka.util.FakeEventTarget {
 
   /** @private */
   onPlayPauseClick_() {
-    if (this.ad_ && this.ad_.isLinear()) {
+    if (this.ad_) {
       this.playPauseAd();
-    } else {
-      this.playPausePresentation();
+      if (this.ad_.isLinear()) {
+        return;
+      }
     }
+    this.playPausePresentation();
   }
 
   /** @private */

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;

package/ui/less/ad_controls.less

@@ -95,11 +95,11 @@
 
 .shaka-skip-ad-button {
   padding: 5px 15px;
-  background: rgba(0 0 0 / 70%);
+  background: rgba(0, 0, 0, 70%);
   border: none;
 
   &:disabled {
-    background: rgba(0 0 0 / 30%);
+    background: rgba(0, 0, 0, 30%);
   }
 
   cursor: pointer;
@@ -107,6 +107,6 @@
 
 .shaka-skip-ad-counter {
   padding: 5px;
-  background: rgba(0 0 0 / 70%);
+  background: rgba(0, 0, 0, 70%);
   margin: 0;
 }

package/ui/less/buttons.less

@@ -38,7 +38,7 @@
   border-radius: 50%;
 
   /* A small drop shadow below the button. */
-  box-shadow: rgba(0 0 0 / 10%) 0 0 20px 0;
+  box-shadow: rgba(0, 0, 0, 10%) 0 0 20px 0;
 
   /* No border. */
   border: none;
@@ -51,7 +51,7 @@
   background-position: center center;
 
   /* A background color behind the play arrow. */
-  background-color: rgba(255 255 255 / 90%);
+  background-color: rgba(255, 255, 255, 90%);
 
   .show-when-controls-shown();
 
@@ -127,10 +127,10 @@
   border: none;
 
   /* Setting text color to white */
-  color: rgb(255 255 255);
+  color: rgb(255, 255, 255);
 
   /* Setting background color to black so white text can be seen clearly */
-  background-color: rgb(0 0 0 / 50%);
+  background-color: rgb(0, 0, 0, 50%);
 
   cursor: default;
   font-size: 20px;

package/ui/less/containers.less

@@ -222,7 +222,7 @@
   min-width: 300px;
 
   color: white;
-  background-color: rgba(35 35 35 / 90%);
+  background-color: rgba(35, 35, 35, 90%);
 
   font-size: 14px;
 
@@ -243,7 +243,7 @@
   }
 
   span {
-    color: rgb(150 150 150);
+    color: rgb(150, 150, 150);
   }
 }
 
@@ -254,7 +254,7 @@
   min-width: 150px;
 
   color: white;
-  background-color: rgba(35 35 35 / 90%);
+  background-color: rgba(35, 35, 35, 90%);
 
   font-size: 14px;
 
@@ -275,12 +275,12 @@
   }
 
   span {
-    color: rgb(150 150 150);
+    color: rgb(150, 150, 150);
   }
 }
 
 .shaka-context-menu {
-  background-color: rgba(35 35 35 / 90%);
+  background-color: rgba(35, 35, 35, 90%);
 
   border-radius: 2px;
 
@@ -300,7 +300,7 @@
     cursor: pointer;
 
     &:hover {
-      background-color: rgba(50 50 50 / 90%);
+      background-color: rgba(50, 50, 50, 90%);
     }
   }
 
@@ -406,7 +406,7 @@
 
   /* Add a bit of a white shadow to keep our black spinner visible
   on a black background. */
-  filter: drop-shadow(0 0 2px rgba(255 255 255 / 50%));
+  filter: drop-shadow(0 0 2px rgba(255, 255, 255, 50%));
 }
 
 .shaka-hidden-fast-forward-container,

package/ui/less/overflow_menu.less

@@ -18,7 +18,7 @@
 
   /* Styles for the menu itself. */
   background: white;
-  box-shadow: 0 1px 9px 0 rgba(0 0 0 / 40%);
+  box-shadow: 0 1px 9px 0 rgba(0, 0, 0, 40%);
   border-radius: 2px;
   max-height: 250px;
   min-width: 180px;
@@ -53,7 +53,7 @@
 
     /* When hovered, the button's background is highlighted. */
     &:hover {
-      background: rgb(224 224 224);
+      background: rgb(224, 224, 224);
     }
 
     /* The button is clickable, showing cursor pointer */
@@ -65,7 +65,7 @@
     }
 
     .shaka-keyboard-navigation &:focus {
-      background: rgb(224 224 224);
+      background: rgb(224, 224, 224);
     }
   }
 
@@ -110,7 +110,7 @@
  * language, the currently-selected resolution, etc. */
 .shaka-current-selection-span {
   /* This is dimmer than the other span, which is the name of the submenu. */
-  color: rgba(0 0 0 / 54%);
+  color: rgba(0, 0, 0, 54%);
 }
 
 /* The submenus have somewhat different margins inside them. */

package/ui/less/thumbnails.less

@@ -1,7 +1,7 @@
 #shaka-player-ui-thumbnail-container {
   background-color: black;
   border: 1px solid black;
-  box-shadow: 0 8px 8px 0 rgb(0 0 0 / 50%);
+  box-shadow: 0 8px 8px 0 rgb(0, 0, 0, 50%);
   min-width: 150px;
   overflow: hidden;
   position: absolute;
@@ -14,7 +14,7 @@
   }
 
   #shaka-player-ui-thumbnail-time {
-    background-color: rgb(0 0 0 / 50%);
+    background-color: rgb(0, 0, 0, 50%);
     bottom: 0;
     color: white;
     font-size: 16px;
@@ -29,7 +29,7 @@
   background-color: white;
   border: 1px solid black;
   border-radius: 10px;
-  box-shadow: 0 8px 8px 0 rgb(0 0 0 / 50%);
+  box-shadow: 0 8px 8px 0 rgb(0, 0, 0, 50%);
   color: black;
   overflow: hidden;
   padding: 1px 7px;

package/ui/less/tooltip.less

@@ -53,7 +53,7 @@
       font-size: 13px;
 
       /* Styling */
-      background: rgba(35 35 35 / 90%);
+      background: rgba(35, 35, 35, 90%);
       color: white;
       border-radius: 3px;
       padding: 5px 10px;

package/ui/play_button.js

@@ -77,11 +77,13 @@ shaka.ui.PlayButton = class extends shaka.ui.Element {
     });
 
     this.eventManager.listen(this.button, 'click', () => {
-      if (this.ad && this.ad.isLinear()) {
+      if (this.ad) {
         this.controls.playPauseAd();
-      } else {
-        this.controls.playPausePresentation();
+        if (this.ad.isLinear()) {
+          return;
+        }
       }
+      this.controls.playPausePresentation();
     });
 
     if (this.ad) {

package/ui/presentation_time.js

@@ -55,7 +55,7 @@ shaka.ui.PresentationTimeTracker = class extends shaka.ui.Element {
 
     this.eventManager.listen(
         this.adManager, shaka.ads.Utils.AD_STARTED, () => {
-          shaka.ui.Utils.setDisplay(this.currentTime_, false);
+          shaka.ui.Utils.setDisplay(this.currentTime_, !this.ad.isLinear());
         });
 
     this.eventManager.listen(