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

Side by Side Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/send_side.h

Issue 1748403002: Move RtcEventLog object from inside VoiceEngine to Call. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Another rebase and accompanying changes. Created 4 years, 5 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 <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/call/mock/mock_rtc_event_log.h"
17 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h" 18 #include "webrtc/modules/remote_bitrate_estimator/include/send_time_history.h"
18 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h" 19 #include "webrtc/modules/remote_bitrate_estimator/test/bwe.h"
19 20
20 namespace webrtc { 21 namespace webrtc {
21 namespace testing { 22 namespace testing {
22 namespace bwe { 23 namespace bwe {
23 24
24 class FullBweSender : public BweSender, public RemoteBitrateObserver { 25 class FullBweSender : public BweSender, public RemoteBitrateObserver {
25 public: 26 public:
26 FullBweSender(int kbps, BitrateObserver* observer, Clock* clock); 27 FullBweSender(int kbps, BitrateObserver* observer, Clock* clock);
(...skipping 12 matching lines...) Expand all
39 std::unique_ptr<RemoteBitrateEstimator> rbe_; 40 std::unique_ptr<RemoteBitrateEstimator> rbe_;
40 std::unique_ptr<RtcpBandwidthObserver> feedback_observer_; 41 std::unique_ptr<RtcpBandwidthObserver> feedback_observer_;
41 42
42 private: 43 private:
43 Clock* const clock_; 44 Clock* const clock_;
44 RTCPReportBlock report_block_; 45 RTCPReportBlock report_block_;
45 SendTimeHistory send_time_history_; 46 SendTimeHistory send_time_history_;
46 bool has_received_ack_; 47 bool has_received_ack_;
47 uint16_t last_acked_seq_num_; 48 uint16_t last_acked_seq_num_;
48 int64_t last_log_time_ms_; 49 int64_t last_log_time_ms_;
50 MockRtcEventLog event_log_;
49 51
50 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender); 52 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender);
51 }; 53 };
52 54
53 class SendSideBweReceiver : public BweReceiver { 55 class SendSideBweReceiver : public BweReceiver {
54 public: 56 public:
55 explicit SendSideBweReceiver(int flow_id); 57 explicit SendSideBweReceiver(int flow_id);
56 virtual ~SendSideBweReceiver(); 58 virtual ~SendSideBweReceiver();
57 59
58 void ReceivePacket(int64_t arrival_time_ms, 60 void ReceivePacket(int64_t arrival_time_ms,
59 const MediaPacket& media_packet) override; 61 const MediaPacket& media_packet) override;
60 FeedbackPacket* GetFeedback(int64_t now_ms) override; 62 FeedbackPacket* GetFeedback(int64_t now_ms) override;
61 63
62 private: 64 private:
63 int64_t last_feedback_ms_; 65 int64_t last_feedback_ms_;
64 std::vector<PacketInfo> packet_feedback_vector_; 66 std::vector<PacketInfo> packet_feedback_vector_;
65 }; 67 };
66 68
67 } // namespace bwe 69 } // namespace bwe
68 } // namespace testing 70 } // namespace testing
69 } // namespace webrtc 71 } // namespace webrtc
70 72
71 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ 73 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698