From ac2720e9679d0adf12924b1a4e6f3c6c0d01717b Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 6 Mar 2024 16:30:34 +0100 Subject: [PATCH] Remove unnecessary RtcEventLog parameter in RtpTransportControllerSend::CreateRtpVideoSender MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RtpTransportControllerSend has access to the same Environment as the caller, and thus can take RtcEventLog directly from it. Bug: None Change-Id: I4b20811d3f6de8193c63d6c58d0fe1204b3ec7b1 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/342040 Reviewed-by: Åsa Persson Commit-Queue: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#41864} --- call/BUILD.gn | 1 - call/rtp_transport_controller_send.cc | 5 ++--- call/rtp_transport_controller_send.h | 2 -- call/rtp_transport_controller_send_interface.h | 2 -- call/test/mock_rtp_transport_controller_send.h | 1 - video/video_send_stream_impl.cc | 1 - 6 files changed, 2 insertions(+), 10 deletions(-) diff --git a/call/BUILD.gn b/call/BUILD.gn index 85c3332fe1..654db9cb1e 100644 --- a/call/BUILD.gn +++ b/call/BUILD.gn @@ -116,7 +116,6 @@ rtc_library("rtp_interfaces") { "../api:rtp_parameters", "../api/crypto:options", "../api/environment", - "../api/rtc_event_log", "../api/transport:bandwidth_estimation_settings", "../api/transport:bitrate_settings", "../api/transport:network_control", diff --git a/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc index 32c4addfb9..7e0580d1e2 100644 --- a/call/rtp_transport_controller_send.cc +++ b/call/rtp_transport_controller_send.cc @@ -128,7 +128,6 @@ RtpVideoSenderInterface* RtpTransportControllerSend::CreateRtpVideoSender( int rtcp_report_interval_ms, Transport* send_transport, const RtpSenderObservers& observers, - RtcEventLog* event_log, std::unique_ptr fec_controller, const RtpSenderFrameEncryptionConfig& frame_encryption_config, rtc::scoped_refptr frame_transformer) { @@ -138,8 +137,8 @@ RtpVideoSenderInterface* RtpTransportControllerSend::CreateRtpVideoSender( rtcp_report_interval_ms, send_transport, observers, // TODO(holmer): Remove this circular dependency by injecting // the parts of RtpTransportControllerSendInterface that are really used. - this, event_log, &retransmission_rate_limiter_, std::move(fec_controller), - frame_encryption_config.frame_encryptor, + this, &env_.event_log(), &retransmission_rate_limiter_, + std::move(fec_controller), frame_encryption_config.frame_encryptor, frame_encryption_config.crypto_options, std::move(frame_transformer), env_.field_trials(), &env_.task_queue_factory())); return video_rtp_senders_.back().get(); diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h index 1438d82851..3d4db3c815 100644 --- a/call/rtp_transport_controller_send.h +++ b/call/rtp_transport_controller_send.h @@ -42,7 +42,6 @@ namespace webrtc { class FrameEncryptorInterface; -class RtcEventLog; class RtpTransportControllerSend final : public RtpTransportControllerSendInterface, @@ -66,7 +65,6 @@ class RtpTransportControllerSend final int rtcp_report_interval_ms, Transport* send_transport, const RtpSenderObservers& observers, - RtcEventLog* event_log, std::unique_ptr fec_controller, const RtpSenderFrameEncryptionConfig& frame_encryption_config, rtc::scoped_refptr frame_transformer) override; diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h index 0cc8bb74d7..eda5b1c5a2 100644 --- a/call/rtp_transport_controller_send_interface.h +++ b/call/rtp_transport_controller_send_interface.h @@ -23,7 +23,6 @@ #include "api/crypto/crypto_options.h" #include "api/fec_controller.h" #include "api/frame_transformer_interface.h" -#include "api/rtc_event_log/rtc_event_log.h" #include "api/transport/bandwidth_estimation_settings.h" #include "api/transport/bitrate_settings.h" #include "api/units/timestamp.h" @@ -102,7 +101,6 @@ class RtpTransportControllerSendInterface { int rtcp_report_interval_ms, Transport* send_transport, const RtpSenderObservers& observers, - RtcEventLog* event_log, std::unique_ptr fec_controller, const RtpSenderFrameEncryptionConfig& frame_encryption_config, rtc::scoped_refptr frame_transformer) = 0; diff --git a/call/test/mock_rtp_transport_controller_send.h b/call/test/mock_rtp_transport_controller_send.h index 63f686eb3c..805027009c 100644 --- a/call/test/mock_rtp_transport_controller_send.h +++ b/call/test/mock_rtp_transport_controller_send.h @@ -41,7 +41,6 @@ class MockRtpTransportControllerSend int rtcp_report_interval_ms, Transport*, const RtpSenderObservers&, - RtcEventLog*, std::unique_ptr, const RtpSenderFrameEncryptionConfig&, rtc::scoped_refptr), diff --git a/video/video_send_stream_impl.cc b/video/video_send_stream_impl.cc index 6b14fd00bb..03d3950578 100644 --- a/video/video_send_stream_impl.cc +++ b/video/video_send_stream_impl.cc @@ -437,7 +437,6 @@ VideoSendStreamImpl::VideoSendStreamImpl( &encoder_feedback_, &stats_proxy_, &send_packet_observer_), - &env_.event_log(), std::move(fec_controller), CreateFrameEncryptionConfig(&config_), config_.frame_transformer)),