diff --git a/webrtc/modules/audio_coding/neteq/background_noise.cc b/webrtc/modules/audio_coding/neteq/background_noise.cc index 8d5a293b8..4fbc84c5a 100644 --- a/webrtc/modules/audio_coding/neteq/background_noise.cc +++ b/webrtc/modules/audio_coding/neteq/background_noise.cc @@ -191,8 +191,7 @@ void BackgroundNoise::IncrementEnergyThreshold(size_t channel, assert(channel < num_channels_); ChannelParameters& parameters = channel_parameters_[channel]; int32_t temp_energy = - WEBRTC_SPL_MUL_16_16_RSFT(kThresholdIncrement, - parameters.low_energy_update_threshold, 16); + (kThresholdIncrement * parameters.low_energy_update_threshold) >> 16; temp_energy += kThresholdIncrement * (parameters.energy_update_threshold & 0xFF); temp_energy += (kThresholdIncrement * diff --git a/webrtc/modules/audio_coding/neteq/normal.cc b/webrtc/modules/audio_coding/neteq/normal.cc index 492447065..fd4c46a55 100644 --- a/webrtc/modules/audio_coding/neteq/normal.cc +++ b/webrtc/modules/audio_coding/neteq/normal.cc @@ -67,8 +67,8 @@ int Normal::Process(const int16_t* input, for (size_t channel_ix = 0; channel_ix < output->Channels(); ++channel_ix) { // Adjust muting factor (main muting factor times expand muting factor). external_mute_factor_array[channel_ix] = static_cast( - WEBRTC_SPL_MUL_16_16_RSFT(external_mute_factor_array[channel_ix], - expand_->MuteFactor(channel_ix), 14)); + (external_mute_factor_array[channel_ix] * + expand_->MuteFactor(channel_ix)) >> 14); int16_t* signal = &(*output)[channel_ix][0]; size_t length_per_channel = length / output->Channels();