Deprecating injection of event log into GoogCC factory.
Bug: webrtc:9883
Change-Id: I6087b4a0a2c934e6a9ab435fffaf2eb1fc2a29e4
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134644
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27824}
diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc
index 00369e8..71c5f74 100644
--- a/rtc_tools/event_log_visualizer/analyzer.cc
+++ b/rtc_tools/event_log_visualizer/analyzer.cc
@@ -1166,9 +1166,8 @@
TimeSeries probe_results("Logged probe success", LineStyle::kNone,
PointStyle::kHighlight);
- RtcEventLogNullImpl null_event_log;
LogBasedNetworkControllerSimulation simulation(
- absl::make_unique<GoogCcNetworkControllerFactory>(&null_event_log),
+ absl::make_unique<GoogCcNetworkControllerFactory>(),
[&](const NetworkControlUpdate& update, Timestamp at_time) {
if (update.target_rate) {
target_rates.points.emplace_back(
@@ -1222,13 +1221,14 @@
PacketRouter packet_router;
PacedSender pacer(&clock, &packet_router, &null_event_log);
TransportFeedbackAdapter transport_feedback;
- auto factory = GoogCcNetworkControllerFactory(&null_event_log);
+ auto factory = GoogCcNetworkControllerFactory();
TimeDelta process_interval = factory.GetProcessInterval();
// TODO(holmer): Log the call config and use that here instead.
static const uint32_t kDefaultStartBitrateBps = 300000;
NetworkControllerConfig cc_config;
cc_config.constraints.at_time = Timestamp::us(clock.TimeInMicroseconds());
cc_config.constraints.starting_rate = DataRate::bps(kDefaultStartBitrateBps);
+ cc_config.event_log = &null_event_log;
auto goog_cc = factory.Create(cc_config);
TimeSeries time_series("Delay-based estimate", LineStyle::kStep,
diff --git a/rtc_tools/event_log_visualizer/log_simulation.cc b/rtc_tools/event_log_visualizer/log_simulation.cc
index 1595e35..818775d 100644
--- a/rtc_tools/event_log_visualizer/log_simulation.cc
+++ b/rtc_tools/event_log_visualizer/log_simulation.cc
@@ -35,6 +35,7 @@
config.constraints.at_time = to_time;
config.constraints.min_data_rate = DataRate::kbps(30);
config.constraints.starting_rate = DataRate::kbps(300);
+ config.event_log = &null_event_log_;
controller_ = factory_->Create(config);
}
if (last_process_.IsInfinite() ||
diff --git a/rtc_tools/event_log_visualizer/log_simulation.h b/rtc_tools/event_log_visualizer/log_simulation.h
index f891db6..0387e3b 100644
--- a/rtc_tools/event_log_visualizer/log_simulation.h
+++ b/rtc_tools/event_log_visualizer/log_simulation.h
@@ -45,6 +45,7 @@
void OnFeedback(const LoggedRtcpPacketTransportFeedback& feedback);
void OnReceiverReport(const LoggedRtcpPacketReceiverReport& report);
void OnIceConfig(const LoggedIceCandidatePairConfig& candidate);
+ RtcEventLogNullImpl null_event_log_;
const std::function<void(const NetworkControlUpdate&, Timestamp)>
update_handler_;