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 <nisse@webrtc.org> > Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> > 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 <danilchap@webrtc.org> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/master@{#27383}
This commit is contained in:

committed by
Commit Bot

parent
90705cbc41
commit
c42f1a764d
14
call/call.cc
14
call/call.cc
@ -424,20 +424,16 @@ std::string Call::Stats::ToString(int64_t time_ms) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Call* Call::Create(const Call::Config& config) {
|
Call* Call::Create(const Call::Config& config) {
|
||||||
return Create(config, Clock::GetRealTimeClock(),
|
return Create(
|
||||||
ProcessThread::Create("PacerThread"),
|
config, Clock::GetRealTimeClock(), ProcessThread::Create("PacerThread"),
|
||||||
ProcessThread::Create("ModuleProcessThread"));
|
ProcessThread::Create("ModuleProcessThread"), &GlobalTaskQueueFactory());
|
||||||
}
|
}
|
||||||
|
|
||||||
Call* Call::Create(const Call::Config& config,
|
Call* Call::Create(const Call::Config& config,
|
||||||
Clock* clock,
|
Clock* clock,
|
||||||
std::unique_ptr<ProcessThread> call_thread,
|
std::unique_ptr<ProcessThread> call_thread,
|
||||||
std::unique_ptr<ProcessThread> pacer_thread) {
|
std::unique_ptr<ProcessThread> pacer_thread,
|
||||||
// TODO(bugs.webrtc.org/10284): DCHECK task_queue_factory dependency is
|
TaskQueueFactory* task_queue_factory) {
|
||||||
// always provided in the config.
|
|
||||||
TaskQueueFactory* task_queue_factory = config.task_queue_factory
|
|
||||||
? config.task_queue_factory
|
|
||||||
: &GlobalTaskQueueFactory();
|
|
||||||
return new internal::Call(
|
return new internal::Call(
|
||||||
clock, config,
|
clock, config,
|
||||||
absl::make_unique<RtpTransportControllerSend>(
|
absl::make_unique<RtpTransportControllerSend>(
|
||||||
|
@ -16,6 +16,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
#include "api/media_types.h"
|
#include "api/media_types.h"
|
||||||
|
#include "api/task_queue/task_queue_factory.h"
|
||||||
#include "call/audio_receive_stream.h"
|
#include "call/audio_receive_stream.h"
|
||||||
#include "call/audio_send_stream.h"
|
#include "call/audio_send_stream.h"
|
||||||
#include "call/call_config.h"
|
#include "call/call_config.h"
|
||||||
@ -53,7 +54,8 @@ class Call {
|
|||||||
static Call* Create(const Call::Config& config,
|
static Call* Create(const Call::Config& config,
|
||||||
Clock* clock,
|
Clock* clock,
|
||||||
std::unique_ptr<ProcessThread> call_thread,
|
std::unique_ptr<ProcessThread> call_thread,
|
||||||
std::unique_ptr<ProcessThread> pacer_thread);
|
std::unique_ptr<ProcessThread> pacer_thread,
|
||||||
|
TaskQueueFactory* task_queue_factory);
|
||||||
|
|
||||||
virtual AudioSendStream* CreateAudioSendStream(
|
virtual AudioSendStream* CreateAudioSendStream(
|
||||||
const AudioSendStream::Config& config) = 0;
|
const AudioSendStream::Config& config) = 0;
|
||||||
|
@ -13,7 +13,6 @@
|
|||||||
#include "api/bitrate_constraints.h"
|
#include "api/bitrate_constraints.h"
|
||||||
#include "api/fec_controller.h"
|
#include "api/fec_controller.h"
|
||||||
#include "api/rtc_error.h"
|
#include "api/rtc_error.h"
|
||||||
#include "api/task_queue/task_queue_factory.h"
|
|
||||||
#include "api/transport/network_control.h"
|
#include "api/transport/network_control.h"
|
||||||
#include "call/audio_state.h"
|
#include "call/audio_state.h"
|
||||||
|
|
||||||
@ -46,9 +45,6 @@ struct CallConfig {
|
|||||||
// FecController to use for this call.
|
// FecController to use for this call.
|
||||||
FecControllerFactoryInterface* fec_controller_factory = nullptr;
|
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.
|
// Network controller factory to use for this call.
|
||||||
NetworkControllerFactoryInterface* network_controller_factory = nullptr;
|
NetworkControllerFactoryInterface* network_controller_factory = nullptr;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user