admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Inject network state predictor into video quality test.

Browse Source 
Bug: webrtc:10492
Change-Id: Ia2ae5de1019ac4ab89e54e261b1d94a482334ee9
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/133161
Reviewed-by: Artem Titov <titovartem@webrtc.org>
Reviewed-by: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Per Kjellander <perkj@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Ying Wang <yinwa@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27681}
This commit is contained in:
Ying Wang 2019-04-16 11:12:49 +02:00 committed by Commit Bot
parent 2317c5ee0a
commit cab77fd1be
4 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/test/video_quality_test_fixture.h
View File

@ -19,6 +19,7 @@
#include "api/bitrate_constraints.h" #include "api/bitrate_constraints.h"
#include "api/fec_controller.h" #include "api/fec_controller.h"
#include "api/media_types.h" #include "api/media_types.h"
#include "api/network_state_predictor.h"
#include "api/test/simulated_network.h" #include "api/test/simulated_network.h"
#include "api/video_codecs/video_encoder_config.h" #include "api/video_codecs/video_encoder_config.h"
@ -120,6 +121,8 @@ class VideoQualityTestFixtureInterface {
std::unique_ptr<NetworkBehaviorInterface> receiver_network; std::unique_ptr<NetworkBehaviorInterface> receiver_network;
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory; std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory;
std::unique_ptr<NetworkStatePredictorFactoryInterface>
network_state_predictor_factory;
}; };
virtual ~VideoQualityTestFixtureInterface() = default; virtual ~VideoQualityTestFixtureInterface() = default;

5
test/call_test.cc
View File

@ -215,7 +215,10 @@ void CallTest::CreateSenderCall() {
} }
void CallTest::CreateSenderCall(const Call::Config& config) { 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) { void CallTest::CreateReceiverCall(const Call::Config& config) {

2
test/call_test.h
View File

@ -200,6 +200,8 @@ class CallTest : public ::testing::Test {
DegradationPreference::MAINTAIN_FRAMERATE; DegradationPreference::MAINTAIN_FRAMERATE;
std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory_; std::unique_ptr<FecControllerFactoryInterface> fec_controller_factory_;
std::unique_ptr<NetworkStatePredictorFactoryInterface>
network_state_predictor_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

@ -361,6 +361,8 @@ VideoQualityTest::VideoQualityTest(
fec_controller_factory_ = fec_controller_factory_ =
std::move(injection_components_->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() VideoQualityTest::Params::Params()