From 287cfdecab0fd0c97016c7037f9f5c266440d014 Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Wed, 26 Sep 2018 19:45:29 +0200 Subject: [PATCH] Removes deprecated functions from legacy SendSideCongestionController. Bug: webrtc:9586 Change-Id: Id1b7e8a56044d6d4fb9167f03e71310aa6b8c26a Reviewed-on: https://webrtc-review.googlesource.com/102200 Reviewed-by: Christoffer Rodbro Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#24870} --- .../include/send_side_congestion_controller.h | 10 ---------- .../send_side_congestion_controller.cc | 19 ------------------- 2 files changed, 29 deletions(-) diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h index 9d4f852686..ba26272e6f 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/include/send_side_congestion_controller.h @@ -80,15 +80,7 @@ class SendSideCongestionController int max_bitrate_bps) override; void SignalNetworkState(NetworkState state) override; - // Deprecated: Is updated by OnNetworkRouteChanged - RTC_DEPRECATED virtual void SetTransportOverhead( - size_t transport_overhead_bytes_per_packet); - - // Deprecated: Use GetBandwidthObserver instead. - RTC_DEPRECATED virtual BitrateController* GetBitrateController() const; - RtcpBandwidthObserver* GetBandwidthObserver() override; - RTC_DEPRECATED RtcpBandwidthObserver* GetBandwidthObserver() const; bool AvailableBandwidth(uint32_t* bandwidth) const override; virtual int64_t GetPacerQueuingDelayMs() const; @@ -96,8 +88,6 @@ class SendSideCongestionController TransportFeedbackObserver* GetTransportFeedbackObserver() override; - RTC_DEPRECATED virtual RateLimiter* GetRetransmissionRateLimiter(); - void SetPerPacketFeedbackAvailable(bool available) override; void EnablePeriodicAlrProbing(bool enable) override; diff --git a/modules/congestion_controller/send_side_congestion_controller.cc b/modules/congestion_controller/send_side_congestion_controller.cc index 5ff433a1a8..2df610c7c8 100644 --- a/modules/congestion_controller/send_side_congestion_controller.cc +++ b/modules/congestion_controller/send_side_congestion_controller.cc @@ -257,10 +257,6 @@ void SendSideCongestionController::OnNetworkRouteChanged( MaybeTriggerOnNetworkChanged(); } -BitrateController* SendSideCongestionController::GetBitrateController() const { - return bitrate_controller_.get(); -} - bool SendSideCongestionController::AvailableBandwidth( uint32_t* bandwidth) const { return bitrate_controller_->AvailableBandwidth(bandwidth); @@ -270,15 +266,6 @@ RtcpBandwidthObserver* SendSideCongestionController::GetBandwidthObserver() { return bitrate_controller_.get(); } -RtcpBandwidthObserver* SendSideCongestionController::GetBandwidthObserver() - const { - return bitrate_controller_.get(); -} - -RateLimiter* SendSideCongestionController::GetRetransmissionRateLimiter() { - return retransmission_rate_limiter_.get(); -} - void SendSideCongestionController::SetPerPacketFeedbackAvailable( bool available) {} @@ -319,12 +306,6 @@ void SendSideCongestionController::SignalNetworkState(NetworkState state) { MaybeTriggerOnNetworkChanged(); } -void SendSideCongestionController::SetTransportOverhead( - size_t transport_overhead_bytes_per_packet) { - rtc::CritScope cs(&bwe_lock_); - transport_overhead_bytes_per_packet_ = transport_overhead_bytes_per_packet; -} - void SendSideCongestionController::OnSentPacket( const rtc::SentPacket& sent_packet) { // We're not interested in packets without an id, which may be stun packets,