Remove MimdRateControl and factories for RemoteBitrateEstimor.

webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h

 /*
  *  Copyright (c) 2014 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.
  */
 
 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_
 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_
 
+#include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/remote_bitrate_estimator/include/bwe_defines.h"
-#include "webrtc/modules/remote_bitrate_estimator/remote_rate_control.h"
 
 namespace webrtc {
 
 // A RemoteRateControl implementation based on additive increases of
 // bitrate when no over-use is detected and multiplicative decreases when
 // over-uses are detected. When we think the available bandwidth has changes or
 // is unknown, we will switch to a "slow-start mode" where we increase
 // multiplicatively.
-class AimdRateControl : public RemoteRateControl {
+class AimdRateControl {
  public:
   explicit AimdRateControl(uint32_t min_bitrate_bps);
   virtual ~AimdRateControl() {}
 
   // Implements RemoteRateControl.
-  bool ValidEstimate() const override;
-  RateControlType GetControlType() const override;
-  uint32_t GetMinBitrate() const override;
-  int64_t GetFeedbackInterval() const override;
+  bool ValidEstimate() const;
+  uint32_t GetMinBitrate() const;
+  int64_t GetFeedbackInterval() const;
   // Returns true if the bitrate estimate hasn't been changed for more than
   // an RTT, or if the incoming_bitrate is more than 5% above the current
   // estimate. Should be used to decide if we should reduce the rate further
   // when over-using.
   bool TimeToReduceFurther(int64_t time_now,
-                           uint32_t incoming_bitrate_bps) const override;
-  uint32_t LatestEstimate() const override;
-  uint32_t UpdateBandwidthEstimate(int64_t now_ms) override;
-  void SetRtt(int64_t rtt) override;
-  RateControlRegion Update(const RateControlInput* input,
-                           int64_t now_ms) override;
-  void SetEstimate(int bitrate_bps, int64_t now_ms) override;
+                           uint32_t incoming_bitrate_bps) const;
+  uint32_t LatestEstimate() const;
+  uint32_t UpdateBandwidthEstimate(int64_t now_ms);
+  void SetRtt(int64_t rtt);
+  RateControlRegion Update(const RateControlInput* input, int64_t now_ms);
+  void SetEstimate(int bitrate_bps, int64_t now_ms);
 
  private:
   // Update the target bitrate according based on, among other things,
   // the current rate control state, the current target bitrate and the incoming
   // bitrate. When in the "increase" state the bitrate will be increased either
   // additively or multiplicatively depending on the rate control region. When
   // in the "decrease" state the bitrate will be decreased to slightly below the
   // incoming bitrate. When in the "hold" state the bitrate will be kept
   // constant to allow built up queues to drain.
   uint32_t ChangeBitrate(uint32_t current_bit_rate,
@@ skipping 25 matching lines @@
   bool bitrate_is_initialized_;
   float beta_;
   int64_t rtt_;
   int64_t time_of_last_log_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(AimdRateControl);
 };
 }  // namespace webrtc
 
 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_AIMD_RATE_CONTROL_H_