commit edbea46295b8ee474a7807400d38d1cc6b7b5018
author Ruslan Burakov <kuddai@google.com> Mon Feb 04 16:17:31 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Mon Feb 04 17:19:55 2019 +0000
tree 976bcda66a71bc81719f53e77c9456d016546cba
parent d8b980464c83247838f525e95ce186ae6ad5e928

Allow to change base minimum delay on NetEq.

This is first step to allow to set latency
from client code in Chromium.
Existing minimum latency hasn't been used because it can clash
with video syncronization code.

Bug: webrtc:10287
Change-Id: Ia38906506069a1abfa01698dc62df283fc15cfbc
Reviewed-on: https://webrtc-review.googlesource.com/c/121423
Reviewed-by: Ivo Creusen <ivoc@webrtc.org>
Commit-Queue: Ruslan Burakov <kuddai@google.com>
Cr-Commit-Position: refs/heads/master@{#26536}

modules/audio_coding/neteq/delay_manager_unittest.cc

diff --git a/modules/audio_coding/neteq/delay_manager_unittest.cc b/modules/audio_coding/neteq/delay_manager_unittest.cc
index e1cca89..b0e23a9 100644
--- a/modules/audio_coding/neteq/delay_manager_unittest.cc
+++ b/modules/audio_coding/neteq/delay_manager_unittest.cc
@@ -267,6 +267,50 @@
   EXPECT_EQ(kMinDelayPackets << 8, dm_->TargetLevel());
 }
 
+TEST_F(DelayManagerTest, BaseMinDelay) {
+  const int kExpectedTarget = 5;
+  const int kTimeIncrement = kExpectedTarget * kFrameSizeMs;
+  SetPacketAudioLength(kFrameSizeMs);
+  // First packet arrival.
+  InsertNextPacket();
+  // Second packet arrival.
+  // Expect detector update method to be called once with inter-arrival time
+  // equal to |kExpectedTarget| packet. Return true to indicate peaks found.
+  EXPECT_CALL(detector_, Update(kExpectedTarget, false, _))
+      .WillRepeatedly(Return(true));
+  EXPECT_CALL(detector_, MaxPeakHeight())
+      .WillRepeatedly(Return(kExpectedTarget));
+  IncreaseTime(kTimeIncrement);
+  InsertNextPacket();
+
+  // No limit is applied.
+  EXPECT_EQ(kExpectedTarget << 8, dm_->TargetLevel());
+
+  int kBaseMinDelayPackets = kExpectedTarget + 2;
+  int kBaseMinDelayMs = kBaseMinDelayPackets * kFrameSizeMs;
+  EXPECT_TRUE(dm_->SetBaseMinimumDelay(kBaseMinDelayMs));
+  EXPECT_EQ(dm_->GetBaseMinimumDelay(), kBaseMinDelayMs);
+
+  IncreaseTime(kTimeIncrement);
+  InsertNextPacket();
+  EXPECT_EQ(dm_->GetBaseMinimumDelay(), kBaseMinDelayMs);
+  EXPECT_EQ(kBaseMinDelayPackets << 8, dm_->TargetLevel());
+}
+
+TEST_F(DelayManagerTest, BaseMinDelayGreaterThanMaxDelayIsInvalid) {
+  int kMaxDelayMs = 2 * kFrameSizeMs;
+  int kBaseMinDelayMs = 4 * kFrameSizeMs;
+  EXPECT_TRUE(dm_->SetMaximumDelay(kMaxDelayMs));
+  EXPECT_FALSE(dm_->SetBaseMinimumDelay(kBaseMinDelayMs));
+}
+
+TEST_F(DelayManagerTest, BaseMinDelayGreaterThanQ75MaxPacketsIsInvalid) {
+  // .75 of |max_packets_in_buffer|, + 1 to ensure that |kBaseMinDelayMs| is
+  // greater.
+  int kBaseMinDelayMs = (3 * kMaxNumberOfPackets * kFrameSizeMs / 4) + 1;
+  EXPECT_FALSE(dm_->SetBaseMinimumDelay(kBaseMinDelayMs));
+}
+
 TEST_F(DelayManagerTest, UpdateReorderedPacket) {
   SetPacketAudioLength(kFrameSizeMs);
   InsertNextPacket();