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

Refactor AEC: PowerLevel

Browse Source 
* Style changes
* Tested with audioproc_unittest and trybots

TEST=none
BUG=none

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3551 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
bjornv@webrtc.org 2013-02-20 19:24:50 +00:00
parent 4d1cfae622
commit 71e91f3b64
3 changed files with 46 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -126,10 +126,10 @@ static void ComfortNoise(aec_t *aec, float efw[2][PART_LEN1],
complex_t *comfortNoiseHband, complex_t *comfortNoiseHband,
const float *noisePow, const float *lambda); const float *noisePow, const float *lambda);
static void InitLevel(power_level_t *level); static void InitLevel(PowerLevel* level);
static void InitStats(Stats* stats); static void InitStats(Stats* stats);
static void InitMetrics(aec_t *aec); static void InitMetrics(aec_t *aec);
static void UpdateLevel(power_level_t* level, float in[2][PART_LEN1]); static void UpdateLevel(PowerLevel* 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
// overwritten. // overwritten.
@ -1440,27 +1440,26 @@ static void ComfortNoise(aec_t *aec, float efw[2][PART_LEN1],
} }
} }
static void InitLevel(power_level_t *level) static void InitLevel(PowerLevel* level) {
{ const float kBigFloat = 1E17f;
const float bigFloat = 1E17f;
level->averagelevel = 0; level->averagelevel = 0;
level->framelevel = 0; level->framelevel = 0;
level->minlevel = bigFloat; level->minlevel = kBigFloat;
level->frsum = 0; level->frsum = 0;
level->sfrsum = 0; level->sfrsum = 0;
level->frcounter = 0; level->frcounter = 0;
level->sfrcounter = 0; level->sfrcounter = 0;
} }
static void InitStats(Stats* stats) { static void InitStats(Stats* stats) {
stats->instant = offsetLevel; stats->instant = kOffsetLevel;
stats->average = offsetLevel; stats->average = kOffsetLevel;
stats->max = offsetLevel; stats->max = kOffsetLevel;
stats->min = offsetLevel * (-1); stats->min = kOffsetLevel * (-1);
stats->sum = 0; stats->sum = 0;
stats->hisum = 0; stats->hisum = 0;
stats->himean = offsetLevel; stats->himean = kOffsetLevel;
stats->counter = 0; stats->counter = 0;
stats->hicounter = 0; stats->hicounter = 0;
} }
@ -1479,7 +1478,7 @@ static void InitMetrics(aec_t* self) {
InitStats(&self->rerl); InitStats(&self->rerl);
} }
static void UpdateLevel(power_level_t* level, float in[2][PART_LEN1]) { static void UpdateLevel(PowerLevel* level, float in[2][PART_LEN1]) {
// Do the energy calculation in the frequency domain. The FFT is performed on // Do the energy calculation in the frequency domain. The FFT is performed on
// a segment of PART_LEN2 samples due to overlap, but we only want the energy // a segment of PART_LEN2 samples due to overlap, but we only want the energy
// of half that data (the last PART_LEN samples). Parseval's relation states // of half that data (the last PART_LEN samples). Parseval's relation states

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

@ -43,17 +43,17 @@ typedef float complex_t[2];
// compile time. // compile time.
// Metrics // Metrics
enum {offsetLevel = -100}; enum { kOffsetLevel = -100 };
typedef struct { typedef struct PowerLevel {
float sfrsum; float sfrsum;
int sfrcounter; int sfrcounter;
float framelevel; float framelevel;
float frsum; float frsum;
int frcounter; int frcounter;
float minlevel; float minlevel;
float averagelevel; float averagelevel;
} power_level_t; } PowerLevel;
typedef struct Stats { typedef struct Stats {
float instant; float instant;
@ -124,10 +124,10 @@ typedef struct {
int noiseEstCtr; int noiseEstCtr;
power_level_t farlevel; PowerLevel farlevel;
power_level_t nearlevel; PowerLevel nearlevel;
power_level_t linoutlevel; PowerLevel linoutlevel;
power_level_t nlpoutlevel; PowerLevel nlpoutlevel;
int metricsMode; int metricsMode;
int stateCounter; int stateCounter;

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

@ -591,47 +591,47 @@ int WebRtcAec_GetMetrics(void* handle, AecMetrics* metrics) {
// ERL // ERL
metrics->erl.instant = (int) erl.instant; metrics->erl.instant = (int) erl.instant;
if ((erl.himean > offsetLevel) && (erl.average > offsetLevel)) { if ((erl.himean > kOffsetLevel) && (erl.average > kOffsetLevel)) {
// Use a mix between regular average and upper part average. // Use a mix between regular average and upper part average.
dtmp = kUpWeight * erl.himean + (1 - kUpWeight) * erl.average; dtmp = kUpWeight * erl.himean + (1 - kUpWeight) * erl.average;
metrics->erl.average = (int) dtmp; metrics->erl.average = (int) dtmp;
} else { } else {
metrics->erl.average = offsetLevel; metrics->erl.average = kOffsetLevel;
} }
metrics->erl.max = (int) erl.max; metrics->erl.max = (int) erl.max;
if (erl.min < (offsetLevel * (-1))) { if (erl.min < (kOffsetLevel * (-1))) {
metrics->erl.min = (int) erl.min; metrics->erl.min = (int) erl.min;
} else { } else {
metrics->erl.min = offsetLevel; metrics->erl.min = kOffsetLevel;
} }
// ERLE // ERLE
metrics->erle.instant = (int) erle.instant; metrics->erle.instant = (int) erle.instant;
if ((erle.himean > offsetLevel) && (erle.average > offsetLevel)) { if ((erle.himean > kOffsetLevel) && (erle.average > kOffsetLevel)) {
// Use a mix between regular average and upper part average. // Use a mix between regular average and upper part average.
dtmp = kUpWeight * erle.himean + (1 - kUpWeight) * erle.average; dtmp = kUpWeight * erle.himean + (1 - kUpWeight) * erle.average;
metrics->erle.average = (int) dtmp; metrics->erle.average = (int) dtmp;
} else { } else {
metrics->erle.average = offsetLevel; metrics->erle.average = kOffsetLevel;
} }
metrics->erle.max = (int) erle.max; metrics->erle.max = (int) erle.max;
if (erle.min < (offsetLevel * (-1))) { if (erle.min < (kOffsetLevel * (-1))) {
metrics->erle.min = (int) erle.min; metrics->erle.min = (int) erle.min;
} else { } else {
metrics->erle.min = offsetLevel; metrics->erle.min = kOffsetLevel;
} }
// RERL // RERL
if ((metrics->erl.average > offsetLevel) if ((metrics->erl.average > kOffsetLevel)
&& (metrics->erle.average > offsetLevel)) { && (metrics->erle.average > kOffsetLevel)) {
stmp = metrics->erl.average + metrics->erle.average; stmp = metrics->erl.average + metrics->erle.average;
} else { } else {
stmp = offsetLevel; stmp = kOffsetLevel;
} }
metrics->rerl.average = stmp; metrics->rerl.average = stmp;
@ -643,20 +643,20 @@ int WebRtcAec_GetMetrics(void* handle, AecMetrics* metrics) {
// A_NLP // A_NLP
metrics->aNlp.instant = (int) a_nlp.instant; metrics->aNlp.instant = (int) a_nlp.instant;
if ((a_nlp.himean > offsetLevel) && (a_nlp.average > offsetLevel)) { if ((a_nlp.himean > kOffsetLevel) && (a_nlp.average > kOffsetLevel)) {
// Use a mix between regular average and upper part average. // Use a mix between regular average and upper part average.
dtmp = kUpWeight * a_nlp.himean + (1 - kUpWeight) * a_nlp.average; dtmp = kUpWeight * a_nlp.himean + (1 - kUpWeight) * a_nlp.average;
metrics->aNlp.average = (int) dtmp; metrics->aNlp.average = (int) dtmp;
} else { } else {
metrics->aNlp.average = offsetLevel; metrics->aNlp.average = kOffsetLevel;
} }
metrics->aNlp.max = (int) a_nlp.max; metrics->aNlp.max = (int) a_nlp.max;
if (a_nlp.min < (offsetLevel * (-1))) { if (a_nlp.min < (kOffsetLevel * (-1))) {
metrics->aNlp.min = (int) a_nlp.min; metrics->aNlp.min = (int) a_nlp.min;
} else { } else {
metrics->aNlp.min = offsetLevel; metrics->aNlp.min = kOffsetLevel;
} }
return 0; return 0;