From 2db5fc00c0d6ceea3628c6971da2546d7539c91c Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Tue, 30 Apr 2019 14:17:45 +0200 Subject: [PATCH] Deprecating injection of event log into GoogCC factory. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:9883 Change-Id: I6087b4a0a2c934e6a9ab435fffaf2eb1fc2a29e4 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134644 Reviewed-by: Björn Terelius Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#27824} --- api/transport/goog_cc_factory.h | 4 +++- .../goog_cc/goog_cc_network_control_unittest.cc | 3 ++- rtc_tools/event_log_visualizer/analyzer.cc | 6 +++--- rtc_tools/event_log_visualizer/log_simulation.cc | 1 + rtc_tools/event_log_visualizer/log_simulation.h | 1 + 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/api/transport/goog_cc_factory.h b/api/transport/goog_cc_factory.h index 10e240c72d..a988c61420 100644 --- a/api/transport/goog_cc_factory.h +++ b/api/transport/goog_cc_factory.h @@ -29,7 +29,9 @@ struct GoogCcFactoryConfig { class GoogCcNetworkControllerFactory : public NetworkControllerFactoryInterface { public: - explicit GoogCcNetworkControllerFactory(RtcEventLog* event_log); + GoogCcNetworkControllerFactory() = default; + explicit RTC_DEPRECATED GoogCcNetworkControllerFactory( + RtcEventLog* event_log); explicit GoogCcNetworkControllerFactory( NetworkStatePredictorFactoryInterface* network_state_predictor_factory); diff --git a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc index e7eea9a2a2..5ec15e97c4 100644 --- a/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc +++ b/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc @@ -112,7 +112,7 @@ void UpdatesTargetRateBasedOnLinkCapacity(std::string test_name = "") { class GoogCcNetworkControllerTest : public ::testing::Test { protected: GoogCcNetworkControllerTest() - : current_time_(Timestamp::ms(123456)), factory_(&event_log_) {} + : current_time_(Timestamp::ms(123456)), factory_() {} ~GoogCcNetworkControllerTest() override {} void SetUp() override { @@ -144,6 +144,7 @@ class GoogCcNetworkControllerTest : public ::testing::Test { config.constraints.min_data_rate = DataRate::kbps(min_data_rate_kbps); config.constraints.max_data_rate = DataRate::kbps(max_data_rate_kbps); config.constraints.starting_rate = DataRate::kbps(starting_bandwidth_kbps); + config.event_log = &event_log_; return config; } ProcessInterval DefaultInterval() { diff --git a/rtc_tools/event_log_visualizer/analyzer.cc b/rtc_tools/event_log_visualizer/analyzer.cc index 00369e8d92..71c5f74bd4 100644 --- a/rtc_tools/event_log_visualizer/analyzer.cc +++ b/rtc_tools/event_log_visualizer/analyzer.cc @@ -1166,9 +1166,8 @@ void EventLogAnalyzer::CreateGoogCcSimulationGraph(Plot* plot) { TimeSeries probe_results("Logged probe success", LineStyle::kNone, PointStyle::kHighlight); - RtcEventLogNullImpl null_event_log; LogBasedNetworkControllerSimulation simulation( - absl::make_unique(&null_event_log), + absl::make_unique(), [&](const NetworkControlUpdate& update, Timestamp at_time) { if (update.target_rate) { target_rates.points.emplace_back( @@ -1222,13 +1221,14 @@ void EventLogAnalyzer::CreateSendSideBweSimulationGraph(Plot* plot) { 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 1595e35a1c..818775d145 100644 --- a/rtc_tools/event_log_visualizer/log_simulation.cc +++ b/rtc_tools/event_log_visualizer/log_simulation.cc @@ -35,6 +35,7 @@ void LogBasedNetworkControllerSimulation::ProcessUntil(Timestamp to_time) { 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 f891db62c0..0387e3be98 100644 --- a/rtc_tools/event_log_visualizer/log_simulation.h +++ b/rtc_tools/event_log_visualizer/log_simulation.h @@ -45,6 +45,7 @@ class LogBasedNetworkControllerSimulation { void OnFeedback(const LoggedRtcpPacketTransportFeedback& feedback); void OnReceiverReport(const LoggedRtcpPacketReceiverReport& report); void OnIceConfig(const LoggedIceCandidatePairConfig& candidate); + RtcEventLogNullImpl null_event_log_; const std::function update_handler_;