fix(Ads): properly set tracking info for SS IMA streams.

Change-Id: Ib3279d064957aa3f03fcca9878792febbb9dda2d

lib/ads/ad_manager.js

@@ -501,13 +501,6 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
           }
           this.dispatchEvent(event);
         });
-
-    // Set the name and version of the player in IMA for tracking.
-    this.replaceServerSideAdTagParameters(
-        {
-          'mpt': 'shaka',
-          'mpv': shaka.Player.version,
-        });
   }
 
 
@@ -526,6 +519,9 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
           shaka.util.Error.Code.SS_AD_MANAGER_NOT_INITIALIZED);
     }
 
+    // Set player and version parameters for tracking
+    imaRequest.adTagParameters['mpt'] = 'Shaka Player';
+    imaRequest.adTagParameters['mpv'] = shaka.Player.version;
     return this.ssAdManager_.streamRequest(imaRequest, backupUrl);
   }
 
@@ -542,6 +538,15 @@ shaka.ads.AdManager = class extends shaka.util.FakeEventTarget {
           shaka.util.Error.Code.SS_AD_MANAGER_NOT_INITIALIZED);
     }
 
+    if (adTagParameters['mpt'] || adTagParameters['mpv']) {
+      shaka.log.alwaysWarn('You have attempted to set "mpt" and/or "mpv" ' +
+        'parameters of the ad tag. Please note that those parameters are ' +
+        'used for Shaka adoption tracking and will be overriden.');
+    }
+
+    adTagParameters['mpt'] = 'Shaka Player';
+    adTagParameters['mpv'] = shaka.Player.version;
+
     this.ssAdManager_.replaceAdTagParameters(adTagParameters);
   }