diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks.c index c7eb590910..f76b403f38 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/filterbanks.c @@ -26,9 +26,6 @@ #include "filterbank_tables.h" #include "settings.h" -// Declare a function pointer. -AllpassFilter2FixDec16 WebRtcIsacfix_AllpassFilter2FixDec16; - void WebRtcIsacfix_AllpassFilter2FixDec16C( int16_t *data_ch1, // Input and output in channel 1, in Q0 int16_t *data_ch2, // Input and output in channel 2, in Q0 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..946f3841e6 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,13 @@ #include "modules/audio_coding/codecs/isac/fix/source/structs.h" #include "system_wrappers/interface/cpu_features_wrapper.h" +// Declare function pointers. +AllpassFilter2FixDec16 WebRtcIsacfix_AllpassFilter2FixDec16; +AutocorrFix WebRtcIsacfix_AutocorrFix; +CalculateResidualEnergy WebRtcIsacfix_CalculateResidualEnergy; +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/lpc_masking_model.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c index 4be438eb52..8e52920861 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lpc_masking_model.c @@ -463,11 +463,6 @@ static __inline WebRtc_Word16 exp2_Q10_T(WebRtc_Word16 x) { // Both in and out } - -// Declare function pointers. -AutocorrFix WebRtcIsacfix_AutocorrFix; -CalculateResidualEnergy WebRtcIsacfix_CalculateResidualEnergy; - /* This routine calculates the residual energy for LPC. * Formula as shown in comments inside. */ 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 f2ad164598..c3deebb109 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform.c @@ -95,10 +95,6 @@ const WebRtc_Word16 kSinTab2[FRAMESAMPLES/4] = { 2032, -1819, 1606, -1392, 1179, -965, 750, -536, 322, -107 }; -// Declare function pointers. -Spec2Time WebRtcIsacfix_Spec2Time; -Time2Spec WebRtcIsacfix_Time2Spec; - void WebRtcIsacfix_Time2SpecC(WebRtc_Word16 *inre1Q9, WebRtc_Word16 *inre2Q9, WebRtc_Word16 *outreQ7,