Resolve cyclic dependency between audio network adaptor and event log api

webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.cc

 /*
  *  Copyright (c) 2016 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 @@
 void FrameLengthController::UpdateNetworkMetrics(
     const NetworkMetrics& network_metrics) {
   if (network_metrics.uplink_bandwidth_bps)
     uplink_bandwidth_bps_ = network_metrics.uplink_bandwidth_bps;
   if (network_metrics.uplink_packet_loss_fraction)
     uplink_packet_loss_fraction_ = network_metrics.uplink_packet_loss_fraction;
   if (network_metrics.overhead_bytes_per_packet)
     overhead_bytes_per_packet_ = network_metrics.overhead_bytes_per_packet;
 }
 
-void FrameLengthController::MakeDecision(
-    AudioNetworkAdaptor::EncoderRuntimeConfig* config) {
+void FrameLengthController::MakeDecision(AudioEncoderRuntimeConfig* config) {
   // Decision on |frame_length_ms| should not have been made.
   RTC_DCHECK(!config->frame_length_ms);
 
   if (FrameLengthIncreasingDecision(*config)) {
     ++frame_length_ms_;
   } else if (FrameLengthDecreasingDecision(*config)) {
     --frame_length_ms_;
   }
   config->frame_length_ms = rtc::Optional<int>(*frame_length_ms_);
 }
 
 FrameLengthController::Config::FrameLengthChange::FrameLengthChange(
     int from_frame_length_ms,
     int to_frame_length_ms)
     : from_frame_length_ms(from_frame_length_ms),
       to_frame_length_ms(to_frame_length_ms) {}
 
 bool FrameLengthController::Config::FrameLengthChange::operator<(
     const FrameLengthChange& rhs) const {
   return from_frame_length_ms < rhs.from_frame_length_ms ||
          (from_frame_length_ms == rhs.from_frame_length_ms &&
           to_frame_length_ms < rhs.to_frame_length_ms);
 }
 
 bool FrameLengthController::FrameLengthIncreasingDecision(
-    const AudioNetworkAdaptor::EncoderRuntimeConfig& config) const {
+    const AudioEncoderRuntimeConfig& config) const {
   // Increase frame length if
   // 1. |uplink_bandwidth_bps| is known to be smaller or equal than
   //    |min_encoder_bitrate_bps| plus |prevent_overuse_margin_bps| plus the
   //    current overhead rate OR all the following:
   // 2. longer frame length is available AND
   // 3. |uplink_bandwidth_bps| is known to be smaller than a threshold AND
   // 4. |uplink_packet_loss_fraction| is known to be smaller than a threshold
   //    AND
   // 5. FEC is not decided or is OFF.
 
@@ skipping 16 matching lines @@
 
   return (uplink_bandwidth_bps_ &&
           *uplink_bandwidth_bps_ <= increase_threshold->second) &&
          (uplink_packet_loss_fraction_ &&
           *uplink_packet_loss_fraction_ <=
               config_.fl_increasing_packet_loss_fraction) &&
          !config.enable_fec.value_or(false);
 }
 
 bool FrameLengthController::FrameLengthDecreasingDecision(
-    const AudioNetworkAdaptor::EncoderRuntimeConfig& config) const {
+    const AudioEncoderRuntimeConfig& config) const {
   // Decrease frame length if
   // 1. shorter frame length is available AND
   // 2. |uplink_bandwidth_bps| is known to be bigger than
   // |min_encoder_bitrate_bps| plus |prevent_overuse_margin_bps| plus the
   // overhead which would be produced with the shorter frame length AND
   // one or more of the followings:
   // 3. |uplink_bandwidth_bps| is known to be larger than a threshold,
   // 4. |uplink_packet_loss_fraction| is known to be larger than a threshold,
   // 5. FEC is decided ON.
   if (frame_length_ms_ == config_.encoder_frame_lengths_ms.begin())
@@ skipping 16 matching lines @@
 
   return (uplink_bandwidth_bps_ &&
           *uplink_bandwidth_bps_ >= decrease_threshold->second) ||
          (uplink_packet_loss_fraction_ &&
           *uplink_packet_loss_fraction_ >=
               config_.fl_decreasing_packet_loss_fraction) ||
          config.enable_fec.value_or(false);
 }
 
 }  // namespace webrtc