fix(Ads): Limit interstitial duration to actual duration if available

shaka-project · Oct 23, 2024 · c4431ad · c4431ad
1 parent fac9d84
commit c4431ad
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/lib/ads/interstitial_ad_manager.js b/lib/ads/interstitial_ad_manager.js
@@ -675,11 +675,25 @@ shaka.ads.InterstitialAdManager = class {
     });
     try {
       this.updatePlayerConfig_();
+      // playRangeEnd in src= causes the ended event not to be fired when that
+      // position is reached.
+      const loadMode = this.basePlayer_.getLoadMode();
+      if (loadMode == shaka.Player.LoadMode.MEDIA_SOURCE &&
+          interstitial.startTime && interstitial.endTime &&
+          interstitial.endTime != Infinity &&
+          interstitial.startTime != interstitial.endTime) {
+        const duration = interstitial.endTime - interstitial.startTime;
+        if (duration > 0) {
+          this.player_.configure('playRangeEnd', duration);
+        }
+      }
       if (interstitial.playoutLimit) {
         playoutLimitTimer = new shaka.util.Timer(() => {
           ad.skip();
         }).tickAfter(interstitial.playoutLimit);
-        this.player_.configure('playRangeEnd', interstitial.playoutLimit);
+        if (loadMode == shaka.Player.LoadMode.MEDIA_SOURCE) {
+          this.player_.configure('playRangeEnd', interstitial.playoutLimit);
+        }
       }
       await this.player_.attach(this.video_);
       if (this.preloadManagerInterstitials_.has(interstitial)) {