| Index: webrtc/api/rtcstatscollector.cc
|
| diff --git a/webrtc/api/rtcstatscollector.cc b/webrtc/api/rtcstatscollector.cc
|
| index f1c7ed7e1acb1ae773753d9586c55a3f07c132e8..d42d0e4fdc67f65f5f6af05bf80a0e66e1c9ca24 100644
|
| --- a/webrtc/api/rtcstatscollector.cc
|
| +++ b/webrtc/api/rtcstatscollector.cc
|
| @@ -415,17 +415,8 @@ void RTCStatsCollector::GetStatsReport(
|
| // necessarily monotonically increasing.
|
| int64_t timestamp_us = rtc::TimeUTCMicros();
|
|
|
| - num_pending_partial_reports_ = 3;
|
| + num_pending_partial_reports_ = 2;
|
| partial_report_timestamp_us_ = cache_now_us;
|
| - invoker_.AsyncInvoke<void>(RTC_FROM_HERE, signaling_thread_,
|
| - rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnSignalingThread,
|
| - rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
|
| -
|
| - // TODO(hbos): No stats are gathered by
|
| - // |ProducePartialResultsOnWorkerThread|, remove it.
|
| - invoker_.AsyncInvoke<void>(RTC_FROM_HERE, worker_thread_,
|
| - rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnWorkerThread,
|
| - rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
|
|
|
| // Prepare |channel_names_| and |media_info_| for use in
|
| // |ProducePartialResultsOnNetworkThread|.
|
| @@ -446,9 +437,11 @@ void RTCStatsCollector::GetStatsReport(
|
| pc_->session()->data_channel()->transport_name()));
|
| }
|
| media_info_.reset(PrepareMediaInfo_s().release());
|
| +
|
| invoker_.AsyncInvoke<void>(RTC_FROM_HERE, network_thread_,
|
| rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnNetworkThread,
|
| rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
|
| + ProducePartialResultsOnSignalingThread(timestamp_us);
|
| }
|
| }
|
|
|
| @@ -481,18 +474,6 @@ void RTCStatsCollector::ProducePartialResultsOnSignalingThread(
|
| AddPartialResults(report);
|
| }
|
|
|
| -void RTCStatsCollector::ProducePartialResultsOnWorkerThread(
|
| - int64_t timestamp_us) {
|
| - RTC_DCHECK(worker_thread_->IsCurrent());
|
| - rtc::scoped_refptr<RTCStatsReport> report = RTCStatsReport::Create(
|
| - timestamp_us);
|
| -
|
| - // TODO(hbos): There are no stats to be gathered on this thread, remove this
|
| - // method.
|
| -
|
| - AddPartialResults(report);
|
| -}
|
| -
|
| void RTCStatsCollector::ProducePartialResultsOnNetworkThread(
|
| int64_t timestamp_us) {
|
| RTC_DCHECK(network_thread_->IsCurrent());
|
|
|