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

webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.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 165 matching lines @@
       webrtc::testing::bwe::Logging::GetInstance()->Log(format, _1, _2, _3, \
                                                         _4); \
     } while (0)
 #define BWE_TEST_LOGGING_LOG5(name, format, _1, _2, _3, _4, _5) \
     do {\
       BWE_TEST_LOGGING_CONTEXT(name); \
       webrtc::testing::bwe::Logging::GetInstance()->Log(format, _1, _2, _3, \
                                                         _4, _5); \
     } while (0)
 
-#define BWE_TEST_LOGGING_PLOT(figure, name, time, value)                  \
-  do {                                                                    \
-    __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name,        \
-                                       static_cast<int64_t>(time), true); \
-    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, value);    \
+#define BWE_TEST_LOGGING_PLOT(figure, name, time, value)                     \
+  do {                                                                       \
+    __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name,           \
+                                       static_cast<int64_t>(time), true);    \
+    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, name, value); \
   } while (0)
 
 #define BWE_TEST_LOGGING_PLOT_WITH_NAME(figure, name, time, value, alg_name) \
   do {                                                                       \
     __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name,           \
                                        static_cast<int64_t>(time), true);    \
-    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, value,        \
+    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, name, value,  \
                                                        alg_name);            \
   } while (0)
 
-#define BWE_TEST_LOGGING_PLOT_WITH_SSRC(figure, name, time, value, ssrc)     \
-  do {                                                                       \
-    __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name,           \
-                                       static_cast<int64_t>(time), true);    \
-    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, value, ssrc); \
+#define BWE_TEST_LOGGING_PLOT_WITH_SSRC(figure, name, time, value, ssrc)    \
+  do {                                                                      \
+    __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name,          \
+                                       static_cast<int64_t>(time), true);   \
+    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, name, value, \
+                                                       ssrc);               \
   } while (0)
 
 #define BWE_TEST_LOGGING_PLOT_WITH_NAME_AND_SSRC(figure, name, time, value, \
                                                  ssrc, alg_name)            \
   do {                                                                      \
     __BWE_TEST_LOGGING_CONTEXT_DECLARE(__bwe_log_, __PLOT__, name,          \
                                        static_cast<int64_t>(time), true);   \
-    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, value, ssrc, \
-                                                       alg_name);           \
+    webrtc::testing::bwe::Logging::GetInstance()->Plot(figure, name, value, \
+                                                       ssrc, alg_name);     \
   } while (0)
 
 #define BWE_TEST_LOGGING_BAR(figure, name, value, flow_id)                     \
   do {                                                                         \
     BWE_TEST_LOGGING_CONTEXT(name);                                            \
     webrtc::testing::bwe::Logging::GetInstance()->PlotBar(figure, name, value, \
                                                           flow_id);            \
   } while (0)
 
 #define BWE_TEST_LOGGING_BASELINEBAR(figure, name, value, flow_id) \
@@ skipping 47 matching lines @@
   };
 
   static Logging* GetInstance();
 
   void SetGlobalContext(uint32_t name);
   void SetGlobalContext(const std::string& name);
   void SetGlobalContext(const char* name);
   void SetGlobalEnable(bool enabled);
 
   void Log(const char format[], ...);
-  void Plot(int figure, double value);
-  void Plot(int figure, double value, const std::string& alg_name);
-  void Plot(int figure, double value, uint32_t ssrc);
+  void Plot(int figure, const std::string& name, double value);
   void Plot(int figure,
+            const std::string& name,
+            double value,
+            const std::string& alg_name);
+  void Plot(int figure, const std::string& name, double value, uint32_t ssrc);
+  void Plot(int figure,
+            const std::string& name,
             double value,
             uint32_t ssrc,
             const std::string& alg_name);
   void PlotBar(int figure, const std::string& name, double value, int flow_id);
   void PlotBaselineBar(int figure,
                        const std::string& name,
                        double value,
                        int flow_id);
   void PlotErrorBar(int figure,
                     const std::string& name,
@@ skipping 43 matching lines @@
   ThreadMap thread_map_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Logging);
 };
 }  // namespace bwe
 }  // namespace testing
 }  // namespace webrtc
 
 #endif  // BWE_TEST_LOGGING_COMPILE_TIME_ENABLE
 #endif  // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_BWE_TEST_LOGGING_H_