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

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

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

Powered by Google App Engine
This is Rietveld 408576698