Index: webrtc/api/statscollector.cc |
diff --git a/webrtc/api/statscollector.cc b/webrtc/api/statscollector.cc |
index d77953b3bed1d49bb75a3be6a35c5d10f91c382b..314cffcb1380aad35a3c412bb86ed83114c098cb 100644 |
--- a/webrtc/api/statscollector.cc |
+++ b/webrtc/api/statscollector.cc |
@@ -236,11 +236,9 @@ void ExtractStats(const cricket::VideoSenderInfo& info, StatsReport* report) { |
{ StatsReport::kStatsValueNameEncodeUsagePercent, |
info.encode_usage_percent }, |
{ StatsReport::kStatsValueNameFirsReceived, info.firs_rcvd }, |
- { StatsReport::kStatsValueNameFrameHeightInput, info.input_frame_height }, |
{ StatsReport::kStatsValueNameFrameHeightSent, info.send_frame_height }, |
{ StatsReport::kStatsValueNameFrameRateInput, info.framerate_input }, |
{ StatsReport::kStatsValueNameFrameRateSent, info.framerate_sent }, |
- { StatsReport::kStatsValueNameFrameWidthInput, info.input_frame_width }, |
{ StatsReport::kStatsValueNameFrameWidthSent, info.send_frame_width }, |
{ StatsReport::kStatsValueNameNacksReceived, info.nacks_rcvd }, |
{ StatsReport::kStatsValueNamePacketsLost, info.packets_lost }, |
@@ -474,6 +472,7 @@ StatsCollector::UpdateStats(PeerConnectionInterface::StatsOutputLevel level) { |
ExtractSessionInfo(); |
ExtractVoiceInfo(); |
ExtractVideoInfo(level); |
+ ExtractSenderInfo(); |
ExtractDataInfo(); |
UpdateTrackReports(); |
} |
@@ -828,6 +827,18 @@ void StatsCollector::ExtractVideoInfo( |
} |
} |
+void StatsCollector::ExtractSenderInfo() { |
+ RTC_DCHECK(pc_->session()->signaling_thread()->IsCurrent()); |
+ |
+ for (rtc::scoped_refptr<RtpSenderInterface> sender : pc_->GetSenders()) { |
+ StatsReport::Id stats_id = sender->stats_id(); |
+ if (stats_id) { |
+ StatsReport* report = reports_.FindOrAddNew(stats_id); |
+ sender->ReportStats(report); |
perkj_webrtc
2016/03/29 11:03:39
Why not just sender->GetStats(&reports_); ? Let th
nisse-webrtc
2016/03/29 11:37:31
I like the reduction to a single method. We then g
|
+ } |
+ } |
+} |
+ |
void StatsCollector::ExtractDataInfo() { |
RTC_DCHECK(pc_->session()->signaling_thread()->IsCurrent()); |