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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc

Issue 1202253003: More Simulation Framework features (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Using rtc::scoped_ptr on nada_unittest.cc Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/modules.gyp ('k') | webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
index af69924f529bdd9c162ba6ac45961ced6b4301b7..2c4cf753b74ce32f28506519990b980648374f2d 100644
--- a/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
+++ b/webrtc/modules/remote_bitrate_estimator/bwe_simulations.cc
@@ -86,15 +86,15 @@ TEST_P(BweSimulation, Choke1000kbps500kbps1000kbpsBiDirectional) {
RateCounterFilter counter2(&downlink_, kFlowIds[1], "receiver_input_1");
PacketReceiver receiver2(&downlink_, kFlowIds[1], GetParam(), true, false);
- choke2.SetCapacity(500);
- delay.SetDelayMs(0);
+ choke2.set_capacity_kbps(500);
+ delay.SetOneWayDelayMs(0);
- choke.SetCapacity(1000);
- choke.SetMaxDelay(500);
+ choke.set_capacity_kbps(1000);
+ choke.set_max_delay_ms(500);
RunFor(60 * 1000);
- choke.SetCapacity(500);
+ choke.set_capacity_kbps(500);
RunFor(60 * 1000);
- choke.SetCapacity(1000);
+ choke.set_capacity_kbps(1000);
RunFor(60 * 1000);
}
@@ -106,12 +106,12 @@ TEST_P(BweSimulation, Choke1000kbps500kbps1000kbps) {
RateCounterFilter counter(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, false);
- choke.SetCapacity(1000);
- choke.SetMaxDelay(500);
+ choke.set_capacity_kbps(1000);
+ choke.set_max_delay_ms(500);
RunFor(60 * 1000);
- choke.SetCapacity(500);
+ choke.set_capacity_kbps(500);
RunFor(60 * 1000);
- choke.SetCapacity(1000);
+ choke.set_capacity_kbps(1000);
RunFor(60 * 1000);
}
@@ -121,12 +121,12 @@ TEST_P(BweSimulation, PacerChoke1000kbps500kbps1000kbps) {
ChokeFilter filter(&uplink_, 0);
RateCounterFilter counter(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
- filter.SetCapacity(1000);
- filter.SetMaxDelay(500);
+ filter.set_capacity_kbps(1000);
+ filter.set_max_delay_ms(500);
RunFor(60 * 1000);
- filter.SetCapacity(500);
+ filter.set_capacity_kbps(500);
RunFor(60 * 1000);
- filter.SetCapacity(1000);
+ filter.set_capacity_kbps(1000);
RunFor(60 * 1000);
}
@@ -136,8 +136,8 @@ TEST_P(BweSimulation, PacerChoke10000kbps) {
ChokeFilter filter(&uplink_, 0);
RateCounterFilter counter(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
- filter.SetCapacity(10000);
- filter.SetMaxDelay(500);
+ filter.set_capacity_kbps(10000);
+ filter.set_max_delay_ms(500);
RunFor(60 * 1000);
}
@@ -147,12 +147,12 @@ TEST_P(BweSimulation, PacerChoke200kbps30kbps200kbps) {
ChokeFilter filter(&uplink_, 0);
RateCounterFilter counter(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
- filter.SetCapacity(200);
- filter.SetMaxDelay(500);
+ filter.set_capacity_kbps(200);
+ filter.set_max_delay_ms(500);
RunFor(60 * 1000);
- filter.SetCapacity(30);
+ filter.set_capacity_kbps(30);
RunFor(60 * 1000);
- filter.SetCapacity(200);
+ filter.set_capacity_kbps(200);
RunFor(60 * 1000);
}
@@ -162,12 +162,12 @@ TEST_P(BweSimulation, Choke200kbps30kbps200kbps) {
ChokeFilter filter(&uplink_, 0);
RateCounterFilter counter(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
- filter.SetCapacity(200);
- filter.SetMaxDelay(500);
+ filter.set_capacity_kbps(200);
+ filter.set_max_delay_ms(500);
RunFor(60 * 1000);
- filter.SetCapacity(30);
+ filter.set_capacity_kbps(30);
RunFor(60 * 1000);
- filter.SetCapacity(200);
+ filter.set_capacity_kbps(200);
RunFor(60 * 1000);
}
@@ -176,7 +176,7 @@ TEST_P(BweSimulation, GoogleWifiTrace3Mbps) {
VideoSender sender(&uplink_, &source, GetParam());
RateCounterFilter counter1(&uplink_, 0, "sender_output");
TraceBasedDeliveryFilter filter(&uplink_, 0, "link_capacity");
- filter.SetMaxDelay(500);
+ filter.set_max_delay_ms(500);
RateCounterFilter counter2(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
ASSERT_TRUE(filter.Init(test::ResourcePath("google-wifi-3mbps", "rx")));
@@ -189,7 +189,7 @@ TEST_P(BweSimulation, LinearIncreasingCapacity) {
ChokeFilter filter(&uplink_, 0);
RateCounterFilter counter(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
- filter.SetMaxDelay(500);
+ filter.set_max_delay_ms(500);
const int kStartingCapacityKbps = 150;
const int kEndingCapacityKbps = 1500;
const int kStepKbps = 5;
@@ -197,7 +197,7 @@ TEST_P(BweSimulation, LinearIncreasingCapacity) {
for (int i = kStartingCapacityKbps; i <= kEndingCapacityKbps;
i += kStepKbps) {
- filter.SetCapacity(i);
+ filter.set_capacity_kbps(i);
RunFor(kStepTimeMs);
}
}
@@ -208,7 +208,7 @@ TEST_P(BweSimulation, LinearDecreasingCapacity) {
ChokeFilter filter(&uplink_, 0);
RateCounterFilter counter(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
- filter.SetMaxDelay(500);
+ filter.set_max_delay_ms(500);
const int kStartingCapacityKbps = 1500;
const int kEndingCapacityKbps = 150;
const int kStepKbps = -5;
@@ -216,7 +216,7 @@ TEST_P(BweSimulation, LinearDecreasingCapacity) {
for (int i = kStartingCapacityKbps; i >= kEndingCapacityKbps;
i += kStepKbps) {
- filter.SetCapacity(i);
+ filter.set_capacity_kbps(i);
RunFor(kStepTimeMs);
}
}
@@ -226,7 +226,7 @@ TEST_P(BweSimulation, PacerGoogleWifiTrace3Mbps) {
PacedVideoSender sender(&uplink_, &source, GetParam());
RateCounterFilter counter1(&uplink_, 0, "sender_output");
TraceBasedDeliveryFilter filter(&uplink_, 0, "link_capacity");
- filter.SetMaxDelay(500);
+ filter.set_max_delay_ms(500);
RateCounterFilter counter2(&uplink_, 0, "receiver_input");
PacketReceiver receiver(&uplink_, 0, GetParam(), true, true);
ASSERT_TRUE(filter.Init(test::ResourcePath("google-wifi-3mbps", "rx")));
@@ -248,7 +248,7 @@ TEST_P(BweSimulation, SelfFairnessTest) {
}
ChokeFilter choke(&uplink_, CreateFlowIds(kAllFlowIds, kNumFlows));
- choke.SetCapacity(1000);
+ choke.set_capacity_kbps(1000);
rtc::scoped_ptr<RateCounterFilter> rate_counters[kNumFlows];
for (size_t i = 0; i < kNumFlows; ++i) {
« no previous file with comments | « webrtc/modules/modules.gyp ('k') | webrtc/modules/remote_bitrate_estimator/remote_bitrate_estimator.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698