From a03585f6118c2add9f4ad2e5888701d4323af90f Mon Sep 17 00:00:00 2001 From: Sebastian Jansson Date: Tue, 13 Mar 2018 16:16:51 +0100 Subject: [PATCH] Removing SetTransportOverhead from SSCC Interface. This is a follow up on an earlier CL removing the usage of SetTransportOverhead. Bug: webrtc:8415 Change-Id: I8d9572c06f3ae1e8cacbe7b9bd57a9b65f371c0e Reviewed-on: https://webrtc-review.googlesource.com/61502 Reviewed-by: Philip Eliasson Commit-Queue: Sebastian Jansson Cr-Commit-Position: refs/heads/master@{#22427} --- .../include/send_side_congestion_controller.h | 4 ++-- .../include/send_side_congestion_controller_interface.h | 2 -- .../rtp/include/send_side_congestion_controller.h | 2 -- .../rtp/send_side_congestion_controller.cc | 6 ------ 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h index 94e549e89c..803a56bd75 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/include/send_side_congestion_controller.h @@ -80,8 +80,8 @@ class SendSideCongestionController void SignalNetworkState(NetworkState state) override; // Deprecated: Is updated by OnNetworkRouteChanged - RTC_DEPRECATED void SetTransportOverhead( - size_t transport_overhead_bytes_per_packet) override; + RTC_DEPRECATED virtual void SetTransportOverhead( + size_t transport_overhead_bytes_per_packet); // Deprecated: Use GetBandwidthObserver instead. RTC_DEPRECATED virtual BitrateController* GetBitrateController() const; diff --git a/modules/congestion_controller/include/send_side_congestion_controller_interface.h b/modules/congestion_controller/include/send_side_congestion_controller_interface.h index 3eb3dd8caa..af153f7255 100644 --- a/modules/congestion_controller/include/send_side_congestion_controller_interface.h +++ b/modules/congestion_controller/include/send_side_congestion_controller_interface.h @@ -57,8 +57,6 @@ class SendSideCongestionControllerInterface : public CallStatsObserver, int min_bitrate_bps, int max_bitrate_bps) = 0; virtual void SignalNetworkState(NetworkState state) = 0; - virtual void SetTransportOverhead( - size_t transport_overhead_bytes_per_packet) = 0; virtual RtcpBandwidthObserver* GetBandwidthObserver() = 0; virtual bool AvailableBandwidth(uint32_t* bandwidth) const = 0; virtual TransportFeedbackObserver* GetTransportFeedbackObserver() = 0; diff --git a/modules/congestion_controller/rtp/include/send_side_congestion_controller.h b/modules/congestion_controller/rtp/include/send_side_congestion_controller.h index 40512c8719..d3f86aa51e 100644 --- a/modules/congestion_controller/rtp/include/send_side_congestion_controller.h +++ b/modules/congestion_controller/rtp/include/send_side_congestion_controller.h @@ -93,8 +93,6 @@ class SendSideCongestionController int min_bitrate_bps, int max_bitrate_bps) override; void SignalNetworkState(NetworkState state) override; - void SetTransportOverhead( - size_t transport_overhead_bytes_per_packet) override; RtcpBandwidthObserver* GetBandwidthObserver() override; diff --git a/modules/congestion_controller/rtp/send_side_congestion_controller.cc b/modules/congestion_controller/rtp/send_side_congestion_controller.cc index 606d3baa9a..fcd48ce645 100644 --- a/modules/congestion_controller/rtp/send_side_congestion_controller.cc +++ b/modules/congestion_controller/rtp/send_side_congestion_controller.cc @@ -461,12 +461,6 @@ void SendSideCongestionController::SignalNetworkState(NetworkState state) { }); } -void SendSideCongestionController::SetTransportOverhead( - size_t transport_overhead_bytes_per_packet) { - // TODO(srte): Remove this method from SendSideCongestionControllerInterface - RTC_NOTREACHED(); -} - void SendSideCongestionController::OnSentPacket( const rtc::SentPacket& sent_packet) { // We're not interested in packets without an id, which may be stun packets,