Clean up perf metrics and report ramp-up stats for fewer tests.

BUG=None

Review-Url: https://codereview.webrtc.org/2738183004
Cr-Commit-Position: refs/heads/master@{#17197}
This commit is contained in:
stefan 2017-03-13 01:27:03 -07:00 committed by Commit bot
parent 8c0a5896d1
commit ff2ebf5e30
2 changed files with 5 additions and 22 deletions

View File

@ -356,13 +356,8 @@ void RampUpTester::TriggerTestDone() {
}
if (report_perf_stats_) {
ReportResult("ramp-up-total-packets-sent", total_packets_sent, "packets");
ReportResult("ramp-up-total-sent", total_sent, "bytes");
ReportResult("ramp-up-media-sent", media_sent, "bytes");
ReportResult("ramp-up-padding-sent", padding_sent, "bytes");
ReportResult("ramp-up-rtx-total-packets-sent", rtx_total_packets_sent,
"packets");
ReportResult("ramp-up-rtx-total-sent", rtx_total_sent, "bytes");
ReportResult("ramp-up-rtx-media-sent", rtx_media_sent, "bytes");
ReportResult("ramp-up-rtx-padding-sent", rtx_padding_sent, "bytes");
if (ramp_up_finished_ms_ >= 0) {
@ -600,7 +595,7 @@ TEST_F(RampUpTest, UpDownUpAudioVideoTransportSequenceNumberRtx) {
std::vector<int> loss_rates = {0, 0, 0, 0};
RampUpDownUpTester test(3, 1, 0, kStartBitrateBps,
RtpExtension::kTransportSequenceNumberUri, true,
false, loss_rates, true);
false, loss_rates, false);
RunBaseTest(&test);
}
@ -608,7 +603,7 @@ TEST_F(RampUpTest, UpDownUpAudioTransportSequenceNumberRtx) {
std::vector<int> loss_rates = {0, 0, 0, 0};
RampUpDownUpTester test(0, 1, 0, kStartBitrateBps,
RtpExtension::kTransportSequenceNumberUri, true,
false, loss_rates, true);
false, loss_rates, false);
RunBaseTest(&test);
}
@ -620,7 +615,7 @@ TEST_F(RampUpTest, TOffsetSimulcastRedRtx) {
TEST_F(RampUpTest, AbsSendTime) {
RampUpTester test(1, 0, 0, 0, 0, RtpExtension::kAbsSendTimeUri, false, false,
true);
false);
RunBaseTest(&test);
}
@ -632,13 +627,13 @@ TEST_F(RampUpTest, AbsSendTimeSimulcastRedRtx) {
TEST_F(RampUpTest, TransportSequenceNumber) {
RampUpTester test(1, 0, 0, 0, 0, RtpExtension::kTransportSequenceNumberUri,
false, false, true);
false, false, false);
RunBaseTest(&test);
}
TEST_F(RampUpTest, TransportSequenceNumberSimulcast) {
RampUpTester test(3, 0, 0, 0, 0, RtpExtension::kTransportSequenceNumberUri,
false, false, true);
false, false, false);
RunBaseTest(&test);
}

View File

@ -744,30 +744,18 @@ class VideoAnalyzer : public PacketReceiver,
rtc::CritScope crit(&comparison_lock_);
PrintResult("psnr", psnr_, " dB");
PrintResult("ssim", ssim_, " score");
PrintResult("sender_time", sender_time_, " ms");
PrintResult("receiver_time", receiver_time_, " ms");
PrintResult("total_delay_incl_network", end_to_end_, " ms");
PrintResult("time_between_rendered_frames", rendered_delta_, " ms");
PrintResult("encoded_frame_size", encoded_frame_size_, " bytes");
PrintResult("encode_frame_rate", encode_frame_rate_, " fps");
PrintResult("encode_time", encode_time_ms_, " ms");
PrintResult("encode_usage_percent", encode_usage_percent_, " percent");
PrintResult("media_bitrate", media_bitrate_bps_, " bps");
printf("RESULT actual_bitrate: %s = %.6lf bps\n", test_label_.c_str(),
GetAverageMediaBitrateBps());
if (receive_stream_ != nullptr) {
PrintResult("decode_time", decode_time_ms_, " ms");
PrintResult("decode_time_max", decode_time_max_ms_, " ms");
}
printf("RESULT dropped_frames: %s = %d frames\n", test_label_.c_str(),
dropped_frames_);
printf("RESULT dropped_frames_before_first_encode: %s = %d frames\n",
test_label_.c_str(), dropped_frames_before_first_encode_);
printf("RESULT dropped_frames_before_rendering: %s = %d frames\n",
test_label_.c_str(), dropped_frames_before_rendering_);
printf("RESULT cpu_usage: %s = %lf %%\n", test_label_.c_str(),
GetCpuUsagePercent());