Implementing auto pausing of video streams.

webrtc/call/bitrate_allocator_unittest.cc

Index: webrtc/call/bitrate_allocator_unittest.cc
diff --git a/webrtc/call/bitrate_allocator_unittest.cc b/webrtc/call/bitrate_allocator_unittest.cc
index 4017645c1d6f022988184fb5ac67b44ccc509649..b952ef0d622dbf78b8eb4bb3eb612dd617fc8f71 100644
--- a/webrtc/call/bitrate_allocator_unittest.cc
+++ b/webrtc/call/bitrate_allocator_unittest.cc
@@ -125,13 +125,13 @@ TEST_F(BitrateAllocatorTestNoEnforceMin, OneBitrateObserver) {
       allocator_->AddObserver(&bitrate_observer_1, 100000, 400000, false);
   EXPECT_EQ(300000, start_bitrate);
 
-  // High REMB.
+  // High BWE.
   allocator_->OnNetworkChanged(150000, 0, 0);
   EXPECT_EQ(150000u, bitrate_observer_1.last_bitrate_);
 
-  // Low REMB.
+  // Low BWE.
   allocator_->OnNetworkChanged(10000, 0, 0);
-  EXPECT_EQ(10000u, bitrate_observer_1.last_bitrate_);
+  EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_);

[pbos-webrtc, 2016/06/06 15:26:29]

Does this still verify EnforceMinBitrate() or should the comment above be
updated?

[mflodman, 2016/06/09 13:23:13]

Comment updated.

 
   allocator_->RemoveObserver(&bitrate_observer_1);
 }
@@ -156,8 +156,8 @@ TEST_F(BitrateAllocatorTestNoEnforceMin, ThreeBitrateObservers) {
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_);
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_);
 
-  // High REMB. Make sure the controllers get a fair share of the surplus
-  // (i.e., what is left after each controller gets its min rate).
+  // High BWE. Make sure the controllers get a fair share of the surplus (i.e.,
+  // what is left after each controller gets its min rate).
   allocator_->OnNetworkChanged(690000, 0, 0);
   // Verify that each observer gets its min rate (sum of min rates is 600000),
   // and that the remaining 90000 is divided equally among the three.
@@ -166,24 +166,28 @@ TEST_F(BitrateAllocatorTestNoEnforceMin, ThreeBitrateObservers) {
   EXPECT_EQ(200000u + bitrate_to_share / 3, bitrate_observer_2.last_bitrate_);
   EXPECT_EQ(300000u + bitrate_to_share / 3, bitrate_observer_3.last_bitrate_);
 
-  // High REMB, but below the sum of min bitrates.
-  allocator_->OnNetworkChanged(500000, 0, 0);
-  // Verify that the first and second observers get their min bitrates, and the
-  // third gets the remainder.
+  // BWE below the sum of observer's min bitrate.
+  allocator_->OnNetworkChanged(300000, 0, 0);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_);  // Min bitrate.
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_);  // Min bitrate.
-  EXPECT_EQ(200000u, bitrate_observer_3.last_bitrate_);  // Remainder.
+  EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_);  // Nothing.
+
+  // Increased BWE, but still below the sum of configured min bitrates for all
+  // observers and too little for observer 3. 1 and 2 will share the rest.
+  allocator_->OnNetworkChanged(500000, 0, 0);
+  EXPECT_EQ(200000u, bitrate_observer_1.last_bitrate_);  // Min + split.
+  EXPECT_EQ(300000u, bitrate_observer_2.last_bitrate_);  // Min + split.
+  EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_);  // Nothing.
 
-  // Low REMB.
+  // Below min for all.
   allocator_->OnNetworkChanged(10000, 0, 0);
-  // Verify that the first observer gets all the rate, and the rest get zero.
-  EXPECT_EQ(10000u, bitrate_observer_1.last_bitrate_);
+  EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_);
   EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_);
 
-  allocator_->OnNetworkChanged(0, 0, 0);
   // Verify that zero estimated bandwidth, means that that all gets zero,
   // regardless of set min bitrate.
+  allocator_->OnNetworkChanged(0, 0, 0);
   EXPECT_EQ(0u, bitrate_observer_1.last_bitrate_);
   EXPECT_EQ(0u, bitrate_observer_2.last_bitrate_);
   EXPECT_EQ(0u, bitrate_observer_3.last_bitrate_);
@@ -193,7 +197,7 @@ TEST_F(BitrateAllocatorTestNoEnforceMin, ThreeBitrateObservers) {
   allocator_->RemoveObserver(&bitrate_observer_3);
 }
 
