Enable adaptive threshold experiment by default.

webrtc/modules/remote_bitrate_estimator/overuse_detector.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 12 matching lines @@
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 
 const char kAdaptiveThresholdExperiment[] = "WebRTC-AdaptiveBweThreshold";
 const char kEnabledPrefix[] = "Enabled";
 const size_t kEnabledPrefixLength = sizeof(kEnabledPrefix) - 1;
-const size_t kMinExperimentLength = kEnabledPrefixLength + 3;
+const char kDisabledPrefix[] = "Disabled";
+const size_t kDisabledPrefixLength = sizeof(kDisabledPrefix) - 1;
 
 const double kMaxAdaptOffsetMs = 15.0;
 const double kOverUsingTimeThreshold = 10;
 
-bool AdaptiveThresholdExperimentIsEnabled() {
+bool AdaptiveThresholdExperimentIsDisabled() {
   std::string experiment_string =
       webrtc::field_trial::FindFullName(kAdaptiveThresholdExperiment);
+  const size_t kMinExperimentLength = kDisabledPrefixLength;
   if (experiment_string.length() < kMinExperimentLength)
     return false;
-  return experiment_string.substr(0, kEnabledPrefixLength) == kEnabledPrefix;
+  return experiment_string.substr(0, kDisabledPrefixLength) == kDisabledPrefix;
 }
 
 // Gets thresholds from the experiment name following the format
 // "WebRTC-AdaptiveBweThreshold/Enabled-0.5,0.002/".
 bool ReadExperimentConstants(double* k_up, double* k_down) {
   std::string experiment_string =
       webrtc::field_trial::FindFullName(kAdaptiveThresholdExperiment);
+  const size_t kMinExperimentLength = kEnabledPrefixLength + 3;
+  if (experiment_string.length() < kMinExperimentLength ||
+      experiment_string.substr(0, kEnabledPrefixLength) != kEnabledPrefix)
+    return false;
   return sscanf(experiment_string.substr(kEnabledPrefixLength + 1).c_str(),
                 "%lf,%lf", k_up, k_down) == 2;
 }
 
 OveruseDetector::OveruseDetector(const OverUseDetectorOptions& options)
-    : in_experiment_(AdaptiveThresholdExperimentIsEnabled()),
-      k_up_(0.01),
-      k_down_(0.00018),
+      // Experiment is on by default, but can be disabled with finch by setting
+      // the field trial string to "WebRTC-AdaptiveBweThreshold/Disabled/".
+    : in_experiment_(!AdaptiveThresholdExperimentIsDisabled()),
+      k_up_(0.004),
+      k_down_(0.00006),
       overusing_time_threshold_(100),
       options_(options),
       threshold_(12.5),
       last_update_ms_(-1),
       prev_offset_(0.0),
       time_over_using_(-1),
       overuse_counter_(0),
       hypothesis_(kBwNormal) {
-  if (in_experiment_)
+  if (!AdaptiveThresholdExperimentIsDisabled())
     InitializeExperiment();
 }
 
 OveruseDetector::~OveruseDetector() {}
 
 BandwidthUsage OveruseDetector::State() const {
   return hypothesis_;
 }
 
 BandwidthUsage OveruseDetector::Detect(double offset,
@@ skipping 70 matching lines @@
   RTC_DCHECK(in_experiment_);
   double k_up = 0.0;
   double k_down = 0.0;
   overusing_time_threshold_ = kOverUsingTimeThreshold;
   if (ReadExperimentConstants(&k_up, &k_down)) {
     k_up_ = k_up;
     k_down_ = k_down;
   }
 }
 }  // namespace webrtc