From cab77fd1be4e88f622e588feaac67e45365ef573 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Tue, 16 Apr 2019 11:12:49 +0200 Subject: [PATCH] Inject network state predictor into video quality test. Bug: webrtc:10492 Change-Id: Ia2ae5de1019ac4ab89e54e261b1d94a482334ee9 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133161 Reviewed-by: Artem Titov Reviewed-by: Sebastian Jansson Reviewed-by: Per Kjellander Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Ying Wang Cr-Commit-Position: refs/heads/master@{#27681} --- api/test/video_quality_test_fixture.h | 3 +++ test/call_test.cc | 5 ++++- test/call_test.h | 2 ++ video/video_quality_test.cc | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/api/test/video_quality_test_fixture.h b/api/test/video_quality_test_fixture.h index 570e406230..e563c513d4 100644 --- a/api/test/video_quality_test_fixture.h +++ b/api/test/video_quality_test_fixture.h @@ -19,6 +19,7 @@ #include "api/bitrate_constraints.h" #include "api/fec_controller.h" #include "api/media_types.h" +#include "api/network_state_predictor.h" #include "api/test/simulated_network.h" #include "api/video_codecs/video_encoder_config.h" @@ -120,6 +121,8 @@ class VideoQualityTestFixtureInterface { std::unique_ptr receiver_network; std::unique_ptr fec_controller_factory; + std::unique_ptr + network_state_predictor_factory; }; virtual ~VideoQualityTestFixtureInterface() = default; diff --git a/test/call_test.cc b/test/call_test.cc index 8d8a9d3853..8c9a62ffc9 100644 --- a/test/call_test.cc +++ b/test/call_test.cc @@ -215,7 +215,10 @@ void CallTest::CreateSenderCall() { } void CallTest::CreateSenderCall(const Call::Config& config) { - sender_call_.reset(Call::Create(config)); + auto sender_config = config; + sender_config.network_state_predictor_factory = + network_state_predictor_factory_.get(); + sender_call_.reset(Call::Create(sender_config)); } void CallTest::CreateReceiverCall(const Call::Config& config) { diff --git a/test/call_test.h b/test/call_test.h index dcdb03b2a1..99f37c5280 100644 --- a/test/call_test.h +++ b/test/call_test.h @@ -200,6 +200,8 @@ class CallTest : public ::testing::Test { DegradationPreference::MAINTAIN_FRAMERATE; std::unique_ptr fec_controller_factory_; + std::unique_ptr + network_state_predictor_factory_; test::FunctionVideoEncoderFactory fake_encoder_factory_; int fake_encoder_max_bitrate_ = -1; diff --git a/video/video_quality_test.cc b/video/video_quality_test.cc index 10f9699601..1b13980e18 100644 --- a/video/video_quality_test.cc +++ b/video/video_quality_test.cc @@ -361,6 +361,8 @@ VideoQualityTest::VideoQualityTest( fec_controller_factory_ = std::move(injection_components_->fec_controller_factory); + network_state_predictor_factory_ = + std::move(injection_components_->network_state_predictor_factory); } VideoQualityTest::Params::Params()