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

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

Issue 2121993002: Added NiceMock for MockRtcEventLog in several unittests where we don't care about the event logging. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Removed EXPECT_CALL for calls related to RtcEventLog in bitrate_controller_unittest 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
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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
(...skipping 29 matching lines...) Expand all
40 std::unique_ptr<RemoteBitrateEstimator> rbe_; 40 std::unique_ptr<RemoteBitrateEstimator> rbe_;
41 std::unique_ptr<RtcpBandwidthObserver> feedback_observer_; 41 std::unique_ptr<RtcpBandwidthObserver> feedback_observer_;
42 42
43 private: 43 private:
44 Clock* const clock_; 44 Clock* const clock_;
45 RTCPReportBlock report_block_; 45 RTCPReportBlock report_block_;
46 SendTimeHistory send_time_history_; 46 SendTimeHistory send_time_history_;
47 bool has_received_ack_; 47 bool has_received_ack_;
48 uint16_t last_acked_seq_num_; 48 uint16_t last_acked_seq_num_;
49 int64_t last_log_time_ms_; 49 int64_t last_log_time_ms_;
50 MockRtcEventLog event_log_; 50 ::testing::NiceMock<MockRtcEventLog> event_log_;
51 51
52 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender); 52 RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(FullBweSender);
53 }; 53 };
54 54
55 class SendSideBweReceiver : public BweReceiver { 55 class SendSideBweReceiver : public BweReceiver {
56 public: 56 public:
57 explicit SendSideBweReceiver(int flow_id); 57 explicit SendSideBweReceiver(int flow_id);
58 virtual ~SendSideBweReceiver(); 58 virtual ~SendSideBweReceiver();
59 59
60 void ReceivePacket(int64_t arrival_time_ms, 60 void ReceivePacket(int64_t arrival_time_ms,
61 const MediaPacket& media_packet) override; 61 const MediaPacket& media_packet) override;
62 FeedbackPacket* GetFeedback(int64_t now_ms) override; 62 FeedbackPacket* GetFeedback(int64_t now_ms) override;
63 63
64 private: 64 private:
65 int64_t last_feedback_ms_; 65 int64_t last_feedback_ms_;
66 std::vector<PacketInfo> packet_feedback_vector_; 66 std::vector<PacketInfo> packet_feedback_vector_;
67 }; 67 };
68 68
69 } // namespace bwe 69 } // namespace bwe
70 } // namespace testing 70 } // namespace testing
71 } // namespace webrtc 71 } // namespace webrtc
72 72
73 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_ 73 #endif // WEBRTC_MODULES_REMOTE_BITRATE_ESTIMATOR_TEST_ESTIMATORS_SEND_SIDE_H_
OLDNEW
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/estimators/remb.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698