generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use __inline in NS-fixed.

Browse Source 
The use of "inline" was failing to build on Windows.

BUG=
TEST=

Review URL: http://webrtc-codereview.appspot.com/255003

git-svn-id: http://webrtc.googlecode.com/svn/trunk@860 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2011-11-01 17:07:46 +00:00
parent 3119ecfec8
commit 18ee6ec8e9
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/audio_processing/ns/nsx_core.c
View File

@ -2341,7 +2341,7 @@ void WebRtcNsx_PrepareSpectrum(NsxInst_t* inst, int16_t* freq_buf) {
} }
// Denormalize the input buffer. // Denormalize the input buffer.
inline void WebRtcNsx_Denormalize(NsxInst_t* inst, int16_t* in, int factor) { __inline void WebRtcNsx_Denormalize(NsxInst_t* inst, int16_t* in, int factor) {
int i = 0, j = 0; int i = 0, j = 0;
int32_t tmp32 = 0; int32_t tmp32 = 0;
for (i = 0, j = 0; i < inst->anaLen; i += 1, j += 2) { for (i = 0, j = 0; i < inst->anaLen; i += 1, j += 2) {
@ -2407,9 +2407,9 @@ void WebRtcNsx_AnalysisUpdate(NsxInst_t* inst,
// Create a complex number buffer (out[]) as the intput (in[]) interleaved with // Create a complex number buffer (out[]) as the intput (in[]) interleaved with
// zeros, and normalize it. // zeros, and normalize it.
inline void WebRtcNsx_CreateComplexBuffer(NsxInst_t* inst, __inline void WebRtcNsx_CreateComplexBuffer(NsxInst_t* inst,
int16_t* in, int16_t* in,
int16_t* out) { int16_t* out) {
int i = 0, j = 0; int i = 0, j = 0;
for (i = 0, j = 0; i < inst->anaLen; i += 1, j += 2) { for (i = 0, j = 0; i < inst->anaLen; i += 1, j += 2) {
out[j] = WEBRTC_SPL_LSHIFT_W16(in[i], inst->normData); // Q(normData) out[j] = WEBRTC_SPL_LSHIFT_W16(in[i], inst->normData); // Q(normData)

12
src/modules/audio_processing/ns/nsx_core.h
View File

@ -190,15 +190,15 @@ void WebRtcNsx_AnalysisUpdate(NsxInst_t* inst,
int16_t* new_speech); int16_t* new_speech);
// Denormalize the input buffer. // Denormalize the input buffer.
inline void WebRtcNsx_Denormalize(NsxInst_t* inst, __inline void WebRtcNsx_Denormalize(NsxInst_t* inst,
int16_t* in, int16_t* in,
int factor); int factor);
// Create a complex number buffer, as the intput interleaved with zeros, // Create a complex number buffer, as the intput interleaved with zeros,
// and normalize it. // and normalize it.
inline void WebRtcNsx_CreateComplexBuffer(NsxInst_t* inst, __inline void WebRtcNsx_CreateComplexBuffer(NsxInst_t* inst,
int16_t* in, int16_t* in,
int16_t* out); int16_t* out);
extern const WebRtc_Word16 WebRtcNsx_kLogTable[9]; extern const WebRtc_Word16 WebRtcNsx_kLogTable[9];
extern const WebRtc_Word16 WebRtcNsx_kLogTableFrac[256]; extern const WebRtc_Word16 WebRtcNsx_kLogTableFrac[256];

8
src/modules/audio_processing/ns/nsx_core_neon.c
View File

@ -456,7 +456,7 @@ void WebRtcNsx_PrepareSpectrum(NsxInst_t* inst, int16_t* freq_buf) {
} }
// Denormalize the input buffer. // Denormalize the input buffer.
inline void WebRtcNsx_Denormalize(NsxInst_t* inst, int16_t* in, int factor) { __inline void WebRtcNsx_Denormalize(NsxInst_t* inst, int16_t* in, int factor) {
int16_t* ptr_real = &inst->real[0]; int16_t* ptr_real = &inst->real[0];
int16_t* ptr_in = &in[0]; int16_t* ptr_in = &in[0];
@ -683,9 +683,9 @@ void WebRtcNsx_AnalysisUpdate(NsxInst_t* inst,
// Create a complex number buffer (out[]) as the intput (in[]) interleaved with // Create a complex number buffer (out[]) as the intput (in[]) interleaved with
// zeros, and normalize it. // zeros, and normalize it.
inline void WebRtcNsx_CreateComplexBuffer(NsxInst_t* inst, __inline void WebRtcNsx_CreateComplexBuffer(NsxInst_t* inst,
int16_t* in, int16_t* in,
int16_t* out) { int16_t* out) {
int16_t* ptr_out = &out[0]; int16_t* ptr_out = &out[0];
int16_t* ptr_in = &in[0]; int16_t* ptr_in = &in[0];