Make overuse estimator one dimensional.

webrtc/modules/remote_bitrate_estimator/overuse_estimator.h

Index: webrtc/modules/remote_bitrate_estimator/overuse_estimator.h
diff --git a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h
index d671f39166f29200eed05429bb1276f6c2bd6776..d04e7d9f981d457bc0be20c3a86e363a6cf85f14 100644
--- a/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h
+++ b/webrtc/modules/remote_bitrate_estimator/overuse_estimator.h
@@ -20,14 +20,15 @@ namespace webrtc {
 
 class OveruseEstimator {
  public:
-  explicit OveruseEstimator(const OverUseDetectorOptions& options);
+  OveruseEstimator();
   ~OveruseEstimator();
 
   // Update the estimator with a new sample. The deltas should represent deltas
   // between timestamp groups as defined by the InterArrival class.
   // |current_hypothesis| should be the hypothesis of the over-use detector at
   // this time.
-  void Update(int64_t t_delta, double ts_delta, int size_delta,
+  void Update(double recv_delta_ms,
+              double send_delta_ms,
               BandwidthUsage current_hypothesis);
 
   // Returns the estimated noise/jitter variance in ms^2.
@@ -47,21 +48,21 @@ class OveruseEstimator {
   }
 
  private:
-  double UpdateMinFramePeriod(double ts_delta);
-  void UpdateNoiseEstimate(double residual, double ts_delta, bool stable_state);
+  double UpdateMinFramePeriod(double send_delta_ms);
+  void UpdateNoiseEstimate(double residual,
+                           double send_delta_ms,
+                           bool stable_state);
 
   // Must be first member variable. Cannot be const because we need to be
   // copyable.
-  OverUseDetectorOptions options_;
   uint16_t num_of_deltas_;
-  double slope_;
   double offset_;
   double prev_offset_;
-  double E_[2][2];
-  double process_noise_[2];
+  double e_;
+  double process_noise_;
   double avg_noise_;
   double var_noise_;
-  std::list<double> ts_delta_hist_;
+  std::list<double> send_delta_history_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(OveruseEstimator);
 };