From 6d113eae03ab4cd51816e0ed0aacacd0412d61be Mon Sep 17 00:00:00 2001
From: Stefan Holmer <stefan@webrtc.org>
Date: Wed, 5 Jan 2022 17:03:49 +0100
Subject: [PATCH] Add ImproveDirection to RampupTests

Bug: None
Change-Id: I386e992f33d21f20b0965e6d88a222cbb76d00a3
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/244099
Reviewed-by: Andrey Logvin <landrey@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Stefan Holmer <stefan@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35647}
---
 call/rampup_tests.cc | 37 ++++++++++++++++++++++++-------------
 call/rampup_tests.h  |  4 +++-
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/call/rampup_tests.cc b/call/rampup_tests.cc
index 8e589b1f8a..abd0f1f348 100644
--- a/call/rampup_tests.cc
+++ b/call/rampup_tests.cc
@@ -329,9 +329,11 @@ void RampUpTester::PollStats() {
   }
 }
 
-void RampUpTester::ReportResult(const std::string& measurement,
-                                size_t value,
-                                const std::string& units) const {
+void RampUpTester::ReportResult(
+    const std::string& measurement,
+    size_t value,
+    const std::string& units,
+    test::ImproveDirection improve_direction) const {
   webrtc::test::PrintResult(
       measurement, "",
       ::testing::UnitTest::GetInstance()->current_test_info()->name(), value,
@@ -391,16 +393,21 @@ void RampUpTester::TriggerTestDone() {
   }
 
   if (report_perf_stats_) {
-    ReportResult("ramp-up-media-sent", media_sent, "bytes");
-    ReportResult("ramp-up-padding-sent", padding_sent, "bytes");
-    ReportResult("ramp-up-rtx-media-sent", rtx_media_sent, "bytes");
-    ReportResult("ramp-up-rtx-padding-sent", rtx_padding_sent, "bytes");
+    ReportResult("ramp-up-media-sent", media_sent, "bytes",
+                 test::ImproveDirection::kBiggerIsBetter);
+    ReportResult("ramp-up-padding-sent", padding_sent, "bytes",
+                 test::ImproveDirection::kSmallerIsBetter);
+    ReportResult("ramp-up-rtx-media-sent", rtx_media_sent, "bytes",
+                 test::ImproveDirection::kBiggerIsBetter);
+    ReportResult("ramp-up-rtx-padding-sent", rtx_padding_sent, "bytes",
+                 test::ImproveDirection::kSmallerIsBetter);
     if (ramp_up_finished_ms_ >= 0) {
       ReportResult("ramp-up-time", ramp_up_finished_ms_ - test_start_ms_,
-                   "milliseconds");
+                   "milliseconds", test::ImproveDirection::kSmallerIsBetter);
     }
     ReportResult("ramp-up-average-network-latency",
-                 send_transport_->GetAverageDelayMs(), "milliseconds");
+                 send_transport_->GetAverageDelayMs(), "milliseconds",
+                 test::ImproveDirection::kSmallerIsBetter);
   }
 }
 
@@ -527,7 +534,8 @@ void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
         if (report_perf_stats_) {
           webrtc::test::PrintResult("ramp_up_down_up", GetModifierString(),
                                     "first_rampup", now - state_start_ms_, "ms",
-                                    false);
+                                    false,
+                                    test::ImproveDirection::kSmallerIsBetter);
         }
         // Apply loss during the transition between states if FEC is enabled.
         forward_transport_config_.loss_percent = loss_rates_[test_state_];
@@ -543,7 +551,8 @@ void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
         if (report_perf_stats_) {
           webrtc::test::PrintResult("ramp_up_down_up", GetModifierString(),
                                     "rampdown", now - state_start_ms_, "ms",
-                                    false);
+                                    false,
+                                    test::ImproveDirection::kSmallerIsBetter);
         }
         // Apply loss during the transition between states if FEC is enabled.
         forward_transport_config_.loss_percent = loss_rates_[test_state_];
@@ -557,9 +566,11 @@ void RampUpDownUpTester::EvolveTestState(int bitrate_bps, bool suspended) {
         if (report_perf_stats_) {
           webrtc::test::PrintResult("ramp_up_down_up", GetModifierString(),
                                     "second_rampup", now - state_start_ms_,
-                                    "ms", false);
+                                    "ms", false,
+                                    test::ImproveDirection::kSmallerIsBetter);
           ReportResult("ramp-up-down-up-average-network-latency",
-                       send_transport_->GetAverageDelayMs(), "milliseconds");
+                       send_transport_->GetAverageDelayMs(), "milliseconds",
+                       test::ImproveDirection::kSmallerIsBetter);
         }
         // Apply loss during the transition between states if FEC is enabled.
         forward_transport_config_.loss_percent = loss_rates_[test_state_];
diff --git a/call/rampup_tests.h b/call/rampup_tests.h
index 075de6d888..0432e662ba 100644
--- a/call/rampup_tests.h
+++ b/call/rampup_tests.h
@@ -25,6 +25,7 @@
 #include "rtc_base/event.h"
 #include "rtc_base/task_utils/repeating_task.h"
 #include "test/call_test.h"
+#include "test/testsupport/perf_test.h"
 
 namespace webrtc {
 
@@ -66,7 +67,8 @@ class RampUpTester : public test::EndToEndTest {
 
   void ReportResult(const std::string& measurement,
                     size_t value,
-                    const std::string& units) const;
+                    const std::string& units,
+                    test::ImproveDirection improve_direction) const;
   void TriggerTestDone();
 
   Clock* const clock_;