From f53b3436e46d9ce49606abfc10c63213807e40d5 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Thu, 25 May 2023 12:52:21 +0200 Subject: [PATCH] Cleanup RtcpTransceiver dependency on webrtc::Transport Bug: webrtc:8239 Change-Id: I5740935044ba422a32b571eb9f559e83b915fe15 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306522 Auto-Submit: Danil Chapovalov Reviewed-by: Emil Lundmark Commit-Queue: Emil Lundmark Cr-Commit-Position: refs/heads/main@{#40152} --- modules/rtp_rtcp/BUILD.gn | 1 - modules/rtp_rtcp/source/rtcp_transceiver_config.h | 5 ----- modules/rtp_rtcp/source/rtcp_transceiver_impl.cc | 8 -------- 3 files changed, 14 deletions(-) diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn index 2048cdb1d8..f17567cba3 100644 --- a/modules/rtp_rtcp/BUILD.gn +++ b/modules/rtp_rtcp/BUILD.gn @@ -404,7 +404,6 @@ rtc_library("rtcp_transceiver") { ":rtp_rtcp_format", "../../api:array_view", "../../api:rtp_headers", - "../../api:transport_api", "../../api/task_queue", "../../api/units:data_rate", "../../api/units:time_delta", diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_config.h b/modules/rtp_rtcp/source/rtcp_transceiver_config.h index 2906689108..881666d704 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_config.h +++ b/modules/rtp_rtcp/source/rtcp_transceiver_config.h @@ -26,7 +26,6 @@ namespace webrtc { class ReceiveStatisticsProvider; -class Transport; // Interface to watch incoming rtcp packets by media (rtp) receiver. // All message handlers have default empty implementation. This way users only @@ -114,10 +113,6 @@ struct RtcpTransceiverConfig { Clock* clock = nullptr; // Transport to send RTCP packets to. - union { - [[deprecated]] Transport* outgoing_transport = nullptr; - Transport* deprecated_outgoing_transport; - }; std::function)> rtcp_transport; // Queue for scheduling delayed tasks, e.g. sending periodic compound packets. diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc index b21313175f..69ecddc354 100644 --- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc +++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc @@ -15,7 +15,6 @@ #include "absl/algorithm/container.h" #include "absl/memory/memory.h" -#include "api/call/transport.h" #include "api/video/video_bitrate_allocation.h" #include "modules/rtp_rtcp/include/receive_statistics.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" @@ -54,13 +53,6 @@ std::function)> GetRtcpTransport( return config.rtcp_transport; } - if (config.deprecated_outgoing_transport != nullptr) { - Transport* transport = config.deprecated_outgoing_transport; - return [transport](rtc::ArrayView packet) { - transport->SendRtcp(packet.data(), packet.size()); - }; - } - bool first = true; std::string log_prefix = config.debug_id; return [first, log_prefix](rtc::ArrayView packet) mutable {