Adding BlockMeanCalculator for AEC.

webrtc/modules/audio_processing/aec/aec_core_internal.h

Index: webrtc/modules/audio_processing/aec/aec_core_internal.h
diff --git a/webrtc/modules/audio_processing/aec/aec_core_internal.h b/webrtc/modules/audio_processing/aec/aec_core_internal.h
index 810d517834fe07d31793d8dfb89cc686a64ef4bf..ea5889f50309683a3ce168303da3a190f6396504 100644
--- a/webrtc/modules/audio_processing/aec/aec_core_internal.h
+++ b/webrtc/modules/audio_processing/aec/aec_core_internal.h
@@ -17,6 +17,7 @@ extern "C" {
 #include "webrtc/common_audio/wav_file.h"
 #include "webrtc/modules/audio_processing/aec/aec_common.h"
 #include "webrtc/modules/audio_processing/aec/aec_core.h"
+#include "webrtc/modules/audio_processing/utility/block_mean_calculator.h"
 #include "webrtc/typedefs.h"
 
 namespace webrtc {
@@ -40,16 +41,16 @@ static const float kExtendedMu = 0.4f;
 static const float kExtendedErrorThreshold = 1.0e-6f;
 
 typedef struct PowerLevel {
-  float sfrsum;
-  int sfrcounter;
-  float framelevel;
-  float frsum;
-  int frcounter;
+  PowerLevel();
+
+  BlockMeanCalculator framelevel;
+  BlockMeanCalculator averagelevel;
   float minlevel;
-  float averagelevel;
 } PowerLevel;
 
 struct AecCore {
+  AecCore();
+
   int farBufWritePos, farBufReadPos;
 
   int knownDelay;