shaka-player 4.12.2 → 4.12.4

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.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

@@ -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 {
@@ -673,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;
@@ -687,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', () => {
@@ -754,10 +782,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 +921,7 @@ shaka.ads.InterstitialAdManager = class {
         startTime,
         endTime,
         uri,
+        mimeType: null,
         isSkippable,
         skipOffset,
         skipFor,
@@ -916,27 +951,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/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/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/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/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;