From 03392d0047f8af9664395595150b95cb4fb9630c Mon Sep 17 00:00:00 2001 From: ivoc Date: Tue, 13 Dec 2016 01:05:27 -0800 Subject: [PATCH] Fix for negative shift value in NetEq. BUG=chromium:667028 Review-Url: https://codereview.webrtc.org/2562423002 Cr-Commit-Position: refs/heads/master@{#15562} --- webrtc/modules/audio_coding/neteq/normal.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/neteq/normal.cc b/webrtc/modules/audio_coding/neteq/normal.cc index 48e1e930d2..9e6f19ed68 100644 --- a/webrtc/modules/audio_coding/neteq/normal.cc +++ b/webrtc/modules/audio_coding/neteq/normal.cc @@ -98,8 +98,8 @@ int Normal::Process(const int16_t* input, // Normalize new frame energy to 15 bits. scaling = WebRtcSpl_NormW32(energy) - 16; // We want background_noise_.energy() / energy in Q14. - int32_t bgn_energy = - background_noise_.Energy(channel_ix) << (scaling+14); + int32_t bgn_energy = WEBRTC_SPL_SHIFT_W32( + background_noise_.Energy(channel_ix), scaling + 14); int16_t energy_scaled = static_cast(WEBRTC_SPL_SHIFT_W32(energy, scaling)); int32_t ratio = WebRtcSpl_DivW32W16(bgn_energy, energy_scaled);