admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change unit of logged bitrate stats in bytes/s to bits/s.

Browse Source 
Multiplier added to ToString method in AggregatedStats.

BUG=webrtc:5283

Review-Url: https://codereview.webrtc.org/2535323003
Cr-Commit-Position: refs/heads/master@{#15330}
This commit is contained in:
asapersson 2016-11-30 05:17:16 -08:00 committed by Commit bot
parent aff96361d3
commit 076c0118c5
3 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
webrtc/call/call.cc
View File

@ -383,32 +383,32 @@ void Call::UpdateReceiveHistograms() {
if (video_bytes_per_sec.num_samples > kMinRequiredPeriodicSamples) {
RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.VideoBitrateReceivedInKbps",
video_bytes_per_sec.average * 8 / 1000);
LOG(LS_INFO) << "WebRTC.Call.VideoBitrateReceivedInBytesPerSec, "
<< video_bytes_per_sec.ToString();
LOG(LS_INFO) << "WebRTC.Call.VideoBitrateReceivedInBps, "
<< video_bytes_per_sec.ToStringWithMultiplier(8);
}
AggregatedStats audio_bytes_per_sec =
received_audio_bytes_per_second_counter_.GetStats();
if (audio_bytes_per_sec.num_samples > kMinRequiredPeriodicSamples) {
RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.AudioBitrateReceivedInKbps",
audio_bytes_per_sec.average * 8 / 1000);
LOG(LS_INFO) << "WebRTC.Call.AudioBitrateReceivedInBytesPerSec, "
<< audio_bytes_per_sec.ToString();
LOG(LS_INFO) << "WebRTC.Call.AudioBitrateReceivedInBps, "
<< audio_bytes_per_sec.ToStringWithMultiplier(8);
}
AggregatedStats rtcp_bytes_per_sec =
received_rtcp_bytes_per_second_counter_.GetStats();
if (rtcp_bytes_per_sec.num_samples > kMinRequiredPeriodicSamples) {
RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.RtcpBitrateReceivedInBps",
rtcp_bytes_per_sec.average * 8);
LOG(LS_INFO) << "WebRTC.Call.RtcpBitrateReceivedInBytesPerSec, "
<< rtcp_bytes_per_sec.ToString();
LOG(LS_INFO) << "WebRTC.Call.RtcpBitrateReceivedInBps, "
<< rtcp_bytes_per_sec.ToStringWithMultiplier(8);
}
AggregatedStats recv_bytes_per_sec =
received_bytes_per_second_counter_.GetStats();
if (recv_bytes_per_sec.num_samples > kMinRequiredPeriodicSamples) {
RTC_HISTOGRAM_COUNTS_100000("WebRTC.Call.BitrateReceivedInKbps",
recv_bytes_per_sec.average * 8 / 1000);
LOG(LS_INFO) << "WebRTC.Call.BitrateReceivedInBytesPerSec, "
<< recv_bytes_per_sec.ToString();
LOG(LS_INFO) << "WebRTC.Call.BitrateReceivedInBps, "
<< recv_bytes_per_sec.ToStringWithMultiplier(8);
}
}

10
webrtc/video/stats_counter.cc
View File

@ -26,11 +26,15 @@ const uint32_t kStreamId0 = 0;
} // namespace
std::string AggregatedStats::ToString() const {
return ToStringWithMultiplier(1);
}
std::string AggregatedStats::ToStringWithMultiplier(int multiplier) const {
std::stringstream ss;
ss << "periodic_samples:" << num_samples << ", {";
ss << "min:" << min << ", ";
ss << "avg:" << average << ", ";
ss << "max:" << max << "}";
ss << "min:" << (min * multiplier) << ", ";
ss << "avg:" << (average * multiplier) << ", ";
ss << "max:" << (max * multiplier) << "}";
return ss.str();
}

1
webrtc/video/stats_counter.h
View File

@ -33,6 +33,7 @@ class StatsCounterObserver {
struct AggregatedStats {
std::string ToString() const;
std::string ToStringWithMultiplier(int multiplier) const;
int64_t num_samples = 0;
int min = -1;