zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Move TaskQueueFactory from Call::Create parameter to CallConfig"

Browse Source 
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:
Danil Chapovalov
2019-04-01 08:40:56 +00:00
committed by Commit Bot
parent 90705cbc41
commit c42f1a764d
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
call/call.cc
View File

@ -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<ProcessThread> call_thread,
std::unique_ptr<ProcessThread> 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<ProcessThread> pacer_thread,
TaskQueueFactory* task_queue_factory) {
return new internal::Call(
clock, config,
absl::make_unique<RtpTransportControllerSend>(