NetEq: Introduce TickTimer in DelayPeakDetector

webrtc/modules/audio_coding/neteq/delay_manager_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 21 matching lines @@
   static const int kTsIncrement = kFrameSizeMs * kFs / 1000;
 
   DelayManagerTest();
   virtual void SetUp();
   virtual void TearDown();
   void SetPacketAudioLength(int lengt_ms);
   void InsertNextPacket();
   void IncreaseTime(int inc_ms);
 
   DelayManager* dm_;
+  TickTimer tick_timer_;
   MockDelayPeakDetector detector_;
   uint16_t seq_no_;
   uint32_t ts_;
 };
 
 DelayManagerTest::DelayManagerTest()
-    : dm_(NULL),
-      seq_no_(0x1234),
-      ts_(0x12345678) {
-}
+    : dm_(NULL), detector_(&tick_timer_), seq_no_(0x1234), ts_(0x12345678) {}
 
 void DelayManagerTest::SetUp() {
   EXPECT_CALL(detector_, Reset())
             .Times(1);
   dm_ = new DelayManager(kMaxNumberOfPackets, &detector_);
 }
 
 void DelayManagerTest::SetPacketAudioLength(int lengt_ms) {
   EXPECT_CALL(detector_, SetPacketAudioLength(lengt_ms));
   dm_->SetPacketAudioLength(lengt_ms);
 }
 
 void DelayManagerTest::InsertNextPacket() {
   EXPECT_EQ(0, dm_->Update(seq_no_, ts_, kFs));
   seq_no_ += 1;
   ts_ += kTsIncrement;
 }
 
 void DelayManagerTest::IncreaseTime(int inc_ms) {
   for (int t = 0; t < inc_ms; t += kTimeStepMs) {
-    EXPECT_CALL(detector_, IncrementCounter(kTimeStepMs))
-        .Times(1);
     dm_->UpdateCounters(kTimeStepMs);
+    tick_timer_.Increment();
   }
 }
 void DelayManagerTest::TearDown() {
   EXPECT_CALL(detector_, Die());
   delete dm_;
 }
 
 TEST_F(DelayManagerTest, CreateAndDestroy) {
   // Nothing to do here. The test fixture creates and destroys the DelayManager
   // object.
@@ skipping 23 matching lines @@
   // Expect DelayManager to pass on the question to the detector.
   // Call twice, and let the detector return true the first time and false the
   // second time.
   EXPECT_CALL(detector_, peak_found())
       .WillOnce(Return(true))
       .WillOnce(Return(false));
   EXPECT_TRUE(dm_->PeakFound());
   EXPECT_FALSE(dm_->PeakFound());
 }
 
-TEST_F(DelayManagerTest, UpdateCounters) {
-  // Expect DelayManager to pass on the counter update to the detector.
-  EXPECT_CALL(detector_, IncrementCounter(kTimeStepMs))
-      .Times(1);
-  dm_->UpdateCounters(kTimeStepMs);
-}
-
 TEST_F(DelayManagerTest, UpdateNormal) {
   SetPacketAudioLength(kFrameSizeMs);
   // First packet arrival.
   InsertNextPacket();
   // Advance time by one frame size.
   IncreaseTime(kFrameSizeMs);
   // Second packet arrival.
   // Expect detector update method to be called once with inter-arrival time
   // equal to 1 packet, and (base) target level equal to 1 as well.
   // Return false to indicate no peaks found.
@@ skipping 153 matching lines @@
   EXPECT_TRUE(dm_->SetMaximumDelay(10));
   EXPECT_FALSE(dm_->SetMinimumDelay(20));
 
   // Maximum delay less than minimum delay is not accepted.
   EXPECT_TRUE(dm_->SetMaximumDelay(100));
   EXPECT_TRUE(dm_->SetMinimumDelay(80));
   EXPECT_FALSE(dm_->SetMaximumDelay(60));
 }
 
 }  // namespace webrtc