shaka-player 4.12.3 → 4.12.4

package/lib/ads/interstitial_ad.js

@@ -144,7 +144,7 @@ shaka.ads.InterstitialAd = class {
    * @export
    */
   canSkipNow() {
-    return this.getTimeUntilSkippable() == 0;
+    return this.isSkippable_ && this.getTimeUntilSkippable() == 0;
   }
 
   /**
@@ -152,7 +152,9 @@ shaka.ads.InterstitialAd = class {
    * @export
    */
   skip() {
-    this.onSkip_();
+    if (this.canSkipNow()) {
+      this.onSkip_();
+    }
   }
 
   /**

package/lib/ads/interstitial_ad_manager.js

@@ -704,7 +704,6 @@ shaka.ads.InterstitialAdManager = class {
       this.onEvent_(new shaka.util.FakeEvent(
           shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
     }
-    const eventsSent = new Set();
     this.adEventManager_.listenOnce(this.player_, 'error', error);
     this.adEventManager_.listen(this.video_, 'timeupdate', () => {
       const duration = this.video_.duration;
@@ -718,23 +717,21 @@ shaka.ads.InterstitialAdManager = class {
             new shaka.util.FakeEvent(shaka.ads.Utils.AD_SKIP_STATE_CHANGED));
       }
       prevCanSkipNow = currentCanSkipNow;
-      const currentPercent = 100 * this.video_.currentTime / duration;
-      if (currentPercent >= 25 && !eventsSent.has('firstquartile')) {
-        updateBaseVideoTime();
-        this.onEvent_(
-            new shaka.util.FakeEvent(shaka.ads.Utils.AD_FIRST_QUARTILE));
-        eventsSent.add('firstquartile');
-      } else if (currentPercent >= 50 && !eventsSent.has('midpoint')) {
-        updateBaseVideoTime();
-        this.onEvent_(
-            new shaka.util.FakeEvent(shaka.ads.Utils.AD_MIDPOINT));
-        eventsSent.add('midpoint');
-      } else if (currentPercent >= 75 && !eventsSent.has('thirdquartile')) {
-        updateBaseVideoTime();
-        this.onEvent_(
-            new shaka.util.FakeEvent(shaka.ads.Utils.AD_THIRD_QUARTILE));
-        eventsSent.add('thirdquartile');
-      }
+    });
+    this.adEventManager_.listenOnce(this.player_, 'firstquartile', () => {
+      updateBaseVideoTime();
+      this.onEvent_(
+          new shaka.util.FakeEvent(shaka.ads.Utils.AD_FIRST_QUARTILE));
+    });
+    this.adEventManager_.listenOnce(this.player_, 'midpoint', () => {
+      updateBaseVideoTime();
+      this.onEvent_(
+          new shaka.util.FakeEvent(shaka.ads.Utils.AD_MIDPOINT));
+    });
+    this.adEventManager_.listenOnce(this.player_, 'thirdquartile', () => {
+      updateBaseVideoTime();
+      this.onEvent_(
+          new shaka.util.FakeEvent(shaka.ads.Utils.AD_THIRD_QUARTILE));
     });
     this.adEventManager_.listenOnce(this.player_, 'complete', complete);
     this.adEventManager_.listen(this.video_, 'play', () => {

package/lib/media/drm_engine.js

@@ -9,12 +9,14 @@ goog.provide('shaka.media.DrmEngine');
 goog.require('goog.asserts');
 goog.require('shaka.log');
 goog.require('shaka.net.NetworkingEngine');
+goog.require('shaka.util.ArrayUtils');
 goog.require('shaka.util.BufferUtils');
 goog.require('shaka.util.Destroyer');
 goog.require('shaka.util.DrmUtils');
 goog.require('shaka.util.Error');
 goog.require('shaka.util.EventManager');
 goog.require('shaka.util.FakeEvent');
+goog.require('shaka.util.Functional');
 goog.require('shaka.util.IDestroyable');
 goog.require('shaka.util.Iterables');
 goog.require('shaka.util.ManifestParserUtils');
@@ -66,12 +68,18 @@ shaka.media.DrmEngine = class {
      */
     this.activeSessions_ = new Map();
 
+    /** @private {!Array.<!shaka.net.NetworkingEngine.PendingRequest>} */
+    this.activeRequests_ = [];
+
     /**
      * @private {!Map<string,
      *           {initData: ?Uint8Array, initDataType: ?string}>}
      */
     this.storedPersistentSessions_ = new Map();
 
+    /** @private {boolean} */
+    this.hasInitData_ = false;
+
     /** @private {!shaka.util.PublicPromise} */
     this.allSessionsLoaded_ = new shaka.util.PublicPromise();
 
@@ -705,6 +713,7 @@ shaka.media.DrmEngine = class {
 
       // Reset the promise for the next sessions to come if key needs aren't
       // satisfied with persistent sessions
+      this.hasInitData_ = false;
       this.allSessionsLoaded_ = new shaka.util.PublicPromise();
       this.allSessionsLoaded_.catch(() => {});
     }
@@ -766,11 +775,16 @@ shaka.media.DrmEngine = class {
       }
     }
 
