From df3a15f63bb4531b9c7e4bc05ac7d24b23dc8977 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Mon, 7 Jan 2013 10:06:52 +0000 Subject: [PATCH] Removed spaces from full stack test labels, consolidated graphs NOTE TO SELF: save history on master when deploying! BUG= TEST=Ran locally Review URL: https://webrtc-codereview.appspot.com/1021007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3337 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../auto_test/automated/vie_video_verification_test.cc | 8 ++++---- .../test/auto_test/primitives/framedrop_primitives.cc | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc b/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc index cace5b3f2d..12aa621b99 100644 --- a/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc +++ b/webrtc/video_engine/test/auto_test/automated/vie_video_verification_test.cc @@ -148,7 +148,7 @@ class ParameterizedFullStackTest : public ViEVideoVerificationTest, parameter_table_[i].bitrate = 300; parameter_table_[i].avg_psnr_threshold = 35; parameter_table_[i].avg_ssim_threshold = 0.96; - parameter_table_[i].test_label = "net delay (0, 0), plr 0"; + parameter_table_[i].test_label = "net_delay_0_0_plr_0"; ++i; parameter_table_[i].protection_method = kNack; parameter_table_[i].network.loss_model = kUniformLoss; @@ -159,7 +159,7 @@ class ParameterizedFullStackTest : public ViEVideoVerificationTest, parameter_table_[i].bitrate = 300; parameter_table_[i].avg_psnr_threshold = 35; parameter_table_[i].avg_ssim_threshold = 0.96; - parameter_table_[i].test_label = "net delay (50, 5), plr 5"; + parameter_table_[i].test_label = "net_delay_50_5_plr_5"; ++i; parameter_table_[i].protection_method = kNack; parameter_table_[i].network.loss_model = kUniformLoss; @@ -170,7 +170,7 @@ class ParameterizedFullStackTest : public ViEVideoVerificationTest, parameter_table_[i].bitrate = 300; parameter_table_[i].avg_psnr_threshold = 35; parameter_table_[i].avg_ssim_threshold = 0.96; - parameter_table_[i].test_label = "net delay (100, 10), plr 0"; + parameter_table_[i].test_label = "net_delay_100_10_plr_0"; ++i; parameter_table_[i].protection_method = kNack; parameter_table_[i].network.loss_model = kGilbertElliotLoss; @@ -181,7 +181,7 @@ class ParameterizedFullStackTest : public ViEVideoVerificationTest, parameter_table_[i].bitrate = 300; parameter_table_[i].avg_psnr_threshold = 35; parameter_table_[i].avg_ssim_threshold = 0.96; - parameter_table_[i].test_label = "net delay (100, 10), plr 0"; + parameter_table_[i].test_label = "net_delay_100_10_plr_5_gilbert_elliot"; ASSERT_EQ(kNumFullStackInstances - 1, i); } diff --git a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc index 52b63a2c92..003b75b6d7 100644 --- a/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc +++ b/webrtc/video_engine/test/auto_test/primitives/framedrop_primitives.cc @@ -496,12 +496,13 @@ void FrameDropDetector::PrintReport(const std::string& test_label) { total_latency_excl_network); } - // Print dashboard data. + // Plot all measurements in the same graph since they share the same value + // range. webrtc::test::PrintResultMeanAndError( - "total delay (incl. network)", " " + test_label, "", + "total_delay_incl_network", "", test_label, latency_incl_network_stats.AsString(), "ms", false); webrtc::test::PrintResultMeanAndError( - "time between rendered frames", " " + test_label, "", + "time_between_rendered_frames", "", test_label, rendering_stats.AsString(), "ms", false);