Fix a bug that was adding CMCD parameters multiple times to the reque… (Dash-Industry-Forum#4684)

* Fix a bug that was adding CMCD parameters multiple times to the request URL in case of request retries

* Add correct description of constant

Author: dsilhavy

src/streaming/ManifestUpdater.js

@@ -37,6 +37,7 @@ import Errors from '../core/errors/Errors.js';
 import DashConstants from '../dash/constants/DashConstants.js';
 import URLUtils from './utils/URLUtils.js';
 import LocationSelector from './utils/LocationSelector.js';
+import Constants from './constants/Constants.js';
 import Utils from '../core/Utils.js';
 
 function ManifestUpdater() {
@@ -157,7 +158,7 @@ function ManifestUpdater() {
 
         // Remove previous CMCD parameters from URL
         if (url) {
-            url = Utils.removeQueryParameterFromUrl(url, 'CMCD');
+            url = Utils.removeQueryParameterFromUrl(url, Constants.CMCD_QUERY_KEY);
         }
 
         // Check for PatchLocation and Location alternatives

src/streaming/constants/Constants.js

@@ -201,6 +201,14 @@ export default {
      */
     TRACK_SELECTION_MODE_HIGHEST_SELECTION_PRIORITY: 'highestSelectionPriority',
 
+
+    /**
+     *  @constant {string} CMCD_QUERY_KEY specifies the key that is used for the CMCD query parameter.
+     *  @memberof Constants#
+     *  @static
+     */
+    CMCD_QUERY_KEY: 'CMCD',
+
     /**
      *  @constant {string} CMCD_MODE_QUERY specifies to attach CMCD metrics as query parameters.
      *  @memberof Constants#

src/streaming/net/HTTPLoader.js

@@ -625,10 +625,12 @@ function HTTPLoader(cfg) {
         const currentAdaptationSetId = request?.mediaInfo?.id?.toString();
         const isIncludedFilters = clientDataReportingController.isServiceLocationIncluded(request.type, currentServiceLocation) &&
             clientDataReportingController.isAdaptationsIncluded(currentAdaptationSetId);
+
         if (isIncludedFilters && cmcdModel.isCmcdEnabled()) {
             const cmcdParameters = cmcdModel.getCmcdParametersFromManifest();
             const cmcdMode = cmcdParameters.mode ? cmcdParameters.mode : settings.get().streaming.cmcd.mode;
             if (cmcdMode === Constants.CMCD_MODE_QUERY) {
+                request.url = Utils.removeQueryParameterFromUrl(request.url, Constants.CMCD_QUERY_KEY);
                 const additionalQueryParameter = _getAdditionalQueryParameter(request);
                 request.url = Utils.addAdditionalQueryParameterToUrl(request.url, additionalQueryParameter);
             } else if (cmcdMode === Constants.CMCD_MODE_HEADER) {