Creating controller manager from config string in audio network adaptor.

webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc

Index: webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
diff --git a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
index a6c8436847c2df0528586744e1dc3ab98ea2d847..6e41012dcaab69222ffd02dc0ebf2d3a4e8c1768 100644
--- a/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
+++ b/webrtc/modules/audio_coding/audio_network_adaptor/controller_manager_unittest.cc
@@ -15,6 +15,14 @@
 #include "webrtc/modules/audio_coding/audio_network_adaptor/mock/mock_controller.h"
 #include "webrtc/system_wrappers/include/clock.h"
 
+#ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
+#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
+#endif
+
 namespace webrtc {
 
 using ::testing::NiceMock;
@@ -190,4 +198,206 @@ TEST(ControllerManagerTest, DoNotReorderIfNetworkMetricsChangeTooSmall) {
       {kNumControllers - 2, kNumControllers - 1, 0, 1});
 }
 
+#ifdef WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
+
+namespace {
+
+void AddBitrateControllerConfig(
+    audio_network_adaptor::config::ControllerManager* config) {
+  config->add_controllers()->mutable_bitrate_controller();
+}
+
+void AddChannelControllerConfig(
+    audio_network_adaptor::config::ControllerManager* config) {
+  auto controller_config =
+      config->add_controllers()->mutable_channel_controller();
+  controller_config->set_channel_1_to_2_bandwidth_bps(31000);
+  controller_config->set_channel_2_to_1_bandwidth_bps(29000);
+}
+
+void AddDtxControllerConfig(
+    audio_network_adaptor::config::ControllerManager* config) {
+  auto controller_config = config->add_controllers()->mutable_dtx_controller();
+  controller_config->set_dtx_enabling_bandwidth_bps(55000);
+  controller_config->set_dtx_disabling_bandwidth_bps(65000);
+}
+
+void AddFecControllerConfig(
+    audio_network_adaptor::config::ControllerManager* config) {
+  auto controller_config_ext = config->add_controllers();
+  auto controller_config = controller_config_ext->mutable_fec_controller();
+  auto fec_enabling_threshold =
+      controller_config->mutable_fec_enabling_threshold();
+  fec_enabling_threshold->set_low_bandwidth_bps(17000);
+  fec_enabling_threshold->set_low_bandwidth_packet_loss(0.1f);
+  fec_enabling_threshold->set_high_bandwidth_bps(64000);
+  fec_enabling_threshold->set_high_bandwidth_packet_loss(0.05f);
+  auto fec_disabling_threshold =
+      controller_config->mutable_fec_disabling_threshold();
+  fec_disabling_threshold->set_low_bandwidth_bps(15000);
+  fec_disabling_threshold->set_low_bandwidth_packet_loss(0.08f);
+  fec_disabling_threshold->set_high_bandwidth_bps(64000);
+  fec_disabling_threshold->set_high_bandwidth_packet_loss(0.01f);
+  controller_config->set_time_constant_ms(500);
+
+  auto scoring_point = controller_config_ext->mutable_scoring_point();
+  scoring_point->set_uplink_bandwidth_bps(kChracteristicBandwithBps[0]);
+  scoring_point->set_uplink_packet_loss_fraction(
+      kChracteristicPacketLossFraction[0]);
+}
+
+void AddFrameLengthControllerConfig(
+    audio_network_adaptor::config::ControllerManager* config) {
+  auto controller_config_ext = config->add_controllers();
+  auto controller_config =
+      controller_config_ext->mutable_frame_length_controller();
+  controller_config->set_fl_decreasing_packet_loss_fraction(0.05f);
+  controller_config->set_fl_increasing_packet_loss_fraction(0.04f);
+  controller_config->set_fl_20ms_to_60ms_bandwidth_bps(72000);
+  controller_config->set_fl_60ms_to_20ms_bandwidth_bps(88000);
+
+  auto scoring_point = controller_config_ext->mutable_scoring_point();
+  scoring_point->set_uplink_bandwidth_bps(kChracteristicBandwithBps[1]);
+  scoring_point->set_uplink_packet_loss_fraction(
+      kChracteristicPacketLossFraction[1]);
+}
+
+constexpr int kInitialBitrateBps = 24000;
+constexpr size_t kIntialChannelsToEncode = 1;
+constexpr bool kInitialDtxEnabled = true;
+constexpr bool kInitialFecEnabled = true;
+constexpr int kInitialFrameLengthMs = 60;
+
+ControllerManagerStates CreateControllerManager(
+    const std::string& config_string) {
+  ControllerManagerStates states;
+  states.simulated_clock.reset(new SimulatedClock(kClockInitialTime));
+  constexpr size_t kNumEncoderChannels = 2;
+  const std::vector<int> encoder_frame_lengths_ms = {20, 60};
+  states.controller_manager = ControllerManagerImpl::Create(
+      config_string, kNumEncoderChannels, encoder_frame_lengths_ms,
+      kIntialChannelsToEncode, kInitialFrameLengthMs, kInitialBitrateBps,
+      kInitialFecEnabled, kInitialDtxEnabled, states.simulated_clock.get());
+  return states;
+}
+
+enum ControllerType { FEC, CHANNEL, DTX, FRAME_LENGTH, BIT_RATE };

[hlundin-webrtc, 2016/09/29 09:31:53]

enum class

[minyue-webrtc, 2016/09/29 11:56:26]

I figured that it would a bit of pain to use enum class. All elements have to
add ControllerType::. For a unittest and anonymously namespaced type, we may not
lose too much benefit of enum class vs enum.

[kwiberg-webrtc, 2016/09/29 12:03:30]

But on the other hand, since you'd have to write "ControllerType::" in just a
few places, there's also not much to lose...

+1 for using enum class.

[michaelt, 2016/09/29 12:20:01]

+1 for using enum class.

+
+void CheckControllersOrder(const std::vector<Controller*>& controllers,
+                           const std::vector<ControllerType>& expected_types) {
+  ASSERT_EQ(expected_types.size(), controllers.size());
+
+  // We also check that the controllers follow the initial settings.
+  AudioNetworkAdaptor::EncoderRuntimeConfig encoder_config;
+
+  // We do not check the internal logic of controllers. We only check that
+  // when no network metrics are known, controllers provide the initial values.
+  Controller::NetworkMetrics metrics;
+
+  for (size_t i = 0; i < controllers.size(); ++i) {
+    AudioNetworkAdaptor::EncoderRuntimeConfig encoder_config;
+    // We check the order of |controllers| by judging their decisions.
+    controllers[i]->MakeDecision(metrics, &encoder_config);
+    switch (expected_types[i]) {
+      case FEC:
+        EXPECT_EQ(rtc::Optional<bool>(kInitialFecEnabled),
+                  encoder_config.enable_fec);
+        break;
+      case CHANNEL:
+        EXPECT_EQ(rtc::Optional<size_t>(kIntialChannelsToEncode),
+                  encoder_config.num_channels);
+        break;
+      case DTX:
+        EXPECT_EQ(rtc::Optional<bool>(kInitialDtxEnabled),
+                  encoder_config.enable_dtx);
+        break;
+      case FRAME_LENGTH:
+        EXPECT_EQ(rtc::Optional<int>(kInitialFrameLengthMs),
+                  encoder_config.frame_length_ms);
+        break;
+      case BIT_RATE:
+        EXPECT_EQ(rtc::Optional<int>(kInitialBitrateBps),
+                  encoder_config.bitrate_bps);
+    }
+  }
+}
+
+}  // namespace
+
+TEST(ControllerManagerTest, CreateFromConfigStringAndCheckDefaultOrder) {
+  audio_network_adaptor::config::ControllerManager config;
+  config.set_min_reordering_time_ms(kMinReorderingTimeMs);
+  config.set_min_reordering_squared_distance(kMinReorderingSquareDistance);
+
+  AddFecControllerConfig(&config);
+  AddChannelControllerConfig(&config);
+  AddDtxControllerConfig(&config);
+  AddFrameLengthControllerConfig(&config);
+  AddBitrateControllerConfig(&config);
+
+  std::string config_string;
+  config.SerializeToString(&config_string);
+
+  auto states = CreateControllerManager(config_string);
+  Controller::NetworkMetrics metrics;
+
+  auto controllers = states.controller_manager->GetSortedControllers(metrics);
+  CheckControllersOrder(
+      controllers,
+      std::vector<ControllerType>{FEC, CHANNEL, DTX, FRAME_LENGTH, BIT_RATE});
+}
+
+TEST(ControllerManagerTest, CreateFromConfigStringAndCheckReordering) {
+  audio_network_adaptor::config::ControllerManager config;
+  config.set_min_reordering_time_ms(kMinReorderingTimeMs);
+  config.set_min_reordering_squared_distance(kMinReorderingSquareDistance);
+
+  AddChannelControllerConfig(&config);
+
+  // Internally associated with characteristic point 0.
+  AddFecControllerConfig(&config);
+
+  AddDtxControllerConfig(&config);
+
+  // Internally associated with characteristic point 1.
+  AddFrameLengthControllerConfig(&config);
+
+  AddBitrateControllerConfig(&config);
+
+  std::string config_string;
+  config.SerializeToString(&config_string);
+
+  auto states = CreateControllerManager(config_string);
+
+  Controller::NetworkMetrics metrics;
+  metrics.uplink_bandwidth_bps =
+      rtc::Optional<int>(kChracteristicBandwithBps[0]);
+  metrics.uplink_packet_loss_fraction =
+      rtc::Optional<float>(kChracteristicPacketLossFraction[0]);
+
+  auto controllers = states.controller_manager->GetSortedControllers(metrics);
+  CheckControllersOrder(
+      controllers,
+      std::vector<ControllerType>{FEC, FRAME_LENGTH, CHANNEL, DTX, BIT_RATE});
+
+  metrics.uplink_bandwidth_bps =
+      rtc::Optional<int>(kChracteristicBandwithBps[1]);
+  metrics.uplink_packet_loss_fraction =
+      rtc::Optional<float>(kChracteristicPacketLossFraction[1]);
+  states.simulated_clock->AdvanceTimeMilliseconds(kMinReorderingTimeMs - 1);
+  controllers = states.controller_manager->GetSortedControllers(metrics);
+  // Should not reorder since min reordering time is not met.
+  CheckControllersOrder(
+      controllers,
+      std::vector<ControllerType>{FEC, FRAME_LENGTH, CHANNEL, DTX, BIT_RATE});
+
+  states.simulated_clock->AdvanceTimeMilliseconds(1);
+  controllers = states.controller_manager->GetSortedControllers(metrics);
+  // Reorder now.
+  CheckControllersOrder(
+      controllers,
+      std::vector<ControllerType>{FRAME_LENGTH, FEC, CHANNEL, DTX, BIT_RATE});
+}
+#endif  // WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP
+
 }  // namespace webrtc