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

Unified Diff: webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc

Issue 2201093006: Tune BWE to be more sensitive on low capacity networks. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Tests passing. Created 4 years, 4 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
index ec008ffb7ffdbc916691c98e03f1fac44701c844..7feaeedf4c5fba30654ba8ff36d0b3b12cf9a16c 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/estimators/nada_unittest.cc
@@ -170,7 +170,7 @@ class NadaFbGenerator {
TEST_F(NadaSenderSideTest, AcceleratedRampUp) {
const int64_t kRefSignalMs = 1;
const int64_t kOneWayDelayMs = 50;
- int original_bitrate = 2 * kMinBitrateKbps;
+ int original_bitrate = 2 * NadaBweSender::kMinNadaBitrateKbps;
size_t receiving_rate = static_cast<size_t>(original_bitrate);
int64_t send_time_ms = nada_sender_.NowMs() - kOneWayDelayMs;
@@ -202,7 +202,7 @@ TEST_F(NadaSenderSideTest, AcceleratedRampUp) {
// Verify if AcceleratedRampDown is called and if bitrate decreases.
TEST_F(NadaSenderSideTest, AcceleratedRampDown) {
const int64_t kOneWayDelayMs = 50;
- int original_bitrate = 3 * kMinBitrateKbps;
+ int original_bitrate = 3 * NadaBweSender::kMinNadaBitrateKbps;
size_t receiving_rate = static_cast<size_t>(original_bitrate);
int64_t send_time_ms = nada_sender_.NowMs() - kOneWayDelayMs;
@@ -219,7 +219,8 @@ TEST_F(NadaSenderSideTest, AcceleratedRampDown) {
// Updates the bitrate according to the receiving rate and other constant
// parameters.
nada_sender_.AcceleratedRampDown(congested_fb);
- int bitrate_2_kbps = std::max(nada_sender_.bitrate_kbps(), kMinBitrateKbps);
+ int bitrate_2_kbps =
+ std::max(nada_sender_.bitrate_kbps(), NadaBweSender::kMinNadaBitrateKbps);
EXPECT_EQ(bitrate_2_kbps, bitrate_1_kbps);
}
@@ -227,7 +228,7 @@ TEST_F(NadaSenderSideTest, GradualRateUpdate) {
const int64_t kDeltaSMs = 20;
const int64_t kRefSignalMs = 20;
const int64_t kOneWayDelayMs = 50;
- int original_bitrate = 2 * kMinBitrateKbps;
+ int original_bitrate = 2 * NadaBweSender::kMinNadaBitrateKbps;
size_t receiving_rate = static_cast<size_t>(original_bitrate);
int64_t send_time_ms = nada_sender_.NowMs() - kOneWayDelayMs;
@@ -254,7 +255,8 @@ TEST_F(NadaSenderSideTest, GradualRateUpdate) {
TEST_F(NadaSenderSideTest, VeryLowBandwith) {
const int64_t kOneWayDelayMs = 50;
- size_t receiving_rate = static_cast<size_t>(kMinBitrateKbps);
+ size_t receiving_rate =
+ static_cast<size_t>(NadaBweSender::kMinNadaBitrateKbps);
int64_t send_time_ms = nada_sender_.NowMs() - kOneWayDelayMs;
NadaFeedback extremely_congested_fb =
@@ -262,7 +264,7 @@ TEST_F(NadaSenderSideTest, VeryLowBandwith) {
NadaFeedback congested_fb =
NadaFbGenerator::CongestedFb(receiving_rate, send_time_ms);
- nada_sender_.set_bitrate_kbps(5 * kMinBitrateKbps);
+ nada_sender_.set_bitrate_kbps(5 * NadaBweSender::kMinNadaBitrateKbps);
nada_sender_.set_original_operating_mode(true);
for (int i = 0; i < 100; ++i) {
// Trigger GradualRateUpdate mode.
@@ -270,10 +272,10 @@ TEST_F(NadaSenderSideTest, VeryLowBandwith) {
}
// The original implementation doesn't allow the bitrate to stay at kMin,
// even if the congestion signal is very high.
- EXPECT_GE(nada_sender_.bitrate_kbps(), kMinBitrateKbps);
+ EXPECT_GE(nada_sender_.bitrate_kbps(), NadaBweSender::kMinNadaBitrateKbps);
nada_sender_.set_original_operating_mode(false);
- nada_sender_.set_bitrate_kbps(5 * kMinBitrateKbps);
+ nada_sender_.set_bitrate_kbps(5 * NadaBweSender::kMinNadaBitrateKbps);
for (int i = 0; i < 1000; ++i) {
int previous_bitrate = nada_sender_.bitrate_kbps();
@@ -281,7 +283,7 @@ TEST_F(NadaSenderSideTest, VeryLowBandwith) {
nada_sender_.GiveFeedback(congested_fb);
EXPECT_LE(nada_sender_.bitrate_kbps(), previous_bitrate);
}
- EXPECT_EQ(nada_sender_.bitrate_kbps(), kMinBitrateKbps);
+ EXPECT_EQ(nada_sender_.bitrate_kbps(), NadaBweSender::kMinNadaBitrateKbps);
}
// Sending bitrate should increase and reach its Max bound.
@@ -303,7 +305,7 @@ TEST_F(NadaSenderSideTest, VeryHighBandwith) {
EXPECT_EQ(nada_sender_.bitrate_kbps(), kMaxBitrateKbps);
nada_sender_.set_original_operating_mode(false);
- nada_sender_.set_bitrate_kbps(kMinBitrateKbps);
+ nada_sender_.set_bitrate_kbps(NadaBweSender::kMinNadaBitrateKbps);
for (int i = 0; i < 100; ++i) {
int previous_bitrate = nada_sender_.bitrate_kbps();
« no previous file with comments | « webrtc/modules/remote_bitrate_estimator/test/estimators/nada.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698