More Simulation Framework features

webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc

Index: webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
diff --git a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
index dd7bbfcfeba80b10e6ceca6c433dbd2e1d55b340..bef227f715358b2466b191f12a410af956908215 100644
--- a/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
+++ b/webrtc/modules/remote_bitrate_estimator/test/bwe_test_framework_unittest.cc
@@ -332,7 +332,7 @@ class BweTestFramework_DelayFilterTest : public ::testing::Test {
   }
 
   void TestDelayFilter(int64_t delay_ms) {
-    filter_.SetDelayMs(delay_ms);
+    filter_.SetOneWayDelayMs(delay_ms);
     TestDelayFilter(1, 0, 0);    // No input should yield no output
 
     // Single packet
@@ -340,7 +340,7 @@ class BweTestFramework_DelayFilterTest : public ::testing::Test {
     TestDelayFilter(delay_ms, 0, 0);
 
     for (int i = 0; i < delay_ms; ++i) {
-      filter_.SetDelayMs(i);
+      filter_.SetOneWayDelayMs(i);
       TestDelayFilter(1, 10, 10);
     }
     TestDelayFilter(0, 0, 0);
@@ -350,11 +350,11 @@ class BweTestFramework_DelayFilterTest : public ::testing::Test {
     TestDelayFilter(delay_ms, 0, 0);
 
     for (int i = 1; i < delay_ms + 1; ++i) {
-      filter_.SetDelayMs(i);
+      filter_.SetOneWayDelayMs(i);
       TestDelayFilter(1, 5, 5);
     }
     TestDelayFilter(0, 0, 0);
-    filter_.SetDelayMs(2 * delay_ms);
+    filter_.SetOneWayDelayMs(2 * delay_ms);
     TestDelayFilter(1, 0, 0);
     TestDelayFilter(delay_ms, 13, 13);
     TestDelayFilter(delay_ms, 0, 0);
@@ -363,11 +363,11 @@ class BweTestFramework_DelayFilterTest : public ::testing::Test {
     TestDelayFilter(delay_ms, 0, 0);
 
     for (int i = 0; i < 2 * delay_ms; ++i) {
-      filter_.SetDelayMs(2 * delay_ms - i - 1);
+      filter_.SetOneWayDelayMs(2 * delay_ms - i - 1);
       TestDelayFilter(1, 5, 5);
     }
     TestDelayFilter(0, 0, 0);
-    filter_.SetDelayMs(0);
+    filter_.SetOneWayDelayMs(0);
     TestDelayFilter(0, 7, 7);
 
     ASSERT_TRUE(IsTimeSorted(accumulated_packets_));
@@ -388,7 +388,7 @@ TEST_F(BweTestFramework_DelayFilterTest, Delay0) {
   TestDelayFilter(1, 0, 0);    // No input should yield no output
   TestDelayFilter(1, 10, 10);  // Expect no delay (delay time is zero)
   TestDelayFilter(1, 0, 0);    // Check no packets are still in buffer
-  filter_.SetDelayMs(0);
+  filter_.SetOneWayDelayMs(0);
   TestDelayFilter(1, 5, 5);    // Expect no delay (delay time is zero)
   TestDelayFilter(1, 0, 0);    // Check no packets are still in buffer
 }
@@ -415,7 +415,7 @@ TEST_F(BweTestFramework_DelayFilterTest, JumpToZeroDelay) {
   Packets packets;
 
   // Delay a bunch of packets, accumulate them to the 'acc' list.
-  delay.SetDelayMs(100.0f);
+  delay.SetOneWayDelayMs(100.0f);
   for (uint32_t i = 0; i < 10; ++i) {
     packets.push_back(new MediaPacket(i * 100, i));
   }
@@ -426,7 +426,7 @@ TEST_F(BweTestFramework_DelayFilterTest, JumpToZeroDelay) {
 
   // Drop delay to zero, send a few more packets through the delay, append them
   // to the 'acc' list and verify that it is all sorted.
-  delay.SetDelayMs(0.0f);
+  delay.SetOneWayDelayMs(0.0f);
   for (uint32_t i = 10; i < 50; ++i) {
     packets.push_back(new MediaPacket(i * 100, i));
   }
@@ -445,12 +445,12 @@ TEST_F(BweTestFramework_DelayFilterTest, IncreasingDelay) {
     TestDelayFilter(i);
   }
   // Reach a steady state.
-  filter_.SetDelayMs(100);
+  filter_.SetOneWayDelayMs(100);
   TestDelayFilter(1, 20, 20);
   TestDelayFilter(2, 0, 0);
   TestDelayFilter(99, 20, 20);
   // Drop delay back down to zero.
-  filter_.SetDelayMs(0);
+  filter_.SetOneWayDelayMs(0);
   TestDelayFilter(1, 100, 100);
   TestDelayFilter(23010, 0, 0);
   ASSERT_TRUE(IsTimeSorted(accumulated_packets_));
@@ -669,14 +669,14 @@ TEST_F(BweTestFramework_ChokeFilterTest, Short) {
   // That is actually just a single packet, since each packet has 1000 bits of
   // payload.
   ChokeFilter filter(NULL, 0);
-  filter.SetCapacity(10);
+  filter.SetCapacityKbps(10);
   TestChoke(&filter, 100, 100, 1);
 }
 
 TEST_F(BweTestFramework_ChokeFilterTest, Medium) {
   // 100ms, 10 packets, 10 kbps choke -> 1 packet through, or 1 kbit.
   ChokeFilter filter(NULL, 0);
-  filter.SetCapacity(10);
+  filter.SetCapacityKbps(10);
   TestChoke(&filter, 100, 10, 1);
   // 200ms, no new packets -> another packet through.
   TestChoke(&filter, 100, 0, 1);
@@ -689,7 +689,7 @@ TEST_F(BweTestFramework_ChokeFilterTest, Medium) {
 TEST_F(BweTestFramework_ChokeFilterTest, Long) {
   // 100ms, 100 packets in queue, 10 kbps choke -> 1 packet through, or 1 kbit.
   ChokeFilter filter(NULL, 0);
-  filter.SetCapacity(10);
+  filter.SetCapacityKbps(10);
   TestChoke(&filter, 100, 100, 1);
   // 200ms, no input, another packet through.
   TestChoke(&filter, 100, 0, 1);
@@ -697,22 +697,22 @@ TEST_F(BweTestFramework_ChokeFilterTest, Long) {
   TestChoke(&filter, 800, 0, 8);
   // 10000ms, no input, raise choke to 100 kbps. Remaining 90 packets in queue
   // should be propagated, for a total of 90 kbps.
-  filter.SetCapacity(100);
+  filter.SetCapacityKbps(100);
   TestChoke(&filter, 9000, 0, 90);
   // 10100ms, 20 more packets -> 10 packets or 10 kbit through.
   TestChoke(&filter, 100, 20, 10);
   // 10300ms, 10 more packets -> 20 packets out.
   TestChoke(&filter, 200, 10, 20);
   // 11300ms, no input, queue should be empty.
-  filter.SetCapacity(10);
+  filter.SetCapacityKbps(10);
   TestChoke(&filter, 1000, 0, 0);
 }
 
 TEST_F(BweTestFramework_ChokeFilterTest, MaxDelay) {
   // 10 kbps choke, 500 ms delay cap
   ChokeFilter filter(NULL, 0);
-  filter.SetCapacity(10);
-  filter.SetMaxDelay(500);
+  filter.SetCapacityKbps(10);
+  filter.SetMaxDelayMs(500);
   // 100ms, 100 packets in queue, 10 kbps choke -> 1 packet through, or 1 kbit.
   TestChoke(&filter, 100, 100, 1);
   CheckMaxDelay(500);
@@ -722,7 +722,7 @@ TEST_F(BweTestFramework_ChokeFilterTest, MaxDelay) {
   TestChoke(&filter, 9500, 0, 0);
 
   // 100 ms delay cap
-  filter.SetMaxDelay(100);
+  filter.SetMaxDelayMs(100);
   // 10100ms, 50 more packets -> 2 packets or 2 kbit through.
   TestChoke(&filter, 100, 50, 2);
   CheckMaxDelay(100);
@@ -730,8 +730,8 @@ TEST_F(BweTestFramework_ChokeFilterTest, MaxDelay) {
   TestChoke(&filter, 9900, 0, 0);
 
   // Reset delay cap (0 is no cap) and verify no packets are dropped.
-  filter.SetCapacity(10);
-  filter.SetMaxDelay(0);
+  filter.SetCapacityKbps(10);
+  filter.SetMaxDelayMs(0);
   TestChoke(&filter, 100, 100, 2);
   TestChoke(&filter, 9900, 0, 98);
 }
@@ -754,7 +754,7 @@ TEST_F(BweTestFramework_ChokeFilterTest, ShortTraceTwoWraps) {
 
 TEST_F(BweTestFramework_ChokeFilterTest, ShortTraceMaxDelay) {
   TraceBasedDeliveryFilter filter(NULL, 0);
-  filter.SetMaxDelay(25);
+  filter.SetMaxDelayMs(25);
   ASSERT_TRUE(filter.Init(test::ResourcePath("synthetic-trace", "rx")));
   // Uses all slots up to 110 ms. Several packets are being dropped.
   TestChoke(&filter, 110, 20, 9);