From 60f83131e482f6ff63968bf8b3bc811f00d5c875 Mon Sep 17 00:00:00 2001 From: "bjornv@webrtc.org" Date: Thu, 21 Feb 2013 16:12:24 +0000 Subject: [PATCH] AEC refactoring: Moved typedefs to _internal.h * This was actually part of r3553 * Tested with audioproc_unittest, trybots TBR=andrew@webrtc.org TEST=none BUG=none Review URL: https://webrtc-codereview.appspot.com/1118005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3556 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_processing/aec/aec_core.h | 9 --------- webrtc/modules/audio_processing/aec/aec_core_internal.h | 8 ++++++++ 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/webrtc/modules/audio_processing/aec/aec_core.h b/webrtc/modules/audio_processing/aec/aec_core.h index 9ac98a1c70..ae736113f4 100644 --- a/webrtc/modules/audio_processing/aec/aec_core.h +++ b/webrtc/modules/audio_processing/aec/aec_core.h @@ -55,15 +55,6 @@ typedef struct Stats { typedef struct AecCore AecCore; -typedef void (*WebRtcAec_FilterFar_t)(AecCore* aec, float yf[2][PART_LEN1]); -typedef void (*WebRtcAec_ScaleErrorSignal_t) - (AecCore* aec, float ef[2][PART_LEN1]); -typedef void (*WebRtcAec_FilterAdaptation_t) - (AecCore* aec, float *fft, float ef[2][PART_LEN1]); -typedef void (*WebRtcAec_OverdriveAndSuppress_t) - (AecCore* aec, float hNl[PART_LEN1], const float hNlFb, - float efw[2][PART_LEN1]); - int WebRtcAec_CreateAec(AecCore** aec); int WebRtcAec_FreeAec(AecCore* aec); int WebRtcAec_InitAec(AecCore* aec, int sampFreq); diff --git a/webrtc/modules/audio_processing/aec/aec_core_internal.h b/webrtc/modules/audio_processing/aec/aec_core_internal.h index 279fb5c5f5..382f079252 100644 --- a/webrtc/modules/audio_processing/aec/aec_core_internal.h +++ b/webrtc/modules/audio_processing/aec/aec_core_internal.h @@ -117,9 +117,17 @@ struct AecCore { #endif }; +typedef void (*WebRtcAec_FilterFar_t)(AecCore* aec, float yf[2][PART_LEN1]); extern WebRtcAec_FilterFar_t WebRtcAec_FilterFar; +typedef void (*WebRtcAec_ScaleErrorSignal_t) + (AecCore* aec, float ef[2][PART_LEN1]); extern WebRtcAec_ScaleErrorSignal_t WebRtcAec_ScaleErrorSignal; +typedef void (*WebRtcAec_FilterAdaptation_t) + (AecCore* aec, float *fft, float ef[2][PART_LEN1]); extern WebRtcAec_FilterAdaptation_t WebRtcAec_FilterAdaptation; +typedef void (*WebRtcAec_OverdriveAndSuppress_t) + (AecCore* aec, float hNl[PART_LEN1], const float hNlFb, + float efw[2][PART_LEN1]); extern WebRtcAec_OverdriveAndSuppress_t WebRtcAec_OverdriveAndSuppress; #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_