diff --git a/call/call.cc b/call/call.cc index e458c48391..3f7ef5ff22 100644 --- a/call/call.cc +++ b/call/call.cc @@ -424,20 +424,16 @@ std::string Call::Stats::ToString(int64_t time_ms) const { } Call* Call::Create(const Call::Config& config) { - return Create(config, Clock::GetRealTimeClock(), - ProcessThread::Create("PacerThread"), - ProcessThread::Create("ModuleProcessThread")); + return Create( + config, Clock::GetRealTimeClock(), ProcessThread::Create("PacerThread"), + ProcessThread::Create("ModuleProcessThread"), &GlobalTaskQueueFactory()); } Call* Call::Create(const Call::Config& config, Clock* clock, std::unique_ptr call_thread, - std::unique_ptr pacer_thread) { - // TODO(bugs.webrtc.org/10284): DCHECK task_queue_factory dependency is - // always provided in the config. - TaskQueueFactory* task_queue_factory = config.task_queue_factory - ? config.task_queue_factory - : &GlobalTaskQueueFactory(); + std::unique_ptr pacer_thread, + TaskQueueFactory* task_queue_factory) { return new internal::Call( clock, config, absl::make_unique( diff --git a/call/call.h b/call/call.h index 1c29feec0f..90977dab2c 100644 --- a/call/call.h +++ b/call/call.h @@ -16,6 +16,7 @@ #include #include "api/media_types.h" +#include "api/task_queue/task_queue_factory.h" #include "call/audio_receive_stream.h" #include "call/audio_send_stream.h" #include "call/call_config.h" @@ -53,7 +54,8 @@ class Call { static Call* Create(const Call::Config& config, Clock* clock, std::unique_ptr call_thread, - std::unique_ptr pacer_thread); + std::unique_ptr pacer_thread, + TaskQueueFactory* task_queue_factory); virtual AudioSendStream* CreateAudioSendStream( const AudioSendStream::Config& config) = 0; diff --git a/call/call_config.h b/call/call_config.h index eaac16b317..260a3accdd 100644 --- a/call/call_config.h +++ b/call/call_config.h @@ -13,7 +13,6 @@ #include "api/bitrate_constraints.h" #include "api/fec_controller.h" #include "api/rtc_error.h" -#include "api/task_queue/task_queue_factory.h" #include "api/transport/network_control.h" #include "call/audio_state.h" @@ -46,9 +45,6 @@ struct CallConfig { // FecController to use for this call. FecControllerFactoryInterface* fec_controller_factory = nullptr; - // Task Queue Factory to be used in this call. - TaskQueueFactory* task_queue_factory = nullptr; - // Network controller factory to use for this call. NetworkControllerFactoryInterface* network_controller_factory = nullptr; };