Update BWE_TEST_LOGGING_PLOT output format, and fix plot_dynamics.py script.

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h

 /*
  *  Copyright (c) 2013 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 212 matching lines @@
   const FlowIds flow_ids_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(PacketProcessor);
 };
 
 class RateCounterFilter : public PacketProcessor {
  public:
   RateCounterFilter(PacketProcessorListener* listener,
                     int flow_id,
                     const char* name,
-                    const std::string& plot_name);
+                    const std::string& algorithm_name);
   RateCounterFilter(PacketProcessorListener* listener,
                     const FlowIds& flow_ids,
                     const char* name,
-                    const std::string& plot_name);
+                    const std::string& algorithm_name);
   RateCounterFilter(PacketProcessorListener* listener,
                     const FlowIds& flow_ids,
                     const char* name,
                     int64_t start_plotting_time_ms,
-                    const std::string& plot_name);
+                    const std::string& algorithm_name);
   virtual ~RateCounterFilter();
 
   void LogStats();
   Stats<double> GetBitrateStats() const;
   virtual void Plot(int64_t timestamp_ms);
   virtual void RunFor(int64_t time_ms, Packets* in_out);
 
  private:
   Stats<double> packets_per_second_stats_;
   Stats<double> kbps_stats_;
+  int64_t start_plotting_time_ms_;
+  int flow_id_;
   std::string name_;
-  int64_t start_plotting_time_ms_;
   // Algorithm name if single flow, Total link utilization if all flows.
-  std::string plot_name_;
+  std::string algorithm_name_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RateCounterFilter);
 };
 
 class LossFilter : public PacketProcessor {
  public:
   LossFilter(PacketProcessorListener* listener, int flow_id);
   LossFilter(PacketProcessorListener* listener, const FlowIds& flow_ids);
   virtual ~LossFilter() {}
 
@@ skipping 196 matching lines @@
   uint32_t frame_counter_;
   int compensation_bytes_;
   int compensation_per_frame_;
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(PeriodicKeyFrameSource);
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_FRAMEWORK_H_