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

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

Issue 2415543002: Set min BWE bitrate form 10kbps to 5kbps and centralize minimum bitrate. (Closed)
Patch Set: Response to comments Created 4 years, 1 month 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/call/mock/mock_rtc_event_log.h" 11 #include "webrtc/call/mock/mock_rtc_event_log.h"
12 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h" 12 #include "webrtc/modules/bitrate_controller/include/bitrate_controller.h"
13 #include "webrtc/modules/congestion_controller/include/congestion_controller.h" 13 #include "webrtc/modules/congestion_controller/include/congestion_controller.h"
14 #include "webrtc/modules/congestion_controller/include/defines.h"
14 #include "webrtc/modules/congestion_controller/include/mock/mock_congestion_cont roller.h" 15 #include "webrtc/modules/congestion_controller/include/mock/mock_congestion_cont roller.h"
15 #include "webrtc/modules/pacing/mock/mock_paced_sender.h" 16 #include "webrtc/modules/pacing/mock/mock_paced_sender.h"
16 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitra te_observer.h" 17 #include "webrtc/modules/remote_bitrate_estimator/include/mock/mock_remote_bitra te_observer.h"
17 #include "webrtc/system_wrappers/include/clock.h" 18 #include "webrtc/system_wrappers/include/clock.h"
18 #include "webrtc/test/gmock.h" 19 #include "webrtc/test/gmock.h"
19 #include "webrtc/test/gtest.h" 20 #include "webrtc/test/gtest.h"
20 21
21 using testing::_; 22 using testing::_;
22 using testing::AtLeast; 23 using testing::AtLeast;
23 using testing::NiceMock; 24 using testing::NiceMock;
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 controller_->SignalNetworkState(kNetworkDown); 129 controller_->SignalNetworkState(kNetworkDown);
129 } 130 }
130 131
131 TEST_F(CongestionControllerTest, ResetBweAndBitrates) { 132 TEST_F(CongestionControllerTest, ResetBweAndBitrates) {
132 int new_bitrate = 200000; 133 int new_bitrate = 200000;
133 EXPECT_CALL(observer_, OnNetworkChanged(new_bitrate, _, _)); 134 EXPECT_CALL(observer_, OnNetworkChanged(new_bitrate, _, _));
134 EXPECT_CALL(*pacer_, SetEstimatedBitrate(new_bitrate)); 135 EXPECT_CALL(*pacer_, SetEstimatedBitrate(new_bitrate));
135 controller_->ResetBweAndBitrates(new_bitrate, -1, -1); 136 controller_->ResetBweAndBitrates(new_bitrate, -1, -1);
136 137
137 // If the bitrate is reset to -1, the new starting bitrate will be 138 // If the bitrate is reset to -1, the new starting bitrate will be
138 // the minimum default bitrate 10000bps. 139 // the minimum default bitrate kMinBitrateBps.
139 int min_default_bitrate = 10000; 140 EXPECT_CALL(observer_,
140 EXPECT_CALL(observer_, OnNetworkChanged(min_default_bitrate, _, _)); 141 OnNetworkChanged(congestion_controller::kMinBitrateBps, _, _));
141 EXPECT_CALL(*pacer_, SetEstimatedBitrate(min_default_bitrate)); 142 EXPECT_CALL(*pacer_,
143 SetEstimatedBitrate(congestion_controller::kMinBitrateBps));
142 controller_->ResetBweAndBitrates(-1, -1, -1); 144 controller_->ResetBweAndBitrates(-1, -1, -1);
143 } 145 }
144 146
145 TEST_F(CongestionControllerTest, 147 TEST_F(CongestionControllerTest,
146 SignalNetworkStateAndQueueIsFullAndEstimateChange) { 148 SignalNetworkStateAndQueueIsFullAndEstimateChange) {
147 // Send queue is full 149 // Send queue is full
148 EXPECT_CALL(*pacer_, ExpectedQueueTimeMs()) 150 EXPECT_CALL(*pacer_, ExpectedQueueTimeMs())
149 .WillRepeatedly(Return(PacedSender::kMaxQueueLengthMs + 1)); 151 .WillRepeatedly(Return(PacedSender::kMaxQueueLengthMs + 1));
150 EXPECT_CALL(observer_, OnNetworkChanged(0, _, _)); 152 EXPECT_CALL(observer_, OnNetworkChanged(0, _, _));
151 controller_->Process(); 153 controller_->Process();
(...skipping 30 matching lines...) Expand all
182 controller_->SignalNetworkState(kNetworkDown); 184 controller_->SignalNetworkState(kNetworkDown);
183 EXPECT_EQ(0, controller_->GetPacerQueuingDelayMs()); 185 EXPECT_EQ(0, controller_->GetPacerQueuingDelayMs());
184 186
185 // Network is up, pacer delay should be reported. 187 // Network is up, pacer delay should be reported.
186 controller_->SignalNetworkState(kNetworkUp); 188 controller_->SignalNetworkState(kNetworkUp);
187 EXPECT_EQ(kQueueTimeMs, controller_->GetPacerQueuingDelayMs()); 189 EXPECT_EQ(kQueueTimeMs, controller_->GetPacerQueuingDelayMs());
188 } 190 }
189 191
190 } // namespace test 192 } // namespace test
191 } // namespace webrtc 193 } // namespace webrtc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698