Revert of Refactor NACK bitrate allocation

webrtc/common_types.h

Index: webrtc/common_types.h
diff --git a/webrtc/common_types.h b/webrtc/common_types.h
index bb29af0bebe0775054d5ec41dfe8365bb8084f13..13d0c3f8089cd48c73ec91612c4d6583ef0d79dd 100644
--- a/webrtc/common_types.h
+++ b/webrtc/common_types.h
@@ -252,10 +252,11 @@
 
 // Rate statistics for a stream.
 struct BitrateStatistics {
-  BitrateStatistics() : bitrate_bps(0), packet_rate(0) {}
+  BitrateStatistics() : bitrate_bps(0), packet_rate(0), timestamp_ms(0) {}
 
   uint32_t bitrate_bps;   // Bitrate in bits per second.
   uint32_t packet_rate;   // Packet rate in packets per second.
+  uint64_t timestamp_ms;  // Ntp timestamp in ms at time of rate estimation.
 };
 
 // Callback, used to notify an observer whenever new rates have been estimated.
@@ -263,8 +264,8 @@
  public:
   virtual ~BitrateStatisticsObserver() {}
 
-  virtual void Notify(uint32_t total_bitrate_bps,
-                      uint32_t retransmit_bitrate_bps,
+  virtual void Notify(const BitrateStatistics& total_stats,
+                      const BitrateStatistics& retransmit_stats,
                       uint32_t ssrc) = 0;
 };