Change VideoReceiveStream::Stats total_bitrate_bps to include all received packets.

webrtc/video/receive_statistics_proxy.h

Index: webrtc/video/receive_statistics_proxy.h
diff --git a/webrtc/video/receive_statistics_proxy.h b/webrtc/video/receive_statistics_proxy.h
index 30d5d0012e4152e09f5f907d74d3b3f571460983..07e59b4d74ad6253bf90f29ea086c1c305466837 100644
--- a/webrtc/video/receive_statistics_proxy.h
+++ b/webrtc/video/receive_statistics_proxy.h
@@ -104,9 +104,8 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
 
   void QualitySample() EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
-  // Removes info about old frames and then updates the framerate/bitrate.
-  void UpdateFrameAndBitrate(int64_t now_ms) const
-      EXCLUSIVE_LOCKS_REQUIRED(crit_);
+  // Removes info about old frames and then updates the framerate.
+  void UpdateFramerate(int64_t now_ms) const EXCLUSIVE_LOCKS_REQUIRED(crit_);
 
   Clock* const clock_;
   // Ownership of this object lies with the owner of the ReceiveStatisticsProxy
@@ -132,6 +131,7 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
   RateStatistics renders_fps_estimator_ GUARDED_BY(crit_);
   rtc::RateTracker render_fps_tracker_ GUARDED_BY(crit_);
   rtc::RateTracker render_pixel_tracker_ GUARDED_BY(crit_);
+  rtc::RateTracker total_byte_tracker_ GUARDED_BY(crit_);
   SampleCounter render_width_counter_ GUARDED_BY(crit_);
   SampleCounter render_height_counter_ GUARDED_BY(crit_);
   SampleCounter sync_offset_counter_ GUARDED_BY(crit_);
@@ -148,7 +148,6 @@ class ReceiveStatisticsProxy : public VCMReceiveStatisticsCallback,
   std::map<uint32_t, StreamDataCounters> rtx_stats_ GUARDED_BY(crit_);
   int64_t avg_rtt_ms_ GUARDED_BY(crit_);
   mutable std::map<int64_t, size_t> frame_window_ GUARDED_BY(&crit_);
-  mutable size_t frame_window_accumulated_bytes_ GUARDED_BY(&crit_);
 };
 
 }  // namespace webrtc