Resolve dependency between rtc_event_log_api and remote_bitrate_estimator

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.cc

 /*
  *  Copyright (c) 2014 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 129 matching lines @@
 
 uint32_t AimdRateControl::ChangeBitrate(uint32_t new_bitrate_bps,
                                         const RateControlInput& input,
                                         int64_t now_ms) {
   uint32_t incoming_bitrate_bps =
       input.incoming_bitrate.value_or(current_bitrate_bps_);
 
   // An over-use should always trigger us to reduce the bitrate, even though
   // we have not yet established our first estimate. By acting on the over-use,
   // we will end up with a valid estimate.
-  if (!bitrate_is_initialized_ && input.bw_state != kBwOverusing)
+  if (!bitrate_is_initialized_ &&
+      input.bw_state != BandwidthUsage::kBwOverusing)
     return current_bitrate_bps_;
 
   ChangeState(input, now_ms);
   // Calculated here because it's used in multiple places.
   const float incoming_bitrate_kbps = incoming_bitrate_bps / 1000.0f;
   // Calculate the max bit rate std dev given the normalized
   // variance and the current incoming bit rate.
   const float std_max_bit_rate = sqrt(var_max_bitrate_kbps_ *
                                       avg_max_bitrate_kbps_);
   switch (rate_control_state_) {
@@ skipping 111 matching lines @@
   }
   // 2.5f ~= 35 kbit/s at 500 kbit/s
   if (var_max_bitrate_kbps_ > 2.5f) {
     var_max_bitrate_kbps_ = 2.5f;
   }
 }
 
 void AimdRateControl::ChangeState(const RateControlInput& input,
                                   int64_t now_ms) {
   switch (input.bw_state) {
-    case kBwNormal:
+    case BandwidthUsage::kBwNormal:
       if (rate_control_state_ == kRcHold) {
         time_last_bitrate_change_ = now_ms;
         rate_control_state_ = kRcIncrease;
       }
       break;
-    case kBwOverusing:
+    case BandwidthUsage::kBwOverusing:
       if (rate_control_state_ != kRcDecrease) {
         rate_control_state_ = kRcDecrease;
       }
       break;
-    case kBwUnderusing:
+    case BandwidthUsage::kBwUnderusing:
       rate_control_state_ = kRcHold;
       break;
     default:
       assert(false);
   }
 }
 
 void AimdRateControl::ChangeRegion(RateControlRegion region) {
   rate_control_region_ = region;
 }
 
 }  // namespace webrtc