Resolve dependency between rtc_event_log_api and remote_bitrate_estimator

webrtc/modules/remote_bitrate_estimator/overuse_estimator.cc

 /*
  *  Copyright (c) 2013 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 47 matching lines @@
 
   ++num_of_deltas_;
   if (num_of_deltas_ > kDeltaCounterMax) {
     num_of_deltas_ = kDeltaCounterMax;
   }
 
   // Update the Kalman filter.
   E_[0][0] += process_noise_[0];
   E_[1][1] += process_noise_[1];
 
-  if ((current_hypothesis == kBwOverusing && offset_ < prev_offset_) ||
-      (current_hypothesis == kBwUnderusing && offset_ > prev_offset_)) {
+  if ((current_hypothesis == BandwidthUsage::kBwOverusing &&
+       offset_ < prev_offset_) ||
+      (current_hypothesis == BandwidthUsage::kBwUnderusing &&
+       offset_ > prev_offset_)) {
     E_[1][1] += 10 * process_noise_[1];
   }
 
   const double h[2] = {fs_delta, 1.0};
   const double Eh[2] = {E_[0][0]*h[0] + E_[0][1]*h[1],
                         E_[1][0]*h[0] + E_[1][1]*h[1]};
 
   BWE_TEST_LOGGING_PLOT(1, "d_ms", now_ms, slope_ * h[0] - offset_);
 
   const double residual = t_ts_delta - slope_*h[0] - offset_;
 
-  const bool in_stable_state = (current_hypothesis == kBwNormal);
+  const bool in_stable_state =
+      (current_hypothesis == BandwidthUsage::kBwNormal);
   const double max_residual = 3.0 * sqrt(var_noise_);
   // We try to filter out very late frames. For instance periodic key
   // frames doesn't fit the Gaussian model well.
   if (fabs(residual) < max_residual) {
     UpdateNoiseEstimate(residual, min_frame_period, in_stable_state);
   } else {
     UpdateNoiseEstimate(residual < 0 ? -max_residual : max_residual,
                         min_frame_period, in_stable_state);
   }
 
@@ skipping 62 matching lines @@
   const double beta = pow(1 - alpha, ts_delta * 30.0 / 1000.0);
   avg_noise_ = beta * avg_noise_
               + (1 - beta) * residual;
   var_noise_ = beta * var_noise_
               + (1 - beta) * (avg_noise_ - residual) * (avg_noise_ - residual);
   if (var_noise_ < 1) {
     var_noise_ = 1;
   }
 }
 }  // namespace webrtc