-TEST_F(BitrateAllocatorTest, ThreeBitrateObserversLowRembEnforceMin) {
+TEST_F(BitrateAllocatorTest, ThreeBitrateObserversLowBweEnforceMin) {
   TestBitrateObserver bitrate_observer_1;
   TestBitrateObserver bitrate_observer_2;
   TestBitrateObserver bitrate_observer_3;
@@ -212,7 +216,7 @@ TEST_F(BitrateAllocatorTest, ThreeBitrateObserversLowRembEnforceMin) {
   EXPECT_EQ(100000, static_cast<int>(bitrate_observer_1.last_bitrate_));
   EXPECT_EQ(200000, static_cast<int>(bitrate_observer_2.last_bitrate_));
 
-  // Low REMB. Verify that all observers still get their respective min bitrate.
+  // Low BWE. Verify that all observers still get their respective min bitrate.
   allocator_->OnNetworkChanged(1000, 0, 0);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_);  // Min cap.
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_);  // Min cap.
@@ -250,4 +254,102 @@ TEST_F(BitrateAllocatorTest, AddObserverWhileNetworkDown) {
   EXPECT_EQ(750000u, bitrate_observer_2.last_bitrate_);
 }
 
+TEST_F(BitrateAllocatorTest, MixedEnforecedConfigs) {
+  TestBitrateObserver enforced_observer;
+  int start_bitrate =
+      allocator_->AddObserver(&enforced_observer, 6000, 30000, true);
+  EXPECT_EQ(60000, start_bitrate);
+
+  TestBitrateObserver not_enforced_observer;
+  start_bitrate =
+      allocator_->AddObserver(&not_enforced_observer, 30000, 2500000, false);
+  EXPECT_EQ(270000, start_bitrate);
+  EXPECT_EQ(30000u, enforced_observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(36000, 0, 50);
+  EXPECT_EQ(6000u, enforced_observer.last_bitrate_);
+  EXPECT_EQ(30000u, not_enforced_observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(35000, 0, 50);
+  EXPECT_EQ(30000u, enforced_observer.last_bitrate_);
+  EXPECT_EQ(0u, not_enforced_observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(5000, 0, 50);
+  EXPECT_EQ(6000u, enforced_observer.last_bitrate_);
+  EXPECT_EQ(0u, not_enforced_observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(36000, 0, 50);
+  EXPECT_EQ(30000u, enforced_observer.last_bitrate_);
+  EXPECT_EQ(0u, not_enforced_observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(55000, 0, 50);
+  EXPECT_EQ(30000u, enforced_observer.last_bitrate_);
+  EXPECT_EQ(0u, not_enforced_observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(56000, 0, 50);
+  EXPECT_EQ(6000u, enforced_observer.last_bitrate_);
+  EXPECT_EQ(50000u, not_enforced_observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(56000, 0, 50);
+  EXPECT_EQ(16000u, enforced_observer.last_bitrate_);
+  EXPECT_EQ(40000u, not_enforced_observer.last_bitrate_);
+
+  allocator_->RemoveObserver(&enforced_observer);
+  allocator_->RemoveObserver(&not_enforced_observer);
+}
+
+TEST_F(BitrateAllocatorTest, AvoidToggleAbsolute) {
+  TestBitrateObserver observer;
+  int start_bitrate =
+      allocator_->AddObserver(&observer, 30000, 300000, false);
+  EXPECT_EQ(300000, start_bitrate);
+
+  allocator_->OnNetworkChanged(30000, 0, 50);
+  EXPECT_EQ(30000u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(20000, 0, 50);
+  EXPECT_EQ(0u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(30000, 0, 50);
+  EXPECT_EQ(0u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(49000, 0, 50);
+  EXPECT_EQ(0u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(50000, 0, 50);
+  EXPECT_EQ(50000u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(30000, 0, 50);
+  EXPECT_EQ(30000u, observer.last_bitrate_);
+
+  allocator_->RemoveObserver(&observer);
+}
+
+TEST_F(BitrateAllocatorTest, AvoidTogglePercent) {
+  TestBitrateObserver observer;
+  int start_bitrate =
+      allocator_->AddObserver(&observer, 300000, 600000, false);
+  EXPECT_EQ(300000, start_bitrate);
+
+  allocator_->OnNetworkChanged(300000, 0, 50);
+  EXPECT_EQ(300000u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(200000, 0, 50);
+  EXPECT_EQ(0u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(300000, 0, 50);
+  EXPECT_EQ(0u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(329000, 0, 50);
+  EXPECT_EQ(0u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(330000, 0, 50);
+  EXPECT_EQ(330000u, observer.last_bitrate_);
+
+  allocator_->OnNetworkChanged(300000, 0, 50);
+  EXPECT_EQ(300000u, observer.last_bitrate_);
+
+  allocator_->RemoveObserver(&observer);
+}
+
 }  // namespace webrtc