From e011cb742d99cbfcc26fb699429cdc6043432c85 Mon Sep 17 00:00:00 2001 From: Bjorn Terelius Date: Mon, 10 Dec 2018 18:42:09 +0100 Subject: [PATCH] Move chart proto for event_log_visualizer. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: None Change-Id: I7bca9002f208ac0bafc2d2d399978a289209496f Reviewed-on: https://webrtc-review.googlesource.com/c/113815 Reviewed-by: Mirko Bonadei Commit-Queue: Björn Terelius Cr-Commit-Position: refs/heads/master@{#25963} --- rtc_tools/BUILD.gn | 5 +++-- rtc_tools/event_log_visualizer/plot_protobuf.h | 2 +- .../event_log_visualizer/{ => proto}/chart.proto | 13 ++----------- .../event_log_visualizer/proto/chart_enums.proto | 13 +++++++++++++ 4 files changed, 19 insertions(+), 14 deletions(-) rename rtc_tools/event_log_visualizer/{ => proto}/chart.proto (79%) create mode 100644 rtc_tools/event_log_visualizer/proto/chart_enums.proto diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn index 9778c9cdcf..4cdfd09c54 100644 --- a/rtc_tools/BUILD.gn +++ b/rtc_tools/BUILD.gn @@ -227,9 +227,10 @@ if (!build_with_chromium) { 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 f59d303f1e..b81515a535 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 41e3ebd330..3a11d78671 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 0000000000..985ad0ad7d --- /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; + }; +};