fix(Ads): Disable interstitials when using AirPlay (#7479)

shaka-project · Oct 23, 2024 · 2394ec2 · 2394ec2
1 parent 2b56dcd
commit 2394ec2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lib/ads/interstitial_ad_manager.js b/lib/ads/interstitial_ad_manager.js
@@ -93,7 +93,7 @@ shaka.ads.InterstitialAdManager = class {
     this.lastPlayedAd_ = null;
 
     this.eventManager_.listen(this.baseVideo_, 'timeupdate', () => {
-      if (this.playingAd_) {
+      if (this.playingAd_ || this.basePlayer_.isRemotePlayback()) {
         return;
       }
       const needPreRoll = this.lastTime_ == null || this.lastTime_ == 0;

diff --git a/lib/player.js b/lib/player.js
@@ -8092,6 +8092,19 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
         shaka.util.Error.Category.PLAYER,
         shaka.util.Error.Code.LOAD_INTERRUPTED);
   }
+
+  /**
+   * Indicate if we are using remote playback.
+   *
+   * @return {boolean}
+   * @export
+   */
+  isRemotePlayback() {
+    if (!this.video_ || !this.video_.remote) {
+      return false;
+    }
+    return this.video_.remote.state != 'disconnected';
+  }
 };
 
 /**

diff --git a/test/cast/cast_utils_unit.js b/test/cast/cast_utils_unit.js
@@ -35,6 +35,7 @@ describe('CastUtils', () => {
       'getNonDefaultConfiguration',
       'addFont',
       'getFetchedPlaybackInfo',
+      'isRemotePlayback',
 
       // Test helper methods (not @export'd)
       'createDrmEngine',