Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(40)

Side by Side Diff: webrtc/modules/congestion_controller/include/congestion_controller.h

Issue 1924443002: Revert of Replace the remaining scoped_ptr with unique_ptr in webrtc/modules/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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
16 #include "webrtc/base/constructormagic.h" 14 #include "webrtc/base/constructormagic.h"
15 #include "webrtc/base/scoped_ptr.h"
17 #include "webrtc/modules/include/module.h" 16 #include "webrtc/modules/include/module.h"
18 #include "webrtc/modules/include/module_common_types.h" 17 #include "webrtc/modules/include/module_common_types.h"
19 #include "webrtc/modules/pacing/packet_router.h" 18 #include "webrtc/modules/pacing/packet_router.h"
20 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h" 19 #include "webrtc/modules/remote_bitrate_estimator/remote_estimator_proxy.h"
21 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h" 20 #include "webrtc/modules/remote_bitrate_estimator/transport_feedback_adapter.h"
22 #include "webrtc/stream.h" 21 #include "webrtc/stream.h"
23 22
24 namespace rtc { 23 namespace rtc {
25 struct SentPacket; 24 struct SentPacket;
26 } 25 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 62
64 // Implements CallStatsObserver. 63 // Implements CallStatsObserver.
65 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override; 64 void OnRttUpdate(int64_t avg_rtt_ms, int64_t max_rtt_ms) override;
66 65
67 // Implements Module. 66 // Implements Module.
68 int64_t TimeUntilNextProcess() override; 67 int64_t TimeUntilNextProcess() override;
69 void Process() override; 68 void Process() override;
70 69
71 private: 70 private:
72 Clock* const clock_; 71 Clock* const clock_;
73 const std::unique_ptr<PacedSender> pacer_; 72 const rtc::scoped_ptr<PacedSender> pacer_;
74 const std::unique_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_; 73 const rtc::scoped_ptr<RemoteBitrateEstimator> remote_bitrate_estimator_;
75 const std::unique_ptr<BitrateController> bitrate_controller_; 74 const rtc::scoped_ptr<BitrateController> bitrate_controller_;
76 PacketRouter packet_router_; 75 PacketRouter packet_router_;
77 RemoteEstimatorProxy remote_estimator_proxy_; 76 RemoteEstimatorProxy remote_estimator_proxy_;
78 TransportFeedbackAdapter transport_feedback_adapter_; 77 TransportFeedbackAdapter transport_feedback_adapter_;
79 int min_bitrate_bps_; 78 int min_bitrate_bps_;
80 79
81 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController); 80 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(CongestionController);
82 }; 81 };
83 82
84 } // namespace webrtc 83 } // namespace webrtc
85 84
86 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_ 85 #endif // WEBRTC_MODULES_CONGESTION_CONTROLLER_INCLUDE_CONGESTION_CONTROLLER_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_processing/test/debug_dump_test.cc ('k') | webrtc/modules/desktop_capture/cropping_window_capturer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698