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

Side by Side Diff: webrtc/modules/congestion_controller/probe_bitrate_estimator_unittest.cc

Issue 2708873003: Propagate packet pacing information to SendTimeHistory. (Closed)
Patch Set: . Created 3 years, 10 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) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 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 #include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h" 11 #include "webrtc/modules/congestion_controller/probe_bitrate_estimator.h"
12 12
13 #include <vector> 13 #include <vector>
14 #include <utility> 14 #include <utility>
15 15
16 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h" 16 #include "webrtc/modules/remote_bitrate_estimator/aimd_rate_control.h"
17 #include "webrtc/test/gmock.h" 17 #include "webrtc/test/gmock.h"
18 #include "webrtc/test/gtest.h" 18 #include "webrtc/test/gtest.h"
19 19
20 namespace webrtc { 20 namespace webrtc {
21 21
22 constexpr int INVALID_BPS = -1; 22 constexpr int INVALID_BPS = -1;
23 23
24 class TestProbeBitrateEstimator : public ::testing::Test { 24 class TestProbeBitrateEstimator : public ::testing::Test {
25 public: 25 public:
26 TestProbeBitrateEstimator() : probe_bitrate_estimator_() {} 26 TestProbeBitrateEstimator() : probe_bitrate_estimator_() {}
27 27
28 // TODO(philipel): Use PacedPacketInfo when ProbeBitrateEstimator is rewritten
29 // to use that information.
28 void AddPacketFeedback(int probe_cluster_id, 30 void AddPacketFeedback(int probe_cluster_id,
29 size_t size_bytes, 31 size_t size_bytes,
30 int64_t send_time_ms, 32 int64_t send_time_ms,
31 int64_t arrival_time_ms) { 33 int64_t arrival_time_ms) {
32 PacketInfo info(arrival_time_ms, send_time_ms, 0, size_bytes, 34 PacketInfo info(arrival_time_ms, send_time_ms, 0, size_bytes,
33 probe_cluster_id); 35 PacedPacketInfo(probe_cluster_id, -1, -1));
nisse-webrtc 2017/02/22 12:37:47 This implies that there's no change in behavior, r
philipel 2017/02/22 13:11:26 Yes, that's right.
34 measured_bps_ = 36 measured_bps_ =
35 probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(info); 37 probe_bitrate_estimator_.HandleProbeAndEstimateBitrate(info);
36 } 38 }
37 39
38 protected: 40 protected:
39 int measured_bps_ = INVALID_BPS; 41 int measured_bps_ = INVALID_BPS;
40 ProbeBitrateEstimator probe_bitrate_estimator_; 42 ProbeBitrateEstimator probe_bitrate_estimator_;
41 }; 43 };
42 44
43 TEST_F(TestProbeBitrateEstimator, OneCluster) { 45 TEST_F(TestProbeBitrateEstimator, OneCluster) {
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 TEST_F(TestProbeBitrateEstimator, IgnoreSizeFirstReceivePacket) { 138 TEST_F(TestProbeBitrateEstimator, IgnoreSizeFirstReceivePacket) {
137 AddPacketFeedback(0, 1500, 0, 10); 139 AddPacketFeedback(0, 1500, 0, 10);
138 AddPacketFeedback(0, 1000, 10, 20); 140 AddPacketFeedback(0, 1000, 10, 20);
139 AddPacketFeedback(0, 1000, 20, 30); 141 AddPacketFeedback(0, 1000, 20, 30);
140 AddPacketFeedback(0, 1000, 30, 40); 142 AddPacketFeedback(0, 1000, 30, 40);
141 143
142 EXPECT_NEAR(measured_bps_, 800000, 10); 144 EXPECT_NEAR(measured_bps_, 800000, 10);
143 } 145 }
144 146
145 } // namespace webrtc 147 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698