Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h |
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h |
index 53550fb854c50e49c935cff05fafc55a47dfc7d3..7a7bca1fce19efed8fb916de7479cebf6a316783 100644 |
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h |
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_logging.h |
@@ -91,9 +91,13 @@ |
// |name| is a char*, std::string or uint32_t to name the plotted value. |
// |time| is an int64_t time in ms, or -1 to inherit time from previous context. |
// |value| is a double precision float to be plotted. |
+// |ssrc| identifies the source of a stream |
// |alg_name| is an optional argument, a string |
#define BWE_TEST_LOGGING_PLOT(figure, name, time, value) |
#define BWE_TEST_LOGGING_PLOT_WITH_NAME(figure, name, time, value, alg_name) |
+#define BWE_TEST_LOGGING_PLOT_WITH_SSRC(figure, name, time, value, ssrc) |
+#define BWE_TEST_LOGGING_PLOT_WITH_NAME_AND_SSRC(figure, name, time, value, \ |
+ ssrc, alg_name) |
// Print to stdout in tab-separated format suitable for plotting, e.g.: |
// BAR figure Context1_Context2_Name x_left width value |
@@ -194,6 +198,22 @@ |
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); \ |
+ } 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); \ |
+ } while (0) |
+ |
#define BWE_TEST_LOGGING_BAR(figure, name, value, flow_id) \ |
do { \ |
BWE_TEST_LOGGING_CONTEXT(name); \ |
@@ -261,6 +281,11 @@ class Logging { |
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, |
+ 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, |