+    // Mark that there is init data, so that the preloader will know to wait
+    // for sessions to be loaded.
+    this.hasInitData_ = true;
+
     // If there are pre-existing sessions that have all been loaded
     // then reset the allSessionsLoaded_ promise, which can now be
     // used to wait for new sesssions to be loaded
     if (this.activeSessions_.size > 0 && this.areAllSessionsLoaded_()) {
       this.allSessionsLoaded_.resolve();
+      this.hasInitData_ = false;
       this.allSessionsLoaded_ = new shaka.util.PublicPromise();
       this.allSessionsLoaded_.catch(() => {});
     }
@@ -1380,6 +1394,14 @@ shaka.media.DrmEngine = class {
             this.video_.paused && !this.initialRequestsSent_);
   }
 
+  /** @return {!Promise} */
+  async waitForActiveRequests() {
+    if (this.hasInitData_) {
+      await this.allSessionsLoaded_;
+      await Promise.all(this.activeRequests_.map((req) => req.promise));
+    }
+  }
+
   /**
    * Sends a license request.
    * @param {!MediaKeyMessageEvent} event
@@ -1439,7 +1461,9 @@ shaka.media.DrmEngine = class {
     try {
       const req = this.playerInterface_.netEngine.request(
           requestType, request, {isPreload: this.isPreload_()});
+      this.activeRequests_.push(req);
       response = await req.promise;
+      shaka.util.ArrayUtils.remove(this.activeRequests_, req);
     } catch (error) {
       if (this.destroyer_.destroyed()) {
         return;
@@ -1859,9 +1883,16 @@ shaka.media.DrmEngine = class {
         offlineConfig.sessionTypes = ['persistent-license'];
 
         const configs = [offlineConfig, basicConfig];
-
-        const access = await navigator.requestMediaKeySystemAccess(
-            keySystem, configs);
+        // On some (Android) WebView environments,
+        // requestMediaKeySystemAccess 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_CHECKACCESS_IN_SECONDS = 1;
+        const access =
+          await shaka.util.Functional.promiseWithTimeout(
+              TIMEOUT_FOR_CHECKACCESS_IN_SECONDS,
+              navigator.requestMediaKeySystemAccess(keySystem, configs),
+          );
         await processMediaKeySystemAccess(keySystem, access);
       } catch (error) {}  // Ignore errors.
     };
@@ -1896,13 +1927,22 @@ shaka.media.DrmEngine = class {
             },
           },
         };
-
+        // 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;
         const decodingInfo =
-            await navigator.mediaCapabilities.decodingInfo(decodingConfig);
+          await shaka.util.Functional.promiseWithTimeout(
+              TIMEOUT_FOR_DECODING_INFO_IN_SECONDS,
+              navigator.mediaCapabilities.decodingInfo(decodingConfig),
+          );
 
         const access = decodingInfo.keySystemAccess;
         await processMediaKeySystemAccess(keySystem, access);
-      } catch (error) {}  // Ignore errors.
+      } catch (error) {
+        // Ignore errors.
+        shaka.log.v2('Failed to probe support for', keySystem, error);
+      }
     };
 
     // Initialize the support structure for each key system.

package/lib/media/preload_manager.js

@@ -398,7 +398,13 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
         await this.initializeDrmInner_();
         this.throwIfDestroyed_();
 
-        await this.chooseInitialVariantInner_();
+        await this.chooseInitialVariantAndPrefetchInner_();
+        this.throwIfDestroyed_();
+
+        // We don't need the drm keys to load completely for the initial variant
+        // to be chosen, but we won't mark the load as a success until it has
+        // been loaded. So wait for it here, not inside initializeDrmInner_.
+        await this.drmEngine_.waitForActiveRequests();
         this.throwIfDestroyed_();
 
         this.successPromise_.resolve();
@@ -610,12 +616,12 @@ shaka.media.PreloadManager = class extends shaka.util.FakeEventTarget {
 
   /**
    * Performs a final filtering of the manifest, and chooses the initial
-   * variant.
+   * variant. Also prefetches segments.
    *
    * @return {!Promise}
    * @private
    */
-  async chooseInitialVariantInner_() {
+  async chooseInitialVariantAndPrefetchInner_() {
     goog.asserts.assert(
         this.manifest_, 'The manifest should already be parsed.');
 

package/lib/player.js

@@ -1508,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();
       }
@@ -6984,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 ' +
@@ -6993,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 ' +
@@ -8275,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.3' + '-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/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/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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "shaka-player",
   "description": "DASH/EME video player library",
-  "version": "4.12.3",
+  "version": "4.12.4",
   "homepage": "https://github.com/shaka-project/shaka-player",
   "author": "Google",
   "maintainers": [

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/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(