commit fbb31dff0cd927bed9f0c5edf637a89557c1bf97
author Danil Chapovalov <danilchap@webrtc.org> Thu Sep 24 12:05:23 2020
committer Commit Bot <commit-bot@chromium.org> Mon Sep 28 17:36:00 2020
tree 1b5ea767ee0fd36c7c527b5080b51e82ca301c15
parent 87b11009afea925b7bd43fd5fadfd701eb6194ea

Delete RtpRtcp::BitrateSent as no longer used

Bug: None
Change-Id: I3e54efcb493126803f2b7139a06d6101462d678a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/185186
Reviewed-by: Erik Språng <sprang@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32215}

modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index d597b1e..70b073c 100644
--- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -82,13 +82,6 @@
   MOCK_METHOD(bool, SendingMedia, (), (const, override));
   MOCK_METHOD(bool, IsAudioConfigured, (), (const, override));
   MOCK_METHOD(void, SetAsPartOfAllocation, (bool), (override));
-  MOCK_METHOD(void,
-              BitrateSent,
-              (uint32_t * total_rate,
-               uint32_t* video_rate,
-               uint32_t* fec_rate,
-               uint32_t* nack_rate),
-              (const, override));
   MOCK_METHOD(RtpSendRates, GetSendRates, (), (const, override));
   MOCK_METHOD(bool,
               OnSendingRtpFrame,

modules/rtp_rtcp/source/rtp_rtcp_impl.cc

diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 92abd9b..b2268c7 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -727,19 +727,6 @@
   rtcp_receiver_.SetRemoteSSRC(ssrc);
 }
 
-void ModuleRtpRtcpImpl::BitrateSent(uint32_t* total_rate,
-                                    uint32_t* video_rate,
-                                    uint32_t* fec_rate,
-                                    uint32_t* nack_rate) const {
-  RtpSendRates send_rates = rtp_sender_->packet_sender.GetSendRates();
-  *total_rate = send_rates.Sum().bps<uint32_t>();
-  if (video_rate)
-    *video_rate = 0;
-  if (fec_rate)
-    *fec_rate = 0;
-  *nack_rate = send_rates[RtpPacketMediaType::kRetransmission].bps<uint32_t>();
-}
-
 RtpSendRates ModuleRtpRtcpImpl::GetSendRates() const {
   return rtp_sender_->packet_sender.GetSendRates();
 }

modules/rtp_rtcp/source/rtp_rtcp_impl.h

diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
index c413efe..7f7df17 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
@@ -264,11 +264,6 @@
                        uint32_t* NTPfrac,
                        uint32_t* remote_sr) const;
 
-  void BitrateSent(uint32_t* total_rate,
-                   uint32_t* video_rate,
-                   uint32_t* fec_rate,
-                   uint32_t* nackRate) const override;
-
   RtpSendRates GetSendRates() const override;
 
   void OnReceivedNack(

modules/rtp_rtcp/source/rtp_rtcp_impl2.cc

diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
index 31e4854..88ede3d 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
@@ -631,21 +631,6 @@
   rtcp_receiver_.SetRemoteSSRC(ssrc);
 }
 
-// TODO(nisse): Delete video_rate amd fec_rate arguments.
-void ModuleRtpRtcpImpl2::BitrateSent(uint32_t* total_rate,
-                                     uint32_t* video_rate,
-                                     uint32_t* fec_rate,
-                                     uint32_t* nack_rate) const {
-  RTC_DCHECK_RUN_ON(worker_queue_);
-  RtpSendRates send_rates = rtp_sender_->packet_sender.GetSendRates();
-  *total_rate = send_rates.Sum().bps<uint32_t>();
-  if (video_rate)
-    *video_rate = 0;
-  if (fec_rate)
-    *fec_rate = 0;
-  *nack_rate = send_rates[RtpPacketMediaType::kRetransmission].bps<uint32_t>();
-}
-
 RtpSendRates ModuleRtpRtcpImpl2::GetSendRates() const {
   RTC_DCHECK_RUN_ON(worker_queue_);
   return rtp_sender_->packet_sender.GetSendRates();

modules/rtp_rtcp/source/rtp_rtcp_impl2.h

diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h
index 9611ace..9eb7e3a 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h
@@ -250,11 +250,6 @@
                        uint32_t* NTPfrac,
                        uint32_t* remote_sr) const;
 
-  void BitrateSent(uint32_t* total_rate,
-                   uint32_t* video_rate,
-                   uint32_t* fec_rate,
-                   uint32_t* nackRate) const override;
-
   RtpSendRates GetSendRates() const override;
 
   void OnReceivedNack(

modules/rtp_rtcp/source/rtp_rtcp_interface.h

diff --git a/modules/rtp_rtcp/source/rtp_rtcp_interface.h b/modules/rtp_rtcp/source/rtp_rtcp_interface.h
index f763da2..3bd5d47 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_interface.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_interface.h
@@ -267,13 +267,6 @@
   // bitrate estimate since the stream participates in the bitrate allocation.
   virtual void SetAsPartOfAllocation(bool part_of_allocation) = 0;
 
-  // TODO(sprang): Remove when all call sites have been moved to
-  // GetSendRates(). Fetches the current send bitrates in bits/s.
-  virtual void BitrateSent(uint32_t* total_rate,
-                           uint32_t* video_rate,
-                           uint32_t* fec_rate,
-                           uint32_t* nack_rate) const = 0;
-
   // Returns bitrate sent (post-pacing) per packet type.
   virtual RtpSendRates GetSendRates() const = 0;