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

webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.cc

 /*
  *  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.
  */
 
 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h"
 
 #if BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
 
 #include <stdarg.h>
 #include <stdio.h>
 
 #include <algorithm>
 #include <sstream>
 
+#include "webrtc/base/format_macros.h"
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
 
 namespace webrtc {
 namespace testing {
 namespace bwe {
 
 Logging Logging::g_Logging;
 
 static std::string ToString(uint32_t v) {
@@ skipping 52 matching lines @@
   if (state.enabled) {
     printf("%s\t", state.tag.c_str());
     va_list args;
     va_start(args, format);
     vprintf(format, args);
     va_end(args);
     printf("\n");
   }
 }
 
-void Logging::Plot(int figure, double value) {
-  Plot(figure, value, 0, "-");
-}
-
-void Logging::Plot(int figure, double value, uint32_t ssrc) {
-  Plot(figure, value, ssrc, "-");
-}
-
-void Logging::Plot(int figure, double value, const std::string& alg_name) {
-  Plot(figure, value, 0, alg_name);
+void Logging::Plot(int figure, const std::string& name, double value) {
+  Plot(figure, name, value, 0, "-");
 }
 
 void Logging::Plot(int figure,
+                   const std::string& name,
+                   double value,
+                   uint32_t ssrc) {
+  Plot(figure, name, value, ssrc, "-");
+}
+
+void Logging::Plot(int figure,
+                   const std::string& name,
+                   double value,
+                   const std::string& alg_name) {
+  Plot(figure, name, value, 0, alg_name);
+}
+
+void Logging::Plot(int figure,
+                   const std::string& name,
                    double value,
                    uint32_t ssrc,
                    const std::string& alg_name) {
   CriticalSectionScoped cs(crit_sect_.get());
   ThreadMap::iterator it = thread_map_.find(rtc::CurrentThreadId());
   assert(it != thread_map_.end());
   const State& state = it->second.stack.top();
-  std::stringstream ss;
-  ss << ssrc;
-  std::string label = state.tag + ':' + ss.str() + '@' + alg_name;
-  std::string prefix("Available");
-  if (alg_name.compare(0, prefix.length(), prefix) == 0) {
-    std::string receiver("Receiver");
-    size_t start_pos = label.find(receiver);
-    if (start_pos != std::string::npos) {
-      label.replace(start_pos, receiver.length(), "Sender");
-    }
-  }
   if (state.enabled) {
-    printf("PLOT\t%d\t%s\t%f\t%f\n", figure, label.c_str(),
-           state.timestamp_ms * 0.001, value);
+    printf("PLOT\t%d\t%s:%" PRIu32 "@%s\t%f\t%f\n", figure, name.c_str(), ssrc,
+           alg_name.c_str(), state.timestamp_ms * 0.001, value);
   }
 }
 
 void Logging::PlotBar(int figure,
                       const std::string& name,
                       double value,
                       int flow_id) {
   CriticalSectionScoped cs(crit_sect_.get());
   ThreadMap::iterator it = thread_map_.find(rtc::CurrentThreadId());
   assert(it != thread_map_.end());
@@ skipping 117 matching lines @@
     // Update time so that next log/plot will use the latest time seen so far
     // in this call tree.
     state->timestamp_ms = std::max(state->timestamp_ms, newest_timestamp_ms);
   }
 }
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE