From 076c0118c52c0ff74f81dc855b0753e19e5a5010 Mon Sep 17 00:00:00 2001
From: asapersson <asapersson@webrtc.org>
Date: Wed, 30 Nov 2016 05:17:16 -0800
Subject: [PATCH] Change unit of logged bitrate stats in bytes/s to bits/s.

Multiplier added to ToString method in AggregatedStats.

BUG=webrtc:5283

Review-Url: https://codereview.webrtc.org/2535323003
Cr-Commit-Position: refs/heads/master@{#15330}
---
 webrtc/call/call.cc           | 16 ++++++++--------
 webrtc/video/stats_counter.cc | 10 +++++++---
 webrtc/video/stats_counter.h  |  1 +
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/webrtc/call/call.cc b/webrtc/call/call.cc
index ae04409d6e..e76df360bc 100644
--- a/webrtc/call/call.cc
+++ b/webrtc/call/call.cc
@@ -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);
   }
 }
 
diff --git a/webrtc/video/stats_counter.cc b/webrtc/video/stats_counter.cc
index b1c24ee673..86dedd9e4f 100644
--- a/webrtc/video/stats_counter.cc
+++ b/webrtc/video/stats_counter.cc
@@ -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();
 }
 
diff --git a/webrtc/video/stats_counter.h b/webrtc/video/stats_counter.h
index e84d73b758..6dc94b4328 100644
--- a/webrtc/video/stats_counter.h
+++ b/webrtc/video/stats_counter.h
@@ -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;