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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.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_ESTIMATORS_SEND_SIDE_H_ 11 #ifndef WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_
12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ 12 #define WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_
13 13
14 #include <memory>
14 #include <vector> 15 #include <vector>
15 16
16 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" 17 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
17 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" 18 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
18 19
19 namespace webrtc { 20 namespace webrtc {
20 namespace testing { 21 namespace testing {
21 namespace bwe { 22 namespace bwe {
22 23
23 class FullBweSender : public BweSender, public RemoteBitrateObserver { 24 class FullBweSender : public BweSender, public RemoteBitrateObserver {
24 public: 25 public:
25 FullBweSender(int kbps, BitrateObserver* observer, Clock* clock); 26 FullBweSender(int kbps, BitrateObserver* observer, Clock* clock);
26 virtual ~FullBweSender(); 27 virtual ~FullBweSender();
27 28
28 int GetFeedbackIntervalMs() const override; 29 int GetFeedbackIntervalMs() const override;
29 void GiveFeedback(const FeedbackPacket& feedback) override; 30 void GiveFeedback(const FeedbackPacket& feedback) override;
30 void OnPacketsSent(const Packets& packets) override; 31 void OnPacketsSent(const Packets& packets) override;
31 void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs, 32 void OnReceiveBitrateChanged(const std::vector<uint32_t>& ssrcs,
32 uint32_t bitrate) override; 33 uint32_t bitrate) override;
33 int64_t TimeUntilNextProcess() override; 34 int64_t TimeUntilNextProcess() override;
34 void Process() override; 35 void Process() override;
35 36
36 protected: 37 protected:
37 rtc::scoped_ptr<BitrateController> bitrate_controller_; 38 std::unique_ptr<BitrateController> bitrate_controller_;
38 rtc::scoped_ptr<RemoteBitrateEstimator> rbe_; 39 std::unique_ptr<RemoteBitrateEstimator> rbe_;
39 rtc::scoped_ptr<RtcpBandwidthObserver> feedback_observer_; 40 std::unique_ptr<RtcpBandwidthObserver> feedback_observer_;
40 41
41 private: 42 private:
42 Clock* const clock_; 43 Clock* const clock_;
43 RTCPReportBlock report_block_; 44 RTCPReportBlock report_block_;
44 SendTimeHistory send_time_history_; 45 SendTimeHistory send_time_history_;
45 bool has_received_ack_; 46 bool has_received_ack_;
46 uint16_t last_acked_seq_num_; 47 uint16_t last_acked_seq_num_;
47 48
48 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender); 49 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender);
49 }; 50 };
(...skipping 10 matching lines...) Expand all
60 private: 61 private:
61 int64_t last_feedback_ms_; 62 int64_t last_feedback_ms_;
62 std::vector<PacketInfo> packet_feedback_vector_; 63 std::vector<PacketInfo> packet_feedback_vector_;
63 }; 64 };
64 65
65 } // namespace bwe 66 } // namespace bwe
66 } // namespace testing 67 } // namespace testing
67 } // namespace webrtc 68 } // namespace webrtc
68 69
69 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ 70 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698