From ed665521e4f1852c3756afc8ac46b2d59224f4b4 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Wed, 29 Jun 2022 16:45:31 +0200 Subject: [PATCH] in RtpRtcp configuration delete unused remote bitrate estimator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No code sets that configuration field. Bug: None Change-Id: Idd611d15ec54b3bd9115eac77d2222b97620d675 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/267180 Commit-Queue: Åsa Persson Reviewed-by: Åsa Persson Auto-Submit: Danil Chapovalov Cr-Commit-Position: refs/heads/main@{#37382} --- modules/rtp_rtcp/source/rtp_rtcp_impl.cc | 12 ------------ modules/rtp_rtcp/source/rtp_rtcp_impl.h | 3 --- modules/rtp_rtcp/source/rtp_rtcp_impl2.cc | 1 - modules/rtp_rtcp/source/rtp_rtcp_impl2.h | 3 --- modules/rtp_rtcp/source/rtp_rtcp_interface.h | 5 ----- 5 files changed, 24 deletions(-) diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc index e138ebaf12..51b5f68b8c 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc @@ -73,7 +73,6 @@ ModuleRtpRtcpImpl::ModuleRtpRtcpImpl(const Configuration& configuration) packet_overhead_(28), // IPV4 UDP. nack_last_time_sent_full_ms_(0), nack_last_seq_number_sent_(0), - remote_bitrate_(configuration.remote_bitrate_estimator), rtt_stats_(configuration.rtt_stats), rtt_ms_(0) { if (!configuration.receiver_only) { @@ -141,17 +140,6 @@ void ModuleRtpRtcpImpl::Process() { RTC_LOG_F(LS_WARNING) << "Timeout: No increase in RTCP RR extended " "highest sequence number."; } - - if (remote_bitrate_ && rtcp_sender_.TMMBR()) { - unsigned int target_bitrate = 0; - std::vector ssrcs; - if (remote_bitrate_->LatestEstimate(&ssrcs, &target_bitrate)) { - if (!ssrcs.empty()) { - target_bitrate = target_bitrate / ssrcs.size(); - } - rtcp_sender_.SetTargetBitrate(target_bitrate); - } - } } else { // Report rtt from receiver. if (process_rtt) { diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h index 7521b9d96a..5e0681984b 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -24,7 +24,6 @@ #include "api/rtp_headers.h" #include "api/video/video_bitrate_allocation.h" #include "modules/include/module_fec_types.h" -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/rtp_rtcp/include/rtp_rtcp.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" // RTCPPacketType #include "modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.h" @@ -311,8 +310,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { int64_t nack_last_time_sent_full_ms_; uint16_t nack_last_seq_number_sent_; - RemoteBitrateEstimator* const remote_bitrate_; - RtcpRttStats* const rtt_stats_; // The processed RTT from RtcpRttStats. diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc index a8b6235e71..518f610209 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc @@ -87,7 +87,6 @@ ModuleRtpRtcpImpl2::ModuleRtpRtcpImpl2(const Configuration& configuration) packet_overhead_(28), // IPV4 UDP. nack_last_time_sent_full_ms_(0), nack_last_seq_number_sent_(0), - remote_bitrate_(configuration.remote_bitrate_estimator), rtt_stats_(configuration.rtt_stats), rtt_ms_(0) { RTC_DCHECK(worker_queue_); diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h index 67c45e5d44..031b92fad9 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h @@ -29,7 +29,6 @@ #include "api/units/time_delta.h" #include "api/video/video_bitrate_allocation.h" #include "modules/include/module_fec_types.h" -#include "modules/remote_bitrate_estimator/include/remote_bitrate_estimator.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" // RTCPPacketType #include "modules/rtp_rtcp/source/packet_sequencer.h" #include "modules/rtp_rtcp/source/rtcp_packet/tmmb_item.h" @@ -322,8 +321,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface, int64_t nack_last_time_sent_full_ms_; uint16_t nack_last_seq_number_sent_; - RemoteBitrateEstimator* const remote_bitrate_; - RtcpRttStats* const rtt_stats_; RepeatingTaskHandle rtt_update_task_ RTC_GUARDED_BY(worker_queue_); diff --git a/modules/rtp_rtcp/source/rtp_rtcp_interface.h b/modules/rtp_rtcp/source/rtp_rtcp_interface.h index 6158d95678..c49115a116 100644 --- a/modules/rtp_rtcp/source/rtp_rtcp_interface.h +++ b/modules/rtp_rtcp/source/rtp_rtcp_interface.h @@ -35,7 +35,6 @@ namespace webrtc { // Forward declarations. class FrameEncryptorInterface; class RateLimiter; -class RemoteBitrateEstimator; class RtcEventLog; class RTPSender; class Transport; @@ -87,10 +86,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface { RtcpCnameCallback* rtcp_cname_callback = nullptr; ReportBlockDataObserver* report_block_data_observer = nullptr; - // Estimates the bandwidth available for a set of streams from the same - // client. - RemoteBitrateEstimator* remote_bitrate_estimator = nullptr; - // Spread any bursts of packets into smaller bursts to minimize packet loss. RtpPacketSender* paced_sender = nullptr;