diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc index 37a75d7f5a..ee11c466a8 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc +++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.cc @@ -207,12 +207,7 @@ Operations DecisionLogicNormal::FuturePacketAvailable( } } // 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(kAllowMergeWithoutExpandMs * fs_mult_ * 8))) { + if (prev_mode == kModeExpand) { return kMerge; } else if (play_dtmf) { // Play DTMF instead of expand. diff --git a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h index aa0edf3152..85d0857627 100644 --- a/webrtc/modules/audio_coding/neteq/decision_logic_normal.h +++ b/webrtc/modules/audio_coding/neteq/decision_logic_normal.h @@ -40,7 +40,6 @@ class DecisionLogicNormal : public DecisionLogic { tick_timer) {} protected: - static const int kAllowMergeWithoutExpandMs = 20; // 20 ms. static const int kReinitAfterExpands = 100; static const int kMaxWaitForPacket = 10; diff --git a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc index 8fba41e737..1494eeca98 100644 --- a/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc +++ b/webrtc/modules/audio_coding/neteq/neteq_impl_unittest.cc @@ -609,7 +609,7 @@ TEST_F(NetEqImplTest, FirstPacketUnknown) { const int kSampleRateHz = 8000; const size_t kPayloadLengthSamples = static_cast(10 * kSampleRateHz / 1000); // 10 ms. - const size_t kPayloadLengthBytes = kPayloadLengthSamples; + const size_t kPayloadLengthBytes = kPayloadLengthSamples * 2; uint8_t payload[kPayloadLengthBytes] = {0}; WebRtcRTPHeader rtp_header; rtp_header.header.payloadType = kPayloadType;