BWE Simulation Framework: Standard plot logging

webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimators_test.cc

 /*
  *  Copyright (c) 2013 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 73 matching lines @@
     delay.SetOneWayDelayMs(i);
     RunFor(10 * 1000);
   }
   RunFor(10 * 60 * 1000);
 }
 
 TEST_P(DefaultBweTest, IncreasingDelay2) {
   VideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   DelayFilter delay(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "");
+  RateCounterFilter counter(&uplink_, 0, "", "");
   PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
   RunFor(1 * 60 * 1000);
   for (int i = 1; i < 51; ++i) {
     delay.SetOneWayDelayMs(10.0f * i);
     RunFor(10 * 1000);
   }
   delay.SetOneWayDelayMs(0.0f);
   RunFor(10 * 60 * 1000);
 }
 
@@ skipping 10 matching lines @@
     RunFor(1000);
   }
   delay.SetOneWayDelayMs(0.0f);
   RunFor(10 * 60 * 1000);
 }
 
 TEST_P(DefaultBweTest, SteadyJitter) {
   VideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   JitterFilter jitter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "");
+  RateCounterFilter counter(&uplink_, 0, "", "");
   PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
   jitter.SetMaxJitter(20);
   RunFor(2 * 60 * 1000);
 }
 
 TEST_P(DefaultBweTest, IncreasingJitter1) {
   VideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   JitterFilter jitter(&uplink_, 0);
   PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
@@ skipping 68 matching lines @@
     choke.set_capacity_kbps(i);
     RunFor(1000);
   }
 }
 
 TEST_P(DefaultBweTest, Multi1) {
   VideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   DelayFilter delay(&uplink_, 0);
   ChokeFilter choke(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "");
+  RateCounterFilter counter(&uplink_, 0, "", "");
   PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
   choke.set_capacity_kbps(1000);
   RunFor(1 * 60 * 1000);
   for (int i = 1; i < 51; ++i) {
     delay.SetOneWayDelayMs(100.0f * i);
     RunFor(10 * 1000);
   }
   RunFor(500 * 1000);
   delay.SetOneWayDelayMs(0.0f);
   RunFor(5 * 60 * 1000);
 }
 
 TEST_P(DefaultBweTest, Multi2) {
   VideoSource source(0, 30, 300, 0, 0);
   VideoSender sender(&uplink_, &source, GetParam());
   ChokeFilter choke(&uplink_, 0);
   JitterFilter jitter(&uplink_, 0);
-  RateCounterFilter counter(&uplink_, 0, "");
+  RateCounterFilter counter(&uplink_, 0, "", "");
   PacketReceiver receiver(&uplink_, 0, GetParam(), false, false);
   choke.set_capacity_kbps(2000);
   jitter.SetMaxJitter(120);
   RunFor(5 * 60 * 1000);
 }
 
 // This test fixture is used to instantiate tests running with adaptive video
 // senders.
 class BweFeedbackTest
     : public BweTest,
@@ skipping 18 matching lines @@
 
 INSTANTIATE_TEST_CASE_P(VideoSendersTest,
                         BweFeedbackTest,
                         ::testing::Values(kRembEstimator,
                                           kFullSendSideEstimator));
 
 TEST_P(BweFeedbackTest, ConstantCapacity) {
   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(), false, false);
   const int kCapacityKbps = 1000;
   filter.set_capacity_kbps(kCapacityKbps);
   filter.set_max_delay_ms(500);
   RunFor(180 * 1000);
   PrintResults(kCapacityKbps, counter.GetBitrateStats(), 0,
                receiver.GetDelayStats(), counter.GetBitrateStats());
 }
 
 TEST_P(BweFeedbackTest, Choke1000kbps500kbps1000kbps) {
   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(), false, false);
   const int kHighCapacityKbps = 1000;
   const int kLowCapacityKbps = 500;
   filter.set_capacity_kbps(kHighCapacityKbps);
   filter.set_max_delay_ms(500);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(kLowCapacityKbps);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(kHighCapacityKbps);
   RunFor(60 * 1000);
   PrintResults((2 * kHighCapacityKbps + kLowCapacityKbps) / 3.0,
                counter.GetBitrateStats(), 0, receiver.GetDelayStats(),
                counter.GetBitrateStats());
 }
 
 TEST_P(BweFeedbackTest, Choke200kbps30kbps200kbps) {
   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(), false, false);
   const int kHighCapacityKbps = 200;
   const int kLowCapacityKbps = 30;
   filter.set_capacity_kbps(kHighCapacityKbps);
   filter.set_max_delay_ms(500);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(kLowCapacityKbps);
   RunFor(60 * 1000);
   filter.set_capacity_kbps(kHighCapacityKbps);
   RunFor(60 * 1000);
 
   PrintResults((2 * kHighCapacityKbps + kLowCapacityKbps) / 3.0,
                counter.GetBitrateStats(), 0, receiver.GetDelayStats(),
                counter.GetBitrateStats());
 }
 
 TEST_P(BweFeedbackTest, Verizon4gDownlinkTest) {
   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(), false, false);
   ASSERT_TRUE(filter.Init(test::ResourcePath("verizon4g-downlink", "rx")));
   RunFor(22 * 60 * 1000);
   PrintResults(filter.GetBitrateStats().GetMean(), counter2.GetBitrateStats(),
                0, receiver.GetDelayStats(), counter2.GetBitrateStats());
 }
 
 // webrtc:3277
 TEST_P(BweFeedbackTest, 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(), false, false);
   ASSERT_TRUE(filter.Init(test::ResourcePath("google-wifi-3mbps", "rx")));
   RunFor(300 * 1000);
   PrintResults(filter.GetBitrateStats().GetMean(), counter2.GetBitrateStats(),
                0, receiver.GetDelayStats(), counter2.GetBitrateStats());
 }
 
 TEST_P(BweFeedbackTest, PacedSelfFairness50msTest) {
   int64_t kRttMs = 100;
   int64_t kMaxJitterMs = 15;
@@ skipping 70 matching lines @@
   for (int i = 0; i < 2; ++i) {
     offset_ms[i] = std::max(0, 5000 * i + rand() % 2001 - 1000);
   }
 
   RunFairnessTest(GetParam(), 1, 1, 300, 2000, 1000, kRttMs, kMaxJitterMs,
                   offset_ms);
 }
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc