More Simulation Framework features

webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h

Index: webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h
diff --git a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h
index a6838269c688334dba28ef9c06a886880cdf040d..7e9ec307e3a459ff4cc3c11e2fcd48da8a48a92f 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h
+++ b/webrtc/modules/remote_bitrate_estimator/test/packet_receiver.h
@@ -17,6 +17,7 @@
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
+#include "webrtc/modules/remote_bitrate_estimator/test/metric_recorder.h"
 
 namespace webrtc {
 namespace testing {
@@ -29,6 +30,12 @@ class PacketReceiver : public PacketProcessor {
                  BandwidthEstimatorType bwe_type,
                  bool plot_delay,
                  bool plot_bwe);
+  PacketReceiver(PacketProcessorListener* listener,
+                 int flow_id,
+                 BandwidthEstimatorType bwe_type,
+                 bool plot_delay,
+                 bool plot_bwe,
+                 MetricRecorder* metric_recorder);
   ~PacketReceiver();
 
   // Implements PacketProcessor.
@@ -40,28 +47,24 @@ class PacketReceiver : public PacketProcessor {
 
  protected:
   void PlotDelay(int64_t arrival_time_ms, int64_t send_time_ms);
+  void PlotThroughput(int64_t arrival_time_ms);
+  void PlotTotalAvailableCapacity(int64_t arrival_time_ms);
+  void PlotAvailableCapacityPerFlow(int64_t arrival_time_ms);
   void PlotObjectiveFunction(int64_t arrival_time_ms);
   void PlotPacketLoss(int64_t arrival_time_ms);
-  double ObjectiveFunction();
 
-  int64_t now_ms_;
   std::string delay_log_prefix_;
   std::string metric_log_prefix_;
   std::string packet_loss_log_prefix_;
-  int64_t last_delay_plot_ms_;
-  int64_t last_metric_plot_ms_;
-  int64_t last_packet_loss_plot_ms_;
-  bool plot_delay_;
-  bool plot_objective_function_;
-  bool plot_packet_loss_;
+  std::string available_capacity_log_prefix_;
+  std::string throughput_log_prefix_;
+
   Stats<double> delay_stats_;
   rtc::scoped_ptr<BweReceiver> bwe_receiver_;
 
-  int64_t total_delay_ms_;
-  size_t total_throughput_;
-  int number_packets_;
-
  private:
+  MetricRecorder* metric_recorder_;
+
   DISALLOW_IMPLICIT_CONSTRUCTORS(PacketReceiver);
 };
 }  // namespace bwe