| 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 "webrtc/base/constructormagic.h" | 
| 14 #include "webrtc/base/scoped_ptr.h" | 15 #include "webrtc/base/scoped_ptr.h" | 
| 15 #include "webrtc/modules/include/module.h" | 16 #include "webrtc/modules/include/module.h" | 
| 16 #include "webrtc/modules/include/module_common_types.h" | 17 #include "webrtc/modules/include/module_common_types.h" | 
| 17 #include "webrtc/modules/pacing/packet_router.h" | 18 #include "webrtc/modules/pacing/packet_router.h" | 
| 18 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" | 19 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" | 
| 19 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" | 20 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" | 
| 20 #include "webrtc/stream.h" | 21 #include "webrtc/stream.h" | 
| 21 | 22 | 
| 22 namespace rtc { | 23 namespace rtc { | 
| 23 struct SentPacket; | 24 struct SentPacket; | 
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 75   RemoteEstimatorProxy remote_estimator_proxy_; | 76   RemoteEstimatorProxy remote_estimator_proxy_; | 
| 76   TransportFeedbackAdapter transport_feedback_adapter_; | 77   TransportFeedbackAdapter transport_feedback_adapter_; | 
| 77   int min_bitrate_bps_; | 78   int min_bitrate_bps_; | 
| 78 | 79 | 
| 79   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController); | 80   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController); | 
| 80 }; | 81 }; | 
| 81 | 82 | 
| 82 }  // namespace webrtc | 83 }  // namespace webrtc | 
| 83 | 84 | 
| 84 #endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ | 85 #endif  // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ | 
| OLD | NEW | 
|---|