fix: Fix deprecation warning for manifestPreprocessor that is always logged (#6496)

Fixes #6488

Author: avelad

lib/dash/dash_parser.js

@@ -30,6 +30,7 @@ goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Networking');
 goog.require('shaka.util.OperationManager');
 goog.require('shaka.util.PeriodCombiner');
+goog.require('shaka.util.PlayerConfiguration');
 goog.require('shaka.util.StringUtils');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.TXml');
@@ -338,7 +339,9 @@ shaka.dash.DashParser = class {
   async parseManifest_(data, finalManifestUri) {
     let manifestData = data;
     const manifestPreprocessor = this.config_.dash.manifestPreprocessor;
-    if (manifestPreprocessor) {
+    const defaultManifestPreprocessor =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessor;
+    if (manifestPreprocessor != defaultManifestPreprocessor) {
       shaka.Deprecate.deprecateFeature(5,
           'manifest.dash.manifestPreprocessor configuration',
           'Please Use manifest.dash.manifestPreprocessorTXml instead.');
@@ -364,7 +367,9 @@ shaka.dash.DashParser = class {
     }
     const manifestPreprocessorTXml =
         this.config_.dash.manifestPreprocessorTXml;
-    if (manifestPreprocessorTXml) {
+    const defaultManifestPreprocessorTXml =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml;
+    if (manifestPreprocessorTXml != defaultManifestPreprocessorTXml) {
       manifestPreprocessorTXml(mpd);
     }
 

lib/mss/mss_parser.js

@@ -23,6 +23,7 @@ goog.require('shaka.util.ManifestParserUtils');
 goog.require('shaka.util.MimeUtils');
 goog.require('shaka.util.Mp4Generator');
 goog.require('shaka.util.OperationManager');
+goog.require('shaka.util.PlayerConfiguration');
 goog.require('shaka.util.Timer');
 goog.require('shaka.util.TXml');
 goog.require('shaka.util.XmlUtils');
@@ -282,7 +283,9 @@ shaka.mss.MssParser = class {
   parseManifest_(data, finalManifestUri) {
     let manifestData = data;
     const manifestPreprocessor = this.config_.mss.manifestPreprocessor;
-    if (manifestPreprocessor) {
+    const defaultManifestPreprocessor =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessor;
+    if (manifestPreprocessor != defaultManifestPreprocessor) {
       shaka.Deprecate.deprecateFeature(5,
           'manifest.mss.manifestPreprocessor configuration',
           'Please Use manifest.mss.manifestPreprocessorTXml instead.');
@@ -307,7 +310,9 @@ shaka.mss.MssParser = class {
           finalManifestUri);
     }
     const manifestPreprocessorTXml = this.config_.mss.manifestPreprocessorTXml;
-    if (manifestPreprocessorTXml) {
+    const defaultManifestPreprocessorTXml =
+        shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml;
+    if (manifestPreprocessorTXml != defaultManifestPreprocessorTXml) {
       manifestPreprocessorTXml(mss);
     }
     this.processManifest_(mss, finalManifestUri);

lib/util/player_configuration.js

@@ -141,16 +141,10 @@ shaka.util.PlayerConfiguration = class {
           'urn:uuid:79f0049a-4098-8642-ab92-e65be0885f95':
             'com.microsoft.playready',
         },
-        manifestPreprocessor: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
-        manifestPreprocessorTXml: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
+        manifestPreprocessor:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessor,
+        manifestPreprocessorTXml:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml,
         sequenceMode: false,
         enableAudioGroups: false,
         multiTypeVariantsAllowed,
@@ -174,16 +168,10 @@ shaka.util.PlayerConfiguration = class {
         allowLowLatencyByteRangeOptimization: true,
       },
       mss: {
-        manifestPreprocessor: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
-        manifestPreprocessorTXml: (element) => {
-          return shaka.util.ConfigUtils.referenceParametersAndReturn(
-              [element],
-              element);
-        },
+        manifestPreprocessor:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessor,
+        manifestPreprocessorTXml:
+            shaka.util.PlayerConfiguration.defaultManifestPreprocessorTXml,
         sequenceMode: false,
         keySystemsBySystemId: {
           '9a04f079-9840-4286-ab92-e65be0885f95':
@@ -615,4 +603,24 @@ shaka.util.PlayerConfiguration = class {
 
     return selectedTracks;
   }
+
+  /**
+   * @param {!Element} element
+   * @return {!Element}
+   */
+  static defaultManifestPreprocessor(element) {
+    return shaka.util.ConfigUtils.referenceParametersAndReturn(
+        [element],
+        element);
+  }
+
+  /**
+   * @param {!shaka.extern.xml.Node} element
+   * @return {!shaka.extern.xml.Node}
+   */
+  static defaultManifestPreprocessorTXml(element) {
+    return shaka.util.ConfigUtils.referenceParametersAndReturn(
+        [element],
+        element);
+  }
 };