Introduce ThresholdCurve (avoids code duplication between PLR/RPLR-based FecController)

webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.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.
  */
 
 #include "webrtc/modules/audio_coding/audio_network_adaptor/controller_manager.h"
 
 #include <cmath>
 #include <utility>
 
 #include "webrtc/base/ignore_wundef.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/bitrate_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/channel_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/dtx_controller.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based.h"
 #include "webrtc/modules/audio_coding/audio_network_adaptor/frame_length_controller.h"
+#include "webrtc/modules/audio_coding/audio_network_adaptor/util/threshold_curve.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
 #ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
 RTC_PUSH_IGNORING_WUNDEF()
 #ifdef WEBRTC_ANDROID_PLATFORM_BUILD
 #include "external/webrtc/webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
 #else
 #include "webrtc/modules/audio_coding/audio_network_adaptor/config.pb.h"
 #endif
 RTC_POP_IGNORING_WUNDEF()
@@ skipping 21 matching lines @@
 
   auto& fec_disabling_threshold = config.fec_disabling_threshold();
   RTC_CHECK(fec_disabling_threshold.has_low_bandwidth_bps());
   RTC_CHECK(fec_disabling_threshold.has_low_bandwidth_packet_loss());
   RTC_CHECK(fec_disabling_threshold.has_high_bandwidth_bps());
   RTC_CHECK(fec_disabling_threshold.has_high_bandwidth_packet_loss());
 
   return std::unique_ptr<FecControllerPlrBased>(
       new FecControllerPlrBased(FecControllerPlrBased::Config(
           initial_fec_enabled,
-          FecControllerPlrBased::Config::Threshold(
-              fec_enabling_threshold.low_bandwidth_bps(),
-              fec_enabling_threshold.low_bandwidth_packet_loss(),
-              fec_enabling_threshold.high_bandwidth_bps(),
-              fec_enabling_threshold.high_bandwidth_packet_loss()),
-          FecControllerPlrBased::Config::Threshold(
-              fec_disabling_threshold.low_bandwidth_bps(),
-              fec_disabling_threshold.low_bandwidth_packet_loss(),
-              fec_disabling_threshold.high_bandwidth_bps(),
-              fec_disabling_threshold.high_bandwidth_packet_loss()),
+          ThresholdCurve(fec_enabling_threshold.low_bandwidth_bps(),
+                         fec_enabling_threshold.low_bandwidth_packet_loss(),
+                         fec_enabling_threshold.high_bandwidth_bps(),
+                         fec_enabling_threshold.high_bandwidth_packet_loss()),
+          ThresholdCurve(fec_disabling_threshold.low_bandwidth_bps(),
+                         fec_disabling_threshold.low_bandwidth_packet_loss(),
+                         fec_disabling_threshold.high_bandwidth_bps(),
+                         fec_disabling_threshold.high_bandwidth_packet_loss()),
           config.time_constant_ms(), clock)));
 }
 
 std::unique_ptr<FecControllerRplrBased> CreateFecControllerRplrBased(
     const audio_network_adaptor::config::FecControllerRplrBased& config,
     bool initial_fec_enabled) {
   RTC_CHECK(config.has_fec_enabling_threshold());
   RTC_CHECK(config.has_fec_disabling_threshold());
 
   auto& fec_enabling_threshold = config.fec_enabling_threshold();
   RTC_CHECK(fec_enabling_threshold.has_low_bandwidth_bps());
   RTC_CHECK(fec_enabling_threshold.has_low_bandwidth_recoverable_packet_loss());
   RTC_CHECK(fec_enabling_threshold.has_high_bandwidth_bps());
   RTC_CHECK(
       fec_enabling_threshold.has_high_bandwidth_recoverable_packet_loss());
 
   auto& fec_disabling_threshold = config.fec_disabling_threshold();
   RTC_CHECK(fec_disabling_threshold.has_low_bandwidth_bps());
   RTC_CHECK(
       fec_disabling_threshold.has_low_bandwidth_recoverable_packet_loss());
   RTC_CHECK(fec_disabling_threshold.has_high_bandwidth_bps());
   RTC_CHECK(
       fec_disabling_threshold.has_high_bandwidth_recoverable_packet_loss());
 
   return std::unique_ptr<FecControllerRplrBased>(
       new FecControllerRplrBased(FecControllerRplrBased::Config(
           initial_fec_enabled,
-          FecControllerRplrBased::Config::Threshold(
+          ThresholdCurve(
               fec_enabling_threshold.low_bandwidth_bps(),
               fec_enabling_threshold.low_bandwidth_recoverable_packet_loss(),
               fec_enabling_threshold.high_bandwidth_bps(),
               fec_enabling_threshold.high_bandwidth_recoverable_packet_loss()),
-          FecControllerRplrBased::Config::Threshold(
+          ThresholdCurve(
               fec_disabling_threshold.low_bandwidth_bps(),
               fec_disabling_threshold.low_bandwidth_recoverable_packet_loss(),
               fec_disabling_threshold.high_bandwidth_bps(),
               fec_disabling_threshold
                   .high_bandwidth_recoverable_packet_loss()))));
 }
 
 std::unique_ptr<FrameLengthController> CreateFrameLengthController(
     const audio_network_adaptor::config::FrameLengthController& config,
     rtc::ArrayView<const int> encoder_frame_lengths_ms,
@@ skipping 270 matching lines @@
       NormalizeUplinkBandwidth(scoring_point.uplink_bandwidth_bps) -
       NormalizeUplinkBandwidth(uplink_bandwidth_bps);
   float diff_normalized_packet_loss =
       NormalizePacketLossFraction(scoring_point.uplink_packet_loss_fraction) -
       NormalizePacketLossFraction(uplink_packet_loss_fraction);
   return std::pow(diff_normalized_bitrate_bps, 2) +
          std::pow(diff_normalized_packet_loss, 2);
 }
 
 }  // namespace webrtc