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

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

Issue 2532993002: Revert of Pass time constant to bwe smoothing filter. (Closed)
Patch Set: Created 4 years 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 <memory> 11 #include <memory>
12 #include <utility> 12 #include <utility>
13 13
14 #include "webrtc/modules/congestion_controller/probing_interval_estimator.h" 14 #include "webrtc/modules/congestion_controller/probing_interval_estimator.h"
15 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_aimd_rate_co ntrol.h" 15 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_aimd_rate_co ntrol.h"
16 #include "webrtc/test/gmock.h" 16 #include "webrtc/test/gmock.h"
17 #include "webrtc/test/gtest.h" 17 #include "webrtc/test/gtest.h"
18 18
19 using ::testing::Return; 19 using ::testing::Return;
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 namespace { 23 namespace {
24 24
25 constexpr int kMinIntervalMs = 2000; 25 constexpr int kMinIntervalMs = 2000;
26 constexpr int kMaxIntervalMs = 50000; 26 constexpr int kMaxIntervalMs = 50000;
27 constexpr int kDefaultIntervalMs = 3000;
28 27
29 struct ProbingIntervalEstimatorStates { 28 struct ProbingIntervalEstimatorStates {
30 std::unique_ptr<ProbingIntervalEstimator> probing_interval_estimator; 29 std::unique_ptr<ProbingIntervalEstimator> probing_interval_estimator;
31 std::unique_ptr<MockAimdRateControl> aimd_rate_control; 30 std::unique_ptr<MockAimdRateControl> aimd_rate_control;
32 }; 31 };
33 32
34 ProbingIntervalEstimatorStates CreateProbingIntervalEstimatorStates() { 33 ProbingIntervalEstimatorStates CreateProbingIntervalEstimatorStates() {
35 ProbingIntervalEstimatorStates states; 34 ProbingIntervalEstimatorStates states;
36 states.aimd_rate_control.reset(new MockAimdRateControl()); 35 states.aimd_rate_control.reset(new MockAimdRateControl());
37 states.probing_interval_estimator.reset(new ProbingIntervalEstimator( 36 states.probing_interval_estimator.reset(new ProbingIntervalEstimator(
38 kMinIntervalMs, kMaxIntervalMs, kDefaultIntervalMs, 37 kMinIntervalMs, kMaxIntervalMs, states.aimd_rate_control.get()));
39 states.aimd_rate_control.get()));
40 return states; 38 return states;
41 } 39 }
42 } // namespace 40 } // namespace
43 41
44 TEST(ProbingIntervalEstimatorTest, DefaultIntervalUntillWeHaveDrop) { 42 TEST(ProbingIntervalEstimatorTest, NoIntervalUntillWeHaveDrop) {
45 auto states = CreateProbingIntervalEstimatorStates(); 43 auto states = CreateProbingIntervalEstimatorStates();
46 44
47 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps()) 45 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps())
48 .WillOnce(Return(rtc::Optional<int>())) 46 .WillOnce(Return(rtc::Optional<int>()))
49 .WillOnce(Return(rtc::Optional<int>(5000))); 47 .WillOnce(Return(rtc::Optional<int>(5000)));
50 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps()) 48 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps())
51 .WillOnce(Return(4000)) 49 .WillOnce(Return(4000))
52 .WillOnce(Return(4000)); 50 .WillOnce(Return(4000));
53 51
54 EXPECT_EQ(kDefaultIntervalMs, 52 EXPECT_EQ(rtc::Optional<int>(),
55 states.probing_interval_estimator->GetIntervalMs()); 53 states.probing_interval_estimator->GetIntervalMs());
56 EXPECT_NE(kDefaultIntervalMs, 54 EXPECT_NE(rtc::Optional<int>(),
57 states.probing_interval_estimator->GetIntervalMs()); 55 states.probing_interval_estimator->GetIntervalMs());
58 } 56 }
59 57
60 TEST(ProbingIntervalEstimatorTest, CalcInterval) { 58 TEST(ProbingIntervalEstimatorTest, CalcInterval) {
61 auto states = CreateProbingIntervalEstimatorStates(); 59 auto states = CreateProbingIntervalEstimatorStates();
62 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps()) 60 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps())
63 .WillOnce(Return(rtc::Optional<int>(20000))); 61 .WillOnce(Return(rtc::Optional<int>(20000)));
64 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps()) 62 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps())
65 .WillOnce(Return(5000)); 63 .WillOnce(Return(5000));
66 EXPECT_EQ(4000, states.probing_interval_estimator->GetIntervalMs()); 64 EXPECT_EQ(rtc::Optional<int>(4000),
65 states.probing_interval_estimator->GetIntervalMs());
67 } 66 }
68 67
69 TEST(ProbingIntervalEstimatorTest, IntervalDoesNotExceedMin) { 68 TEST(ProbingIntervalEstimatorTest, IntervalDoesNotExceedMin) {
70 auto states = CreateProbingIntervalEstimatorStates(); 69 auto states = CreateProbingIntervalEstimatorStates();
71 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps()) 70 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps())
72 .WillOnce(Return(rtc::Optional<int>(1000))); 71 .WillOnce(Return(rtc::Optional<int>(1000)));
73 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps()) 72 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps())
74 .WillOnce(Return(5000)); 73 .WillOnce(Return(5000));
75 EXPECT_EQ(kMinIntervalMs, states.probing_interval_estimator->GetIntervalMs()); 74 EXPECT_EQ(rtc::Optional<int>(kMinIntervalMs),
75 states.probing_interval_estimator->GetIntervalMs());
76 } 76 }
77 77
78 TEST(ProbingIntervalEstimatorTest, IntervalDoesNotExceedMax) { 78 TEST(ProbingIntervalEstimatorTest, IntervalDoesNotExceedMax) {
79 auto states = CreateProbingIntervalEstimatorStates(); 79 auto states = CreateProbingIntervalEstimatorStates();
80 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps()) 80 EXPECT_CALL(*states.aimd_rate_control, GetLastBitrateDecreaseBps())
81 .WillOnce(Return(rtc::Optional<int>(50000))); 81 .WillOnce(Return(rtc::Optional<int>(50000)));
82 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps()) 82 EXPECT_CALL(*states.aimd_rate_control, GetNearMaxIncreaseRateBps())
83 .WillOnce(Return(100)); 83 .WillOnce(Return(100));
84 EXPECT_EQ(kMaxIntervalMs, states.probing_interval_estimator->GetIntervalMs()); 84 EXPECT_EQ(rtc::Optional<int>(kMaxIntervalMs),
85 states.probing_interval_estimator->GetIntervalMs());
85 } 86 }
86 } // namespace webrtc 87 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698