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

webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_rplr_based_unittest.cc

 /*
  *  Copyright (c) 2017 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 39 matching lines @@
 
   if (distribution(generator) < 0.2) {
     return rtc::Optional<float>();
   } else {
     return rtc::Optional<float>(distribution(generator));
   }
 }
 
 std::unique_ptr<FecControllerRplrBased> CreateFecControllerRplrBased(
     bool initial_fec_enabled) {
-  using Threshold = FecControllerRplrBased::Config::Threshold;
   return std::unique_ptr<FecControllerRplrBased>(
       new FecControllerRplrBased(FecControllerRplrBased::Config(
           initial_fec_enabled,
-          Threshold(
+          ThresholdCurve(
               kEnablingBandwidthLow, kEnablingRecoverablePacketLossAtLowBw,
               kEnablingBandwidthHigh, kEnablingRecoverablePacketLossAtHighBw),
-          Threshold(kDisablingBandwidthLow,
-                    kDisablingRecoverablePacketLossAtLowBw,
-                    kDisablingBandwidthHigh,
-                    kDisablingRecoverablePacketLossAtHighBw))));
+          ThresholdCurve(kDisablingBandwidthLow,
+                         kDisablingRecoverablePacketLossAtLowBw,
+                         kDisablingBandwidthHigh,
+                         kDisablingRecoverablePacketLossAtHighBw))));
 }
 
 void UpdateNetworkMetrics(
     FecControllerRplrBased* controller,
     const rtc::Optional<int>& uplink_bandwidth_bps,
     const rtc::Optional<float>& uplink_packet_loss,
     const rtc::Optional<float>& uplink_recoveralbe_packet_loss) {
   // UpdateNetworkMetrics can accept multiple network metric updates at once.
   // However, currently, the most used case is to update one metric at a time.
   // To reflect this fact, we separate the calls.
@@ skipping 273 matching lines @@
   // packet-loss |   |  |
   //             |   | C|
   //             |   |  |
   //             |   | D|_______
   //             |  A|___B______
   //             |-----------------> bandwidth
 
   constexpr int kEnablingBandwidthHigh = kEnablingBandwidthLow;
   constexpr float kDisablingRecoverablePacketLossAtLowBw =
       kDisablingRecoverablePacketLossAtHighBw;
-  using Threshold = FecControllerRplrBased::Config::Threshold;
   FecControllerRplrBased controller(FecControllerRplrBased::Config(
       true,
-      Threshold(kEnablingBandwidthLow, kEnablingRecoverablePacketLossAtLowBw,
-                kEnablingBandwidthHigh, kEnablingRecoverablePacketLossAtHighBw),
-      Threshold(kDisablingBandwidthLow, kDisablingRecoverablePacketLossAtLowBw,
-                kDisablingBandwidthHigh,
-                kDisablingRecoverablePacketLossAtHighBw)));
+      ThresholdCurve(
+          kEnablingBandwidthLow, kEnablingRecoverablePacketLossAtLowBw,
+          kEnablingBandwidthHigh, kEnablingRecoverablePacketLossAtHighBw),
+      ThresholdCurve(
+          kDisablingBandwidthLow, kDisablingRecoverablePacketLossAtLowBw,
+          kDisablingBandwidthHigh, kDisablingRecoverablePacketLossAtHighBw)));
 
   UpdateNetworkMetrics(&controller,
                        rtc::Optional<int>(kDisablingBandwidthLow - 1),
                        rtc::Optional<float>(1.0));
   CheckDecision(&controller, false, 1.0);
 
   UpdateNetworkMetrics(
       &controller, rtc::Optional<int>(kEnablingBandwidthLow),
       rtc::Optional<float>(kEnablingRecoverablePacketLossAtHighBw * 0.99f));
   CheckDecision(&controller, false,
@@ skipping 11 matching lines @@
                 kDisablingRecoverablePacketLossAtHighBw * 1.01f);
 
   UpdateNetworkMetrics(&controller,
                        rtc::Optional<int>(kDisablingBandwidthHigh + 1),
                        rtc::Optional<float>(0.0));
   CheckDecision(&controller, false, 0.0);
 }
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(FecControllerRplrBasedDeathTest, InvalidConfig) {
-  using Threshold = FecControllerRplrBased::Config::Threshold;
   EXPECT_DEATH(
       FecControllerRplrBased controller(FecControllerRplrBased::Config(
           true,
-          Threshold(
+          ThresholdCurve(
               kDisablingBandwidthLow - 1, kEnablingRecoverablePacketLossAtLowBw,
               kEnablingBandwidthHigh, kEnablingRecoverablePacketLossAtHighBw),
-          Threshold(kDisablingBandwidthLow,
-                    kDisablingRecoverablePacketLossAtLowBw,
-                    kDisablingBandwidthHigh,
-                    kDisablingRecoverablePacketLossAtHighBw))),
+          ThresholdCurve(kDisablingBandwidthLow,
+                         kDisablingRecoverablePacketLossAtLowBw,
+                         kDisablingBandwidthHigh,
+                         kDisablingRecoverablePacketLossAtHighBw))),
       "Check failed");
 }
 #endif
 
 }  // namespace webrtc