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

Replace Thread::Invoke with Thread::BlockingCall

Browse Source 
BlockingCall doesn't take rtc::Location parameter and thus most of the dependencies on location can be removed

Bug: webrtc:11318
Change-Id: I91a17e342dd9a9e3e2c8f7fbe267474c98a8d0e5
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/274620
Reviewed-by: Tomas Gunnarsson <tommi@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38045}
This commit is contained in:
Danil Chapovalov
2022-09-08 18:38:10 +02:00
committed by WebRTC LUCI CQ
parent b190ca9e70
commit 9e09a1f327
54 changed files with 209 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pc/legacy_stats_collector.cc
View File

@ -46,7 +46,6 @@
#include "pc/transport_stats.h"
#include "rtc_base/checks.h"
#include "rtc_base/ip_address.h"
#include "rtc_base/location.h"
#include "rtc_base/logging.h"
#include "rtc_base/rtc_certificate.h"
#include "rtc_base/socket_address.h"
@ -861,9 +860,9 @@ std::map<std::string, std::string> LegacyStatsCollector::ExtractSessionInfo() {
SessionStats stats;
auto transceivers = pc_->GetTransceiversInternal();
pc_->network_thread()->Invoke<void>(
RTC_FROM_HERE, [&, sctp_transport_name = pc_->sctp_transport_name(),
sctp_mid = pc_->sctp_mid()]() mutable {
pc_->network_thread()->BlockingCall(
[&, sctp_transport_name = pc_->sctp_transport_name(),
sctp_mid = pc_->sctp_mid()]() mutable {
stats = ExtractSessionInfo_n(
transceivers, std::move(sctp_transport_name), std::move(sctp_mid));
});
@ -1049,7 +1048,7 @@ void LegacyStatsCollector::ExtractBweInfo() {
}
if (!video_media_channels.empty()) {
pc_->worker_thread()->Invoke<void>(RTC_FROM_HERE, [&] {
pc_->worker_thread()->BlockingCall([&] {
for (const auto& channel : video_media_channels) {
channel->FillBitrateInfo(&bwe_info);
}
@ -1200,7 +1199,7 @@ void LegacyStatsCollector::ExtractMediaInfo(
}
}
pc_->worker_thread()->Invoke<void>(RTC_FROM_HERE, [&] {
pc_->worker_thread()->BlockingCall([&] {
rtc::Thread::ScopedDisallowBlockingCalls no_blocking_calls;
// Populate `receiver_track_id_by_ssrc` for the gatherers.
int i = 0;