diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc index c4c30a9467..30a9d01ebb 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.cc +++ b/modules/rtp_rtcp/source/rtcp_sender.cc @@ -186,9 +186,6 @@ RTCPSender::RTCPSender(Configuration config) builders_[kRtcpAnyExtendedReports] = &RTCPSender::BuildExtendedReports; } -RTCPSender::RTCPSender(const RtpRtcpInterface::Configuration& config) - : RTCPSender(Configuration::FromRtpRtcpConfiguration(config)) {} - RTCPSender::~RTCPSender() {} RtcpMode RTCPSender::Status() const { @@ -328,16 +325,6 @@ void RTCPSender::SetLastRtpTime(uint32_t rtp_timestamp, } } -void RTCPSender::SetLastRtpTime(uint32_t rtp_timestamp, - int64_t capture_time_ms, - int8_t payload_type) { - absl::optional payload_type_optional; - if (payload_type != -1) - payload_type_optional = payload_type; - SetLastRtpTime(rtp_timestamp, Timestamp::Millis(capture_time_ms), - payload_type_optional); -} - void RTCPSender::SetRtpClockRate(int8_t payload_type, int rtp_clock_rate_hz) { MutexLock lock(&mutex_rtcp_sender_); rtp_clock_rates_khz_[payload_type] = rtp_clock_rate_hz / 1000; diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h index e50ce44e13..027d3d0c13 100644 --- a/modules/rtp_rtcp/source/rtcp_sender.h +++ b/modules/rtp_rtcp/source/rtcp_sender.h @@ -98,9 +98,6 @@ class RTCPSender final { }; explicit RTCPSender(Configuration config); - // TODO(bugs.webrtc.org/11581): delete this temporary compatibility helper - // once downstream dependencies migrates. - explicit RTCPSender(const RtpRtcpInterface::Configuration& config); RTCPSender() = delete; RTCPSender(const RTCPSender&) = delete; @@ -125,14 +122,6 @@ class RTCPSender final { absl::optional capture_time, absl::optional payload_type) RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_); - // TODO(bugs.webrtc.org/6458): Remove default parameter value when all the - // depending projects are updated to correctly set payload type. - // TODO(bugs.webrtc.org/12873): Remove once downstream consumers migrates to - // the new version of SetLastRtpTime declared above. - void SetLastRtpTime(uint32_t rtp_timestamp, - int64_t capture_time_ms, - int8_t payload_type = -1) - RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_); void SetRtpClockRate(int8_t payload_type, int rtp_clock_rate_hz) RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_);