BitrateProber::CreateProbeCluster now only accept one parameter (bitrate_bps).

webrtc/modules/pacing/paced_sender_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.
  */
 
 #include <list>
 #include <memory>
 
 #include "webrtc/modules/pacing/paced_sender.h"
 #include "webrtc/system_wrappers/include/clock.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
 using testing::_;
 using testing::Return;
 
 namespace {
 constexpr unsigned kFirstClusterBps = 900000;
-constexpr int kFirstClusterCount = 6;
 constexpr unsigned kSecondClusterBps = 1800000;
-constexpr int kSecondClusterCount = 5;
 
 // The error stems from truncating the time interval of probe packets to integer
 // values. This results in probing slightly higher than the target bitrate.
 // For 1.8 Mbps, this comes to be about 120 kbps with 1200 probe packets.
 constexpr int kBitrateProbingError = 150000;
 }  // namespace
 
 namespace webrtc {
 namespace test {
 
@@ skipping 61 matching lines @@
   int packets_sent_;
   int padding_sent_;
 };
 
 class PacedSenderTest : public ::testing::Test {
  protected:
   PacedSenderTest() : clock_(123456) {
     srand(0);
     // Need to initialize PacedSender after we initialize clock.
     send_bucket_.reset(new PacedSender(&clock_, &callback_));
-    send_bucket_->CreateProbeCluster(kFirstClusterBps, kFirstClusterCount);
-    send_bucket_->CreateProbeCluster(kSecondClusterBps, kSecondClusterCount);
+    send_bucket_->CreateProbeCluster(kFirstClusterBps);
+    send_bucket_->CreateProbeCluster(kSecondClusterBps);
     // Default to bitrate probing disabled for testing purposes. Probing tests
     // have to enable probing, either by creating a new PacedSender instance or
     // by calling SetProbingEnabled(true).
     send_bucket_->SetProbingEnabled(false);
     send_bucket_->SetEstimatedBitrate(kTargetBitrateBps);
 
     clock_.AdvanceTimeMilliseconds(send_bucket_->TimeUntilNextProcess());
   }
 
   void SendAndExpectPacket(PacedSender::Priority priority,
@@ skipping 679 matching lines @@
 }
 
 TEST_F(PacedSenderTest, ProbingWithInsertedPackets) {
   const size_t kPacketSize = 1200;
   const int kInitialBitrateBps = 300000;
   uint32_t ssrc = 12346;
   uint16_t sequence_number = 1234;
 
   PacedSenderProbing packet_sender;
   send_bucket_.reset(new PacedSender(&clock_, &packet_sender));
-  send_bucket_->CreateProbeCluster(kFirstClusterBps, kFirstClusterCount);
-  send_bucket_->CreateProbeCluster(kSecondClusterBps, kSecondClusterCount);
+  send_bucket_->CreateProbeCluster(kFirstClusterBps);
+  send_bucket_->CreateProbeCluster(kSecondClusterBps);
   send_bucket_->SetEstimatedBitrate(kInitialBitrateBps);
 
-  for (int i = 0; i < kFirstClusterCount + kSecondClusterCount; ++i) {
+  for (int i = 0; i < 10; ++i) {
     send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
                                sequence_number++, clock_.TimeInMilliseconds(),
                                kPacketSize, false);
   }
 
   int64_t start = clock_.TimeInMilliseconds();
-  while (packet_sender.packets_sent() < kFirstClusterCount) {
+  while (packet_sender.packets_sent() < 5) {
     int time_until_process = send_bucket_->TimeUntilNextProcess();
     clock_.AdvanceTimeMilliseconds(time_until_process);
     send_bucket_->Process();
   }
   int packets_sent = packet_sender.packets_sent();
   // Validate first cluster bitrate. Note that we have to account for number
   // of intervals and hence (packets_sent - 1) on the first cluster.
   EXPECT_NEAR((packets_sent - 1) * kPacketSize * 8000 /
                   (clock_.TimeInMilliseconds() - start),
               kFirstClusterBps, kBitrateProbingError);
   EXPECT_EQ(0, packet_sender.padding_sent());
 
   start = clock_.TimeInMilliseconds();
-  while (packet_sender.packets_sent() <
-         kFirstClusterCount + kSecondClusterCount) {
+  while (packet_sender.packets_sent() < 10) {
     int time_until_process = send_bucket_->TimeUntilNextProcess();
     clock_.AdvanceTimeMilliseconds(time_until_process);
     send_bucket_->Process();
   }
   packets_sent = packet_sender.packets_sent() - packets_sent;
   // Validate second cluster bitrate.
   EXPECT_NEAR(
       packets_sent * kPacketSize * 8000 / (clock_.TimeInMilliseconds() - start),
       kSecondClusterBps, kBitrateProbingError);
 }
 
 TEST_F(PacedSenderTest, ProbingWithPaddingSupport) {
   const size_t kPacketSize = 1200;
   const int kInitialBitrateBps = 300000;
   uint32_t ssrc = 12346;
   uint16_t sequence_number = 1234;
 
   PacedSenderProbing packet_sender;
   send_bucket_.reset(new PacedSender(&clock_, &packet_sender));
-  send_bucket_->CreateProbeCluster(kFirstClusterBps, kFirstClusterCount);
+  send_bucket_->CreateProbeCluster(kFirstClusterBps);
   send_bucket_->SetEstimatedBitrate(kInitialBitrateBps);
 
-  for (int i = 0; i < kFirstClusterCount - 2; ++i) {
+  for (int i = 0; i < 3; ++i) {
     send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
                                sequence_number++, clock_.TimeInMilliseconds(),
                                kPacketSize, false);
   }
 
   int64_t start = clock_.TimeInMilliseconds();
   int process_count = 0;
-  while (process_count < kFirstClusterCount) {
+  while (process_count < 5) {
     int time_until_process = send_bucket_->TimeUntilNextProcess();
     clock_.AdvanceTimeMilliseconds(time_until_process);
     send_bucket_->Process();
     ++process_count;
   }
   int packets_sent = packet_sender.packets_sent();
   int padding_sent = packet_sender.padding_sent();
   EXPECT_GT(packets_sent, 0);
   EXPECT_GT(padding_sent, 0);
   // Note that the number of intervals here for kPacketSize is
@@ skipping 125 matching lines @@
   EXPECT_EQ(0, send_bucket_->AverageQueueTimeMs());
 }
 
 TEST_F(PacedSenderTest, ProbeClusterId) {
   uint32_t ssrc = 12346;
   uint16_t sequence_number = 1234;
   const size_t kPacketSize = 1200;
 
   send_bucket_->SetSendBitrateLimits(kTargetBitrateBps, kTargetBitrateBps);
   send_bucket_->SetProbingEnabled(true);
-  for (int i = 0; i < 11; ++i) {
+  for (int i = 0; i < 10; ++i) {
     send_bucket_->InsertPacket(PacedSender::kNormalPriority, ssrc,
                                sequence_number + i, clock_.TimeInMilliseconds(),
                                kPacketSize, false);
   }
 
   // First probing cluster.
   EXPECT_CALL(callback_, TimeToSendPacket(_, _, _, _, 0))
-      .Times(6)
+      .Times(5)
       .WillRepeatedly(Return(true));
-  for (int i = 0; i < 6; ++i) {
+  for (int i = 0; i < 5; ++i) {
     clock_.AdvanceTimeMilliseconds(20);
     send_bucket_->Process();
   }
 
   // Second probing cluster.
   EXPECT_CALL(callback_, TimeToSendPacket(_, _, _, _, 1))
       .Times(5)
       .WillRepeatedly(Return(true));
   for (int i = 0; i < 5; ++i) {
     clock_.AdvanceTimeMilliseconds(20);
     send_bucket_->Process();
   }
 
   // No more probing packets.
   EXPECT_CALL(callback_, TimeToSendPadding(_, PacketInfo::kNotAProbe))
         .Times(1)
         .WillRepeatedly(Return(500));
   send_bucket_->Process();
 }
 
 }  // namespace test
 }  // namespace webrtc