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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/test/packet_sender.h

Issue 1750533002: Replace scoped_ptr with unique_ptr in webrtc/modules/remote_bitrate_estimator/ (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 9 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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ 11 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_
12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ 12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_
13 13
14 #include <list> 14 #include <list>
15 #include <limits> 15 #include <limits>
16 #include <memory>
16 #include <set> 17 #include <set>
17 #include <string> 18 #include <string>
18 19
19 #include "webrtc/base/constructormagic.h" 20 #include "webrtc/base/constructormagic.h"
20 #include "webrtc/base/scoped_ptr.h"
21 #include "webrtc/modules/include/module.h" 21 #include "webrtc/modules/include/module.h"
22 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" 22 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
23 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h" 23 #include "webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework.h"
24 24
25 namespace webrtc { 25 namespace webrtc {
26 namespace testing { 26 namespace testing {
27 namespace bwe { 27 namespace bwe {
28 28
29 class MetricRecorder; 29 class MetricRecorder;
30 30
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 void Pause() override; 85 void Pause() override;
86 void Resume(int64_t paused_time_ms) override; 86 void Resume(int64_t paused_time_ms) override;
87 87
88 protected: 88 protected:
89 void ProcessFeedbackAndGeneratePackets(int64_t time_ms, 89 void ProcessFeedbackAndGeneratePackets(int64_t time_ms,
90 std::list<FeedbackPacket*>* feedbacks, 90 std::list<FeedbackPacket*>* feedbacks,
91 Packets* generated); 91 Packets* generated);
92 92
93 VideoSource* source_; 93 VideoSource* source_;
94 rtc::scoped_ptr<BweSender> bwe_; 94 std::unique_ptr<BweSender> bwe_;
95 int64_t start_of_run_ms_; 95 int64_t start_of_run_ms_;
96 std::list<Module*> modules_; 96 std::list<Module*> modules_;
97 97
98 private: 98 private:
99 uint32_t previous_sending_bitrate_; 99 uint32_t previous_sending_bitrate_;
100 RTC_DISALLOW_COPY_AND_ASSIGN(VideoSender); 100 RTC_DISALLOW_COPY_AND_ASSIGN(VideoSender);
101 }; 101 };
102 102
103 class PacedVideoSender : public VideoSender, public PacedSender::Callback { 103 class PacedVideoSender : public VideoSender, public PacedSender::Callback {
104 public: 104 public:
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 int total_sent_bytes_; 186 int total_sent_bytes_;
187 int send_limit_bytes_; // Initialized by default as kNoLimit. 187 int send_limit_bytes_; // Initialized by default as kNoLimit.
188 int64_t last_generated_packets_ms_; 188 int64_t last_generated_packets_ms_;
189 size_t num_recent_sent_packets_; 189 size_t num_recent_sent_packets_;
190 uint32_t bitrate_kbps_; 190 uint32_t bitrate_kbps_;
191 }; 191 };
192 } // namespace bwe 192 } // namespace bwe
193 } // namespace testing 193 } // namespace testing
194 } // namespace webrtc 194 } // namespace webrtc
195 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_ 195 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_PACKET_SENDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698