Test and fix for huge bwe drop after alr state.

webrtc/modules/congestion_controller/bitrate_estimator.h

Index: webrtc/modules/congestion_controller/bitrate_estimator.h
diff --git a/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h b/webrtc/modules/congestion_controller/bitrate_estimator.h
similarity index 66%
copy from webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h
copy to webrtc/modules/congestion_controller/bitrate_estimator.h
index 7a9d669a1cb6a5473f99d77d30152cacc71e4955..7d562081b2e45bb55955a03e288c55598992c836 100644
--- a/webrtc/modules/congestion_controller/acknowledge_bitrate_estimator.h
+++ b/webrtc/modules/congestion_controller/bitrate_estimator.h
@@ -8,8 +8,8 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_
-#define WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_
+#ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_
+#define WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_
 
 #include <vector>
 
@@ -17,25 +17,21 @@
 
 namespace webrtc {
 
-struct PacketFeedback;
-
 // Computes a bayesian estimate of the throughput given acks containing
 // the arrival time and payload size. Samples which are far from the current
 // estimate or are based on few packets are given a smaller weight, as they
 // are considered to be more likely to have been caused by, e.g., delay spikes
 // unrelated to congestion.
-class AcknowledgedBitrateEstimator {
+class BitrateEstimator {

[minyue-webrtc, 2017/06/12 10:08:07]

why not just modifying the old one?

[tschumi, 2017/06/12 11:33:28]

Tow reasons:

1. I tried to not create a reset function, since this is always a bit of a pain
in terms of code 
maintenance. And since i would like to reset the estimator, the easiest way was
just to recreated it. 

2. BitrateEstimator seamed already to be complicated enough in its own. So
having two classes should make 
the code better readable and testable. 

[minyue-webrtc, 2017/06/12 12:23:42]

OK. But why was this one called AcknowledgedBitrateEstimator and why does the
new one to be called AcknowledgedBitrateEstimator?

  public:
-  AcknowledgedBitrateEstimator();
+  BitrateEstimator();
+  virtual ~BitrateEstimator();
+  virtual void Update(int64_t now_ms, int bytes);
 
-  void IncomingPacketFeedbackVector(
-      const std::vector<PacketFeedback>& packet_feedback_vector);
-  rtc::Optional<uint32_t> bitrate_bps() const;
+  virtual rtc::Optional<uint32_t> bitrate_bps() const;
 
  private:
-  void Update(int64_t now_ms, int bytes);
   float UpdateWindow(int64_t now_ms, int bytes, int rate_window_ms);
-
   int sum_;
   int64_t current_win_ms_;
   int64_t prev_time_ms_;
@@ -45,4 +41,4 @@ class AcknowledgedBitrateEstimator {
 
 }  // namespace webrtc
 
-#endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_ACKNOWLEDGE_BITRATE_ESTIMATOR_H_
+#endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_BITRATE_ESTIMATOR_H_