mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-19 16:47:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup RtcpTransceiver dependency on webrtc::Transport

Browse source 
Bug: webrtc:8239
Change-Id: I5740935044ba422a32b571eb9f559e83b915fe15
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/306522
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Emil Lundmark <lndmrk@webrtc.org>
Commit-Queue: Emil Lundmark <lndmrk@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#40152}
This commit is contained in:
Danil Chapovalov 2023-05-25 12:52:21 +02:00 committed by WebRTC LUCI CQ
parent 5f38949c54
commit f53b3436e4
3 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
modules/rtp_rtcp/BUILD.gn
View file

@ -404,7 +404,6 @@ rtc_library("rtcp_transceiver") {
":rtp_rtcp_format", ":rtp_rtcp_format",
"../../api:array_view", "../../api:array_view",
"../../api:rtp_headers", "../../api:rtp_headers",
"../../api:transport_api",
"../../api/task_queue", "../../api/task_queue",
"../../api/units:data_rate", "../../api/units:data_rate",
"../../api/units:time_delta", "../../api/units:time_delta",

5
modules/rtp_rtcp/source/rtcp_transceiver_config.h
View file

@ -26,7 +26,6 @@
namespace webrtc { namespace webrtc {
class ReceiveStatisticsProvider; class ReceiveStatisticsProvider;
class Transport;
// Interface to watch incoming rtcp packets by media (rtp) receiver. // Interface to watch incoming rtcp packets by media (rtp) receiver.
// All message handlers have default empty implementation. This way users only // All message handlers have default empty implementation. This way users only
@ -114,10 +113,6 @@ struct RtcpTransceiverConfig {
Clock* clock = nullptr; Clock* clock = nullptr;
// Transport to send RTCP packets to. // Transport to send RTCP packets to.
union {
[[deprecated]] Transport* outgoing_transport = nullptr;
Transport* deprecated_outgoing_transport;
};
std::function<void(rtc::ArrayView<const uint8_t>)> rtcp_transport; std::function<void(rtc::ArrayView<const uint8_t>)> rtcp_transport;
// Queue for scheduling delayed tasks, e.g. sending periodic compound packets. // Queue for scheduling delayed tasks, e.g. sending periodic compound packets.

8
modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
View file

@ -15,7 +15,6 @@
#include "absl/algorithm/container.h" #include "absl/algorithm/container.h"
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
#include "api/call/transport.h"
#include "api/video/video_bitrate_allocation.h" #include "api/video/video_bitrate_allocation.h"
#include "modules/rtp_rtcp/include/receive_statistics.h" #include "modules/rtp_rtcp/include/receive_statistics.h"
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
@ -54,13 +53,6 @@ std::function<void(rtc::ArrayView<const uint8_t>)> GetRtcpTransport(
return config.rtcp_transport; return config.rtcp_transport;
} }
if (config.deprecated_outgoing_transport != nullptr) {
Transport* transport = config.deprecated_outgoing_transport;
return [transport](rtc::ArrayView<const uint8_t> packet) {
transport->SendRtcp(packet.data(), packet.size());
};
}
bool first = true; bool first = true;
std::string log_prefix = config.debug_id; std::string log_prefix = config.debug_id;
return [first, log_prefix](rtc::ArrayView<const uint8_t> packet) mutable { return [first, log_prefix](rtc::ArrayView<const uint8_t> packet) mutable {