From 832b1c80d455911d38d68bad8c3beda1074103a8 Mon Sep 17 00:00:00 2001 From: philipel Date: Wed, 28 Feb 2018 17:04:18 +0100 Subject: [PATCH] Propagating total_bitrate_bps from BitrateAllocator to ProbeController, part 2. Added total_bitrate_bps to RtpTransportControllerSend::SetAllocatedSendBitrateLimits. Bug: webrtc:8955 Change-Id: Ifa2d70e189b8976ab5bf77e9d6b159dddabfb270 Reviewed-on: https://webrtc-review.googlesource.com/58940 Reviewed-by: Stefan Holmer Commit-Queue: Philip Eliasson Cr-Commit-Position: refs/heads/master@{#22252} --- call/call.cc | 4 ++-- call/rtp_transport_controller_send.cc | 3 ++- call/rtp_transport_controller_send.h | 3 ++- call/rtp_transport_controller_send_interface.h | 3 ++- call/test/mock_rtp_transport_controller_send.h | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/call/call.cc b/call/call.cc index 29f619f953..973b9db1e2 100644 --- a/call/call.cc +++ b/call/call.cc @@ -1078,8 +1078,8 @@ void Call::OnNetworkChanged(uint32_t target_bitrate_bps, void Call::OnAllocationLimitsChanged(uint32_t min_send_bitrate_bps, uint32_t max_padding_bitrate_bps, uint32_t total_bitrate_bps) { - transport_send_->SetAllocatedSendBitrateLimits(min_send_bitrate_bps, - max_padding_bitrate_bps); + transport_send_->SetAllocatedSendBitrateLimits( + min_send_bitrate_bps, max_padding_bitrate_bps, total_bitrate_bps); rtc::CritScope lock(&bitrate_crit_); min_allocated_send_bitrate_bps_ = min_send_bitrate_bps; configured_max_padding_bitrate_bps_ = max_padding_bitrate_bps; diff --git a/call/rtp_transport_controller_send.cc b/call/rtp_transport_controller_send.cc index 7e447c547c..5c6b6b9417 100644 --- a/call/rtp_transport_controller_send.cc +++ b/call/rtp_transport_controller_send.cc @@ -64,7 +64,8 @@ const RtpKeepAliveConfig& RtpTransportControllerSend::keepalive_config() const { void RtpTransportControllerSend::SetAllocatedSendBitrateLimits( int min_send_bitrate_bps, - int max_padding_bitrate_bps) { + int max_padding_bitrate_bps, + int total_bitrate_bps) { pacer_.SetSendBitrateLimits(min_send_bitrate_bps, max_padding_bitrate_bps); } diff --git a/call/rtp_transport_controller_send.h b/call/rtp_transport_controller_send.h index c909511386..49bd8b8f7f 100644 --- a/call/rtp_transport_controller_send.h +++ b/call/rtp_transport_controller_send.h @@ -45,7 +45,8 @@ class RtpTransportControllerSend : public RtpTransportControllerSendInterface { const RtpKeepAliveConfig& keepalive_config() const override; void SetAllocatedSendBitrateLimits(int min_send_bitrate_bps, - int max_padding_bitrate_bps) override; + int max_padding_bitrate_bps, + int total_bitrate_bps) override; void SetKeepAliveConfig(const RtpKeepAliveConfig& config); void SetPacingFactor(float pacing_factor) override; diff --git a/call/rtp_transport_controller_send_interface.h b/call/rtp_transport_controller_send_interface.h index 2c49889bc5..56cac12214 100644 --- a/call/rtp_transport_controller_send_interface.h +++ b/call/rtp_transport_controller_send_interface.h @@ -78,7 +78,8 @@ class RtpTransportControllerSendInterface { // current network estimate and tells the PacedSender how much it should max // pad unless there is real packets to send. virtual void SetAllocatedSendBitrateLimits(int min_send_bitrate_bps, - int max_padding_bitrate_bps) = 0; + int max_padding_bitrate_bps, + int total_bitrate_bps) = 0; virtual void SetPacingFactor(float pacing_factor) = 0; virtual void SetQueueTimeLimit(int limit_ms) = 0; diff --git a/call/test/mock_rtp_transport_controller_send.h b/call/test/mock_rtp_transport_controller_send.h index 85c6e58221..3ecb7a99ee 100644 --- a/call/test/mock_rtp_transport_controller_send.h +++ b/call/test/mock_rtp_transport_controller_send.h @@ -31,7 +31,7 @@ class MockRtpTransportControllerSend MOCK_METHOD0(transport_feedback_observer, TransportFeedbackObserver*()); MOCK_METHOD0(packet_sender, RtpPacketSender*()); MOCK_CONST_METHOD0(keepalive_config, RtpKeepAliveConfig&()); - MOCK_METHOD2(SetAllocatedSendBitrateLimits, void(int, int)); + MOCK_METHOD3(SetAllocatedSendBitrateLimits, void(int, int, int)); MOCK_METHOD0(GetPacerModule, Module*()); MOCK_METHOD1(SetPacingFactor, void(float)); MOCK_METHOD1(SetQueueTimeLimit, void(int));