Update CallPerfTest.TestEncodeFramerateVp8Simulcast Only verify simulcast layers with reduced framerate (FramerateController used) and not input fps for now. Input framerate varies in some tests. Bug: webrtc:13031 Change-Id: I19b14b9fba70da2df49c0471b67e4c3a5fea4a2e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/230782 Commit-Queue: Åsa Persson <asapersson@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/main@{#34881}
diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc index b1f17c8..8510af4 100644 --- a/call/call_perf_tests.cc +++ b/call/call_perf_tests.cc
@@ -1124,6 +1124,10 @@ } void VerifyStats() const { + double input_fps = 0.0; + for (const auto& configured_framerate : configured_framerates_) { + input_fps = std::max(configured_framerate.second, input_fps); + } for (const auto& encode_frame_rate_list : encode_frame_rate_lists_) { const std::vector<double>& values = encode_frame_rate_list.second; test::PrintResultList("substream", "", "encode_frame_rate", values, @@ -1132,7 +1136,8 @@ std::accumulate(values.begin(), values.end(), 0.0) / values.size(); uint32_t ssrc = encode_frame_rate_list.first; double expected_fps = configured_framerates_.find(ssrc)->second; - EXPECT_NEAR(expected_fps, average_fps, kAllowedFpsDiff); + if (expected_fps != input_fps) + EXPECT_NEAR(expected_fps, average_fps, kAllowedFpsDiff); } }