zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QualityScalingTests: Move encoder factory creation to ScalingObserver.

Browse Source 
Bug: none
Change-Id: I44131952c8ef8efa62049702ae1c715a7c419dd5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/208102
Reviewed-by: Sergey Silkin <ssilkin@webrtc.org>
Commit-Queue: Åsa Persson <asapersson@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#33290}
This commit is contained in:
Åsa Persson
2021-02-17 14:37:01 +01:00
committed by Commit Bot
parent 39993844fa
commit e927c0ff3e
1 changed files with 34 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
video/quality_scaling_tests.cc
View File

@ -48,8 +48,7 @@ void SetEncoderSpecific(VideoEncoderConfig* encoder_config,
class QualityScalingTest : public test::CallTest { class QualityScalingTest : public test::CallTest {
protected: protected:
void RunTest(VideoEncoderFactory* encoder_factory, void RunTest(const std::string& payload_name,
const std::string& payload_name,
const std::vector<bool>& streams_active, const std::vector<bool>& streams_active,
int start_bps, int start_bps,
bool automatic_resize, bool automatic_resize,
@ -59,8 +58,7 @@ class QualityScalingTest : public test::CallTest {
const std::string kEnd = ",0,0,0.9995,0.9999,1/"; const std::string kEnd = ",0,0,0.9995,0.9999,1/";
}; };
void QualityScalingTest::RunTest(VideoEncoderFactory* encoder_factory, void QualityScalingTest::RunTest(const std::string& payload_name,
const std::string& payload_name,
const std::vector<bool>& streams_active, const std::vector<bool>& streams_active,
int start_bps, int start_bps,
bool automatic_resize, bool automatic_resize,
@ -69,14 +67,23 @@ void QualityScalingTest::RunTest(VideoEncoderFactory* encoder_factory,
: public test::SendTest, : public test::SendTest,
public test::FrameGeneratorCapturer::SinkWantsObserver { public test::FrameGeneratorCapturer::SinkWantsObserver {
public: public:
ScalingObserver(VideoEncoderFactory* encoder_factory, ScalingObserver(const std::string& payload_name,
const std::string& payload_name,
const std::vector<bool>& streams_active, const std::vector<bool>& streams_active,
int start_bps, int start_bps,
bool automatic_resize, bool automatic_resize,
bool expect_adaptation) bool expect_adaptation)
: SendTest(expect_adaptation ? kDefaultTimeoutMs : kTimeoutMs), : SendTest(expect_adaptation ? kDefaultTimeoutMs : kTimeoutMs),
encoder_factory_(encoder_factory), encoder_factory_([](const SdpVideoFormat& format)
-> std::unique_ptr<VideoEncoder> {
if (format.name == "VP8")
return VP8Encoder::Create();
if (format.name == "VP9")
return VP9Encoder::Create();
if (format.name == "H264")
return H264Encoder::Create(cricket::VideoCodec("H264"));
RTC_NOTREACHED() << format.name;
return nullptr;
}),
payload_name_(payload_name), payload_name_(payload_name),
streams_active_(streams_active), streams_active_(streams_active),
start_bps_(start_bps), start_bps_(start_bps),
@ -110,9 +117,10 @@ void QualityScalingTest::RunTest(VideoEncoderFactory* encoder_factory,
VideoSendStream::Config* send_config, VideoSendStream::Config* send_config,
std::vector<VideoReceiveStream::Config>* receive_configs, std::vector<VideoReceiveStream::Config>* receive_configs,
VideoEncoderConfig* encoder_config) override { VideoEncoderConfig* encoder_config) override {
send_config->encoder_settings.encoder_factory = encoder_factory_; send_config->encoder_settings.encoder_factory = &encoder_factory_;
send_config->rtp.payload_name = payload_name_; send_config->rtp.payload_name = payload_name_;
send_config->rtp.payload_type = kVideoSendPayloadType; send_config->rtp.payload_type = kVideoSendPayloadType;
encoder_config->video_format.name = payload_name_;
const VideoCodecType codec_type = PayloadStringToCodecType(payload_name_); const VideoCodecType codec_type = PayloadStringToCodecType(payload_name_);
encoder_config->codec_type = codec_type; encoder_config->codec_type = codec_type;
encoder_config->max_bitrate_bps = encoder_config->max_bitrate_bps =
@ -137,14 +145,14 @@ void QualityScalingTest::RunTest(VideoEncoderFactory* encoder_factory,
<< "Timed out while waiting for a scale down."; << "Timed out while waiting for a scale down.";
} }
VideoEncoderFactory* const encoder_factory_; test::FunctionVideoEncoderFactory encoder_factory_;
const std::string payload_name_; const std::string payload_name_;
const std::vector<bool> streams_active_; const std::vector<bool> streams_active_;
const int start_bps_; const int start_bps_;
const bool automatic_resize_; const bool automatic_resize_;
const bool expect_adaptation_; const bool expect_adaptation_;
} test(encoder_factory, payload_name, streams_active, start_bps, } test(payload_name, streams_active, start_bps, automatic_resize,
automatic_resize, expect_adaptation); expect_adaptation);
RunBaseTest(&test); RunBaseTest(&test);
} }
@ -153,9 +161,7 @@ TEST_F(QualityScalingTest, AdaptsDownForHighQp_Vp8) {
// qp_low:1, qp_high:1 -> kHighQp // qp_low:1, qp_high:1 -> kHighQp
test::ScopedFieldTrials field_trials(kPrefix + "1,1,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,1,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {true}, kHighStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {true}, kHighStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
@ -163,9 +169,7 @@ TEST_F(QualityScalingTest, NoAdaptDownForHighQpIfScalingOff_Vp8) {
// qp_low:1, qp_high:1 -> kHighQp // qp_low:1, qp_high:1 -> kHighQp
test::ScopedFieldTrials field_trials(kPrefix + "1,1,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,1,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {true}, kHighStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {true}, kHighStartBps,
/*automatic_resize=*/false, /*expect_adaptation=*/false); /*automatic_resize=*/false, /*expect_adaptation=*/false);
} }
@ -173,9 +177,7 @@ TEST_F(QualityScalingTest, NoAdaptDownForNormalQp_Vp8) {
// qp_low:1, qp_high:127 -> kNormalQp // qp_low:1, qp_high:127 -> kNormalQp
test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {true}, kHighStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {true}, kHighStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/false); /*automatic_resize=*/true, /*expect_adaptation=*/false);
} }
@ -183,9 +185,7 @@ TEST_F(QualityScalingTest, AdaptsDownForLowStartBitrate_Vp8) {
// qp_low:1, qp_high:127 -> kNormalQp // qp_low:1, qp_high:127 -> kNormalQp
test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {true}, kLowStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {true}, kLowStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
@ -193,9 +193,7 @@ TEST_F(QualityScalingTest, NoAdaptDownForLowStartBitrate_Simulcast) {
// qp_low:1, qp_high:127 -> kNormalQp // qp_low:1, qp_high:127 -> kNormalQp
test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {true, true}, kLowStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {true, true}, kLowStartBps,
/*automatic_resize=*/false, /*expect_adaptation=*/false); /*automatic_resize=*/false, /*expect_adaptation=*/false);
} }
@ -204,9 +202,7 @@ TEST_F(QualityScalingTest,
// qp_low:1, qp_high:127 -> kNormalQp // qp_low:1, qp_high:127 -> kNormalQp
test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {false, false, true}, kLowStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {false, false, true}, kLowStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
@ -215,9 +211,7 @@ TEST_F(QualityScalingTest,
// qp_low:1, qp_high:127 -> kNormalQp // qp_low:1, qp_high:127 -> kNormalQp
test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {true, false, false}, kLowStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {true, false, false}, kLowStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/false); /*automatic_resize=*/true, /*expect_adaptation=*/false);
} }
@ -225,9 +219,7 @@ TEST_F(QualityScalingTest, NoAdaptDownForLowStartBitrateIfScalingOff_Vp8) {
// qp_low:1, qp_high:127 -> kNormalQp // qp_low:1, qp_high:127 -> kNormalQp
test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "1,127,0,0,0,0" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP8", {true}, kLowStartBps,
[]() { return VP8Encoder::Create(); });
RunTest(&encoder_factory, "VP8", {true}, kLowStartBps,
/*automatic_resize=*/false, /*expect_adaptation=*/false); /*automatic_resize=*/false, /*expect_adaptation=*/false);
} }
@ -236,9 +228,7 @@ TEST_F(QualityScalingTest, AdaptsDownForHighQp_Vp9) {
test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,1,0,0" + kEnd + test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,1,0,0" + kEnd +
"WebRTC-VP9QualityScaler/Enabled/"); "WebRTC-VP9QualityScaler/Enabled/");
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP9", {true}, kHighStartBps,
[]() { return VP9Encoder::Create(); });
RunTest(&encoder_factory, "VP9", {true}, kHighStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
@ -247,9 +237,7 @@ TEST_F(QualityScalingTest, NoAdaptDownForHighQpIfScalingOff_Vp9) {
test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,1,0,0" + kEnd + test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,1,0,0" + kEnd +
"WebRTC-VP9QualityScaler/Disabled/"); "WebRTC-VP9QualityScaler/Disabled/");
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP9", {true}, kHighStartBps,
[]() { return VP9Encoder::Create(); });
RunTest(&encoder_factory, "VP9", {true}, kHighStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/false); /*automatic_resize=*/true, /*expect_adaptation=*/false);
} }
@ -258,9 +246,7 @@ TEST_F(QualityScalingTest, AdaptsDownForLowStartBitrate_Vp9) {
test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,255,0,0" + kEnd + test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,255,0,0" + kEnd +
"WebRTC-VP9QualityScaler/Enabled/"); "WebRTC-VP9QualityScaler/Enabled/");
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP9", {true}, kLowStartBps,
[]() { return VP9Encoder::Create(); });
RunTest(&encoder_factory, "VP9", {true}, kLowStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
@ -270,9 +256,7 @@ TEST_F(QualityScalingTest,
test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,255,0,0" + kEnd + test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,255,0,0" + kEnd +
"WebRTC-VP9QualityScaler/Enabled/"); "WebRTC-VP9QualityScaler/Enabled/");
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP9", {true, false, false}, kLowStartBps,
[]() { return VP9Encoder::Create(); });
RunTest(&encoder_factory, "VP9", {true, false, false}, kLowStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/false); /*automatic_resize=*/true, /*expect_adaptation=*/false);
} }
@ -282,9 +266,7 @@ TEST_F(QualityScalingTest,
test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,255,0,0" + kEnd + test::ScopedFieldTrials field_trials(kPrefix + "0,0,1,255,0,0" + kEnd +
"WebRTC-VP9QualityScaler/Enabled/"); "WebRTC-VP9QualityScaler/Enabled/");
test::FunctionVideoEncoderFactory encoder_factory( RunTest("VP9", {false, true, false}, kLowStartBps,
[]() { return VP9Encoder::Create(); });
RunTest(&encoder_factory, "VP9", {false, true, false}, kLowStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
@ -293,9 +275,7 @@ TEST_F(QualityScalingTest, AdaptsDownForHighQp_H264) {
// qp_low:1, qp_high:1 -> kHighQp // qp_low:1, qp_high:1 -> kHighQp
test::ScopedFieldTrials field_trials(kPrefix + "0,0,0,0,1,1" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "0,0,0,0,1,1" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("H264", {true}, kHighStartBps,
[]() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
RunTest(&encoder_factory, "H264", {true}, kHighStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
@ -303,9 +283,7 @@ TEST_F(QualityScalingTest, AdaptsDownForLowStartBitrate_H264) {
// qp_low:1, qp_high:51 -> kNormalQp // qp_low:1, qp_high:51 -> kNormalQp
test::ScopedFieldTrials field_trials(kPrefix + "0,0,0,0,1,51" + kEnd); test::ScopedFieldTrials field_trials(kPrefix + "0,0,0,0,1,51" + kEnd);
test::FunctionVideoEncoderFactory encoder_factory( RunTest("H264", {true}, kLowStartBps,
[]() { return H264Encoder::Create(cricket::VideoCodec("H264")); });
RunTest(&encoder_factory, "H264", {true}, kLowStartBps,
/*automatic_resize=*/true, /*expect_adaptation=*/true); /*automatic_resize=*/true, /*expect_adaptation=*/true);
} }
#endif // defined(WEBRTC_USE_H264) #endif // defined(WEBRTC_USE_H264)