commit 03392d0047f8af9664395595150b95cb4fb9630c
author ivoc <ivoc@webrtc.org> Tue Dec 13 01:05:27 2016 -0800
committer Commit bot <commit-bot@chromium.org> Tue Dec 13 09:05:37 2016 +0000
tree 697984e0507ce0b1c1bd2a0bc10ffbf77da32884
parent 921019c48baee32431308001904bdd297c8d7865

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

diff --git a/webrtc/modules/audio_coding/neteq/normal.cc b/webrtc/modules/audio_coding/neteq/normal.cc
index 48e1e93..9e6f19e 100644
--- a/webrtc/modules/audio_coding/neteq/normal.cc
+++ b/webrtc/modules/audio_coding/neteq/normal.cc
@@ -98,8 +98,8 @@
         // 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<int16_t>(WEBRTC_SPL_SHIFT_W32(energy, scaling));
         int32_t ratio = WebRtcSpl_DivW32W16(bgn_energy, energy_scaled);