From f832a6d0903179914c1dbda2a43172206d9e1daa Mon Sep 17 00:00:00 2001 From: "pbos@webrtc.org" Date: Thu, 18 Dec 2014 09:56:09 +0000 Subject: [PATCH] Remove _t from function pointer typedefs. _t are reserved in POSIX. R=bjornv@webrtc.org BUG=162 Review URL: https://webrtc-codereview.appspot.com/34539004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@7947 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../modules/audio_processing/aec/aec_core.c | 12 ++--- .../audio_processing/aec/aec_core_internal.h | 53 +++++++++---------- .../modules/audio_processing/aec/aec_rdft.c | 14 ++--- .../modules/audio_processing/aec/aec_rdft.h | 16 +++--- 4 files changed, 47 insertions(+), 48 deletions(-) diff --git a/webrtc/modules/audio_processing/aec/aec_core.c b/webrtc/modules/audio_processing/aec/aec_core.c index 98899687cf..d2d55ec93d 100644 --- a/webrtc/modules/audio_processing/aec/aec_core.c +++ b/webrtc/modules/audio_processing/aec/aec_core.c @@ -122,12 +122,12 @@ enum { extern int webrtc_aec_instance_count; #endif -WebRtcAec_FilterFar_t WebRtcAec_FilterFar; -WebRtcAec_ScaleErrorSignal_t WebRtcAec_ScaleErrorSignal; -WebRtcAec_FilterAdaptation_t WebRtcAec_FilterAdaptation; -WebRtcAec_OverdriveAndSuppress_t WebRtcAec_OverdriveAndSuppress; -WebRtcAec_ComfortNoise_t WebRtcAec_ComfortNoise; -WebRtcAec_SubbandCoherence_t WebRtcAec_SubbandCoherence; +WebRtcAecFilterFar WebRtcAec_FilterFar; +WebRtcAecScaleErrorSignal WebRtcAec_ScaleErrorSignal; +WebRtcAecFilterAdaptation WebRtcAec_FilterAdaptation; +WebRtcAecOverdriveAndSuppress WebRtcAec_OverdriveAndSuppress; +WebRtcAecComfortNoise WebRtcAec_ComfortNoise; +WebRtcAecSubBandCoherence WebRtcAec_SubbandCoherence; __inline static float MulRe(float aRe, float aIm, float bRe, float bIm) { return aRe * bRe - aIm * bIm; diff --git a/webrtc/modules/audio_processing/aec/aec_core_internal.h b/webrtc/modules/audio_processing/aec/aec_core_internal.h index 63109f2aa4..d11df931ff 100644 --- a/webrtc/modules/audio_processing/aec/aec_core_internal.h +++ b/webrtc/modules/audio_processing/aec/aec_core_internal.h @@ -168,34 +168,33 @@ 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; +typedef void (*WebRtcAecFilterFar)(AecCore* aec, float yf[2][PART_LEN1]); +extern WebRtcAecFilterFar WebRtcAec_FilterFar; +typedef void (*WebRtcAecScaleErrorSignal)(AecCore* aec, float ef[2][PART_LEN1]); +extern WebRtcAecScaleErrorSignal WebRtcAec_ScaleErrorSignal; +typedef void (*WebRtcAecFilterAdaptation)(AecCore* aec, + float* fft, + float ef[2][PART_LEN1]); +extern WebRtcAecFilterAdaptation WebRtcAec_FilterAdaptation; +typedef void (*WebRtcAecOverdriveAndSuppress)(AecCore* aec, + float hNl[PART_LEN1], + const float hNlFb, + float efw[2][PART_LEN1]); +extern WebRtcAecOverdriveAndSuppress WebRtcAec_OverdriveAndSuppress; -typedef void (*WebRtcAec_ComfortNoise_t)(AecCore* aec, - float efw[2][PART_LEN1], - complex_t* comfortNoiseHband, - const float* noisePow, - const float* lambda); -extern WebRtcAec_ComfortNoise_t WebRtcAec_ComfortNoise; +typedef void (*WebRtcAecComfortNoise)(AecCore* aec, + float efw[2][PART_LEN1], + complex_t* comfortNoiseHband, + const float* noisePow, + const float* lambda); +extern WebRtcAecComfortNoise WebRtcAec_ComfortNoise; -typedef void (*WebRtcAec_SubbandCoherence_t)(AecCore* aec, - float efw[2][PART_LEN1], - float xfw[2][PART_LEN1], - float* fft, - float* cohde, - float* cohxd); -extern WebRtcAec_SubbandCoherence_t WebRtcAec_SubbandCoherence; +typedef void (*WebRtcAecSubBandCoherence)(AecCore* aec, + float efw[2][PART_LEN1], + float xfw[2][PART_LEN1], + float* fft, + float* cohde, + float* cohxd); +extern WebRtcAecSubBandCoherence WebRtcAec_SubbandCoherence; #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_AEC_CORE_INTERNAL_H_ diff --git a/webrtc/modules/audio_processing/aec/aec_rdft.c b/webrtc/modules/audio_processing/aec/aec_rdft.c index 51be034770..d54ebf8a93 100644 --- a/webrtc/modules/audio_processing/aec/aec_rdft.c +++ b/webrtc/modules/audio_processing/aec/aec_rdft.c @@ -555,13 +555,13 @@ void aec_rdft_inverse_128(float* a) { } // code path selection -rft_sub_128_t cft1st_128; -rft_sub_128_t cftmdl_128; -rft_sub_128_t rftfsub_128; -rft_sub_128_t rftbsub_128; -rft_sub_128_t cftfsub_128; -rft_sub_128_t cftbsub_128; -rft_sub_128_t bitrv2_128; +RftSub128 cft1st_128; +RftSub128 cftmdl_128; +RftSub128 rftfsub_128; +RftSub128 rftbsub_128; +RftSub128 cftfsub_128; +RftSub128 cftbsub_128; +RftSub128 bitrv2_128; void aec_rdft_init(void) { cft1st_128 = cft1st_128_C; diff --git a/webrtc/modules/audio_processing/aec/aec_rdft.h b/webrtc/modules/audio_processing/aec/aec_rdft.h index e72c721630..22f5dd1e89 100644 --- a/webrtc/modules/audio_processing/aec/aec_rdft.h +++ b/webrtc/modules/audio_processing/aec/aec_rdft.h @@ -36,14 +36,14 @@ extern ALIGN16_BEG const float ALIGN16_END rdft_wk3i[32]; extern ALIGN16_BEG const float ALIGN16_END cftmdl_wk1r[4]; // code path selection function pointers -typedef void (*rft_sub_128_t)(float* a); -extern rft_sub_128_t rftfsub_128; -extern rft_sub_128_t rftbsub_128; -extern rft_sub_128_t cft1st_128; -extern rft_sub_128_t cftmdl_128; -extern rft_sub_128_t cftfsub_128; -extern rft_sub_128_t cftbsub_128; -extern rft_sub_128_t bitrv2_128; +typedef void (*RftSub128)(float* a); +extern RftSub128 rftfsub_128; +extern RftSub128 rftbsub_128; +extern RftSub128 cft1st_128; +extern RftSub128 cftmdl_128; +extern RftSub128 cftfsub_128; +extern RftSub128 cftbsub_128; +extern RftSub128 bitrv2_128; // entry points void aec_rdft_init(void);