From cff20c2615d8e0ba7b8a1e5482ce03d5a4d56203 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Erik=20Spr=C3=A5ng?= Date: Mon, 28 Oct 2019 12:28:16 +0100 Subject: [PATCH] Adds protected bitrate helper methods to RtpRtcpImpl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: webrtc:11036 Change-Id: Iac7f79b60b9f4150868e4e2c59c04c6f866011de Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/158527 Reviewed-by: Ilya Nikolaevskiy Commit-Queue: Erik Språng Cr-Commit-Position: refs/heads/master@{#29631} --- modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 8 ++++++++ modules/rtp_rtcp/source/rtp_rtcp_impl.h | 3 +++ 2 files changed, 11 insertions(+) diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index f490439de1..40e07727e8 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -764,4 +764,12 @@ const RTPSender* ModuleRtpRtcpImpl::RtpSender() const { return rtp_sender_.get(); } +DataRate ModuleRtpRtcpImpl::SendRate() const { + return DataRate::bps(rtp_sender_->BitrateSent()); +} + +DataRate ModuleRtpRtcpImpl::NackOverheadRate() const { + return DataRate::bps(rtp_sender_->NackOverheadRate()); +} + } // namespace webrtc diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 01ef03ad46..67a2d4f2bf 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -289,6 +289,9 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { Clock* clock() const { return clock_; } + DataRate SendRate() const; + DataRate NackOverheadRate() const; + private: FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, Rtt); FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, RttForReceiverOnly);