From c42f1a764d66e40a5dcf1a14bc4f01ae4ae0014b Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 1 Apr 2019 08:40:56 +0000 Subject: [PATCH] Revert "Move TaskQueueFactory from Call::Create parameter to CallConfig" This reverts commit 90705cbc414286806a39f715634d90c161ac9bb3. Reason for revert: failed to compile due to conflict with another recent change Original change's description: > Move TaskQueueFactory from Call::Create parameter to CallConfig > > to decouple it from other optional parameters > and with plan to make it mandatory > > Bug: webrtc:10284 > Change-Id: I1224abd90d8e06e0ee2d2baaa6d0fd54f8caad2b > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130470 > Reviewed-by: Niels Moller > Commit-Queue: Danil Chapovalov > Cr-Commit-Position: refs/heads/master@{#27382} TBR=danilchap@webrtc.org,nisse@webrtc.org Change-Id: Ibe70f191d35f72e0373e49e5300d765b88d02db0 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:10284 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/130472 Reviewed-by: Danil Chapovalov Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/master@{#27383} --- call/call.cc | 14 +++++--------- call/call.h | 4 +++- call/call_config.h | 4 ---- 3 files changed, 8 insertions(+), 14 deletions(-) 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; };