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

webrtc/modules/remote_bitrate_estimator/test/packet_receiver.cc

 /*
  *  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 26 matching lines @@
       last_delay_plot_ms_(0),
       // #2 aligns the plot with the right axis.
       delay_prefix_("Delay_ms#2"),
       bwe_type_(bwe_type) {
   if (metric_recorder_ != nullptr) {
     // Setup the prefix std::strings used when logging.
     std::vector<std::string> prefixes;
 
     // Metric recorder plots them in separated figures,
     // alignment will take place with the #1 left axis.
-    prefixes.push_back("Throughput_kbps#1");
+    prefixes.push_back("MetricRecorderThroughput_kbps#1");
     prefixes.push_back("Sending_Estimate_kbps#1");
     prefixes.push_back("Delay_ms_#1");
     prefixes.push_back("Packet_Loss_#1");
     prefixes.push_back("Objective_function_#1");
 
     // Plot Total/PerFlow Available capacity together with throughputs.
-    prefixes.push_back("Throughput_kbps#1");  // Total Available.
-    prefixes.push_back("Throughput_kbps#1");  // Available per flow.
+    prefixes.push_back("Capacity_kbps#1");         // Total Available.
+    prefixes.push_back("PerFlowCapacity_kbps#1");  // Available per flow.
 
     bool plot_loss = plot_delay;  // Plot loss if delay is plotted.
     metric_recorder_->SetPlotInformation(prefixes, plot_delay, plot_loss);
   }
 }
 
 PacketReceiver::PacketReceiver(PacketProcessorListener* listener,
                                int flow_id,
                                BandwidthEstimatorType bwe_type,
                                bool plot_delay,
@@ skipping 72 matching lines @@
 float PacketReceiver::GlobalPacketLoss() {
   return bwe_receiver_->GlobalReceiverPacketLossRatio();
 }
 
 Stats<double> PacketReceiver::GetDelayStats() const {
   return delay_stats_;
 }
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc