Add tests for cpu overuse scaling.
Test that adapt down is triggered on overuse for different degradation preference configurations. Bug: none Change-Id: I326e979c10d09d17a7c1e6ece9a719f5fd4bff5f Reviewed-on: https://webrtc-review.googlesource.com/c/97303 Reviewed-by: Rasmus Brandt <brandtr@webrtc.org> Reviewed-by: Sebastian Jansson <srte@webrtc.org> Commit-Queue: Åsa Persson <asapersson@webrtc.org> Cr-Commit-Position: refs/heads/master@{#25611}
This commit is contained in:
@ -166,6 +166,7 @@ void CallTest::RunBaseTest(BaseTest* test) {
|
|||||||
int height = kDefaultHeight;
|
int height = kDefaultHeight;
|
||||||
int frame_rate = kDefaultFramerate;
|
int frame_rate = kDefaultFramerate;
|
||||||
test->ModifyVideoCaptureStartResolution(&width, &height, &frame_rate);
|
test->ModifyVideoCaptureStartResolution(&width, &height, &frame_rate);
|
||||||
|
test->ModifyVideoDegradationPreference(°radation_preference_);
|
||||||
CreateFrameGeneratorCapturer(frame_rate, width, height);
|
CreateFrameGeneratorCapturer(frame_rate, width, height);
|
||||||
test->OnFrameGeneratorCapturerCreated(frame_generator_capturer_);
|
test->OnFrameGeneratorCapturerCreated(frame_generator_capturer_);
|
||||||
}
|
}
|
||||||
@ -783,6 +784,9 @@ void BaseTest::ModifyVideoCaptureStartResolution(int* width,
|
|||||||
int* heigt,
|
int* heigt,
|
||||||
int* frame_rate) {}
|
int* frame_rate) {}
|
||||||
|
|
||||||
|
void BaseTest::ModifyVideoDegradationPreference(
|
||||||
|
DegradationPreference* degradation_preference) {}
|
||||||
|
|
||||||
void BaseTest::OnVideoStreamsCreated(
|
void BaseTest::OnVideoStreamsCreated(
|
||||||
VideoSendStream* send_stream,
|
VideoSendStream* send_stream,
|
||||||
const std::vector<VideoReceiveStream*>& receive_streams) {}
|
const std::vector<VideoReceiveStream*>& receive_streams) {}
|
||||||
|
@ -263,6 +263,9 @@ class BaseTest : public RtpRtcpObserver {
|
|||||||
virtual void ModifyVideoCaptureStartResolution(int* width,
|
virtual void ModifyVideoCaptureStartResolution(int* width,
|
||||||
int* heigt,
|
int* heigt,
|
||||||
int* frame_rate);
|
int* frame_rate);
|
||||||
|
virtual void ModifyVideoDegradationPreference(
|
||||||
|
DegradationPreference* degradation_preference);
|
||||||
|
|
||||||
virtual void OnVideoStreamsCreated(
|
virtual void OnVideoStreamsCreated(
|
||||||
VideoSendStream* send_stream,
|
VideoSendStream* send_stream,
|
||||||
const std::vector<VideoReceiveStream*>& receive_streams);
|
const std::vector<VideoReceiveStream*>& receive_streams);
|
||||||
|
@ -411,6 +411,7 @@ if (rtc_include_tests) {
|
|||||||
defines = []
|
defines = []
|
||||||
sources = [
|
sources = [
|
||||||
"call_stats_unittest.cc",
|
"call_stats_unittest.cc",
|
||||||
|
"cpu_scaling_tests.cc",
|
||||||
"encoder_rtcp_feedback_unittest.cc",
|
"encoder_rtcp_feedback_unittest.cc",
|
||||||
"end_to_end_tests/bandwidth_tests.cc",
|
"end_to_end_tests/bandwidth_tests.cc",
|
||||||
"end_to_end_tests/call_operation_tests.cc",
|
"end_to_end_tests/call_operation_tests.cc",
|
||||||
|
131
video/cpu_scaling_tests.cc
Normal file
131
video/cpu_scaling_tests.cc
Normal file
@ -0,0 +1,131 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Use of this source code is governed by a BSD-style license
|
||||||
|
* that can be found in the LICENSE file in the root of the source
|
||||||
|
* tree. An additional intellectual property rights grant can be found
|
||||||
|
* in the file PATENTS. All contributing project authors may
|
||||||
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "test/call_test.h"
|
||||||
|
#include "test/field_trial.h"
|
||||||
|
#include "test/frame_generator_capturer.h"
|
||||||
|
|
||||||
|
namespace webrtc {
|
||||||
|
namespace {
|
||||||
|
constexpr int kWidth = 1280;
|
||||||
|
constexpr int kHeight = 720;
|
||||||
|
constexpr int kFps = 28;
|
||||||
|
} // namespace
|
||||||
|
|
||||||
|
// Minimal normal usage at start, then 60s overuse.
|
||||||
|
class CpuOveruseTest : public test::CallTest {
|
||||||
|
protected:
|
||||||
|
CpuOveruseTest()
|
||||||
|
: field_trials_("WebRTC-ForceSimulatedOveruseIntervalMs/1-60000-60000/") {
|
||||||
|
}
|
||||||
|
|
||||||
|
void RunTestAndCheckForAdaptation(
|
||||||
|
const DegradationPreference& degradation_preference,
|
||||||
|
bool expect_adaptation);
|
||||||
|
|
||||||
|
test::ScopedFieldTrials field_trials_;
|
||||||
|
};
|
||||||
|
|
||||||
|
void CpuOveruseTest::RunTestAndCheckForAdaptation(
|
||||||
|
const DegradationPreference& degradation_preference,
|
||||||
|
bool expect_adaptation) {
|
||||||
|
class OveruseObserver
|
||||||
|
: public test::SendTest,
|
||||||
|
public test::FrameGeneratorCapturer::SinkWantsObserver {
|
||||||
|
public:
|
||||||
|
OveruseObserver(const DegradationPreference& degradation_preference,
|
||||||
|
bool expect_adaptation)
|
||||||
|
: SendTest(expect_adaptation ? kLongTimeoutMs : kDefaultTimeoutMs),
|
||||||
|
degradation_preference_(degradation_preference),
|
||||||
|
expect_adaptation_(expect_adaptation) {}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void OnFrameGeneratorCapturerCreated(
|
||||||
|
test::FrameGeneratorCapturer* frame_generator_capturer) override {
|
||||||
|
frame_generator_capturer->SetSinkWantsObserver(this);
|
||||||
|
// Set initial resolution.
|
||||||
|
frame_generator_capturer->ChangeResolution(kWidth, kHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Called when FrameGeneratorCapturer::AddOrUpdateSink is called.
|
||||||
|
void OnSinkWantsChanged(rtc::VideoSinkInterface<VideoFrame>* sink,
|
||||||
|
const rtc::VideoSinkWants& wants) override {
|
||||||
|
if (wants.max_pixel_count == std::numeric_limits<int>::max() &&
|
||||||
|
wants.max_framerate_fps == kFps) {
|
||||||
|
// Max configured framerate is initially set.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
switch (degradation_preference_) {
|
||||||
|
case DegradationPreference::MAINTAIN_FRAMERATE:
|
||||||
|
EXPECT_LT(wants.max_pixel_count, kWidth * kHeight);
|
||||||
|
observation_complete_.Set();
|
||||||
|
break;
|
||||||
|
case DegradationPreference::MAINTAIN_RESOLUTION:
|
||||||
|
EXPECT_LT(wants.max_framerate_fps, kFps);
|
||||||
|
observation_complete_.Set();
|
||||||
|
break;
|
||||||
|
case DegradationPreference::BALANCED:
|
||||||
|
if (wants.max_pixel_count == std::numeric_limits<int>::max() &&
|
||||||
|
wants.max_framerate_fps == std::numeric_limits<int>::max()) {
|
||||||
|
// |adapt_counters_| map in VideoStreamEncoder is reset when
|
||||||
|
// balanced mode is set.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
EXPECT_TRUE(wants.max_pixel_count < kWidth * kHeight ||
|
||||||
|
wants.max_framerate_fps < kFps);
|
||||||
|
observation_complete_.Set();
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
RTC_NOTREACHED();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModifyVideoConfigs(
|
||||||
|
VideoSendStream::Config* send_config,
|
||||||
|
std::vector<VideoReceiveStream::Config>* receive_configs,
|
||||||
|
VideoEncoderConfig* encoder_config) override {
|
||||||
|
EXPECT_FALSE(encoder_config->simulcast_layers.empty());
|
||||||
|
encoder_config->simulcast_layers[0].max_framerate = kFps;
|
||||||
|
}
|
||||||
|
|
||||||
|
void ModifyVideoDegradationPreference(
|
||||||
|
DegradationPreference* degradation_preference) override {
|
||||||
|
*degradation_preference = degradation_preference_;
|
||||||
|
}
|
||||||
|
|
||||||
|
void PerformTest() override {
|
||||||
|
EXPECT_EQ(expect_adaptation_, Wait())
|
||||||
|
<< "Timed out while waiting for a scale down.";
|
||||||
|
}
|
||||||
|
|
||||||
|
const DegradationPreference degradation_preference_;
|
||||||
|
const bool expect_adaptation_;
|
||||||
|
} test(degradation_preference, expect_adaptation);
|
||||||
|
|
||||||
|
RunBaseTest(&test);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(CpuOveruseTest, AdaptsDownInResolutionOnOveruse) {
|
||||||
|
RunTestAndCheckForAdaptation(DegradationPreference::MAINTAIN_FRAMERATE, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(CpuOveruseTest, AdaptsDownInFpsOnOveruse) {
|
||||||
|
RunTestAndCheckForAdaptation(DegradationPreference::MAINTAIN_RESOLUTION,
|
||||||
|
true);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(CpuOveruseTest, AdaptsDownInResolutionOrFpsOnOveruse) {
|
||||||
|
RunTestAndCheckForAdaptation(DegradationPreference::BALANCED, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(CpuOveruseTest, NoAdaptDownOnOveruse) {
|
||||||
|
RunTestAndCheckForAdaptation(DegradationPreference::DISABLED, false);
|
||||||
|
}
|
||||||
|
} // namespace webrtc
|
Reference in New Issue
Block a user