diff options
Diffstat (limited to 'test/scenario/call_client.cc')
| -rw-r--r-- | test/scenario/call_client.cc | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/test/scenario/call_client.cc b/test/scenario/call_client.cc index 3c306675a3..4ae0a640fa 100644 --- a/test/scenario/call_client.cc +++ b/test/scenario/call_client.cc @@ -16,6 +16,8 @@ #include "api/rtc_event_log/rtc_event_log.h" #include "api/rtc_event_log/rtc_event_log_factory.h" #include "api/transport/network_types.h" +#include "call/call.h" +#include "call/rtp_transport_controller_send_factory.h" #include "modules/audio_mixer/audio_mixer_impl.h" #include "modules/rtp_rtcp/source/rtp_util.h" @@ -57,8 +59,7 @@ Call* CreateCall(TimeController* time_controller, RtcEventLog* event_log, CallClientConfig config, LoggingNetworkControllerFactory* network_controller_factory, - rtc::scoped_refptr<AudioState> audio_state, - rtc::scoped_refptr<SharedModuleThread> call_thread) { + rtc::scoped_refptr<AudioState> audio_state) { CallConfig call_config(event_log); call_config.bitrate_config.max_bitrate_bps = config.transport.rates.max_rate.bps_or(-1); @@ -70,9 +71,10 @@ Call* CreateCall(TimeController* time_controller, call_config.network_controller_factory = network_controller_factory; call_config.audio_state = audio_state; call_config.trials = config.field_trials; - return Call::Create(call_config, time_controller->GetClock(), - std::move(call_thread), - time_controller->CreateProcessThread("Pacer")); + Clock* clock = time_controller->GetClock(); + return Call::Create(call_config, clock, + RtpTransportControllerSendFactory().Create( + call_config.ExtractTransportConfig(), clock)); } std::unique_ptr<RtcEventLog> CreateEventLog( @@ -222,14 +224,10 @@ CallClient::CallClient( event_log_ = CreateEventLog(time_controller_->GetTaskQueueFactory(), log_writer_factory_.get()); fake_audio_setup_ = InitAudio(time_controller_); - RTC_DCHECK(!module_thread_); - module_thread_ = SharedModuleThread::Create( - time_controller_->CreateProcessThread("CallThread"), - [this]() { module_thread_ = nullptr; }); call_.reset(CreateCall(time_controller_, event_log_.get(), config, &network_controller_factory_, - fake_audio_setup_.audio_state, module_thread_)); + fake_audio_setup_.audio_state)); transport_ = std::make_unique<NetworkNodeTransport>(clock_, call_.get()); }); } @@ -237,7 +235,6 @@ CallClient::CallClient( CallClient::~CallClient() { SendTask([&] { call_.reset(); - RTC_DCHECK(!module_thread_); // Should be set to null in the lambda above. fake_audio_setup_ = {}; rtc::Event done; event_log_->StopLogging([&done] { done.Set(); }); |