NetEq: Remove special case for Merge without Expand

webrtc/modules/audio_coding/neteq/decision_logic_normal.cc

 /*
  *  Copyright (c) 2013 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 189 matching lines @@
     } else {
       // Too early to play this new packet; keep on playing comfort noise.
       if (prev_mode == kModeRfc3389Cng) {
         return kRfc3389CngNoPacket;
       } else {  // prevPlayMode == kModeCodecInternalCng.
         return kCodecInternalCng;
       }
     }
   }
   // Do not merge unless we have done an expand before.
-  // (Convert kAllowMergeWithoutExpand from ms to samples by multiplying with
-  // fs_mult_ * 8 = fs / 1000.)
-  if (prev_mode == kModeExpand ||
-      (decoder_frame_length < output_size_samples_ &&
-       cur_size_samples >
-           static_cast<size_t>(kAllowMergeWithoutExpandMs * fs_mult_ * 8))) {
+  if (prev_mode == kModeExpand) {
     return kMerge;
   } else if (play_dtmf) {
     // Play DTMF instead of expand.
     return kDtmf;
   } else {
     return kExpand;
   }
 }
 
 bool DecisionLogicNormal::UnderTargetLevel() const {
   return buffer_level_filter_->filtered_current_level() <=
       delay_manager_->TargetLevel();
 }
 
 bool DecisionLogicNormal::ReinitAfterExpands(uint32_t timestamp_leap) const {
   return timestamp_leap >=
       static_cast<uint32_t>(output_size_samples_ * kReinitAfterExpands);
 }
 
 bool DecisionLogicNormal::PacketTooEarly(uint32_t timestamp_leap) const {
   return timestamp_leap >
       static_cast<uint32_t>(output_size_samples_ * num_consecutive_expands_);
 }
 
 bool DecisionLogicNormal::MaxWaitForPacket() const {
   return num_consecutive_expands_ >= kMaxWaitForPacket;
 }
 
 }  // namespace webrtc