commit 9f2c18e237593b5f8cbc7d7a3838ab6596123c53
author soren <soren@wire.com> Mon Apr 10 02:22:46 2017 -0700
committer Commit bot <commit-bot@chromium.org> Mon Apr 10 09:22:46 2017 +0000
tree d6f507b89948beaaeec120dfb513ab1207713540
parent c547e84ec5b935151a8fe9797f283665b660dd24

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

fixing white spaces

updated authors file

Changed OLA window to use Q14 as Q5 dosnt work with 48khz. 1 ms @ 48 khz is > 2^5

BUG=webrtc:1361

Review-Url: https://codereview.webrtc.org/2763273003
Cr-Commit-Position: refs/heads/master@{#17611}

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 23887f5..019bcf8 100644
--- a/webrtc/modules/audio_coding/neteq/normal.h
+++ b/webrtc/modules/audio_coding/neteq/normal.h
@@ -15,7 +15,9 @@
 
 #include <vector>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/base/constructormagic.h"
+#include "webrtc/base/safe_conversions.h"
 #include "webrtc/modules/audio_coding/neteq/audio_multi_vector.h"
 #include "webrtc/modules/audio_coding/neteq/defines.h"
 #include "webrtc/typedefs.h"
@@ -32,14 +34,17 @@
 // 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_(
+            rtc::dchecked_cast<uint16_t>((1 << 14) / samples_per_ms_)) {}
 
   virtual ~Normal() {}
 
@@ -60,6 +65,8 @@
   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);
 };