Revert of Wire up BWE stats through WebrtcSession so that they are filled in both for audio and video calls.

webrtc/pc/rtcstatscollector.cc

 /*
  *  Copyright 2016 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 634 matching lines @@
     }
     // Prepare |track_media_info_map_| for use in
     // |ProducePartialResultsOnNetworkThread| and
     // |ProducePartialResultsOnSignalingThread|.
     track_media_info_map_.reset(PrepareTrackMediaInfoMap_s().release());
     // Prepare |track_to_id_| for use in |ProducePartialResultsOnNetworkThread|.
     // This avoids a possible deadlock if |MediaStreamTrackInterface::id| is
     // implemented to invoke on the signaling thread.
     track_to_id_ = PrepareTrackToID_s();
 
-    // Prepare |call_stats_| here since GetCallStats() will hop to the worker
-    // thread.
-    // TODO(holmer): To avoid the hop we could move BWE and BWE stats to the
-    // network thread, where it more naturally belongs.
-    call_stats_ = pc_->session()->GetCallStats();
-
-    invoker_.AsyncInvoke<void>(
-        RTC_FROM_HERE, network_thread_,
+    invoker_.AsyncInvoke<void>(RTC_FROM_HERE, network_thread_,
         rtc::Bind(&RTCStatsCollector::ProducePartialResultsOnNetworkThread,
-                  rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
+            rtc::scoped_refptr<RTCStatsCollector>(this), timestamp_us));
     ProducePartialResultsOnSignalingThread(timestamp_us);
   }
 }
 
 void RTCStatsCollector::ClearCachedStatsReport() {
   RTC_DCHECK(signaling_thread_->IsCurrent());
   cached_report_ = nullptr;
 }
 
 void RTCStatsCollector::WaitForPendingRequest() {
@@ skipping 29 matching lines @@
   std::unique_ptr<SessionStats> session_stats =
       pc_->session()->GetStats(*channel_name_pairs_);
   if (session_stats) {
     std::map<std::string, CertificateStatsPair> transport_cert_stats =
         PrepareTransportCertificateStats_n(*session_stats);
 
     ProduceCertificateStats_n(
         timestamp_us, transport_cert_stats, report.get());
     ProduceCodecStats_n(
         timestamp_us, *track_media_info_map_, report.get());
-    ProduceIceCandidateAndPairStats_n(timestamp_us, *session_stats,
-                                      track_media_info_map_->video_media_info(),
-                                      call_stats_, report.get());
+    ProduceIceCandidateAndPairStats_n(
+        timestamp_us, *session_stats, track_media_info_map_->video_media_info(),
+        report.get());
     ProduceRTPStreamStats_n(
         timestamp_us, *session_stats, *track_media_info_map_, report.get());
     ProduceTransportStats_n(
         timestamp_us, *session_stats, transport_cert_stats, report.get());
   }
 
   AddPartialResults(report);
 }
 
 void RTCStatsCollector::AddPartialResults(
@@ skipping 108 matching lines @@
         DataStateToRTCDataChannelState(data_channel->state());
     data_channel_stats->messages_sent = data_channel->messages_sent();
     data_channel_stats->bytes_sent = data_channel->bytes_sent();
     data_channel_stats->messages_received = data_channel->messages_received();
     data_channel_stats->bytes_received = data_channel->bytes_received();
     report->AddStats(std::move(data_channel_stats));
   }
 }
 
 void RTCStatsCollector::ProduceIceCandidateAndPairStats_n(
-    int64_t timestamp_us,
-    const SessionStats& session_stats,
-    const cricket::VideoMediaInfo* video_media_info,
-    const Call::Stats& call_stats,
-    RTCStatsReport* report) const {
+      int64_t timestamp_us, const SessionStats& session_stats,
+      const cricket::VideoMediaInfo* video_media_info,
+      RTCStatsReport* report) const {
   RTC_DCHECK(network_thread_->IsCurrent());
   for (const auto& transport_stats : session_stats.transport_stats) {
     for (const auto& channel_stats : transport_stats.second.channel_stats) {
       std::string transport_id = RTCTransportStatsIDFromTransportChannel(
           transport_stats.second.transport_name, channel_stats.component);
       for (const cricket::ConnectionInfo& info :
            channel_stats.connection_infos) {
         std::unique_ptr<RTCIceCandidatePairStats> candidate_pair_stats(
             new RTCIceCandidatePairStats(
                 RTCIceCandidatePairStatsIDFromConnectionInfo(info),
@@ skipping 21 matching lines @@
         candidate_pair_stats->bytes_received =
             static_cast<uint64_t>(info.recv_total_bytes);
         candidate_pair_stats->total_round_trip_time =
             static_cast<double>(info.total_round_trip_time_ms) /
             rtc::kNumMillisecsPerSec;
         if (info.current_round_trip_time_ms) {
           candidate_pair_stats->current_round_trip_time =
               static_cast<double>(*info.current_round_trip_time_ms) /
               rtc::kNumMillisecsPerSec;
         }
-        if (info.best_connection) {
+        if (info.best_connection && video_media_info &&
+            !video_media_info->bw_estimations.empty()) {
           // The bandwidth estimations we have are for the selected candidate
           // pair ("info.best_connection").
-          RTC_DCHECK_GE(call_stats.send_bandwidth_bps, 0);
-          RTC_DCHECK_GE(call_stats.recv_bandwidth_bps, 0);
-          if (call_stats.send_bandwidth_bps > 0) {
+          RTC_DCHECK_EQ(video_media_info->bw_estimations.size(), 1);
+          RTC_DCHECK_GE(
+              video_media_info->bw_estimations[0].available_send_bandwidth, 0);
+          RTC_DCHECK_GE(
+              video_media_info->bw_estimations[0].available_recv_bandwidth, 0);
+          if (video_media_info->bw_estimations[0].available_send_bandwidth) {
             candidate_pair_stats->available_outgoing_bitrate =
-                static_cast<double>(call_stats.send_bandwidth_bps);
+                static_cast<double>(video_media_info->bw_estimations[0]
+                                        .available_send_bandwidth);
           }
-          if (call_stats.recv_bandwidth_bps > 0) {
+          if (video_media_info->bw_estimations[0].available_recv_bandwidth) {
             candidate_pair_stats->available_incoming_bitrate =
-                static_cast<double>(call_stats.recv_bandwidth_bps);
+                static_cast<double>(video_media_info->bw_estimations[0]
+                                        .available_recv_bandwidth);
           }
         }
         candidate_pair_stats->requests_received =
             static_cast<uint64_t>(info.recv_ping_requests);
         candidate_pair_stats->requests_sent = static_cast<uint64_t>(
             info.sent_ping_requests_before_first_response);
         candidate_pair_stats->responses_received =
             static_cast<uint64_t>(info.recv_ping_responses);
         candidate_pair_stats->responses_sent =
             static_cast<uint64_t>(info.sent_ping_responses);
@@ skipping 335 matching lines @@
     const std::string& type) {
   return CandidateTypeToRTCIceCandidateType(type);
 }
 
 const char* DataStateToRTCDataChannelStateForTesting(
     DataChannelInterface::DataState state) {
   return DataStateToRTCDataChannelState(state);
 }
 
 }  // namespace webrtc