Changed OLA window for neteq. Old code didnt work well with 48khz

webrtc/modules/audio_coding/neteq/normal.h

Index: webrtc/modules/audio_coding/neteq/normal.h
diff --git a/webrtc/modules/audio_coding/neteq/normal.h b/webrtc/modules/audio_coding/neteq/normal.h
index 23887f5134389591ebdba24f2f6ca2ddf9cca6fd..99e78a4ba1ef790a33afa70eb9d2a2e732946a42 100644
--- a/webrtc/modules/audio_coding/neteq/normal.h
+++ b/webrtc/modules/audio_coding/neteq/normal.h
@@ -15,6 +15,7 @@
 
 #include <vector>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/modules/audio_coding/neteq/defines.h"
@@ -32,14 +33,16 @@ class Expand;
 // no other "special circumstances" are at hand.
 class Normal {
  public:
-  Normal(int fs_hz, DecoderDatabase* decoder_database,
+  Normal(int fs_hz,
+         DecoderDatabase* decoder_database,
          const BackgroundNoise& background_noise,
          Expand* expand)
       : fs_hz_(fs_hz),
         decoder_database_(decoder_database),
         background_noise_(background_noise),
-        expand_(expand) {
-  }
+        expand_(expand),
+        samples_per_ms_(rtc::CheckedDivExact(fs_hz_, 1000)),
+        default_win_slope_Q14_((1 << 14) / samples_per_ms_) {}

[hlundin-webrtc, 2017/03/28 12:21:04]

You get compilation errors here for Win64. SEe
https://build.chromium.org/p/tryserver.webrtc/builders/win_compile_x64_dbg/bu....

You must add an explicit cast to int16_t. Suggest you use
rtc::dchecked_cast<int16_t>(...) 
and also 
#include "webrtc/base/safe_conversions.h"

 
   virtual ~Normal() {}
 
@@ -60,6 +63,8 @@ class Normal {
   DecoderDatabase* decoder_database_;
   const BackgroundNoise& background_noise_;
   Expand* expand_;
+  const size_t samples_per_ms_;
+  const int16_t default_win_slope_Q14_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(Normal);
 };