Refactor how padding is calculated.

webrtc/modules/congestion_controller/include/congestion_controller.h

Index: webrtc/modules/congestion_controller/include/congestion_controller.h
diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h
index da8719d33a73a86c370a34fb2ac4f34658ecf58e..438a7212beb828cb1c4050e2994efcbe06371e54 100644
--- a/webrtc/modules/congestion_controller/include/congestion_controller.h
+++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
@@ -79,8 +79,18 @@ class CongestionController : public CallStatsObserver, public Module {
   virtual PacketRouter* packet_router() { return packet_router_.get(); }
   virtual TransportFeedbackObserver* GetTransportFeedbackObserver();
 
-  void SetAllocatedSendBitrate(int allocated_bitrate_bps,
-                               int padding_bitrate_bps);
+  // SetAllocatedSendBitrate sets bitrates limits imposed by send code

[mflodman, 2016/06/13 05:02:43]

Maybe SetAllocatedSendBitrateThresholds / Limits? To tell this is not just an
allocation happening during regular bitrate allocation.

[perkj_webrtc, 2016/06/14 10:58:02]

Done.

+  // settings.
+  // |min_send_bitrate_bps| is the total minimum send bitrate required by all
+  // sending streams.  This is the minimum bitrate the PacedSender will use.
+  // Note that CongestionController::OnNetworkChanged can still be called with
+  // a lower bitrate estimate.
+  // |max_padding_bitrate_bps| is the max bitrate the send streams request for
+  // padding. This can be higher than the current network estimate and tells
+  // the PacedSender how much it should max pad unless there is real packets to
+  // send.
+  void SetAllocatedSendBitrate(int min_send_bitrate_bps,
+                               int max_padding_bitrate_bps);
 
   virtual void OnSentPacket(const rtc::SentPacket& sent_packet);