From c4373bc7372a92fe988b6ea8db92eacba538d40b Mon Sep 17 00:00:00 2001 From: "kma@webrtc.org" Date: Fri, 25 Jan 2013 04:55:21 +0000 Subject: [PATCH] Moved several function pointer declarations in iSAC to isac initialization file. Fixed clang linker problem of not being able to find symbols. Review URL: https://webrtc-codereview.appspot.com/1061006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@3410 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c | 4 ++++ webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c | 3 --- .../modules/audio_coding/codecs/isac/fix/source/transform.c | 4 ---- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c index fa4d8d1768..68498de191 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/isacfix.c @@ -27,6 +27,10 @@ #include "modules/audio_coding/codecs/isac/fix/source/structs.h" #include "system_wrappers/interface/cpu_features_wrapper.h" +// Declare function pointers. +FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix; +Spec2Time WebRtcIsacfix_Spec2Time; +Time2Spec WebRtcIsacfix_Time2Spec; /************************************************************************** * WebRtcIsacfix_AssignSize(...) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c index 14588d0f0d..bbc5993b52 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c @@ -84,9 +84,6 @@ void WebRtcIsacfix_FilterMaLoopC(int16_t input0, // Filter coefficient } } -// Declare a function pointer. -FilterMaLoopFix WebRtcIsacfix_FilterMaLoopFix; - /* filter the signal using normalized lattice filter */ /* MA filter */ void WebRtcIsacfix_NormLatticeFilterMa(WebRtc_Word16 orderCoef, diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c index c317b8f414..c7a3e80cce 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c @@ -103,10 +103,6 @@ static const WebRtc_Word16 WebRtcIsacfix_kSinTab2[FRAMESAMPLES/4] = { }; #endif // WEBRTC_DETECT_ARM_NEON || WEBRTC_ARCH_ARM_NEON -// Declare function pointers. -Spec2Time WebRtcIsacfix_Spec2Time; -Time2Spec WebRtcIsacfix_Time2Spec; - void WebRtcIsacfix_Time2SpecC(WebRtc_Word16 *inre1Q9, WebRtc_Word16 *inre2Q9, WebRtc_Word16 *outreQ7,