Fix simulator issue where chokes didn't apply to non-congested packets.

webrtc/modules/remote_bitrate_estimator/test/estimators/nada.h

 /*
  *  Copyright (c) 2015 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 28 matching lines @@
   void ReceivePacket(int64_t arrival_time_ms,
                      const MediaPacket& media_packet) override;
   FeedbackPacket* GetFeedback(int64_t now_ms) override;
 
   size_t RecentReceivingRate();
   static int64_t MedianFilter(int64_t* v, int size);
   static int64_t ExponentialSmoothingFilter(int64_t new_value,
                                             int64_t last_smoothed_value,
                                             float alpha);
 
-  static const int64_t kReceivingRateTimeWindowMs = 500;
+  static const int64_t kReceivingRateTimeWindowMs;
 
  private:
   SimulatedClock clock_;
   int64_t last_feedback_ms_;
   rtc::scoped_ptr<ReceiveStatistics> recv_stats_;
   int64_t baseline_delay_ms_;  // Referred as d_f.
   int64_t delay_signal_ms_;    // Referred as d_n.
   int64_t last_congestion_signal_ms_;
   int last_delays_index_;
   int64_t exp_smoothed_delay_ms_;        // Referred as d_hat_n.
   int64_t est_queuing_delay_signal_ms_;  // Referred as d_tilde_n.
-
-  static const int kMedian = 5;      // Used for k-points Median Filter.
-  int64_t last_delays_ms_[kMedian];  // Used for Median Filter.
+  int64_t last_delays_ms_[5];            // Used for Median Filter.
 };
 
 class NadaBweSender : public BweSender {
  public:
   NadaBweSender(int kbps, BitrateObserver* observer, Clock* clock);
   NadaBweSender(BitrateObserver* observer, Clock* clock);
   virtual ~NadaBweSender();
 
   int GetFeedbackIntervalMs() const override;
   // Updates the min_feedback_delay_ms_ and the min_round_trip_time_ms_.
   void GiveFeedback(const FeedbackPacket& feedback) override;
   void OnPacketsSent(const Packets& packets) override {}
   int64_t TimeUntilNextProcess() override;
   int Process() override;
   void AcceleratedRampUp(const NadaFeedback& fb);
   void AcceleratedRampDown(const NadaFeedback& fb);
   void GradualRateUpdate(const NadaFeedback& fb,
                          float delta_s,
                          double smoothing_factor);
 
   int bitrate_kbps() const { return bitrate_kbps_; }
   void set_bitrate_kbps(int bitrate_kbps) { bitrate_kbps_ = bitrate_kbps; }
   bool original_operating_mode() const { return original_operating_mode_; }
   void set_original_operating_mode(bool original_operating_mode) {
     original_operating_mode_ = original_operating_mode;
   }
   int64_t NowMs() const { return clock_->TimeInMilliseconds(); }
 
-  static const int kMinRefRateKbps = 150;   // Referred as R_min.
-  static const int kMaxRefRateKbps = 1500;  // Referred as R_max.
+  static const int kMinRefRateKbps;  // Referred as R_min.
+  static const int kMaxRefRateKbps;  // Referred as R_max.
 
  private:
   Clock* const clock_;
   BitrateObserver* const observer_;
   // Used as an upper bound for calling AcceleratedRampDown.
   const float kMaxCongestionSignalMs = 40.0f + kMinRefRateKbps / 15;
   // Referred as R_min, default initialization for bitrate R_n.
   int bitrate_kbps_;  // Referred as "Reference Rate" = R_n.
   int64_t last_feedback_ms_ = 0;
   // Referred as delta_0, initialized as an upper bound.
   int64_t min_feedback_delay_ms_ = 200;
   // Referred as RTT_0, initialized as an upper bound.
   int64_t min_round_trip_time_ms_ = 100;
   bool original_operating_mode_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(NadaBweSender);
 };
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_NADA_H_