Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(380)

Unified Diff: webrtc/modules/audio_coding/neteq/normal.h

Issue 2763273003: Changed OLA window for neteq. Old code didnt work well with 48khz (Closed)
Patch Set: updated hash values for Android and win64 Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/normal.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..019bcf8b148e0ecc8998669c4b249f10e6af7970 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 @@ 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_(
+ rtc::dchecked_cast<uint16_t>((1 << 14) / samples_per_ms_)) {}
virtual ~Normal() {}
@@ -60,6 +65,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);
};
« no previous file with comments | « webrtc/modules/audio_coding/neteq/neteq_unittest.cc ('k') | webrtc/modules/audio_coding/neteq/normal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698