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

webrtc/modules/audio_coding/audio_network_adaptor/fec_controller_plr_based_unittest.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 38 matching lines @@
   std::unique_ptr<FecControllerPlrBased> controller;
   MockSmoothingFilter* packet_loss_smoother;
 };
 
 FecControllerPlrBasedTestStates CreateFecControllerPlrBased(
     bool initial_fec_enabled) {
   FecControllerPlrBasedTestStates states;
   std::unique_ptr<MockSmoothingFilter> mock_smoothing_filter(
       new NiceMock<MockSmoothingFilter>());
   states.packet_loss_smoother = mock_smoothing_filter.get();
-  using Threshold = FecControllerPlrBased::Config::Threshold;
   states.controller.reset(new FecControllerPlrBased(
       FecControllerPlrBased::Config(
           initial_fec_enabled,
-          Threshold(kEnablingBandwidthLow, kEnablingPacketLossAtLowBw,
-                    kEnablingBandwidthHigh, kEnablingPacketLossAtHighBw),
-          Threshold(kDisablingBandwidthLow, kDisablingPacketLossAtLowBw,
-                    kDisablingBandwidthHigh, kDisablingPacketLossAtHighBw),
+          ThresholdCurve(kEnablingBandwidthLow, kEnablingPacketLossAtLowBw,
+                         kEnablingBandwidthHigh, kEnablingPacketLossAtHighBw),
+          ThresholdCurve(kDisablingBandwidthLow, kDisablingPacketLossAtLowBw,
+                         kDisablingBandwidthHigh, kDisablingPacketLossAtHighBw),
           0, nullptr),
       std::move(mock_smoothing_filter)));
   return states;
 }
 
 void UpdateNetworkMetrics(FecControllerPlrBasedTestStates* states,
                           const rtc::Optional<int>& uplink_bandwidth_bps,
                           const rtc::Optional<float>& uplink_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.
@@ skipping 229 matching lines @@
   //             |   | D|_______
   //             |  A|___B______
   //             |-----------------> bandwidth
 
   constexpr int kEnablingBandwidthHigh = kEnablingBandwidthLow;
   constexpr float kDisablingPacketLossAtLowBw = kDisablingPacketLossAtHighBw;
   FecControllerPlrBasedTestStates states;
   std::unique_ptr<MockSmoothingFilter> mock_smoothing_filter(
       new NiceMock<MockSmoothingFilter>());
   states.packet_loss_smoother = mock_smoothing_filter.get();
-  using Threshold = FecControllerPlrBased::Config::Threshold;
   states.controller.reset(new FecControllerPlrBased(
       FecControllerPlrBased::Config(
           true,
-          Threshold(kEnablingBandwidthLow, kEnablingPacketLossAtLowBw,
-                    kEnablingBandwidthHigh, kEnablingPacketLossAtHighBw),
-          Threshold(kDisablingBandwidthLow, kDisablingPacketLossAtLowBw,
-                    kDisablingBandwidthHigh, kDisablingPacketLossAtHighBw),
+          ThresholdCurve(kEnablingBandwidthLow, kEnablingPacketLossAtLowBw,
+                         kEnablingBandwidthHigh, kEnablingPacketLossAtHighBw),
+          ThresholdCurve(kDisablingBandwidthLow, kDisablingPacketLossAtLowBw,
+                         kDisablingBandwidthHigh, kDisablingPacketLossAtHighBw),
           0, nullptr),
       std::move(mock_smoothing_filter)));
 
   UpdateNetworkMetrics(&states, rtc::Optional<int>(kDisablingBandwidthLow - 1),
                        rtc::Optional<float>(1.0));
   CheckDecision(&states, false, 1.0);
 
   UpdateNetworkMetrics(
       &states, rtc::Optional<int>(kEnablingBandwidthLow),
       rtc::Optional<float>(kEnablingPacketLossAtHighBw * 0.99f));
@@ skipping 12 matching lines @@
                        rtc::Optional<float>(0.0));
   CheckDecision(&states, false, 0.0);
 }
 
 #if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
 TEST(FecControllerPlrBasedDeathTest, InvalidConfig) {
   FecControllerPlrBasedTestStates states;
   std::unique_ptr<MockSmoothingFilter> mock_smoothing_filter(
       new NiceMock<MockSmoothingFilter>());
   states.packet_loss_smoother = mock_smoothing_filter.get();
-  using Threshold = FecControllerPlrBased::Config::Threshold;
   EXPECT_DEATH(
       states.controller.reset(new FecControllerPlrBased(
           FecControllerPlrBased::Config(
               true,
-              Threshold(kDisablingBandwidthLow - 1, kEnablingPacketLossAtLowBw,
-                        kEnablingBandwidthHigh, kEnablingPacketLossAtHighBw),
-              Threshold(kDisablingBandwidthLow, kDisablingPacketLossAtLowBw,
-                        kDisablingBandwidthHigh, kDisablingPacketLossAtHighBw),
+              ThresholdCurve(kDisablingBandwidthLow - 1,
+                             kEnablingPacketLossAtLowBw, kEnablingBandwidthHigh,
+                             kEnablingPacketLossAtHighBw),
+              ThresholdCurve(
+                  kDisablingBandwidthLow, kDisablingPacketLossAtLowBw,
+                  kDisablingBandwidthHigh, kDisablingPacketLossAtHighBw),
               0, nullptr),
           std::move(mock_smoothing_filter))),
       "Check failed");
 }
 #endif
 
 }  // namespace webrtc