commit b35baccd6f99876050f898495266abe949dc5f80
author Ruslan Burakov <kuddai@google.com> Wed Feb 20 13:41:59 2019 +0100
committer Commit Bot <commit-bot@chromium.org> Wed Feb 20 14:04:51 2019 +0000
tree 04183482b3f6a55c18b923a5ff2e296c2655cf3e
parent 8073db6d890b86e36424a8ab8ca12ed37749471c

Fix NetEq minimum and maximum delay always reset on acm creation.

Bug: webrtc:10305
Change-Id: Iecc55c3b4bb8416e2fd0cf26532b43dcd70a7cca
Reviewed-on: https://webrtc-review.googlesource.com/c/122280
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Ruslan Burakov <kuddai@google.com>
Cr-Commit-Position: refs/heads/master@{#26771}

modules/audio_coding/acm2/audio_coding_module.cc

diff --git a/modules/audio_coding/acm2/audio_coding_module.cc b/modules/audio_coding/acm2/audio_coding_module.cc
index 014aede..67ef556 100644
--- a/modules/audio_coding/acm2/audio_coding_module.cc
+++ b/modules/audio_coding/acm2/audio_coding_module.cc
@@ -652,9 +652,6 @@
   // start-up.
   if (receiver_initialized_)
     receiver_.RemoveAllCodecs();
-  receiver_.ResetInitialDelay();
-  receiver_.SetMinimumDelay(0);
-  receiver_.SetMaximumDelay(0);
   receiver_.FlushBuffers();
 
   receiver_initialized_ = true;

modules/audio_coding/neteq/delay_manager.cc

diff --git a/modules/audio_coding/neteq/delay_manager.cc b/modules/audio_coding/neteq/delay_manager.cc
index 2f397d5..d2dd85d 100644
--- a/modules/audio_coding/neteq/delay_manager.cc
+++ b/modules/audio_coding/neteq/delay_manager.cc
@@ -85,7 +85,7 @@
       last_seq_no_(0),
       last_timestamp_(0),
       minimum_delay_ms_(base_minimum_delay_ms_),
-      maximum_delay_ms_(target_level_),
+      maximum_delay_ms_(0),
       iat_cumulative_sum_(0),
       max_iat_cumulative_sum_(0),
       peak_detector_(*peak_detector),
@@ -96,7 +96,6 @@
       enable_rtx_handling_(enable_rtx_handling) {
   assert(peak_detector);  // Should never be NULL.
   RTC_DCHECK_GE(base_minimum_delay_ms_, 0);
-  RTC_DCHECK_LE(minimum_delay_ms_, maximum_delay_ms_);
 
   Reset();
 }

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 f2656b8..19b99af 100644
--- a/modules/audio_coding/neteq/delay_manager_unittest.cc
+++ b/modules/audio_coding/neteq/delay_manager_unittest.cc
@@ -314,12 +314,17 @@
   SetPacketAudioLength(kFrameSizeMs);
   constexpr int kBaseMinimumDelayMs = kMaxBufferSizeMs + 1;
   constexpr int kMinimumDelayMs = 12;
+  constexpr int kMaximumDelayMs = 20;
   constexpr int kMaxBufferSizeMsQ75 = 3 * kMaxBufferSizeMs / 4;
 
+  EXPECT_TRUE(dm_->SetMaximumDelay(kMaximumDelayMs));
+
   // Base minimum delay is greater than minimum delay, that is why we clamp
   // it to current the highest possible value which is maximum delay.
   RTC_DCHECK_GT(kBaseMinimumDelayMs, kMinimumDelayMs);
   RTC_DCHECK_GT(kBaseMinimumDelayMs, kMaxBufferSizeMs);
+  RTC_DCHECK_GT(kBaseMinimumDelayMs, kMaximumDelayMs);
+  RTC_DCHECK_LT(kMaximumDelayMs, kMaxBufferSizeMsQ75);
 
   EXPECT_TRUE(dm_->SetMinimumDelay(kMinimumDelayMs));
   EXPECT_TRUE(dm_->SetBaseMinimumDelay(kBaseMinimumDelayMs));

modules/audio_coding/neteq/include/neteq.h

diff --git a/modules/audio_coding/neteq/include/neteq.h b/modules/audio_coding/neteq/include/neteq.h
index 91c2ef7..a1c0b52 100644
--- a/modules/audio_coding/neteq/include/neteq.h
+++ b/modules/audio_coding/neteq/include/neteq.h
@@ -115,7 +115,7 @@
     int sample_rate_hz = 16000;  // Initial value. Will change with input data.
     bool enable_post_decode_vad = false;
     size_t max_packets_in_buffer = 50;
-    int max_delay_ms = 2000;
+    int max_delay_ms = 0;
     int min_delay_ms = 0;
     bool enable_fast_accelerate = false;
     bool enable_muted_state = false;