Index: webrtc/modules/audio_processing/aecm/aecm_core_c.cc |
diff --git a/webrtc/modules/audio_processing/aecm/aecm_core_c.c b/webrtc/modules/audio_processing/aecm/aecm_core_c.cc |
similarity index 99% |
rename from webrtc/modules/audio_processing/aecm/aecm_core_c.c |
rename to webrtc/modules/audio_processing/aecm/aecm_core_c.cc |
index 3a8fafa4ece495710b713cb5215fd59a92bc5279..3ee053b09293e35c7fdb80a53ed87fc97a78da70 100644 |
--- a/webrtc/modules/audio_processing/aecm/aecm_core_c.c |
+++ b/webrtc/modules/audio_processing/aecm/aecm_core_c.cc |
@@ -14,19 +14,18 @@ |
#include <stddef.h> |
#include <stdlib.h> |
+extern "C" { |
#include "webrtc/common_audio/ring_buffer.h" |
#include "webrtc/common_audio/signal_processing/include/real_fft.h" |
+} |
#include "webrtc/modules/audio_processing/aecm/echo_control_mobile.h" |
+extern "C" { |
#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h" |
-#include "webrtc/system_wrappers/include/compile_assert_c.h" |
#include "webrtc/system_wrappers/include/cpu_features_wrapper.h" |
+} |
#include "webrtc/typedefs.h" |
// Square root of Hanning window in Q14. |
-#if defined(WEBRTC_DETECT_NEON) || defined(WEBRTC_HAS_NEON) |
-// Table is defined in an ARM assembly file. |
-extern const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END; |
-#else |
static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { |
0, 399, 798, 1196, 1594, 1990, 2386, 2780, 3172, |
3562, 3951, 4337, 4720, 5101, 5478, 5853, 6224, |
@@ -37,7 +36,6 @@ static const ALIGN8_BEG int16_t WebRtcAecm_kSqrtHanning[] ALIGN8_END = { |
15231, 15373, 15506, 15631, 15746, 15851, 15947, 16034, |
16111, 16179, 16237, 16286, 16325, 16354, 16373, 16384 |
}; |
-#endif |
#ifdef AECM_WITH_ABS_APPROX |
//Q15 alpha = 0.99439986968132 const Factor for magnitude approximation |
@@ -768,4 +766,3 @@ static void ComfortNoise(AecmCore* aecm, |
out[i].imag = WebRtcSpl_AddSatW16(out[i].imag, uImag[i]); |
} |
} |
- |