
This reverts commit 9e336ec0b8a77c3461d13677cff3563c11c88daa. Reason for revert: Code can accidentally include the deprecated parser but link with the new one, or vice versa. Reverting to fix naming. Original change's description: > Create new API for RtcEventLogParser. > > The new API stores events gathered by event type. For example, it is > possible to ask fo a list of all incoming RTCP messages or all audio > playout events. > > The new API is experimental and may change over next few weeks. Once > it has stabilized and all unit tests and existing tools have been > ported to the new API, the old one will be removed. > > This CL also updates the event_log_visualizer tool to use the new > parser API. This is not a funcional change except for: > - Incoming and outgoing audio level are now drawn in two separate plots. > - Incoming and outgoing timstamps are now drawn in two separate plots. > - RTCP count is no longer split into Video and Audio. It also counts > all RTCP packets rather than only specific message types. > - Slight timing difference in sendside BWE simulation due to only > iterating over transport feedbacks and not over all RTCP packets. > This timing changes are not visible in the plots. > > > Media type for RTCP messages might not be identified correctly by > rtc_event_log2text anymore. On the other hand, assigning a specific > media type to an RTCP packet was a bit hacky to begin with. > > Bug: webrtc:8111 > Change-Id: I8e7168302beb69b2e163a097a2a142b86dd4a26b > Reviewed-on: https://webrtc-review.googlesource.com/60865 > Reviewed-by: Minyue Li <minyue@webrtc.org> > Reviewed-by: Sebastian Jansson <srte@webrtc.org> > Commit-Queue: Björn Terelius <terelius@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#23015} TBR=terelius@webrtc.org,srte@webrtc.org,minyue@webrtc.org Change-Id: Ib4bbcf0563423675a3cc1dce59ebf665e0c5dae9 No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8111 Reviewed-on: https://webrtc-review.googlesource.com/72500 Reviewed-by: Björn Terelius <terelius@webrtc.org> Commit-Queue: Björn Terelius <terelius@webrtc.org> Cr-Commit-Position: refs/heads/master@{#23026}
88 lines
2.8 KiB
C++
88 lines
2.8 KiB
C++
/*
|
|
* Copyright (c) 2016 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 "rtc_tools/event_log_visualizer/plot_protobuf.h"
|
|
|
|
#include <memory>
|
|
|
|
namespace webrtc {
|
|
namespace plotting {
|
|
|
|
ProtobufPlot::ProtobufPlot() {}
|
|
|
|
ProtobufPlot::~ProtobufPlot() {}
|
|
|
|
void ProtobufPlot::Draw() {}
|
|
|
|
void ProtobufPlot::ExportProtobuf(webrtc::analytics::Chart* chart) {
|
|
for (size_t i = 0; i < series_list_.size(); i++) {
|
|
webrtc::analytics::DataSet* data_set = chart->add_data_sets();
|
|
for (const auto& point : series_list_[i].points) {
|
|
data_set->add_x_values(point.x);
|
|
}
|
|
for (const auto& point : series_list_[i].points) {
|
|
data_set->add_y_values(point.y);
|
|
}
|
|
|
|
if (series_list_[i].line_style == LineStyle::kBar) {
|
|
data_set->set_style(webrtc::analytics::ChartStyle::BAR_CHART);
|
|
} else if (series_list_[i].line_style == LineStyle::kLine) {
|
|
data_set->set_style(webrtc::analytics::ChartStyle::LINE_CHART);
|
|
} else if (series_list_[i].line_style == LineStyle::kStep) {
|
|
data_set->set_style(webrtc::analytics::ChartStyle::LINE_STEP_CHART);
|
|
} else if (series_list_[i].line_style == LineStyle::kNone) {
|
|
data_set->set_style(webrtc::analytics::ChartStyle::SCATTER_CHART);
|
|
} else {
|
|
data_set->set_style(webrtc::analytics::ChartStyle::UNDEFINED);
|
|
}
|
|
|
|
if (series_list_[i].point_style == PointStyle::kHighlight)
|
|
data_set->set_highlight_points(true);
|
|
|
|
data_set->set_label(series_list_[i].label);
|
|
}
|
|
|
|
chart->set_xaxis_min(xaxis_min_);
|
|
chart->set_xaxis_max(xaxis_max_);
|
|
chart->set_yaxis_min(yaxis_min_);
|
|
chart->set_yaxis_max(yaxis_max_);
|
|
chart->set_xaxis_label(xaxis_label_);
|
|
chart->set_yaxis_label(yaxis_label_);
|
|
chart->set_title(title_);
|
|
}
|
|
|
|
ProtobufPlotCollection::ProtobufPlotCollection() {}
|
|
|
|
ProtobufPlotCollection::~ProtobufPlotCollection() {}
|
|
|
|
void ProtobufPlotCollection::Draw() {}
|
|
|
|
void ProtobufPlotCollection::ExportProtobuf(
|
|
webrtc::analytics::ChartCollection* collection) {
|
|
for (const auto& plot : plots_) {
|
|
// TODO(terelius): Ensure that there is no way to insert plots other than
|
|
// ProtobufPlots in a ProtobufPlotCollection. Needed to safely static_cast
|
|
// here.
|
|
webrtc::analytics::Chart* protobuf_representation
|
|
= collection->add_charts();
|
|
static_cast<ProtobufPlot*>(plot.get())
|
|
->ExportProtobuf(protobuf_representation);
|
|
}
|
|
}
|
|
|
|
Plot* ProtobufPlotCollection::AppendNewPlot() {
|
|
Plot* plot = new ProtobufPlot();
|
|
plots_.push_back(std::unique_ptr<Plot>(plot));
|
|
return plot;
|
|
}
|
|
|
|
} // namespace plotting
|
|
} // namespace webrtc
|