Refactor how padding is calculated.

webrtc/modules/congestion_controller/include/congestion_controller.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 61 matching lines @@
                               int max_bitrate_bps);
   virtual void SignalNetworkState(NetworkState state);
   virtual BitrateController* GetBitrateController() const;
   virtual RemoteBitrateEstimator* GetRemoteBitrateEstimator(
       bool send_side_bwe);
   virtual int64_t GetPacerQueuingDelayMs() const;
   virtual PacedSender* pacer() { return pacer_.get(); }
   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);
 
   // Implements CallStatsObserver.
   void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
 
   // Implements Module.
   int64_t TimeUntilNextProcess() override;
   void Process() override;
 
@@ skipping 20 matching lines @@
   uint8_t last_reported_fraction_loss_ GUARDED_BY(critsect_);
   int64_t last_reported_rtt_ GUARDED_BY(critsect_);
   NetworkState network_state_ GUARDED_BY(critsect_);
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_