Refactor NACK bitrate allocation

webrtc/modules/rtp_rtcp/source/rtp_sender_video.h

Index: webrtc/modules/rtp_rtcp/source/rtp_sender_video.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h
index 8307b83864de53302f9bf5cbe2973ad568c01073..ebc816bef21f092b11d09c9b86b01c9163d5bd04 100644
--- a/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h
+++ b/webrtc/modules/rtp_rtcp/source/rtp_sender_video.h
@@ -15,10 +15,10 @@
 
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/onetimeevent.h"
+#include "webrtc/base/rate_statistics.h"
 #include "webrtc/base/thread_annotations.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "webrtc/modules/rtp_rtcp/source/bitrate.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction.h"
 #include "webrtc/modules/rtp_rtcp/source/producer_fec.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_config.h"
@@ -68,8 +68,6 @@ class RTPSenderVideo {
   void SetFecParameters(const FecProtectionParams* delta_params,
                         const FecProtectionParams* key_params);
 
-  void ProcessBitrate();
-
   uint32_t VideoBitrateSent() const;
   uint32_t FecOverheadRate() const;
 
@@ -95,6 +93,7 @@ class RTPSenderVideo {
                             bool protect);
 
   RTPSenderInterface& _rtpSender;
+  Clock* const clock_;
 
   // Should never be held when calling out of this class.
   const rtc::CriticalSection crit_;
@@ -111,11 +110,12 @@ class RTPSenderVideo {
   FecProtectionParams key_fec_params_ GUARDED_BY(crit_);
   ProducerFec producer_fec_ GUARDED_BY(crit_);
 
+  const rtc::CriticalSection stats_crit_;

[tommi, 2016/07/07 12:48:47]

const critical section?

[sprang_webrtc, 2016/07/07 13:46:51]

Copied from |crit_| above. A bit odd, I'll remove const from both.

   // Bitrate used for FEC payload, RED headers, RTP headers for FEC packets
   // and any padding overhead.
-  Bitrate _fecOverheadRate;
-  // Bitrate used for video payload and RTP headers
-  Bitrate _videoBitrate;
+  RateStatistics fec_bitrate_ GUARDED_BY(stats_crit_);
+  // Bitrate used for video payload and RTP headers.
+  RateStatistics video_bitrate_ GUARDED_BY(stats_crit_);
   OneTimeEvent first_frame_sent_;
 };
 }  // namespace webrtc