commit 24301a67c66e6091418e83da49cfb367ef2c6645
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Dec 13 19:17:43 2013 +0000
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Fri Dec 13 19:17:43 2013 +0000
tree 3ae307d4ba86f2c8c90200b18087f65d4c07344c
parent 92c2793154334e6931a86a68d1196b870c406d54

Update talk to 58174641 together with http://review.webrtc.org/4319005/.

R=turaj@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/5809004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5287 4adac7df-926f-26a2-2b94-8c16560cd09d

webrtc/modules/audio_coding/neteq4/neteq_impl.cc

diff --git a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
index 73ca5e4..fb27af2 100644
--- a/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
+++ b/webrtc/modules/audio_coding/neteq4/neteq_impl.cc
@@ -1887,13 +1887,13 @@
   assert(expand_.get());
   if (last_mode_ == kModeCodecInternalCng || last_mode_ == kModeRfc3389Cng) {
     return kOutputCNG;
-  } else if (vad_->running() && !vad_->active_speech()) {
-    return kOutputVADPassive;
   } else if (last_mode_ == kModeExpand && expand_->MuteFactor(0) == 0) {
     // Expand mode has faded down to background noise only (very long expand).
     return kOutputPLCtoCNG;
   } else if (last_mode_ == kModeExpand) {
     return kOutputPLC;
+  } else if (vad_->running() && !vad_->active_speech()) {
+    return kOutputVADPassive;
   } else {
     return kOutputNormal;
   }