Fix for negative shift value in NetEq.

webrtc/modules/audio_coding/neteq/normal.cc

 /*
  *  Copyright (c) 2012 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 80 matching lines @@
       } else {
         energy = 0;
       }
 
       int mute_factor;
       if ((energy != 0) &&
           (energy > background_noise_.Energy(channel_ix))) {
         // 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);
         mute_factor = WebRtcSpl_SqrtFloor(ratio << 14);
       } else {
         mute_factor = 16384;  // 1.0 in Q14.
       }
       if (mute_factor > external_mute_factor_array[channel_ix]) {
         external_mute_factor_array[channel_ix] =
             static_cast<int16_t>(std::min(mute_factor, 16384));
@@ skipping 89 matching lines @@
         external_mute_factor_array[channel_ix] = static_cast<int16_t>(std::min(
             16384, external_mute_factor_array[channel_ix] + increment));
       }
     }
   }
 
   return static_cast<int>(length);
 }
 
 }  // namespace webrtc