fix(Ads): Fix muting/unmuting ads won't affect video and vice versa (#…

…6073) Fixes #6071
shaka-project · Jan 10, 2024 · 01a217f · 01a217f
1 parent 6b7a02a
commit 01a217f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/lib/ads/client_side_ad.js b/lib/ads/client_side_ad.js
@@ -155,6 +155,7 @@ shaka.ads.ClientSideAd = class {
    * @export
    */
   setVolume(volume) {
+    this.video_.volume = volume;
     return this.manager_.setVolume(volume);
   }
 
@@ -197,13 +198,14 @@ shaka.ads.ClientSideAd = class {
    * @export
    */
   setMuted(muted) {
+    this.video_.muted = muted;
     // Emulate the "mute" functionality, where current, pre-mute
     // volume is saved and can be restored on unmute.
     if (muted) {
       this.volume_ = this.getVolume();
-      this.setVolume(0);
+      this.manager_.setVolume(0);
     } else {
-      this.setVolume(this.volume_);
+      this.manager_.setVolume(this.volume_);
     }
   }
 

diff --git a/lib/ads/client_side_ad_manager.js b/lib/ads/client_side_ad_manager.js
@@ -234,10 +234,12 @@ shaka.ads.ClientSideAdManager = class {
         videoPlayHead.currentTime = this.video_.currentTime;
       });
       this.eventManager_.listen(this.video_, 'volumechange', () => {
+        if (!this.ad_) {
+          return;
+        }
+        this.ad_.setVolume(this.video_.volume);
         if (this.video_.muted) {
-          this.imaAdsManager_.setVolume(0);
-        } else {
-          this.imaAdsManager_.setVolume(this.video_.volume);
+          this.ad_.setMuted(true);
         }
       });
     }