Add command line feature NewEncodeCpuLoadEstimator.

Bug: webrtc:8504
Change-Id: I8e227e17c521cb2825cdda909e8071ba0366e69f
Reviewed-on: https://chromium-review.googlesource.com/870119
Commit-Queue: Niels Möller <nisse@chromium.org>
Reviewed-by: Fredrik Hubinette <hubbe@chromium.org>
Cr-Commit-Position: refs/heads/master@{#532371}

content/renderer/media/rtc_peer_connection_handler.cc

@@ -1352,6 +1352,9 @@ bool RTCPeerConnectionHandler::Initialize(
       base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableRTCSmoothnessAlgorithm));
 
+  configuration_.set_experiment_cpu_load_estimator(
+      base::FeatureList::IsEnabled(media::kNewEncodeCpuLoadEstimator));
+
   // Copy all the relevant constraints into |config|.
   CopyConstraintsIntoRtcConfiguration(options, &configuration_);
 

media/base/media_switches.cc

@@ -255,6 +255,13 @@ const base::Feature kMseBufferByPts{"MseBufferByPts",
 const base::Feature kMseFlacInIsobmff{"MseFlacInIsobmff",
                                       base::FEATURE_ENABLED_BY_DEFAULT};
 
+// Enable new cpu load estimator. Intended for evaluation in local
+// testing and origin-trial.
+// TODO(nisse): Delete once we have switched over to always using the
+// new estimator.
+const base::Feature kNewEncodeCpuLoadEstimator{
+    "NewEncodeCpuLoadEstimator", base::FEATURE_DISABLED_BY_DEFAULT};
+
 // Use the new Remote Playback / media flinging pipeline.
 const base::Feature kNewRemotePlaybackPipeline{
     "NewRemotePlaybackPipeline", base::FEATURE_DISABLED_BY_DEFAULT};

media/base/media_switches.h

@@ -120,6 +120,7 @@ MEDIA_EXPORT extern const base::Feature kMojoVideoDecoder;
 MEDIA_EXPORT extern const base::Feature kMseBufferByPts;
 MEDIA_EXPORT extern const base::Feature kMseFlacInIsobmff;
 MEDIA_EXPORT extern const base::Feature kNewAudioRenderingMixingStrategy;
+MEDIA_EXPORT extern const base::Feature kNewEncodeCpuLoadEstimator;
 MEDIA_EXPORT extern const base::Feature kNewRemotePlaybackPipeline;
 MEDIA_EXPORT extern const base::Feature kOverflowIconsForMediaControls;
 MEDIA_EXPORT extern const base::Feature kOverlayFullscreenVideo;