From f9f9d544a599d86daefa391e516578b1d924a3c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Terelius?= Date: Wed, 6 Jul 2022 13:29:10 +0200 Subject: [PATCH] Use TimeDelta for harmonic framerate calculation in DVQA. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I678c12c7994fe0c772f2ec479ad37cef5c05417e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267825 Reviewed-by: Artem Titov Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/main@{#37464} --- .../video/default_video_quality_analyzer.cc | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc index 4355b1e1d7..e31843c8eb 100644 --- a/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc +++ b/test/pc/e2e/analyzer/video/default_video_quality_analyzer.cc @@ -36,7 +36,6 @@ namespace webrtc { namespace { -constexpr int kMicrosPerSecond = 1000000; constexpr int kBitsInByte = 8; constexpr absl::string_view kSkipRenderedFrameReasonProcessed = "processed"; constexpr absl::string_view kSkipRenderedFrameReasonRendered = "rendered"; @@ -896,9 +895,8 @@ void DefaultVideoQualityAnalyzer::ReportResults( double harmonic_framerate_fps = 0; TimeDelta video_duration = video_end_time - video_start_time; if (sum_squared_interframe_delays_secs > 0.0 && video_duration.IsFinite()) { - harmonic_framerate_fps = static_cast(video_duration.us()) / - static_cast(kMicrosPerSecond) / - sum_squared_interframe_delays_secs; + harmonic_framerate_fps = + video_duration.seconds() / sum_squared_interframe_delays_secs; } ReportResult("psnr", test_case_name, stats.psnr, "dB", @@ -956,11 +954,11 @@ void DefaultVideoQualityAnalyzer::ReportResults( ReportResult("target_encode_bitrate", test_case_name, stats.target_encode_bitrate / kBitsInByte, "bytesPerSecond", ImproveDirection::kNone); - test::PrintResult( - "actual_encode_bitrate", "", test_case_name, - static_cast(stats.total_encoded_images_payload) / - static_cast(test_duration.us()) * kMicrosPerSecond, - "bytesPerSecond", /*important=*/false, ImproveDirection::kNone); + test::PrintResult("actual_encode_bitrate", "", test_case_name, + static_cast(stats.total_encoded_images_payload) / + test_duration.seconds(), + "bytesPerSecond", /*important=*/false, + ImproveDirection::kNone); if (options_.report_detailed_frame_stats) { test::PrintResult("num_encoded_frames", "", test_case_name,