zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete RtpRtcp::BitrateSent as no longer used

Browse Source 
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}
This commit is contained in:
Danil Chapovalov
2020-09-24 14:05:23 +02:00
committed by Commit Bot
parent 87b11009af
commit fbb31dff0c
6 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
View File

@ -82,13 +82,6 @@ class MockRtpRtcpInterface : public RtpRtcpInterface {
MOCK_METHOD(bool, SendingMedia, (), (const, override)); MOCK_METHOD(bool, SendingMedia, (), (const, override));
MOCK_METHOD(bool, IsAudioConfigured, (), (const, override)); MOCK_METHOD(bool, IsAudioConfigured, (), (const, override));
MOCK_METHOD(void, SetAsPartOfAllocation, (bool), (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(RtpSendRates, GetSendRates, (), (const, override));
MOCK_METHOD(bool, MOCK_METHOD(bool,
OnSendingRtpFrame, OnSendingRtpFrame,

13
modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -727,19 +727,6 @@ void ModuleRtpRtcpImpl::SetRemoteSSRC(const uint32_t ssrc) {
rtcp_receiver_.SetRemoteSSRC(ssrc); 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 { RtpSendRates ModuleRtpRtcpImpl::GetSendRates() const {
return rtp_sender_->packet_sender.GetSendRates(); return rtp_sender_->packet_sender.GetSendRates();
} }

5
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -264,11 +264,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
uint32_t* NTPfrac, uint32_t* NTPfrac,
uint32_t* remote_sr) const; 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; RtpSendRates GetSendRates() const override;
void OnReceivedNack( void OnReceivedNack(

15
modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
View File

@ -631,21 +631,6 @@ void ModuleRtpRtcpImpl2::SetRemoteSSRC(const uint32_t ssrc) {
rtcp_receiver_.SetRemoteSSRC(ssrc); 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 { RtpSendRates ModuleRtpRtcpImpl2::GetSendRates() const {
RTC_DCHECK_RUN_ON(worker_queue_); RTC_DCHECK_RUN_ON(worker_queue_);
return rtp_sender_->packet_sender.GetSendRates(); return rtp_sender_->packet_sender.GetSendRates();

5
modules/rtp_rtcp/source/rtp_rtcp_impl2.h
View File

@ -250,11 +250,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface,
uint32_t* NTPfrac, uint32_t* NTPfrac,
uint32_t* remote_sr) const; 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; RtpSendRates GetSendRates() const override;
void OnReceivedNack( void OnReceivedNack(

7
modules/rtp_rtcp/source/rtp_rtcp_interface.h
View File

@ -267,13 +267,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface {
// bitrate estimate since the stream participates in the bitrate allocation. // bitrate estimate since the stream participates in the bitrate allocation.
virtual void SetAsPartOfAllocation(bool part_of_allocation) = 0; 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. // Returns bitrate sent (post-pacing) per packet type.
virtual RtpSendRates GetSendRates() const = 0; virtual RtpSendRates GetSendRates() const = 0;