Removes SendSideCongestionController.
Bug: webrtc:9586
Change-Id: Id6f3508eb19f277d74c34edfbcaeb8a22320b030
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/140286
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#28222}
diff --git a/modules/congestion_controller/include/mock/mock_congestion_observer.h b/modules/congestion_controller/include/mock/mock_congestion_observer.h
deleted file mode 100644
index d9c24a2..0000000
--- a/modules/congestion_controller/include/mock/mock_congestion_observer.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2015 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_
-#define MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_
-
-#include "modules/congestion_controller/include/network_changed_observer.h"
-#include "test/gmock.h"
-
-namespace webrtc {
-namespace test {
-
-class MockCongestionObserver : public NetworkChangedObserver {
- public:
- MOCK_METHOD4(OnNetworkChanged,
- void(uint32_t bitrate_bps,
- uint8_t fraction_loss,
- int64_t rtt_ms,
- int64_t probing_interval_ms));
-};
-
-} // namespace test
-} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_MOCK_MOCK_CONGESTION_OBSERVER_H_
diff --git a/modules/congestion_controller/include/network_changed_observer.h b/modules/congestion_controller/include/network_changed_observer.h
deleted file mode 100644
index 34ac32a..0000000
--- a/modules/congestion_controller/include/network_changed_observer.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_NETWORK_CHANGED_OBSERVER_H_
-#define MODULES_CONGESTION_CONTROLLER_INCLUDE_NETWORK_CHANGED_OBSERVER_H_
-
-#include <stdint.h>
-
-namespace webrtc {
-
-// Note: This interface will be deprecated in favor of the
-// TargetTransferRateObserver interface. The new interface provides more
-// information about the network connection and uses structs to make it easier
-// to add fields.
-
-// Observer class for bitrate changes announced due to change in bandwidth
-// estimate or due to that the send pacer is full. Fraction loss and rtt is
-// also part of this callback to allow the observer to optimize its settings
-// for different types of network environments. The bitrate does not include
-// packet headers and is measured in bits per second.
-// TODO(srte): Deprecate and remove this class when SendSideCongestionController
-// is no longer using this as part of our public API.
-class NetworkChangedObserver {
- public:
- virtual void OnNetworkChanged(uint32_t bitrate_bps,
- uint8_t fraction_loss, // 0 - 255.
- int64_t rtt_ms,
- int64_t probing_interval_ms) = 0;
-
- protected:
- virtual ~NetworkChangedObserver() {}
-};
-} // namespace webrtc
-#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_NETWORK_CHANGED_OBSERVER_H_
diff --git a/modules/congestion_controller/include/receive_side_congestion_controller.h b/modules/congestion_controller/include/receive_side_congestion_controller.h
index 1f798b6..dd8a0cf 100644
--- a/modules/congestion_controller/include/receive_side_congestion_controller.h
+++ b/modules/congestion_controller/include/receive_side_congestion_controller.h
@@ -15,6 +15,7 @@
#include <vector>
#include "api/transport/field_trial_based_config.h"
+#include "modules/include/module.h"
#include "modules/remote_bitrate_estimator/remote_estimator_proxy.h"
#include "rtc_base/constructor_magic.h"
#include "rtc_base/critical_section.h"
diff --git a/modules/congestion_controller/include/send_side_congestion_controller.h b/modules/congestion_controller/include/send_side_congestion_controller.h
deleted file mode 100644
index f78763a..0000000
--- a/modules/congestion_controller/include/send_side_congestion_controller.h
+++ /dev/null
@@ -1,188 +0,0 @@
-/*
- * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_
-#define MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_
-
-#include <memory>
-#include <vector>
-
-#include "api/transport/field_trial_based_config.h"
-#include "api/transport/webrtc_key_value_config.h"
-#include "modules/congestion_controller/goog_cc/delay_based_bwe.h"
-#include "modules/congestion_controller/include/network_changed_observer.h"
-#include "modules/congestion_controller/include/send_side_congestion_controller_interface.h"
-#include "modules/congestion_controller/transport_feedback_adapter.h"
-#include "modules/include/module.h"
-#include "modules/include/module_common_types.h"
-#include "modules/pacing/paced_sender.h"
-#include "rtc_base/constructor_magic.h"
-#include "rtc_base/critical_section.h"
-#include "rtc_base/deprecation.h"
-#include "rtc_base/network_route.h"
-#include "rtc_base/race_checker.h"
-
-namespace rtc {
-struct SentPacket;
-}
-
-namespace webrtc {
-
-class BitrateController;
-class Clock;
-class AcknowledgedBitrateEstimator;
-class ProbeController;
-class RateLimiter;
-class RtcEventLog;
-class CongestionWindowPushbackController;
-
-// Deprecated, for somewhat similar functionality GoogCcNetworkController can be
-// used via GoogCcNetworkControllerFactory.
-class DEPRECATED_SendSideCongestionController
- : public SendSideCongestionControllerInterface {
- public:
- using Observer = NetworkChangedObserver;
- DEPRECATED_SendSideCongestionController(
- Clock* clock,
- Observer* observer,
- RtcEventLog* event_log,
- PacedSender* pacer,
- const WebRtcKeyValueConfig* key_value_config = nullptr);
- ~DEPRECATED_SendSideCongestionController() override;
-
- void RegisterPacketFeedbackObserver(
- PacketFeedbackObserver* observer) override;
- void DeRegisterPacketFeedbackObserver(
- PacketFeedbackObserver* observer) override;
-
- // Currently, there can be at most one observer.
- // TODO(nisse): The RegisterNetworkObserver method is needed because we first
- // construct this object (as part of RtpTransportControllerSend), then pass a
- // reference to Call, which then registers itself as the observer. We should
- // try to break this circular chain of references, and make the observer a
- // construction time constant.
- void RegisterNetworkObserver(Observer* observer) override;
- virtual void DeRegisterNetworkObserver(Observer* observer);
-
- void SetBweBitrates(int min_bitrate_bps,
- int start_bitrate_bps,
- int max_bitrate_bps) override;
-
- void SetAllocatedSendBitrateLimits(int64_t min_send_bitrate_bps,
- int64_t max_padding_bitrate_bps,
- int64_t max_total_bitrate_bps) override;
-
- // Resets the BWE state. Note the first argument is the bitrate_bps.
- void OnNetworkRouteChanged(const rtc::NetworkRoute& network_route,
- int bitrate_bps,
- int min_bitrate_bps,
- int max_bitrate_bps) override;
- void SignalNetworkState(NetworkState state) override;
-
- RtcpBandwidthObserver* GetBandwidthObserver() override;
-
- bool AvailableBandwidth(uint32_t* bandwidth) const override;
- virtual int64_t GetPacerQueuingDelayMs() const;
- virtual int64_t GetFirstPacketTimeMs() const;
-
- TransportFeedbackObserver* GetTransportFeedbackObserver() override;
-
- void SetPerPacketFeedbackAvailable(bool available) override;
- void EnablePeriodicAlrProbing(bool enable) override;
-
- void OnSentPacket(const rtc::SentPacket& sent_packet) override;
-
- // Implements CallStatsObserver.
- void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
-
- // Implements Module.
- int64_t TimeUntilNextProcess() override;
- void Process() override;
-
- // Implements TransportFeedbackObserver.
- void OnAddPacket(const RtpPacketSendInfo& packet_info) override;
- void OnTransportFeedback(const rtcp::TransportFeedback& feedback) override;
-
- std::vector<PacketFeedback> GetTransportFeedbackVector() const;
-
- void SetPacingFactor(float pacing_factor) override;
-
- void SetAllocatedBitrateWithoutFeedback(uint32_t bitrate_bps) override;
-
- void EnableCongestionWindowPushback(int64_t accepted_queue_ms,
- uint32_t min_pushback_target_bitrate_bps);
-
- void SetAlrLimitedBackoffExperiment(bool enable);
-
- void SetMaxProbingBitrate(int64_t max_probing_bitrate_bps);
-
- private:
- void MaybeTriggerOnNetworkChanged();
-
- bool IsSendQueueFull() const;
- bool IsNetworkDown() const;
- bool HasNetworkParametersToReportChanged(uint32_t bitrate_bps,
- uint8_t fraction_loss,
- int64_t rtt);
- void LimitOutstandingBytes(size_t num_outstanding_bytes);
- void SendProbes(std::vector<ProbeClusterConfig> probe_configs)
- RTC_EXCLUSIVE_LOCKS_REQUIRED(&probe_lock_);
- const FieldTrialBasedConfig field_trial_config_;
- const WebRtcKeyValueConfig* const key_value_config_;
- Clock* const clock_;
- rtc::CriticalSection observer_lock_;
- Observer* observer_ RTC_GUARDED_BY(observer_lock_);
- RtcEventLog* const event_log_;
- PacedSender* const pacer_;
- const std::unique_ptr<BitrateController> bitrate_controller_;
- std::unique_ptr<AcknowledgedBitrateEstimator> acknowledged_bitrate_estimator_;
- rtc::CriticalSection probe_lock_;
- const std::unique_ptr<ProbeController> probe_controller_
- RTC_GUARDED_BY(probe_lock_);
-
- const std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
- LegacyTransportFeedbackAdapter transport_feedback_adapter_;
- rtc::CriticalSection network_state_lock_;
- uint32_t last_reported_bitrate_bps_ RTC_GUARDED_BY(network_state_lock_);
- uint8_t last_reported_fraction_loss_ RTC_GUARDED_BY(network_state_lock_);
- int64_t last_reported_rtt_ RTC_GUARDED_BY(network_state_lock_);
- NetworkState network_state_ RTC_GUARDED_BY(network_state_lock_);
- bool pause_pacer_ RTC_GUARDED_BY(network_state_lock_);
- // Duplicate the pacer paused state to avoid grabbing a lock when
- // pausing the pacer. This can be removed when we move this class
- // over to the task queue.
- bool pacer_paused_;
- rtc::CriticalSection bwe_lock_;
- int min_bitrate_bps_ RTC_GUARDED_BY(bwe_lock_);
- std::unique_ptr<ProbeBitrateEstimator> probe_bitrate_estimator_
- RTC_GUARDED_BY(bwe_lock_);
- std::unique_ptr<DelayBasedBwe> delay_based_bwe_ RTC_GUARDED_BY(bwe_lock_);
- absl::optional<int64_t> cwnd_experiment_parameter_;
- bool was_in_alr_;
- const bool send_side_bwe_with_overhead_;
- size_t transport_overhead_bytes_per_packet_ RTC_GUARDED_BY(bwe_lock_);
-
- rtc::RaceChecker worker_race_;
-
- std::unique_ptr<CongestionWindowPushbackController>
- congestion_window_pushback_controller_;
-
- RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(DEPRECATED_SendSideCongestionController);
-};
-class RTC_DEPRECATED SendSideCongestionController
- : public DEPRECATED_SendSideCongestionController {
- public:
- using DEPRECATED_SendSideCongestionController::
- DEPRECATED_SendSideCongestionController;
-};
-
-} // namespace webrtc
-
-#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_H_
diff --git a/modules/congestion_controller/include/send_side_congestion_controller_interface.h b/modules/congestion_controller/include/send_side_congestion_controller_interface.h
deleted file mode 100644
index 588c00b..0000000
--- a/modules/congestion_controller/include/send_side_congestion_controller_interface.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2018 The WebRTC project authors. All Rights Reserved.
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS. All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_INTERFACE_H_
-#define MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_INTERFACE_H_
-
-#include <memory>
-#include <vector>
-
-#include "modules/congestion_controller/include/network_changed_observer.h"
-#include "modules/congestion_controller/transport_feedback_adapter.h"
-#include "modules/include/module.h"
-#include "modules/include/module_common_types.h"
-#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
-#include "rtc_base/constructor_magic.h"
-#include "rtc_base/network/sent_packet.h"
-#include "rtc_base/network_route.h"
-
-namespace webrtc {
-
-class BitrateController;
-class Clock;
-class AcknowledgedBitrateEstimator;
-class ProbeController;
-class RateLimiter;
-class RtcEventLog;
-
-class SendSideCongestionControllerInterface : public CallStatsObserver,
- public Module,
- public TransportFeedbackObserver {
- public:
- SendSideCongestionControllerInterface() = default;
- ~SendSideCongestionControllerInterface() override = default;
- virtual void RegisterPacketFeedbackObserver(
- PacketFeedbackObserver* observer) = 0;
- virtual void DeRegisterPacketFeedbackObserver(
- PacketFeedbackObserver* observer) = 0;
- virtual void RegisterNetworkObserver(NetworkChangedObserver* observer) = 0;
- virtual void SetBweBitrates(int min_bitrate_bps,
- int start_bitrate_bps,
- int max_bitrate_bps) = 0;
- virtual void SetAllocatedSendBitrateLimits(int64_t min_send_bitrate_bps,
- int64_t max_padding_bitrate_bps,
- int64_t max_total_bitrate_bps) = 0;
- virtual void OnNetworkRouteChanged(const rtc::NetworkRoute& network_route,
- int bitrate_bps,
- int min_bitrate_bps,
- int max_bitrate_bps) = 0;
- virtual void SignalNetworkState(NetworkState state) = 0;
- virtual RtcpBandwidthObserver* GetBandwidthObserver() = 0;
- virtual bool AvailableBandwidth(uint32_t* bandwidth) const = 0;
- virtual TransportFeedbackObserver* GetTransportFeedbackObserver() = 0;
- virtual void SetPerPacketFeedbackAvailable(bool available) = 0;
- virtual void EnablePeriodicAlrProbing(bool enable) = 0;
- virtual void OnSentPacket(const rtc::SentPacket& sent_packet) = 0;
- virtual void SetPacingFactor(float pacing_factor) = 0;
- virtual void SetAllocatedBitrateWithoutFeedback(uint32_t bitrate_bps) = 0;
- RTC_DISALLOW_COPY_AND_ASSIGN(SendSideCongestionControllerInterface);
-};
-
-} // namespace webrtc
-
-#endif // MODULES_CONGESTION_CONTROLLER_INCLUDE_SEND_SIDE_CONGESTION_CONTROLLER_INTERFACE_H_
