diff options
| author | bjornv@webrtc.org <bjornv@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-02-19 21:06:52 +0000 |
|---|---|---|
| committer | bjornv@webrtc.org <bjornv@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-02-19 21:06:52 +0000 |
| commit | 60a9cb717f673b1ddb828eb07e13d17a579c6d53 (patch) | |
| tree | 6720cbbe26e5a173529e9f6bfd60501e88b2bfb1 /modules/audio_processing/aec/echo_cancellation.c | |
| parent | 527ac819d983b4827402438a48bc4313bf291b3c (diff) | |
| download | webrtc-60a9cb717f673b1ddb828eb07e13d17a579c6d53.tar.gz | |
This refactoring CL moves the nlp_mode member value from aecpc_t to aec_t, since it it never used at that level. Further, I removed two suppression variables by depending on nlp_mode directly.
TEST=audioproc_unittest, trybots
BUG=None
Review URL: https://webrtc-codereview.appspot.com/1095007
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3538 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'modules/audio_processing/aec/echo_cancellation.c')
| -rw-r--r-- | modules/audio_processing/aec/echo_cancellation.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/modules/audio_processing/aec/echo_cancellation.c b/modules/audio_processing/aec/echo_cancellation.c index 15655ac4..c7b3e588 100644 --- a/modules/audio_processing/aec/echo_cancellation.c +++ b/modules/audio_processing/aec/echo_cancellation.c @@ -35,10 +35,6 @@ static const int kMaxBufSizeStart = 62; // In partitions static const int sampMsNb = 8; // samples per ms in nb -// Target suppression levels for nlp modes -// log{0.001, 0.00001, 0.00000001} -static const float targetSupp[3] = {-6.9f, -11.5f, -18.4f}; -static const float minOverDrive[3] = {1.0f, 2.0f, 5.0f}; static const int initCheck = 42; #ifdef WEBRTC_AEC_DEBUG_DUMP @@ -558,9 +554,7 @@ WebRtc_Word32 WebRtcAec_set_config(void *aecInst, AecConfig config) aecpc->lastError = AEC_BAD_PARAMETER_ERROR; return -1; } - aecpc->nlpMode = config.nlpMode; - aecpc->aec->targetSupp = targetSupp[aecpc->nlpMode]; - aecpc->aec->minOverDrive = minOverDrive[aecpc->nlpMode]; + aecpc->aec->nlp_mode = config.nlpMode; if (config.metricsMode != kAecFalse && config.metricsMode != kAecTrue) { aecpc->lastError = AEC_BAD_PARAMETER_ERROR; @@ -601,7 +595,7 @@ WebRtc_Word32 WebRtcAec_get_config(void *aecInst, AecConfig *config) return -1; } - config->nlpMode = aecpc->nlpMode; + config->nlpMode = aecpc->aec->nlp_mode; config->skewMode = aecpc->skewMode; config->metricsMode = aecpc->aec->metricsMode; config->delay_logging = aecpc->aec->delay_logging_enabled; |