generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Name change

Browse Source 
* Removed WebRtcAec_ function name prepending on private function.

TEST=audioproc_unittest, trybots
BUG=None

Review URL: https://webrtc-codereview.appspot.com/1096012

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3537 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org 2013-02-19 21:03:10 +00:00
parent 95b48c3551
commit cea70f4055
3 changed files with 27 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
webrtc/modules/audio_processing/aec/aec_core.c
View File

@ -122,7 +122,7 @@ static void ComfortNoise(aec_t *aec, float efw[2][PART_LEN1],
const float *noisePow, const float *lambda); const float *noisePow, const float *lambda);
static void WebRtcAec_InitLevel(power_level_t *level); static void WebRtcAec_InitLevel(power_level_t *level);
static void WebRtcAec_InitStats(stats* stats); static void InitStats(Stats* stats);
static void UpdateLevel(power_level_t* level, float in[2][PART_LEN1]); static void UpdateLevel(power_level_t* level, float in[2][PART_LEN1]);
static void UpdateMetrics(aec_t *aec); static void UpdateMetrics(aec_t *aec);
// Convert from time domain to frequency domain. Note that |time_data| are // Convert from time domain to frequency domain. Note that |time_data| are
@ -567,10 +567,10 @@ void WebRtcAec_InitMetrics(aec_t *aec)
WebRtcAec_InitLevel(&aec->linoutlevel); WebRtcAec_InitLevel(&aec->linoutlevel);
WebRtcAec_InitLevel(&aec->nlpoutlevel); WebRtcAec_InitLevel(&aec->nlpoutlevel);
WebRtcAec_InitStats(&aec->erl); InitStats(&aec->erl);
WebRtcAec_InitStats(&aec->erle); InitStats(&aec->erle);
WebRtcAec_InitStats(&aec->aNlp); InitStats(&aec->aNlp);
WebRtcAec_InitStats(&aec->rerl); InitStats(&aec->rerl);
} }
void WebRtcAec_BufferFarendPartition(aec_t *aec, const float* farend) { void WebRtcAec_BufferFarendPartition(aec_t *aec, const float* farend) {
@ -721,8 +721,8 @@ int WebRtcAec_echo_state(aec_t* self) {
return self->echoState; return self->echoState;
} }
void WebRtcAec_GetEchoStats(aec_t* self, stats* erl, stats* erle, void WebRtcAec_GetEchoStats(aec_t* self, Stats* erl, Stats* erle,
stats* a_nlp) { Stats* a_nlp) {
assert(self != NULL); assert(self != NULL);
assert(erl != NULL); assert(erl != NULL);
assert(erle != NULL); assert(erle != NULL);
@ -1402,8 +1402,7 @@ static void WebRtcAec_InitLevel(power_level_t *level)
level->sfrcounter = 0; level->sfrcounter = 0;
} }
static void WebRtcAec_InitStats(stats* stats) static void InitStats(Stats* stats) {
{
stats->instant = offsetLevel; stats->instant = offsetLevel;
stats->average = offsetLevel; stats->average = offsetLevel;
stats->max = offsetLevel; stats->max = offsetLevel;

14
webrtc/modules/audio_processing/aec/aec_core.h
View File

@ -55,7 +55,7 @@ typedef struct {
float averagelevel; float averagelevel;
} power_level_t; } power_level_t;
typedef struct { typedef struct Stats {
float instant; float instant;
float average; float average;
float min; float min;
@ -65,7 +65,7 @@ typedef struct {
float himean; float himean;
int counter; int counter;
int hicounter; int hicounter;
} stats; } Stats;
typedef struct { typedef struct {
int farBufWritePos, farBufReadPos; int farBufWritePos, farBufReadPos;
@ -131,10 +131,10 @@ typedef struct {
int metricsMode; int metricsMode;
int stateCounter; int stateCounter;
stats erl; Stats erl;
stats erle; Stats erle;
stats aNlp; Stats aNlp;
stats rerl; Stats rerl;
// Quantities to control H band scaling for SWB input // Quantities to control H band scaling for SWB input
int freq_avg_ic; // initial bin for averaging nlp gain int freq_avg_ic; // initial bin for averaging nlp gain
@ -188,6 +188,6 @@ int WebRtcAec_GetDelayMetricsCore(aec_t* self, int* median, int* std);
// Returns the echo state (1: echo, 0: no echo). // Returns the echo state (1: echo, 0: no echo).
int WebRtcAec_echo_state(aec_t* self); int WebRtcAec_echo_state(aec_t* self);
// Gets statistics of the echo metrics ERL, ERLE, A_NLP. // Gets statistics of the echo metrics ERL, ERLE, A_NLP.
void WebRtcAec_GetEchoStats(aec_t* self, stats* erl, stats* erle, stats* a_nlp); void WebRtcAec_GetEchoStats(aec_t* self, Stats* erl, Stats* erle, Stats* a_nlp);
#endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_MAIN_SOURCE_AEC_CORE_H_ #endif // WEBRTC_MODULES_AUDIO_PROCESSING_AEC_MAIN_SOURCE_AEC_CORE_H_

6
webrtc/modules/audio_processing/aec/echo_cancellation.c
View File

@ -634,9 +634,9 @@ int WebRtcAec_GetMetrics(void* handle, AecMetrics* metrics) {
float dtmp; float dtmp;
int stmp; int stmp;
aecpc_t* self = (aecpc_t*)handle; aecpc_t* self = (aecpc_t*)handle;
stats erl; Stats erl;
stats erle; Stats erle;
stats a_nlp; Stats a_nlp;
if (handle == NULL ) { if (handle == NULL ) {
return -1; return -1;