Revert "Pull the Voice Activity Detector out from the AGC"

webrtc/modules/audio_processing/agc/gmm.cc

Index: webrtc/modules/audio_processing/agc/gmm.cc
diff --git a/webrtc/modules/audio_processing/vad/gmm.cc b/webrtc/modules/audio_processing/agc/gmm.cc
similarity index 81%
rename from webrtc/modules/audio_processing/vad/gmm.cc
rename to webrtc/modules/audio_processing/agc/gmm.cc
index 96519759133197209f20727433daf122dce6cb31..9ad8ef95aee23baac501f1d8e9ca3e5e77fd6dd4 100644
--- a/webrtc/modules/audio_processing/vad/gmm.cc
+++ b/webrtc/modules/audio_processing/agc/gmm.cc
@@ -8,7 +8,7 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/modules/audio_processing/vad/gmm.h"
+#include "webrtc/modules/audio_processing/agc/gmm.h"
 
 #include <math.h>
 #include <stdlib.h>
@@ -19,16 +19,13 @@ namespace webrtc {
 
 static const int kMaxDimension = 10;
 
-static void RemoveMean(const double* in,
-                       const double* mean_vec,
-                       int dimension,
-                       double* out) {
+static void RemoveMean(const double* in, const double* mean_vec,
+                       int dimension, double* out) {
   for (int n = 0; n < dimension; ++n)
     out[n] = in[n] - mean_vec[n];
 }
 
-static double ComputeExponent(const double* in,
-                              const double* covar_inv,
+static double ComputeExponent(const double* in, const double* covar_inv,
                               int dimension) {
   double q = 0;
   for (int i = 0; i < dimension; ++i) {
@@ -53,7 +50,7 @@ double EvaluateGmm(const double* x, const GmmParameters& gmm_parameters) {
   for (int n = 0; n < gmm_parameters.num_mixtures; n++) {
     RemoveMean(x, mean_vec, gmm_parameters.dimension, v);
     double q = ComputeExponent(v, covar_inv, gmm_parameters.dimension) +
-               gmm_parameters.weight[n];
+        gmm_parameters.weight[n];
     f += exp(q);
     mean_vec += gmm_parameters.dimension;
     covar_inv += gmm_parameters.dimension * gmm_parameters.dimension;