mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-17 07:37:51 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allows injection of network controller factory in test fixture.

Browse source 
Bug: webrtc:9155
Change-Id: I929c4cde66ad6743b4a8df2df3abfa7593992977
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134645
Reviewed-by: Stefan Holmer <stefan@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27843}
This commit is contained in:
Sebastian Jansson 2019-04-30 14:23:51 +02:00 committed by Commit Bot
parent 6cb6f08b13
commit 1391ed242a
5 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
api/BUILD.gn
View file

@ -196,6 +196,7 @@ rtc_source_set("video_quality_test_fixture_api") {
"../call:rtp_interfaces", "../call:rtp_interfaces",
"../test:test_common", "../test:test_common",
"../test:video_test_common", "../test:video_test_common",
"transport:network_control",
"video_codecs:video_codecs_api", "video_codecs:video_codecs_api",
] ]
} }

3
api/test/video_quality_test_fixture.h
View file

@ -21,6 +21,7 @@
#include "api/media_types.h" #include "api/media_types.h"
#include "api/network_state_predictor.h" #include "api/network_state_predictor.h"
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/transport/network_control.h"
#include "api/video_codecs/video_encoder_config.h" #include "api/video_codecs/video_encoder_config.h"
namespace webrtc { namespace webrtc {
@ -123,6 +124,8 @@ class VideoQualityTestFixtureInterface {
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory; std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory;
std::unique_ptr<NetworkStatePredictorFactoryInterface> std::unique_ptr<NetworkStatePredictorFactoryInterface>
network_state_predictor_factory; network_state_predictor_factory;
std::unique_ptr<NetworkControllerFactoryInterface>
network_controller_factory;
}; };
virtual ~VideoQualityTestFixtureInterface() = default; virtual ~VideoQualityTestFixtureInterface() = default;

1
test/call_test.cc
View file

@ -220,6 +220,7 @@ void CallTest::CreateSenderCall(const Call::Config& config) {
auto sender_config = config; auto sender_config = config;
sender_config.network_state_predictor_factory = sender_config.network_state_predictor_factory =
network_state_predictor_factory_.get(); network_state_predictor_factory_.get();
sender_config.network_controller_factory = network_controller_factory_.get();
sender_call_.reset(Call::Create(sender_config)); sender_call_.reset(Call::Create(sender_config));
} }

2
test/call_test.h
View file

@ -204,6 +204,8 @@ class CallTest : public ::testing::Test {
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory_; std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory_;
std::unique_ptr<NetworkStatePredictorFactoryInterface> std::unique_ptr<NetworkStatePredictorFactoryInterface>
network_state_predictor_factory_; network_state_predictor_factory_;
std::unique_ptr<NetworkControllerFactoryInterface>
network_controller_factory_;
test::FunctionVideoEncoderFactory fake_encoder_factory_; test::FunctionVideoEncoderFactory fake_encoder_factory_;
int fake_encoder_max_bitrate_ = -1; int fake_encoder_max_bitrate_ = -1;

2
video/video_quality_test.cc
View file

@ -363,6 +363,8 @@ VideoQualityTest::VideoQualityTest(
std::move(injection_components_->fec_controller_factory); std::move(injection_components_->fec_controller_factory);
network_state_predictor_factory_ = network_state_predictor_factory_ =
std::move(injection_components_->network_state_predictor_factory); std::move(injection_components_->network_state_predictor_factory);
network_controller_factory_ =
std::move(injection_components_->network_controller_factory);
} }
VideoQualityTest::Params::Params() VideoQualityTest::Params::Params()