| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ | 11 #ifndef WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ |
| 12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ | 12 #define WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ |
| 13 | 13 |
| 14 #include <memory> |
| 15 |
| 14 #include "webrtc/base/constructormagic.h" | 16 #include "webrtc/base/constructormagic.h" |
| 15 #include "webrtc/base/scoped_ptr.h" | |
| 16 #include "webrtc/modules/include/module.h" | 17 #include "webrtc/modules/include/module.h" |
| 17 #include "webrtc/modules/include/module_common_types.h" | 18 #include "webrtc/modules/include/module_common_types.h" |
| 18 #include "webrtc/modules/pacing/packet_router.h" | 19 #include "webrtc/modules/pacing/packet_router.h" |
| 19 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" | 20 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" |
| 20 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" | 21 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" |
| 21 #include "webrtc/stream.h" | 22 #include "webrtc/stream.h" |
| 22 | 23 |
| 23 namespace rtc { | 24 namespace rtc { |
| 24 struct SentPacket; | 25 struct SentPacket; |
| 25 } | 26 } |
| (...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 62 | 63 |
| 63 // Implements CallStatsObserver. | 64 // Implements CallStatsObserver. |
| 64 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; | 65 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; |
| 65 | 66 |
| 66 // Implements Module. | 67 // Implements Module. |
| 67 int64_t TimeUntilNextProcess() override; | 68 int64_t TimeUntilNextProcess() override; |
| 68 void Process() override; | 69 void Process() override; |
| 69 | 70 |
| 70 private: | 71 private: |
| 71 Clock* const clock_; | 72 Clock* const clock_; |
| 72 const rtc::scoped_ptr<PacedSender> pacer_; | 73 const std::unique_ptr<PacedSender> pacer_; |
| 73 const rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; | 74 const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; |
| 74 const rtc::scoped_ptr<BitrateController> bitrate_controller_; | 75 const std::unique_ptr<BitrateController> bitrate_controller_; |
| 75 PacketRouter packet_router_; | 76 PacketRouter packet_router_; |
| 76 RemoteEstimatorProxy remote_estimator_proxy_; | 77 RemoteEstimatorProxy remote_estimator_proxy_; |
| 77 TransportFeedbackAdapter transport_feedback_adapter_; | 78 TransportFeedbackAdapter transport_feedback_adapter_; |
| 78 int min_bitrate_bps_; | 79 int min_bitrate_bps_; |
| 79 | 80 |
| 80 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController); | 81 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController); |
| 81 }; | 82 }; |
| 82 | 83 |
| 83 } // namespace webrtc | 84 } // namespace webrtc |
| 84 | 85 |
| 85 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ | 86 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ |
| OLD | NEW |