Simplify BitrateAllocator::AddBitrateObserver.

webrtc/modules/bitrate_controller/bitrate_allocator_unittest.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 28 matching lines @@
   BitrateAllocatorTest() : allocator_(new BitrateAllocator()) {
     allocator_->OnNetworkChanged(300000u, 0, 0);
   }
   ~BitrateAllocatorTest() {}
 
   rtc::scoped_ptr<BitrateAllocator> allocator_;
 };
 
 TEST_F(BitrateAllocatorTest, UpdatingBitrateObserver) {
   TestBitrateObserver bitrate_observer;
-  int start_bitrate;
-  allocator_->AddBitrateObserver(&bitrate_observer, 200000, 100000, 1500000,
-                                 &start_bitrate);
+  int start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer, 100000, 1500000);
   EXPECT_EQ(300000, start_bitrate);
   allocator_->OnNetworkChanged(200000, 0, 0);
   EXPECT_EQ(200000u, bitrate_observer.last_bitrate_);
 
-  allocator_->AddBitrateObserver(&bitrate_observer, 1500000, 100000, 1500000,
-                                 &start_bitrate);
-  EXPECT_EQ(1500000, start_bitrate);
-  allocator_->OnNetworkChanged(1500000, 0, 0);
-  EXPECT_EQ(1500000u, bitrate_observer.last_bitrate_);
+  // TODO(pbos): Expect capping to 1.5M instead of 3M when not boosting the max
+  // bitrate for FEC/retransmissions (see TODO in BitrateAllocator).
+  allocator_->OnNetworkChanged(4000000, 0, 0);
+  EXPECT_EQ(3000000u, bitrate_observer.last_bitrate_);
+  start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer, 100000, 4000000);
+  EXPECT_EQ(4000000, start_bitrate);
 
-  allocator_->AddBitrateObserver(&bitrate_observer, 500000, 100000, 1500000,
-                                 &start_bitrate);
-  EXPECT_EQ(1500000, start_bitrate);
+  start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer, 100000, 1500000);
+  EXPECT_EQ(3000000, start_bitrate);
+  EXPECT_EQ(3000000u, bitrate_observer.last_bitrate_);
   allocator_->OnNetworkChanged(1500000, 0, 0);
   EXPECT_EQ(1500000u, bitrate_observer.last_bitrate_);
 }
 
 TEST_F(BitrateAllocatorTest, TwoBitrateObserversOneRtcpObserver) {
   TestBitrateObserver bitrate_observer_1;
   TestBitrateObserver bitrate_observer_2;
-  int start_bitrate;
-  allocator_->AddBitrateObserver(&bitrate_observer_1, 200000, 100000, 300000,
-                                 &start_bitrate);
+  int start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_1, 100000, 300000);
   EXPECT_EQ(300000, start_bitrate);
-  allocator_->AddBitrateObserver(&bitrate_observer_2, 200000, 200000, 300000,
-                                 &start_bitrate);
+  start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_2, 200000, 300000);
   EXPECT_EQ(200000, start_bitrate);
 
   // Test too low start bitrate, hence lower than sum of min. Min bitrates will
   // be allocated to all observers.
   allocator_->OnNetworkChanged(200000, 0, 50);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_);
   EXPECT_EQ(0, bitrate_observer_1.last_fraction_loss_);
   EXPECT_EQ(50, bitrate_observer_1.last_rtt_);
   EXPECT_EQ(200000u, bitrate_observer_2.last_bitrate_);
   EXPECT_EQ(0, bitrate_observer_2.last_fraction_loss_);
@@ skipping 19 matching lines @@
   }
   ~BitrateAllocatorTestNoEnforceMin() {}
 
   rtc::scoped_ptr<BitrateAllocator> allocator_;
 };
 
 // The following three tests verify that the EnforceMinBitrate() method works
 // as intended.
 TEST_F(BitrateAllocatorTestNoEnforceMin, OneBitrateObserver) {
   TestBitrateObserver bitrate_observer_1;
-  int start_bitrate;
-  allocator_->AddBitrateObserver(&bitrate_observer_1, 200000, 100000, 400000,
-                                 &start_bitrate);
+  int start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_1, 100000, 400000);
   EXPECT_EQ(300000, start_bitrate);
 
   // High REMB.
   allocator_->OnNetworkChanged(150000, 0, 0);
   EXPECT_EQ(150000u, bitrate_observer_1.last_bitrate_);
 
   // Low REMB.
   allocator_->OnNetworkChanged(10000, 0, 0);
   EXPECT_EQ(10000u, bitrate_observer_1.last_bitrate_);
 
   allocator_->RemoveBitrateObserver(&bitrate_observer_1);
 }
 
 TEST_F(BitrateAllocatorTestNoEnforceMin, ThreeBitrateObservers) {
   TestBitrateObserver bitrate_observer_1;
   TestBitrateObserver bitrate_observer_2;
   TestBitrateObserver bitrate_observer_3;
   // Set up the observers with min bitrates at 100000, 200000, and 300000.
-  int start_bitrate;
-  allocator_->AddBitrateObserver(&bitrate_observer_1, 200000, 100000, 400000,
-                                 &start_bitrate);
+  int start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_1, 100000, 400000);
   EXPECT_EQ(300000, start_bitrate);
 
-  allocator_->AddBitrateObserver(&bitrate_observer_2, 200000, 200000, 400000,
-                                 &start_bitrate);
+  start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_2, 200000, 400000);
   EXPECT_EQ(200000, start_bitrate);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_);
 
-  allocator_->AddBitrateObserver(&bitrate_observer_3, 200000, 300000, 400000,
-                                 &start_bitrate);
+  start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_3, 300000, 400000);
   EXPECT_EQ(0, start_bitrate);
   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).
   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.
   uint32_t bitrate_to_share = 690000u - 100000u - 200000u - 300000u;
@@ skipping 18 matching lines @@
 
   allocator_->RemoveBitrateObserver(&bitrate_observer_1);
   allocator_->RemoveBitrateObserver(&bitrate_observer_2);
   allocator_->RemoveBitrateObserver(&bitrate_observer_3);
 }
 
 TEST_F(BitrateAllocatorTest, ThreeBitrateObserversLowRembEnforceMin) {
   TestBitrateObserver bitrate_observer_1;
   TestBitrateObserver bitrate_observer_2;
   TestBitrateObserver bitrate_observer_3;
-  int start_bitrate;
-  allocator_->AddBitrateObserver(&bitrate_observer_1, 200000, 100000, 400000,
-                                 &start_bitrate);
+  int start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_1, 100000, 400000);
   EXPECT_EQ(300000, start_bitrate);
 
-  allocator_->AddBitrateObserver(&bitrate_observer_2, 200000, 200000, 400000,
-                                 &start_bitrate);
+  start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_2, 200000, 400000);
   EXPECT_EQ(200000, start_bitrate);
   EXPECT_EQ(100000u, bitrate_observer_1.last_bitrate_);
 
-  allocator_->AddBitrateObserver(&bitrate_observer_3, 200000, 300000, 400000,
-                                 &start_bitrate);
+  start_bitrate =
+      allocator_->AddBitrateObserver(&bitrate_observer_3, 300000, 400000);
   EXPECT_EQ(300000, start_bitrate);
   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.
   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.
   EXPECT_EQ(300000u, bitrate_observer_3.last_bitrate_);  // Min cap.
 
   allocator_->RemoveBitrateObserver(&bitrate_observer_1);
   allocator_->RemoveBitrateObserver(&bitrate_observer_2);
   allocator_->RemoveBitrateObserver(&bitrate_observer_3);
 }
 }  // namespace webrtc