feat(Ads): Expose the interstitial player (#7793)

Close #7763
shaka-project · Dec 23, 2024 · 6783ce0 · 6783ce0
1 parent 6abdec4
commit 6783ce0
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/externs/shaka/ads.js b/externs/shaka/ads.js
@@ -305,6 +305,11 @@ shaka.extern.IAdManager = class extends EventTarget {
    * @return {!Promise}
    */
   addAdUrlInterstitial(url) {}
+
+  /**
+   * @return {shaka.Player}
+   */
+  getInterstitialPlayer() {}
 };
 
 

diff --git a/lib/ads/ad_manager.js b/lib/ads/ad_manager.js
@@ -893,6 +893,20 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
     return this.interstitialAdManager_.addAdUrlInterstitial(url);
   }
 
+  /**
+   * @override
+   * @export
+   */
+  getInterstitialPlayer() {
+    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_.getPlayer();
+  }
+
   /**
    * @param {!shaka.util.FakeEvent} event
    * @private

diff --git a/lib/ads/interstitial_ad_manager.js b/lib/ads/interstitial_ad_manager.js
@@ -299,6 +299,12 @@ shaka.ads.InterstitialAdManager = class {
     this.player_.destroy();
   }
 
+  /**
+   * @return {shaka.Player}
+   */
+  getPlayer() {
+    return this.player_;
+  }
 
   /**
    * @param {shaka.extern.HLSInterstitial} hlsInterstitial
@@ -1352,8 +1358,6 @@ shaka.ads.InterstitialAdManager = class {
     this.player_.configure('ads.disableDASHInterstitial', true);
     const netEngine = this.player_.getNetworkingEngine();
     goog.asserts.assert(netEngine, 'Need networking engine');
-    netEngine.clearAllRequestFilters();
-    netEngine.clearAllResponseFilters();
     this.basePlayer_.getNetworkingEngine().copyFiltersInto(netEngine);
   }
 

diff --git a/test/test/util/fake_ad_manager.js b/test/test/util/fake_ad_manager.js
@@ -103,6 +103,9 @@ shaka.test.FakeAdManager = class extends shaka.util.FakeEventTarget {
   /** @override */
   addAdUrlInterstitial(url) {}
 
+  /** @override */
+  getInterstitialPlayer() {}
+
   /**
    * @param {!shaka.test.FakeAd} ad
    */