feat(Ads): Add support for interstitials when using src= (#6777)

shaka-project · Jun 10, 2024 · 59304b8 · 59304b8
1 parent 205d58b
commit 59304b8
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 0 deletions.
diff --git a/lib/ads/interstitial_ad_manager.js b/lib/ads/interstitial_ad_manager.js
@@ -192,6 +192,13 @@ shaka.ads.InterstitialAdManager = class {
    * @param {shaka.extern.Interstitial} interstitial
    */
   async addMetadata(interstitial) {
+    if (this.basePlayer_.getLoadMode() == shaka.Player.LoadMode.SRC_EQUALS &&
+        this.usingBaseVideo_) {
+      shaka.log.alwaysWarn(
+          'Unsupported interstitial when using single media element',
+          interstitial);
+      return;
+    }
     this.updatePlayerConfig_();
     const interstitialsAd = await this.getInterstitialsInfo_(interstitial);
     if (interstitialsAd.length) {

diff --git a/lib/player.js b/lib/player.js
@@ -3006,13 +3006,43 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         return;
       }
 
+      /** @type {!Array.<shaka.extern.Interstitial>} */
+      const interstitials = [];
+
       for (const cue of track.activeCues) {
         this.dispatchMetadataEvent_(cue.startTime, cue.endTime,
             cue.type, cue.value);
 
         if (this.adManager_) {
           this.adManager_.onCueMetadataChange(cue.value);
         }
+        if (cue.type == 'com.apple.quicktime.HLS' && cue.startTime != null) {
+          let interstitial = interstitials.find((i) => {
+            return i.startTime == cue.startTime && i.endTime == cue.endTime;
+          });
+          if (!interstitial) {
+            interstitial = /** @type {shaka.extern.Interstitial} */ ({
+              startTime: cue.startTime,
+              endTime: cue.endTime,
+              values: [],
+            });
+            interstitials.push(interstitial);
+          }
+          interstitial.values.push(cue.value);
+        }
+      }
+      for (const interstitial of interstitials) {
+        const isValidInterstitial = interstitial.values.some((value) => {
+          return value.key == 'X-ASSET-URI' || value.key == 'X-ASSET-LIST';
+        });
+        if (!isValidInterstitial) {
+          continue;
+        }
+        if (this.adManager_) {
+          goog.asserts.assert(this.video_, 'Must have video');
+          this.adManager_.onInterstitialMetadata(
+              this, this.video_, interstitial);
+        }
       }
     });