| Index: webrtc/modules/congestion_controller/include/congestion_controller.h
|
| diff --git a/webrtc/modules/congestion_controller/include/congestion_controller.h b/webrtc/modules/congestion_controller/include/congestion_controller.h
|
| index eb6db3371226352bc921889226084c985b6b3d05..b6dac9eee8f99ea01a7cee7a13c9e5fc8b0c6f07 100644
|
| --- a/webrtc/modules/congestion_controller/include/congestion_controller.h
|
| +++ b/webrtc/modules/congestion_controller/include/congestion_controller.h
|
| @@ -23,6 +23,7 @@
|
| #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
|
|
|
| namespace rtc {
|
| +struct NetworkRoute;
|
| struct SentPacket;
|
| }
|
|
|
| @@ -66,18 +67,12 @@ class CongestionController : public CallStatsObserver, public Module {
|
| std::unique_ptr<PacedSender> pacer);
|
| virtual ~CongestionController();
|
|
|
| - virtual void SetBweBitrates(int min_bitrate_bps,
|
| - int start_bitrate_bps,
|
| + virtual void SetBweBitrates(int start_bitrate_bps,
|
| + int min_bitrate_bps,
|
| int max_bitrate_bps);
|
| - // Resets both the BWE state and the bitrate estimator. Note the first
|
| - // argument is the bitrate_bps.
|
| - virtual void ResetBweAndBitrates(int bitrate_bps,
|
| - int min_bitrate_bps,
|
| - int max_bitrate_bps);
|
| - virtual void SignalNetworkState(NetworkState state);
|
| + virtual void OnNetworkRouteChanged(const rtc::NetworkRoute& route);
|
| virtual BitrateController* GetBitrateController() const;
|
| - virtual RemoteBitrateEstimator* GetRemoteBitrateEstimator(
|
| - bool send_side_bwe);
|
| + virtual RemoteBitrateEstimator* GetRemoteBitrateEstimator(bool send_side_bwe);
|
| virtual int64_t GetPacerQueuingDelayMs() const;
|
| virtual PacedSender* pacer() { return pacer_.get(); }
|
| virtual PacketRouter* packet_router() { return packet_router_.get(); }
|
| @@ -125,6 +120,7 @@ class CongestionController : public CallStatsObserver, public Module {
|
| const std::unique_ptr<RateLimiter> retransmission_rate_limiter_;
|
| RemoteEstimatorProxy remote_estimator_proxy_;
|
| TransportFeedbackAdapter transport_feedback_adapter_;
|
| + int start_bitrate_bps_;
|
| int min_bitrate_bps_;
|
| int max_bitrate_bps_;
|
| rtc::CriticalSection critsect_;
|
|
|