From 8d4d671e9be98a090921006cc988cc1fc4fe1947 Mon Sep 17 00:00:00 2001 From: Tomas Gunnarsson Date: Tue, 9 Jun 2020 07:39:02 +0200 Subject: [PATCH] Remove dead code from ModuleRtpRtcpImpl2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:11581 Change-Id: I70e1df2724801c1bc7fb5cfb52cb6d1d44920b0d Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/176570 Commit-Queue: Tommi Reviewed-by: Erik Språng Cr-Commit-Position: refs/heads/master@{#31467} --- modules/rtp_rtcp/source/rtp_rtcp_impl2.cc | 11 ----------- modules/rtp_rtcp/source/rtp_rtcp_impl2.h | 22 ---------------------- 2 files changed, 33 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc index 6b3bbd29c8..151789f5eb 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc @@ -812,15 +812,4 @@ const RTPSender* ModuleRtpRtcpImpl2::RtpSender() const { return rtp_sender_ ? &rtp_sender_->packet_generator : nullptr; } -DataRate ModuleRtpRtcpImpl2::SendRate() const { - RTC_DCHECK(rtp_sender_); - return rtp_sender_->packet_sender.GetSendRates().Sum(); -} - -DataRate ModuleRtpRtcpImpl2::NackOverheadRate() const { - RTC_DCHECK(rtp_sender_); - return rtp_sender_->packet_sender - .GetSendRates()[RtpPacketMediaType::kRetransmission]; -} - } // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h index c5fbd2a4a7..b35c801d97 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h @@ -280,28 +280,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface, RTPSender* RtpSender() override; const RTPSender* RtpSender() const override; - protected: - bool UpdateRTCPReceiveInformationTimers(); - - RTPSender* rtp_sender() { - return rtp_sender_ ? &rtp_sender_->packet_generator : nullptr; - } - const RTPSender* rtp_sender() const { - return rtp_sender_ ? &rtp_sender_->packet_generator : nullptr; - } - - RTCPSender* rtcp_sender() { return &rtcp_sender_; } - const RTCPSender* rtcp_sender() const { return &rtcp_sender_; } - - RTCPReceiver* rtcp_receiver() { return &rtcp_receiver_; } - const RTCPReceiver* rtcp_receiver() const { return &rtcp_receiver_; } - - Clock* clock() const { return clock_; } - - // TODO(sprang): Remove when usage is gone. - DataRate SendRate() const; - DataRate NackOverheadRate() const; - private: FRIEND_TEST_ALL_PREFIXES(RtpRtcpImpl2Test, Rtt); FRIEND_TEST_ALL_PREFIXES(RtpRtcpImpl2Test, RttForReceiverOnly);