Move BWE period calculation from ProbingIntervalEstimator to AimdRateControl.

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h

Index: webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
diff --git a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
index 5a0a34584f7520c60ce4d4797ae33b5595d9d3af..02f45c6f3156d2f751dade37b13f12261a08d726 100644
--- a/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
+++ b/webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h
@@ -24,7 +24,7 @@ namespace webrtc {
 class AimdRateControl {
  public:
   AimdRateControl();
-  virtual ~AimdRateControl();
+  ~AimdRateControl();
 
   // Returns true if there is a valid estimate of the incoming bitrate, false
   // otherwise.
@@ -43,11 +43,9 @@ class AimdRateControl {
   uint32_t Update(const RateControlInput* input, int64_t now_ms);
   void SetEstimate(int bitrate_bps, int64_t now_ms);
 
-  // Returns the increase rate which is used when used bandwidth is near the

[michaelt, 2017/04/05 07:06:02]

Was the comment to obvious ?

[terelius, 2017/04/05 10:58:03]

Initially I tried to remove the entire function and I forgot to reinsert the
comment when I changed my mind. Fixed.

-  // maximal available bandwidth.
-  virtual int GetNearMaxIncreaseRateBps() const;
-
-  virtual rtc::Optional<int> GetLastBitrateDecreaseBps() const;
+  int GetNearMaxIncreaseRateBps() const;

[michaelt, 2017/04/05 07:06:02]

This function could be made private, but I'm not sure about it since we would
not be able to test it then.

[stefan-webrtc, 2017/04/05 07:20:42]

I prefer making it private. There should be other ways of testing what we want
to test.

[terelius, 2017/04/05 10:58:03]

In principle I agree, but as I don't see a clean way to test the functionality,
I'd prefer to keep it for now.

+  // Returns the expected time until the next overuse (assuming steady state).
+  int GetExpectedBandwidthPeriodMs() const;
 
  private:
   // Update the target bitrate according based on, among other things,