From ac4d70de04acabec539753eef6e1252cb2dd1fbc Mon Sep 17 00:00:00 2001 From: "kma@webrtc.org" Date: Fri, 5 Oct 2012 00:19:01 +0000 Subject: [PATCH] Moved calling points of spl_int routines from module init to module create routines. Review URL: https://webrtc-codereview.appspot.com/789006 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2872 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/common_audio/signal_processing/spl_init.c | 4 ---- src/common_audio/vad/webrtc_vad.c | 3 ++- src/modules/audio_coding/codecs/ilbc/ilbc.c | 2 ++ src/modules/audio_coding/codecs/ilbc/init_decode.c | 2 -- src/modules/audio_coding/codecs/ilbc/init_encode.c | 2 -- src/modules/audio_coding/codecs/isac/fix/source/isacfix.c | 5 +---- src/modules/audio_coding/neteq/webrtc_neteq.c | 5 +++-- src/modules/audio_device/audio_device_impl.cc | 4 ++-- src/modules/audio_processing/aecm/echo_control_mobile.c | 4 ++-- 9 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/common_audio/signal_processing/spl_init.c b/src/common_audio/signal_processing/spl_init.c index 1021d1b298..595a5ce14f 100644 --- a/src/common_audio/signal_processing/spl_init.c +++ b/src/common_audio/signal_processing/spl_init.c @@ -14,10 +14,6 @@ * Some code came from common/rtcd.c in the WebM project. */ -/* TODO(kma): Add calls to WebRtcSpl_Init() in all related modules - * (AEC, NS, codecs etc.). - */ - #include "common_audio/signal_processing/include/real_fft.h" #include "common_audio/signal_processing/include/signal_processing_library.h" #include "system_wrappers/interface/cpu_features_wrapper.h" diff --git a/src/common_audio/vad/webrtc_vad.c b/src/common_audio/vad/webrtc_vad.c index 034f99b06e..69992110d7 100644 --- a/src/common_audio/vad/webrtc_vad.c +++ b/src/common_audio/vad/webrtc_vad.c @@ -37,6 +37,8 @@ int WebRtcVad_Create(VadInst** handle) { return -1; } + WebRtcSpl_Init(); + self->init_flag = 0; return 0; @@ -54,7 +56,6 @@ int WebRtcVad_Free(VadInst* handle) { // TODO(bjornv): Move WebRtcVad_InitCore() code here. int WebRtcVad_Init(VadInst* handle) { - WebRtcSpl_Init(); // Initialize the core VAD component. return WebRtcVad_InitCore((VadInstT*) handle); } diff --git a/src/modules/audio_coding/codecs/ilbc/ilbc.c b/src/modules/audio_coding/codecs/ilbc/ilbc.c index dbd32d191a..9a93d61f25 100644 --- a/src/modules/audio_coding/codecs/ilbc/ilbc.c +++ b/src/modules/audio_coding/codecs/ilbc/ilbc.c @@ -48,6 +48,7 @@ WebRtc_Word16 WebRtcIlbcfix_DecoderAssign(iLBC_decinst_t **iLBC_decinst, WebRtc_ WebRtc_Word16 WebRtcIlbcfix_EncoderCreate(iLBC_encinst_t **iLBC_encinst) { *iLBC_encinst=(iLBC_encinst_t*)malloc(sizeof(iLBC_Enc_Inst_t)); if (*iLBC_encinst!=NULL) { + WebRtcSpl_Init(); return(0); } else { return(-1); @@ -57,6 +58,7 @@ WebRtc_Word16 WebRtcIlbcfix_EncoderCreate(iLBC_encinst_t **iLBC_encinst) { WebRtc_Word16 WebRtcIlbcfix_DecoderCreate(iLBC_decinst_t **iLBC_decinst) { *iLBC_decinst=(iLBC_decinst_t*)malloc(sizeof(iLBC_Dec_Inst_t)); if (*iLBC_decinst!=NULL) { + WebRtcSpl_Init(); return(0); } else { return(-1); diff --git a/src/modules/audio_coding/codecs/ilbc/init_decode.c b/src/modules/audio_coding/codecs/ilbc/init_decode.c index 7e51d0f154..ea16a32e46 100644 --- a/src/modules/audio_coding/codecs/ilbc/init_decode.c +++ b/src/modules/audio_coding/codecs/ilbc/init_decode.c @@ -29,8 +29,6 @@ WebRtc_Word16 WebRtcIlbcfix_InitDecode( /* (o) Number of decoded samples */ int use_enhancer) { /* (i) 1: use enhancer, 0: no enhancer */ int i; - WebRtcSpl_Init(); - iLBCdec_inst->mode = mode; /* Set all the variables that are dependent on the frame size mode */ diff --git a/src/modules/audio_coding/codecs/ilbc/init_encode.c b/src/modules/audio_coding/codecs/ilbc/init_encode.c index 79b3231216..e1c0fc63b6 100644 --- a/src/modules/audio_coding/codecs/ilbc/init_encode.c +++ b/src/modules/audio_coding/codecs/ilbc/init_encode.c @@ -26,8 +26,6 @@ WebRtc_Word16 WebRtcIlbcfix_InitEncode( /* (o) Number of bytes encoded */ iLBC_Enc_Inst_t *iLBCenc_inst, /* (i/o) Encoder instance */ WebRtc_Word16 mode) { /* (i) frame size mode */ - WebRtcSpl_Init(); - iLBCenc_inst->mode = mode; /* Set all the variables that are dependent on the frame size mode */ diff --git a/src/modules/audio_coding/codecs/isac/fix/source/isacfix.c b/src/modules/audio_coding/codecs/isac/fix/source/isacfix.c index 890cd279b9..5ea5b9628b 100644 --- a/src/modules/audio_coding/codecs/isac/fix/source/isacfix.c +++ b/src/modules/audio_coding/codecs/isac/fix/source/isacfix.c @@ -86,6 +86,7 @@ WebRtc_Word16 WebRtcIsacfix_Create(ISACFIX_MainStruct **ISAC_main_inst) (*(ISACFIX_SubStruct**)ISAC_main_inst)->errorcode = 0; (*(ISACFIX_SubStruct**)ISAC_main_inst)->initflag = 0; (*(ISACFIX_SubStruct**)ISAC_main_inst)->ISACenc_obj.SaveEnc_ptr = NULL; + WebRtcSpl_Init(); return(0); } else { return(-1); @@ -217,8 +218,6 @@ WebRtc_Word16 WebRtcIsacfix_EncoderInit(ISACFIX_MainStruct *ISAC_main_inst, /* flag encoder init */ ISAC_inst->initflag |= 2; - WebRtcSpl_Init(); - if (CodingMode == 0) /* Adaptive mode */ ISAC_inst->ISACenc_obj.new_framelength = INITIAL_FRAMESAMPLES; @@ -529,8 +528,6 @@ WebRtc_Word16 WebRtcIsacfix_DecoderInit(ISACFIX_MainStruct *ISAC_main_inst) /* flag decoder init */ ISAC_inst->initflag |= 1; - WebRtcSpl_Init(); - WebRtcIsacfix_InitMaskingDec(&ISAC_inst->ISACdec_obj.maskfiltstr_obj); WebRtcIsacfix_InitPostFilterbank(&ISAC_inst->ISACdec_obj.postfiltbankstr_obj); WebRtcIsacfix_InitPitchFilter(&ISAC_inst->ISACdec_obj.pitchfiltstr_obj); diff --git a/src/modules/audio_coding/neteq/webrtc_neteq.c b/src/modules/audio_coding/neteq/webrtc_neteq.c index 47355c041d..c9ca4c14bd 100644 --- a/src/modules/audio_coding/neteq/webrtc_neteq.c +++ b/src/modules/audio_coding/neteq/webrtc_neteq.c @@ -290,6 +290,9 @@ int WebRtcNetEQ_Assign(void **inst, void *NETEQ_inst_Addr) MainInst_t *NetEqMainInst = (MainInst_t*) NETEQ_inst_Addr; *inst = NETEQ_inst_Addr; if (*inst == NULL) return (-1); + + WebRtcSpl_Init(); + /* Clear memory */ WebRtcSpl_MemSetW16((WebRtc_Word16*) NetEqMainInst, 0, (sizeof(MainInst_t) / sizeof(WebRtc_Word16))); @@ -396,8 +399,6 @@ int WebRtcNetEQ_Init(void *inst, WebRtc_UWord16 fs) return (-1); } - WebRtcSpl_Init(); - #ifdef NETEQ_VAD /* Start out with no PostDecode VAD instance */ NetEqMainInst->DSPinst.VADInst.VADState = NULL; diff --git a/src/modules/audio_device/audio_device_impl.cc b/src/modules/audio_device/audio_device_impl.cc index 87f8211751..c7c87e66f3 100644 --- a/src/modules/audio_device/audio_device_impl.cc +++ b/src/modules/audio_device/audio_device_impl.cc @@ -111,6 +111,8 @@ AudioDeviceModule* AudioDeviceModuleImpl::Create(const WebRtc_Word32 id, return NULL; } + WebRtcSpl_Init(); + return audioDevice; } @@ -608,8 +610,6 @@ WebRtc_Word32 AudioDeviceModuleImpl::Init() if (!_ptrAudioDevice) return -1; - WebRtcSpl_Init(); - _ptrAudioDeviceUtility->Init(); if (_ptrAudioDevice->Init() == -1) diff --git a/src/modules/audio_processing/aecm/echo_control_mobile.c b/src/modules/audio_processing/aecm/echo_control_mobile.c index b238b2daeb..d0b90d485a 100644 --- a/src/modules/audio_processing/aecm/echo_control_mobile.c +++ b/src/modules/audio_processing/aecm/echo_control_mobile.c @@ -110,6 +110,8 @@ WebRtc_Word32 WebRtcAecm_Create(void **aecmInst) return -1; } + WebRtcSpl_Init(); + aecm->initFlag = 0; aecm->lastError = 0; @@ -171,8 +173,6 @@ WebRtc_Word32 WebRtcAecm_Init(void *aecmInst, WebRtc_Word32 sampFreq) } aecm->sampFreq = sampFreq; - WebRtcSpl_Init(); - // Initialize AECM core if (WebRtcAecm_InitCore(aecm->aecmCore, aecm->sampFreq) == -1) {