BWE Simulation Framework: Standard plot logging

webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc

 /*
  *  Copyright (c) 2014 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 33 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(VideoSendersTest,
                         BweSimulation,
                         ::testing::Values(kRembEstimator,
                                           kFullSendSideEstimator,
                                           kNadaEstimator));
 
 TEST_P(BweSimulation, SprintUplinkTest) {
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
-  RateCounterFilter counter1(&uplink_, 0, "sender_output");
+  RateCounterFilter counter1(&uplink_, 0, "sender_output",
+                             bwe_names[GetParam()]);
   TraceBasedDeliveryFilter filter(&uplink_, 0, "link_capacity");
-  RateCounterFilter counter2(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter2(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   ASSERT_TRUE(filter.Init(test::ResourcePath("sprint-uplink", "rx")));
   RunFor(60 * 1000);
 }
 
 TEST_P(BweSimulation, Verizon4gDownlinkTest) {
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&downlink_, &source, GetParam());
-  RateCounterFilter counter1(&downlink_, 0, "sender_output");
+  RateCounterFilter counter1(&downlink_, 0, "sender_output",
+                             bwe_names[GetParam()] + "_up");
   TraceBasedDeliveryFilter filter(&downlink_, 0, "link_capacity");
-  RateCounterFilter counter2(&downlink_, 0, "receiver_input");
+  RateCounterFilter counter2(&downlink_, 0, "Receiver",
+                             bwe_names[GetParam()] + "_down");
   PacketReceiver receiver(&downlink_, 0, GetParam(), true, true);
   ASSERT_TRUE(filter.Init(test::ResourcePath("verizon4g-downlink", "rx")));
   RunFor(22 * 60 * 1000);
 }
 
 TEST_P(BweSimulation, Choke1000kbps500kbps1000kbpsBiDirectional) {
 
   const int kFlowIds[] = {0, 1};
   const size_t kNumFlows = sizeof(kFlowIds) / sizeof(kFlowIds[0]);
 
   AdaptiveVideoSource source(kFlowIds[0], 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter choke(&uplink_, kFlowIds[0]);
-  RateCounterFilter counter(&uplink_, kFlowIds[0], "receiver_input_0");
+  RateCounterFilter counter(&uplink_, kFlowIds[0], "Receiver_0",
+                            bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, kFlowIds[0], GetParam(), true, false);
 
   AdaptiveVideoSource source2(kFlowIds[1], 30, 300, 0, 0);
   VideoSender sender2(&downlink_, &source2, GetParam());
   ChokeFilter choke2(&downlink_, kFlowIds[1]);
   DelayFilter delay(&downlink_, CreateFlowIds(kFlowIds, kNumFlows));
-  RateCounterFilter counter2(&downlink_, kFlowIds[1], "receiver_input_1");
+  RateCounterFilter counter2(&downlink_, kFlowIds[1], "Receiver_1",
+                             bwe_names[GetParam()]);
   PacketReceiver receiver2(&downlink_, kFlowIds[1], GetParam(), true, false);
 
   choke2.set_capacity_kbps(500);
   delay.SetOneWayDelayMs(0);
 
   choke.set_capacity_kbps(1000);
   choke.set_max_delay_ms(500);
   RunFor(60 * 1000);
   choke.set_capacity_kbps(500);
   RunFor(60 * 1000);
   choke.set_capacity_kbps(1000);
   RunFor(60 * 1000);
 }
 
 TEST_P(BweSimulation, Choke1000kbps500kbps1000kbps) {
 
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter choke(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, false);
 
   choke.set_capacity_kbps(1000);
   choke.set_max_delay_ms(500);
   RunFor(60 * 1000);
   choke.set_capacity_kbps(500);
   RunFor(60 * 1000);
   choke.set_capacity_kbps(1000);
   RunFor(60 * 1000);
 }
 
 TEST_P(BweSimulation, PacerChoke1000kbps500kbps1000kbps) {
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
   PacedVideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter filter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   filter.set_capacity_kbps(1000);
   filter.set_max_delay_ms(500);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(500);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(1000);
   RunFor(60 * 1000);
 }
 
 TEST_P(BweSimulation, PacerChoke10000kbps) {
   PeriodicKeyFrameSource source(0, 30, 300, 0, 0, 1000);
   PacedVideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter filter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   filter.set_capacity_kbps(10000);
   filter.set_max_delay_ms(500);
   RunFor(60 * 1000);
 }
 
 TEST_P(BweSimulation, PacerChoke200kbps30kbps200kbps) {
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
   PacedVideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter filter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   filter.set_capacity_kbps(200);
   filter.set_max_delay_ms(500);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(30);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(200);
   RunFor(60 * 1000);
 }
 
 TEST_P(BweSimulation, Choke200kbps30kbps200kbps) {
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter filter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   filter.set_capacity_kbps(200);
   filter.set_max_delay_ms(500);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(30);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(200);
   RunFor(60 * 1000);
 }
 
 TEST_P(BweSimulation, GoogleWifiTrace3Mbps) {
   AdaptiveVideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
-  RateCounterFilter counter1(&uplink_, 0, "sender_output");
+  RateCounterFilter counter1(&uplink_, 0, "sender_output",
+                             bwe_names[GetParam()]);
   TraceBasedDeliveryFilter filter(&uplink_, 0, "link_capacity");
   filter.set_max_delay_ms(500);
-  RateCounterFilter counter2(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter2(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   ASSERT_TRUE(filter.Init(test::ResourcePath("google-wifi-3mbps", "rx")));
   RunFor(300 * 1000);
 }
 
 TEST_P(BweSimulation, LinearIncreasingCapacity) {
   PeriodicKeyFrameSource source(0, 30, 300, 0, 0, 1000000);
   PacedVideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter filter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   filter.set_max_delay_ms(500);
   const int kStartingCapacityKbps = 150;
   const int kEndingCapacityKbps = 1500;
   const int kStepKbps = 5;
   const int kStepTimeMs = 1000;
 
   for (int i = kStartingCapacityKbps; i <= kEndingCapacityKbps;
        i += kStepKbps) {
     filter.set_capacity_kbps(i);
     RunFor(kStepTimeMs);
   }
 }
 
 TEST_P(BweSimulation, LinearDecreasingCapacity) {
   PeriodicKeyFrameSource source(0, 30, 300, 0, 0, 1000000);
   PacedVideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter filter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   filter.set_max_delay_ms(500);
   const int kStartingCapacityKbps = 1500;
   const int kEndingCapacityKbps = 150;
   const int kStepKbps = -5;
   const int kStepTimeMs = 1000;
 
   for (int i = kStartingCapacityKbps; i >= kEndingCapacityKbps;
        i += kStepKbps) {
     filter.set_capacity_kbps(i);
     RunFor(kStepTimeMs);
   }
 }
 
 TEST_P(BweSimulation, PacerGoogleWifiTrace3Mbps) {
   PeriodicKeyFrameSource source(0, 30, 300, 0, 0, 1000);
   PacedVideoSender sender(&uplink_, &source, GetParam());
-  RateCounterFilter counter1(&uplink_, 0, "sender_output");
+  RateCounterFilter counter1(&uplink_, 0, "sender_output",
+                             bwe_names[GetParam()]);
   TraceBasedDeliveryFilter filter(&uplink_, 0, "link_capacity");
   filter.set_max_delay_ms(500);
-  RateCounterFilter counter2(&uplink_, 0, "receiver_input");
+  RateCounterFilter counter2(&uplink_, 0, "Receiver", bwe_names[GetParam()]);
   PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
   ASSERT_TRUE(filter.Init(test::ResourcePath("google-wifi-3mbps", "rx")));
   RunFor(300 * 1000);
 }
 
 TEST_P(BweSimulation, SelfFairnessTest) {
   srand(Clock::GetRealTimeClock()->TimeInMicroseconds());
   const int kAllFlowIds[] = {0, 1, 2, 3};
   const size_t kNumFlows = sizeof(kAllFlowIds) / sizeof(kAllFlowIds[0]);
   rtc::scoped_ptr<VideoSource> sources[kNumFlows];
   rtc::scoped_ptr<VideoSender> senders[kNumFlows];
   for (size_t i = 0; i < kNumFlows; ++i) {
     // Streams started 20 seconds apart to give them different advantage when
     // competing for the bandwidth.
     sources[i].reset(new AdaptiveVideoSource(kAllFlowIds[i], 30, 300, 0,
                                              i * (rand() % 40000)));
     senders[i].reset(new VideoSender(&uplink_, sources[i].get(), GetParam()));
   }
 
   ChokeFilter choke(&uplink_, CreateFlowIds(kAllFlowIds, kNumFlows));
   choke.set_capacity_kbps(1000);
 
   rtc::scoped_ptr<RateCounterFilter> rate_counters[kNumFlows];
   for (size_t i = 0; i < kNumFlows; ++i) {
-    rate_counters[i].reset(new RateCounterFilter(
-        &uplink_, CreateFlowIds(&kAllFlowIds[i], 1), "receiver_input"));
+    rate_counters[i].reset(
+        new RateCounterFilter(&uplink_, CreateFlowIds(&kAllFlowIds[i], 1),
+                              "Receiver", bwe_names[GetParam()]));
   }
 
   RateCounterFilter total_utilization(
-      &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "total_utilization");
+      &uplink_, CreateFlowIds(kAllFlowIds, kNumFlows), "total_utilization",
+      "Total_link_utilization");
 
   rtc::scoped_ptr<PacketReceiver> receivers[kNumFlows];
   for (size_t i = 0; i < kNumFlows; ++i) {
     receivers[i].reset(new PacketReceiver(&uplink_, kAllFlowIds[i], GetParam(),
                                           i == 0, false));
   }
 
   RunFor(30 * 60 * 1000);
 }
 
@@ skipping 161 matching lines @@
 
   BweTest gcc_test(false);
   gcc_test.RunChoke(kFullSendSideEstimator, capacities_kbps);
 }
 
 #endif  // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc