added WebRTC-QuickPerfTest to RampUpTests and CallPerfTests

webrtc/modules/remote_bitrate_estimator/test/bwe_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.
  */
 
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test.h"
 
 #include <memory>
 #include <sstream>
 
 #include "webrtc/base/arraysize.h"
 #include "webrtc/modules/include/module_common_types.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/packet_sender.h"
 #include "webrtc/system_wrappers/include/clock.h"
+#include "webrtc/system_wrappers/include/field_trial.h"
 #include "webrtc/test/testsupport/perf_test.h"
 
 using std::vector;
 
+namespace {
+const int kQuickTestTimeoutMs = 500;
+}
+
 namespace webrtc {
 namespace testing {
 namespace bwe {
 
 PacketProcessorRunner::PacketProcessorRunner(PacketProcessor* processor)
     : processor_(processor) {
 }
 
 PacketProcessorRunner::~PacketProcessorRunner() {
   for (Packet* packet : queue_)
@@ skipping 116 matching lines @@
   }
 }
 
 void BweTest::VerboseLogging(bool enable) {
   BWE_TEST_LOGGING_GLOBAL_ENABLE(enable);
 }
 
 void BweTest::RunFor(int64_t time_ms) {
   // Set simulation interval from first packet sender.
   // TODO(holmer): Support different feedback intervals for different flows.
+
+  // For quick perf tests ignore passed timeout
+  if (field_trial::FindFullName("WebRTC-QuickPerfTest") == "Enabled") {
+    time_ms = kQuickTestTimeoutMs;
+  }
   if (!uplink_.senders().empty()) {
     simulation_interval_ms_ = uplink_.senders()[0]->GetFeedbackIntervalMs();
   } else if (!downlink_.senders().empty()) {
     simulation_interval_ms_ = downlink_.senders()[0]->GetFeedbackIntervalMs();
   }
   assert(simulation_interval_ms_ > 0);
   if (time_now_ms_ == -1) {
     time_now_ms_ = simulation_interval_ms_;
   }
   for (run_time_ms_ += time_ms;
@@ skipping 190 matching lines @@
 
   std::map<int, Stats<double>> flow_delay_ms;
   for (PacketReceiver* receiver : receivers) {
     int flow_id = *receiver->flow_ids().begin();
     flow_delay_ms[flow_id] = receiver->GetDelayStats();
   }
 
   PrintResults(capacity_kbps, total_utilization.GetBitrateStats(),
                flow_delay_ms, flow_throughput_kbps);
 
-  for (int i : all_flow_ids) {
-    metric_recorders[i]->PlotThroughputHistogram(
-        title, flow_name, static_cast<int>(num_media_flows), 0);
+  if (field_trial::FindFullName("WebRTC-QuickPerfTest") != "Enabled") {
+    for (int i : all_flow_ids) {
+      metric_recorders[i]->PlotThroughputHistogram(
+          title, flow_name, static_cast<int>(num_media_flows), 0);
 
-    metric_recorders[i]->PlotLossHistogram(title, flow_name,
-                                           static_cast<int>(num_media_flows),
-                                           receivers[i]->GlobalPacketLoss());
-  }
+      metric_recorders[i]->PlotLossHistogram(title, flow_name,
+                                             static_cast<int>(num_media_flows),
+                                             receivers[i]->GlobalPacketLoss());
+    }
 
-  // Pointless to show delay histogram for TCP flow.
-  for (int i : media_flow_ids) {
-    metric_recorders[i]->PlotDelayHistogram(title, bwe_names[bwe_type],
-                                            static_cast<int>(num_media_flows),
-                                            one_way_delay_ms);
-    BWE_TEST_LOGGING_BASELINEBAR(5, bwe_names[bwe_type], one_way_delay_ms, i);
+    // Pointless to show delay histogram for TCP flow.
+    for (int i : media_flow_ids) {
+      metric_recorders[i]->PlotDelayHistogram(title, bwe_names[bwe_type],
+                                              static_cast<int>(num_media_flows),
+                                              one_way_delay_ms);
+      BWE_TEST_LOGGING_BASELINEBAR(5, bwe_names[bwe_type], one_way_delay_ms, i);
+    }
   }
 
   for (VideoSource* source : sources)
     delete source;
   for (PacketSender* sender : senders)
     delete sender;
   for (RateCounterFilter* rate_counter : rate_counters)
     delete rate_counter;
   for (PacketReceiver* receiver : receivers)
     delete receiver;
@@ skipping 576 matching lines @@
     tcp_starting_times_ms.push_back(
         static_cast<int64_t>(random.Exponential(1.0f / kMeanMs)));
   }
 
   return tcp_starting_times_ms;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc