commit 54c6640efbdeb03f1050c0b6cc4cb954bdb6acc7
author Minyue Li <minyue@webrtc.org> Mon Apr 15 12:29:27 2019
committer Commit Bot <commit-bot@chromium.org> Mon Apr 15 14:05:11 2019
tree 79a3319d0af9ceebaf284d6c3a55cd2f28244af4
parent ff7730d2ba2b1d2fcf9ed55f51f20b8256d9c31d

Disallow time stretching during DTX.

Bug: b/129521878
Change-Id: I32f60c661c6cae001840c9fe83fc848fe23acabc
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/132789
Reviewed-by: Jakob Ivarsson‎ <jakobi@webrtc.org>
Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org>
Commit-Queue: Minyue Li <minyue@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27622}

modules/audio_coding/neteq/neteq_impl.cc

diff --git a/modules/audio_coding/neteq/neteq_impl.cc b/modules/audio_coding/neteq/neteq_impl.cc
index f1e8527..b7f5579 100644
--- a/modules/audio_coding/neteq/neteq_impl.cc
+++ b/modules/audio_coding/neteq/neteq_impl.cc
@@ -1052,6 +1052,16 @@
       *sync_buffer_, *expand_, decoder_frame_length_, packet, last_mode_,
       *play_dtmf, generated_noise_samples, &reset_decoder_);
 
+  // Disallow time stretching if this packet is DTX, because such a decision may
+  // be based on earlier buffer level estimate, as we do not update buffer level
+  // during DTX. When we have a better way to update buffer level during DTX,
+  // this can be discarded.
+  if (packet && packet->frame && packet->frame->IsDtxPacket() &&
+      (*operation == kMerge || *operation == kAccelerate ||
+       *operation == kFastAccelerate || *operation == kPreemptiveExpand)) {
+    *operation = kNormal;
+  }
+
   if (action_override) {
     // Use the provided action instead of the decision NetEq decided on.
     *operation = *action_override;