From 83773b555cf31d2614608c6e5b9f6a538dd39037 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 19 Aug 2019 10:35:21 +0200 Subject: [PATCH] Delete deprecated RtpRtcp::CreateRtpRtcp factory Bug: None Change-Id: I2ace74c380b89d300a6d0e7cca4766147f33cb1d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/149821 Commit-Queue: Danil Chapovalov Reviewed-by: Niels Moller Cr-Commit-Position: refs/heads/master@{#28890} --- modules/rtp_rtcp/include/rtp_rtcp.h | 3 --- modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/modules/rtp_rtcp/include/rtp_rtcp.h b/modules/rtp_rtcp/include/rtp_rtcp.h index 00b49f24ba..6a2d91b3d6 100644 --- a/modules/rtp_rtcp/include/rtp_rtcp.h +++ b/modules/rtp_rtcp/include/rtp_rtcp.h @@ -133,9 +133,6 @@ class RtpRtcp : public Module, public RtcpFeedbackSenderInterface { // Creates an RTP/RTCP module object using provided |configuration|. static std::unique_ptr Create(const Configuration& configuration); - // Prefer factory function just above. - RTC_DEPRECATED - static RtpRtcp* CreateRtpRtcp(const RtpRtcp::Configuration& configuration); // ************************************************************************** // Receiver functions diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index 5c6697e6a4..06573bfd2b 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -46,18 +46,6 @@ std::unique_ptr RtpRtcp::Create(const Configuration& configuration) { return absl::make_unique(configuration); } -RtpRtcp* RtpRtcp::CreateRtpRtcp(const RtpRtcp::Configuration& configuration) { - if (configuration.clock) { - return new ModuleRtpRtcpImpl(configuration); - } else { - // No clock implementation provided, use default clock. - RtpRtcp::Configuration configuration_copy; - memcpy(&configuration_copy, &configuration, sizeof(RtpRtcp::Configuration)); - configuration_copy.clock = Clock::GetRealTimeClock(); - return new ModuleRtpRtcpImpl(configuration_copy); - } -} - ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) : rtcp_sender_(configuration), rtcp_receiver_(configuration, this),