Move chart proto for event_log_visualizer.
Bug: None
Change-Id: I7bca9002f208ac0bafc2d2d399978a289209496f
Reviewed-on: https://webrtc-review.googlesource.com/c/113815
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25963}diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 9778c9c..4cdfd09 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -227,9 +227,10 @@
if (rtc_enable_protobuf) {
proto_library("chart_proto") {
sources = [
- "event_log_visualizer/chart.proto",
+ "event_log_visualizer/proto/chart.proto",
+ "event_log_visualizer/proto/chart_enums.proto",
]
- proto_out_dir = "rtc_tools/event_log_visualizer"
+ proto_out_dir = "rtc_tools/event_log_visualizer/proto"
}
rtc_static_library("event_log_visualizer_utils") {
diff --git a/rtc_tools/event_log_visualizer/plot_protobuf.h b/rtc_tools/event_log_visualizer/plot_protobuf.h
index f59d303..b81515a 100644
--- a/rtc_tools/event_log_visualizer/plot_protobuf.h
+++ b/rtc_tools/event_log_visualizer/plot_protobuf.h
@@ -12,7 +12,7 @@
#include "rtc_base/ignore_wundef.h"
RTC_PUSH_IGNORING_WUNDEF()
-#include "rtc_tools/event_log_visualizer/chart.pb.h"
+#include "rtc_tools/event_log_visualizer/proto/chart.pb.h"
RTC_POP_IGNORING_WUNDEF()
#include "rtc_tools/event_log_visualizer/plot_base.h"
diff --git a/rtc_tools/event_log_visualizer/chart.proto b/rtc_tools/event_log_visualizer/proto/chart.proto
similarity index 79%
rename from rtc_tools/event_log_visualizer/chart.proto
rename to rtc_tools/event_log_visualizer/proto/chart.proto
index 41e3ebd..3a11d78 100644
--- a/rtc_tools/event_log_visualizer/chart.proto
+++ b/rtc_tools/event_log_visualizer/proto/chart.proto
@@ -1,18 +1,9 @@
-// Describes a chart generated from WebRTC event log data.
syntax = "proto3";
+// Describes a chart generated from WebRTC event log data.
option optimize_for = LITE_RUNTIME;
-
package webrtc.analytics;
-message ChartStyle {
- enum Type {
- UNDEFINED = 0;
- LINE_CHART = 1;
- BAR_CHART = 2;
- LINE_STEP_CHART = 3;
- SCATTER_CHART = 4;
- }
-}
+import "chart_enums.proto";
message DataSet {
repeated float x_values = 1;
diff --git a/rtc_tools/event_log_visualizer/proto/chart_enums.proto b/rtc_tools/event_log_visualizer/proto/chart_enums.proto
new file mode 100644
index 0000000..985ad0a
--- /dev/null
+++ b/rtc_tools/event_log_visualizer/proto/chart_enums.proto
@@ -0,0 +1,13 @@
+syntax = "proto3";
+// Contains enums used as part of chart.proto
+package webrtc.analytics;
+
+message ChartStyle {
+ enum Type {
+ UNDEFINED = 0;
+ LINE_CHART = 1;
+ BAR_CHART = 2;
+ LINE_STEP_CHART = 3;
+ SCATTER_CHART = 4;
+ };
+};
