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

webrtc/pc/statscollector.cc

 /*
  *  Copyright 2012 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 269 matching lines @@
     { StatsReport::kStatsValueNameFramesEncoded, info.frames_encoded },
   };
 
   for (const auto& i : ints)
     report->AddInt(i.name, i.value);
   report->AddString(StatsReport::kStatsValueNameMediaType, "video");
 }
 
 void ExtractStats(const cricket::BandwidthEstimationInfo& info,
                   double stats_gathering_started,
+                  PeerConnectionInterface::StatsOutputLevel level,
                   StatsReport* report) {
   RTC_DCHECK(report->type() == StatsReport::kStatsReportTypeBwe);
 
   report->set_timestamp(stats_gathering_started);
   const IntForAdd ints[] = {
     { StatsReport::kStatsValueNameAvailableSendBandwidth,
       info.available_send_bandwidth },
     { StatsReport::kStatsValueNameAvailableReceiveBandwidth,
       info.available_recv_bandwidth },
     { StatsReport::kStatsValueNameTargetEncBitrate, info.target_enc_bitrate },
@@ skipping 198 matching lines @@
   // TODO(pthatcher): Merge PeerConnection and WebRtcSession so there is no
   // pc_->session().
   if (pc_->session()) {
     // TODO(tommi): All of these hop over to the worker thread to fetch
     // information.  We could use an AsyncInvoker to run all of these and post
     // the information back to the signaling thread where we can create and
     // update stats reports.  That would also clean up the threading story a bit
     // since we'd be creating/updating the stats report objects consistently on
     // the same thread (this class has no locks right now).
     ExtractSessionInfo();
-    ExtractBweInfo();
     ExtractVoiceInfo();
     ExtractVideoInfo(level);
     ExtractSenderInfo();
     ExtractDataInfo();
     UpdateTrackReports();
   }
 }
 
 StatsReport* StatsCollector::PrepareReport(
     bool local,
@@ skipping 241 matching lines @@
         if (info.best_connection) {
           channel_report->AddId(
               StatsReport::kStatsValueNameSelectedCandidatePairId,
               connection_report->id());
         }
       }
     }
   }
 }
 
-void StatsCollector::ExtractBweInfo() {
-  RTC_DCHECK(pc_->session()->signaling_thread()->IsCurrent());
-
-  if (pc_->session()->state() == WebRtcSession::State::STATE_CLOSED)
-    return;
-
-  webrtc::Call::Stats call_stats = pc_->session()->GetCallStats();
-  cricket::BandwidthEstimationInfo bwe_info;
-  bwe_info.available_send_bandwidth = call_stats.send_bandwidth_bps;
-  bwe_info.available_recv_bandwidth = call_stats.recv_bandwidth_bps;
-  bwe_info.bucket_delay = call_stats.pacer_delay_ms;
-  // Fill in target encoder bitrate, actual encoder bitrate, rtx bitrate, etc.
-  // TODO(holmer): Also fill this in for audio.
-  if (!pc_->session()->video_channel()) {
-    return;
-  }
-  pc_->session()->video_channel()->FillBitrateInfo(&bwe_info);
-  StatsReport::Id report_id(StatsReport::NewBandwidthEstimationId());
-  StatsReport* report = reports_.FindOrAddNew(report_id);
-  ExtractStats(bwe_info, stats_gathering_started_, report);
-}
-
 void StatsCollector::ExtractVoiceInfo() {
   RTC_DCHECK(pc_->session()->signaling_thread()->IsCurrent());
 
   if (!pc_->session()->voice_channel()) {
     return;
   }
   cricket::VoiceMediaInfo voice_info;
   if (!pc_->session()->voice_channel()->GetStats(&voice_info)) {
     LOG(LS_ERROR) << "Failed to get voice channel stats.";
     return;
@@ skipping 40 matching lines @@
       proxy_to_transport_, pc_->session()->video_channel()->content_name()));
   if (!transport_id.get()) {
     LOG(LS_ERROR) << "Failed to get transport name for proxy "
                   << pc_->session()->video_channel()->content_name();
     return;
   }
   ExtractStatsFromList(video_info.receivers, transport_id, this,
       StatsReport::kReceive);
   ExtractStatsFromList(video_info.senders, transport_id, this,
       StatsReport::kSend);
+  if (video_info.bw_estimations.size() != 1) {
+    LOG(LS_ERROR) << "BWEs count: " << video_info.bw_estimations.size();
+  } else {
+    StatsReport::Id report_id(StatsReport::NewBandwidthEstimationId());
+    StatsReport* report = reports_.FindOrAddNew(report_id);
+    ExtractStats(
+        video_info.bw_estimations[0], stats_gathering_started_, level, report);
+  }
 }
 
 void StatsCollector::ExtractSenderInfo() {
   RTC_DCHECK(pc_->session()->signaling_thread()->IsCurrent());
 
   for (const auto& sender : pc_->GetSenders()) {
     // TODO(nisse): SSRC == 0 currently means none. Delete check when
     // that is fixed.
     if (!sender->ssrc()) {
       continue;
@@ skipping 140 matching lines @@
     StatsReport* report = entry.second;
     report->set_timestamp(stats_gathering_started_);
   }
 }
 
 void StatsCollector::ClearUpdateStatsCacheForTest() {
   stats_gathering_started_ = 0;
 }
 
 }  // namespace webrtc