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

webrtc/modules/remote_bitrate_estimator/test/metric_recorder.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 106 matching lines @@
     if (plot_information_[i].plot &&
         now_ms_ - plot_information_[i].last_plot_ms >=
             plot_information_[i].plot_interval_ms) {
       PlotDynamics(i);
     }
   }
 }
 
 void MetricRecorder::PlotDynamics(int metric) {
   if (metric == kTotalAvailable) {
-    BWE_TEST_LOGGING_PLOT_WITH_NAME(
+    BWE_TEST_LOGGING_PLOT_WITH_NAME_AND_SSRC(
         0, plot_information_[kTotalAvailable].prefix, now_ms_,
-        GetTotalAvailableKbps(), "Available");
+        GetTotalAvailableKbps(), flow_id_, "Available");
   } else if (metric == kAvailablePerFlow) {
-    BWE_TEST_LOGGING_PLOT_WITH_NAME(
+    BWE_TEST_LOGGING_PLOT_WITH_NAME_AND_SSRC(
         0, plot_information_[kAvailablePerFlow].prefix, now_ms_,
-        GetAvailablePerFlowKbps(), "Available_per_flow");
+        GetAvailablePerFlowKbps(), flow_id_, "Available_per_flow");
   } else {
     PlotLine(metric, plot_information_[metric].prefix,
              plot_information_[metric].time_ms,
              plot_information_[metric].value);
   }
   plot_information_[metric].last_plot_ms = now_ms_;
 }
 
 template <typename T>
 void MetricRecorder::PlotLine(int windows_id,
                               const std::string& prefix,
                               int64_t time_ms,
                               T y) {
-  BWE_TEST_LOGGING_PLOT_WITH_NAME(windows_id, prefix, time_ms,
-                                  static_cast<double>(y), algorithm_name_);
+  BWE_TEST_LOGGING_PLOT_WITH_NAME_AND_SSRC(windows_id, prefix, time_ms,
+                                           static_cast<double>(y), flow_id_,
+                                           algorithm_name_);
 }
 
 void MetricRecorder::UpdateTimeMs(int64_t time_ms) {
   now_ms_ = std::max(now_ms_, time_ms);
 }
 
 void MetricRecorder::UpdateThroughput(int64_t bitrate_kbps,
                                       size_t payload_size) {
   // Total throughput should be computed before updating the time.
   PushThroughputBytes(payload_size, now_ms_);
@@ skipping 189 matching lines @@
                                             const std::string& bwe_name,
                                             size_t num_flows) const {
   BWE_TEST_LOGGING_LABEL(7, title, "objective_function", num_flows);
   BWE_TEST_LOGGING_BAR(7, bwe_name, ObjectiveFunction(), flow_id_);
 }
 
 void MetricRecorder::PlotZero() {
   for (int i = kThroughput; i <= kLoss; ++i) {
     if (plot_information_[i].plot) {
       std::stringstream prefix;
+      // TODO(terelius): Since this does not use the BWE_TEST_LOGGING macros,
+      // it hasn't been kept up to date with the plot format. Remove or fix?
       prefix << "Receiver_" << flow_id_ << "_" + plot_information_[i].prefix;
       PlotLine(i, prefix.str(), now_ms_, 0);
       plot_information_[i].last_plot_ms = now_ms_;
     }
   }
 }
 
 void MetricRecorder::PauseFlow() {
   PlotZero();
   link_share_->PauseFlow(flow_id_);
@@ skipping 68 matching lines @@
 
   double throughput_metric = U(sum_throughput_bytes_, kAlpha);
   double delay_penalty = kDelta * U(sum_delays_ms_, kBeta);
 
   return throughput_metric - delay_penalty;
 }
 
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc