shaka-player 4.10.13 → 4.11.0

package/externs/shaka/text.js

@@ -38,11 +38,12 @@ shaka.extern.TextParser = class {
    *    for each cue.
    * @param {?(string|undefined)} uri
    *    The media uri.
+   * @param {!Array.<string>} images
    * @return {!Array.<!shaka.text.Cue>}
    *
    * @exportDoc
    */
-  parseMedia(data, timeContext, uri) {}
+  parseMedia(data, timeContext, uri, images) {}
 
   /**
    * Notifies the stream if the manifest is in sequence mode or not.

package/lib/abr/simple_abr_manager.js

@@ -344,6 +344,11 @@ shaka.abr.SimpleAbrManager = class {
    */
   getBandwidthEstimate() {
     const defaultBandwidthEstimate = this.getDefaultBandwidth_();
+    if (navigator.connection && navigator.connection.downlink &&
+        this.config_.useNetworkInformation &&
+        this.config_.preferNetworkInformationBandwidth) {
+      return defaultBandwidthEstimate;
+    }
     const bandwidthEstimate = this.bandwidthEstimator_.getBandwidthEstimate(
         defaultBandwidthEstimate);
     if (this.cmsdManager_) {

package/lib/ads/ad_manager.js

@@ -823,7 +823,7 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
    * @override
    * @export
    */
-  onInterstitialMetadata(basePlayer, baseVideo, interstitial) {
+  onHLSInterstitialMetadata(basePlayer, baseVideo, interstitial) {
     if (!this.interstitialAdManager_) {
       this.initInterstitial(/* adContainer= */ null, basePlayer, baseVideo);
     }
@@ -832,6 +832,50 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
     }
   }
 
+  /**
+   * @override
+   * @export
+   */
+  onDASHInterstitialMetadata(basePlayer, baseVideo, region) {
+    if (region.schemeIdUri != 'urn:mpeg:dash:event:alternativeMPD:2022') {
+      return;
+    }
+    if (!this.interstitialAdManager_) {
+      this.initInterstitial(/* adContainer= */ null, basePlayer, baseVideo);
+    }
+    if (this.interstitialAdManager_) {
+      this.interstitialAdManager_.addRegion(region);
+    }
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  addCustomInterstitial(interstitial) {
+    if (!this.interstitialAdManager_) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.ADS,
+          shaka.util.Error.Code.INTERSTITIAL_AD_MANAGER_NOT_INITIALIZED);
+    }
+    this.interstitialAdManager_.addInterstitials([interstitial]);
+  }
+
+  /**
+   * @override
+   * @export
+   */
+  addAdUrlInterstitial(url) {
+    if (!this.interstitialAdManager_) {
+      throw new shaka.util.Error(
+          shaka.util.Error.Severity.RECOVERABLE,
+          shaka.util.Error.Category.ADS,
+          shaka.util.Error.Code.INTERSTITIAL_AD_MANAGER_NOT_INITIALIZED);
+    }
+    return this.interstitialAdManager_.addAdUrlInterstitial(url);
+  }
+
   /**
    * @param {!shaka.util.FakeEvent} event
    * @private

package/lib/ads/ad_utils.js

@@ -7,13 +7,136 @@
 
 goog.provide('shaka.ads.Utils');
 
+goog.require('shaka.util.TextParser');
+goog.require('shaka.util.TXml');
+
 
 /**
  * A class responsible for ad utils.
  * @export
  */
 shaka.ads.Utils = class {
-
+  /**
+   * @param {!shaka.extern.xml.Node} vast
+   * @param {?number} currentTime
+   * @return {!Array.<shaka.extern.AdInterstitial>}
+   */
+  static parseVastToInterstitials(vast, currentTime) {
+    const TXml = shaka.util.TXml;
+    /** @type {!Array.<shaka.extern.AdInterstitial>} */
+    const interstitials = [];
+
+    let startTime = 0;
+    if (currentTime != null) {
+      startTime = currentTime;
+    }
+
+    for (const ad of TXml.findChildren(vast, 'Ad')) {
+      const inline = TXml.findChild(ad, 'InLine');
+      if (!inline) {
+        continue;
+      }
+      const creatives = TXml.findChild(inline, 'Creatives');
+      if (!creatives) {
+        continue;
+      }
+      for (const creative of TXml.findChildren(creatives, 'Creative')) {
+        const linear = TXml.findChild(creative, 'Linear');
+        if (!linear) {
+          continue;
+        }
+        let skipOffset = null;
+        if (linear.attributes['skipoffset']) {
+          skipOffset = shaka.util.TextParser.parseTime(
+              linear.attributes['skipoffset']);
+          if (isNaN(skipOffset)) {
+            skipOffset = null;
+          }
+        }
+        const mediaFiles = TXml.findChild(linear, 'MediaFiles');
+        if (!mediaFiles) {
+          continue;
+        }
+        const medias = TXml.findChildren(mediaFiles, 'MediaFile');
+        let checkMedias = medias;
+        const streamingMedias = medias.filter((media) => {
+          return media.attributes['delivery'] == 'streaming';
+        });
+        if (streamingMedias.length) {
+          checkMedias = streamingMedias;
+        }
+        const sortedMedias = checkMedias.sort((a, b) => {
+          const aHeight = parseInt(a.attributes['height'], 10) || 0;
+          const bHeight = parseInt(b.attributes['height'], 10) || 0;
+          return bHeight - aHeight;
+        });
+        for (const media of sortedMedias) {
+          const adUrl = TXml.getTextContents(media);
+          if (!adUrl) {
+            continue;
+          }
+          interstitials.push({
+            id: null,
+            startTime: startTime,
+            endTime: null,
+            uri: adUrl,
+            isSkippable: skipOffset != null,
+            skipOffset,
+            canJump: false,
+            resumeOffset: 0,
+            playoutLimit: null,
+            once: true,
+            pre: currentTime == null,
+            post: currentTime == Infinity,
+            timelineRange: false,
+          });
+          break;
+        }
+      }
+    }
+    return interstitials;
+  }
+
+  /**
+   * @param {!shaka.extern.xml.Node} vmap
+   * @return {!Array.<{time: ?number, uri: string}>}
+   */
+  static parseVMAP(vmap) {
+    const TXml = shaka.util.TXml;
+    /** @type {!Array.<{time: ?number, uri: string}>} */
+    const ads = [];
+    for (const adBreak of TXml.findChildren(vmap, 'vmap:AdBreak')) {
+      const timeOffset = adBreak.attributes['timeOffset'];
+      if (!timeOffset) {
+        continue;
+      }
+      let time = null;
+      if (timeOffset == 'start') {
+        time = 0;
+      } else if (timeOffset == 'end') {
+        time = Infinity;
+      } else {
+        time = shaka.util.TextParser.parseTime(timeOffset);
+      }
+      const adSource = TXml.findChild(adBreak, 'vmap:AdSource');
+      if (!adSource) {
+        continue;
+      }
+      const adTagURI = TXml.findChild(adSource, 'vmap:AdTagURI');
+      if (!adTagURI) {
+        continue;
+      }
+      const uri = TXml.getTextContents(adTagURI);
+      if (!uri) {
+        continue;
+      }
+      ads.push({
+        time,
+        uri,
+      });
+    }
+    return ads;
+  }
 };
 
 /**

package/lib/ads/interstitial_ad.js

@@ -15,17 +15,22 @@ shaka.ads.InterstitialAd = class {
   /**
    * @param {HTMLMediaElement} video
    * @param {boolean} isSkippable
+   * @param {?number} skipOffset
    * @param {function()} onSkip
    * @param {number} sequenceLength
    * @param {number} adPosition
    */
-  constructor(video, isSkippable, onSkip, sequenceLength, adPosition) {
+  constructor(video, isSkippable, skipOffset, onSkip,
+      sequenceLength, adPosition) {
     /** @private {HTMLMediaElement} */
     this.video_ = video;
 
     /** @private {boolean} */
     this.isSkippable_ = isSkippable;
 
+    /** @private {?number} */
+    this.skipOffset_ = skipOffset;
+
     /** @private {function()} */
     this.onSkip_ = onSkip;
 
@@ -98,7 +103,9 @@ shaka.ads.InterstitialAd = class {
    */
   getTimeUntilSkippable() {
     if (this.isSkippable_) {
-      return 0;
+      const canSkipIn =
+          this.getRemainingTime() + this.skipOffset_ - this.getDuration();
+      return Math.max(canSkipIn, 0);
     }
     return Math.max(this.getRemainingTime(), 0);
   }