Supporting Pause/Resume, Sending Estimate logging. Corrected plot colors

webrtc/modules/remote_bitrate_estimator/test/packet_sender.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.
  */
 
 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_
 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_
 
 #include <list>
 #include <limits>
 #include <string>
 
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/interface/module.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
 
 namespace webrtc {
 namespace testing {
 namespace bwe {
 
+class MetricRecorder;
+
 class PacketSender : public PacketProcessor {
  public:
   PacketSender(PacketProcessorListener* listener, int flow_id)
       : PacketProcessor(listener, flow_id, kSender),
+        running_(true),
         // For Packet::send_time_us() to be comparable with timestamps from
         // clock_, the clock of the PacketSender and the Source must be aligned.
         // We assume that both start at time 0.
-        clock_(0) {}
+        clock_(0),
+        metric_recorder_(nullptr) {}
   virtual ~PacketSender() {}
   // Call GiveFeedback() with the returned interval in milliseconds, provided
   // there is a new estimate available.
   // Note that changing the feedback interval affects the timing of when the
   // output of the estimators is sampled and therefore the baseline files may
   // have to be regenerated.
   virtual int GetFeedbackIntervalMs() const = 0;
   void SetSenderTimestamps(Packets* in_out);
 
   virtual uint32_t TargetBitrateKbps() { return 0; }
 
+  virtual void Pause();
+  virtual void Resume(int64_t paused_time_ms);
+
+  void set_metric_recorder(MetricRecorder* metric_recorder);
+  virtual void RecordBitrate();
+
  protected:
+  bool running_;  // Initialized by default as true.
   SimulatedClock clock_;
+
+ private:
+  MetricRecorder* metric_recorder_;
 };
 
 class VideoSender : public PacketSender, public BitrateObserver {
  public:
   VideoSender(PacketProcessorListener* listener,
               VideoSource* source,
               BandwidthEstimatorType estimator);
   virtual ~VideoSender();
 
   int GetFeedbackIntervalMs() const override;
   void RunFor(int64_t time_ms, Packets* in_out) override;
 
   virtual VideoSource* source() const { return source_; }
 
   uint32_t TargetBitrateKbps() override;
 
   // Implements BitrateObserver.
   void OnNetworkChanged(uint32_t target_bitrate_bps,
                         uint8_t fraction_lost,
                         int64_t rtt) override;
 
-  void Pause();
-  void Resume();
+  void Pause() override;
+  void Resume(int64_t paused_time_ms) override;
 
  protected:
   void ProcessFeedbackAndGeneratePackets(int64_t time_ms,
                                          std::list<FeedbackPacket*>* feedbacks,
                                          Packets* generated);
 
-  bool running_;
   VideoSource* source_;
   rtc::scoped_ptr<BweSender> bwe_;
   int64_t start_of_run_ms_;
   std::list<Module*> modules_;
 
  private:
   uint32_t previous_sending_bitrate_;
   DISALLOW_COPY_AND_ASSIGN(VideoSender);
 };
 
@@ skipping 75 matching lines @@
   int ssthresh_;
   std::set<InFlight> in_flight_;
   bool ack_received_;
   uint16_t last_acked_seq_num_;
   uint16_t next_sequence_number_;
   int64_t offset_ms_;
   int64_t last_reduction_time_ms_;
   int64_t last_rtt_ms_;
   int total_sent_bytes_;
   int send_limit_bytes_;  // Initialized by default as kNoLimit.
-  bool running_;          // Initialized by default as true.
   int64_t last_generated_packets_ms_;
   size_t num_recent_sent_packets_;
   uint32_t bitrate_kbps_;
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_