Added implementations for entering/exiting STARTUP, DRAIN, PROBE_BW, PROBE_RTT modes, also updated M

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

 /*
  *  Copyright (c) 2017 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_TEST_ESTIMATORS_BBR_H_
 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_
 
 #include <map>
 #include <memory>
 #include <vector>
 
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
+#include "webrtc/rtc_base/optional.h"
 
 namespace webrtc {
 namespace testing {
 namespace bwe {
 class MaxBandwidthFilter;
 class MinRttFilter;
 class CongestionWindow;
 class BbrBweSender : public BweSender {
  public:
   explicit BbrBweSender(Clock* clock);
@@ skipping 22 matching lines @@
   void GiveFeedback(const FeedbackPacket& feedback) override;
   int64_t TimeUntilNextProcess() override;
   void Process() override;
 
  private:
   void EnterStartup();
   bool UpdateBandwidthAndMinRtt();
   void TryExitingStartup();
   void TryExitingDrain(int64_t now_ms);
   void EnterProbeBw(int64_t now_ms);
-  void EnterProbeRtt(int64_t now_ms);
   void TryUpdatingCyclePhase(int64_t now_ms);
-  void TryEnteringProbeRtt(int64_t now_ms);
-  void TryExitingProbeRtt(int64_t now_ms);
+  void TryEnteringProbeRtt(int64_t now_ms, bool min_rtt_expired);
+  void TryExitingProbeRtt(int64_t now_ms, int64_t round);
+  size_t TargetCongestionWindow(float gain);
   Clock* const clock_;
   Mode mode_;
   std::unique_ptr<MaxBandwidthFilter> max_bandwidth_filter_;
+  std::unique_ptr<MinRttFilter> min_rtt_filter_;
+  std::unique_ptr<CongestionWindow> congestion_window_;
   uint64_t round_count_;
   uint64_t last_packet_sent_;
   uint64_t round_trip_end_;
   float pacing_gain_;
   float congestion_window_gain_;
 
   // If optimal bandwidth has been discovered and reached, (for example after
   // Startup mode) set this variable to true.
   bool full_bandwidth_reached_;
+
+  // Entering time for PROBE_BW mode's cycle phase.
+  int64_t cycle_start_time_ms_;
+
+  // Index number of the currently used gain value in PROBE_BW mode, from 0 to
+  // kGainCycleLength - 1.
+  int64_t cycle_index_;
+
+  // Data inflight prior to the moment when last feedback was received.
+  size_t prior_in_flight_;
+
+  // Time we entered PROBE_RTT mode.
+  int64_t probe_rtt_start_time_ms_;
+
+  // First moment of time when data inflight decreased below
+  // kMinimumCongestionWindow in PROBE_RTT mode.
+  rtc::Optional<int64_t> minimum_congestion_window_start_time_ms_;
+
+  // First round when data inflight decreased below kMinimumCongestionWindow in
+  // PROBE_RTT mode.
+  int64_t minimum_congestion_window_start_round_;
 };
 
 class BbrBweReceiver : public BweReceiver {
  public:
   explicit BbrBweReceiver(int flow_id);
   virtual ~BbrBweReceiver();
   void ReceivePacket(int64_t arrival_time_ms,
                      const MediaPacket& media_packet) override;
   FeedbackPacket* GetFeedback(int64_t now_ms) override;
 
  private:
   SimulatedClock clock_;
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_BBR_H_