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

Revert "Delete rtc::TaskQueue::Current in favor of webrtc::TaskQueueBase::Current"

Browse Source 
This reverts commit 304e9d2df347630d71fd4423f5971f30dac73e41.

Reason for revert: Breaks downstream projects.
Seems to make VideoSendStreamTest.SupportsFlexfecSimulcastVp8 flaky.

Original change's description:
> Delete rtc::TaskQueue::Current in favor of webrtc::TaskQueueBase::Current
> 
> Bug: webrtc:10191
> Change-Id: I506cc50a90c73a6a4f6a3de36de0999cca72f5ba
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126230
> Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
> Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
> Cr-Commit-Position: refs/heads/master@{#27035}

TBR=danilchap@webrtc.org,kwiberg@webrtc.org

Change-Id: If98324f88e4b3d18bf2fe33597dfb9711867c243
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:10191
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/126484
Reviewed-by: Yves Gerey <yvesg@webrtc.org>
Commit-Queue: Yves Gerey <yvesg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27041}
This commit is contained in:
Yves Gerey
2019-03-08 16:14:47 +00:00
committed by Commit Bot
parent cad95b831e
commit 42d8c93ec3
14 changed files with 49 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rtc_base/task_queue.cc
View File

@ -16,7 +16,9 @@ namespace rtc {
TaskQueue::TaskQueue(
std::unique_ptr<webrtc::TaskQueueBase, webrtc::TaskQueueDeleter> task_queue)
: impl_(task_queue.release()) {}
: impl_(task_queue.release()) {
impl_->task_queue_ = this;
}
TaskQueue::TaskQueue(const char* queue_name, Priority priority)
: TaskQueue(webrtc::GlobalTaskQueueFactory().CreateTaskQueue(queue_name,
@ -30,8 +32,17 @@ TaskQueue::~TaskQueue() {
impl_->Delete();
}
// static
TaskQueue* TaskQueue::Current() {
webrtc::TaskQueueBase* impl = webrtc::TaskQueueBase::Current();
if (impl == nullptr) {
return nullptr;
}
return impl->task_queue_;
}
bool TaskQueue::IsCurrent() const {
return impl_->IsCurrent();
return Current() == this;
}
void TaskQueue::PostTask(std::unique_ptr<QueuedTask> task) {