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

webrtc/tools/agc/activity_metric.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 
 #include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 
 #include <algorithm>
 
 #include "gflags/gflags.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/modules/audio_processing/agc/agc.h"
+#include "webrtc/modules/audio_processing/agc/agc_audio_proc.h"
+#include "webrtc/modules/audio_processing/agc/common.h"
 #include "webrtc/modules/audio_processing/agc/histogram.h"
+#include "webrtc/modules/audio_processing/agc/pitch_based_vad.h"
+#include "webrtc/modules/audio_processing/agc/standalone_vad.h"
 #include "webrtc/modules/audio_processing/agc/utility.h"
-#include "webrtc/modules/audio_processing/vad/vad_audio_proc.h"
-#include "webrtc/modules/audio_processing/vad/common.h"
-#include "webrtc/modules/audio_processing/vad/pitch_based_vad.h"
-#include "webrtc/modules/audio_processing/vad/standalone_vad.h"
 #include "webrtc/modules/interface/module_common_types.h"
 
 static const int kAgcAnalWindowSamples = 100;
 static const double kDefaultActivityThreshold = 0.3;
 
 DEFINE_bool(standalone_vad, true, "enable stand-alone VAD");
 DEFINE_string(true_vad, "", "name of a file containing true VAD in 'int'"
               " format");
 DEFINE_string(video_vad, "", "name of a file containing video VAD (activity"
               " probabilities) in double format. One activity per 10ms is"
@@ skipping 31 matching lines @@
       frame->data_[n] = (rand() & 0xF) - 8;
   }
 }
 
 class AgcStat {
  public:
   AgcStat()
       : video_index_(0),
         activity_threshold_(kDefaultActivityThreshold),
         audio_content_(Histogram::Create(kAgcAnalWindowSamples)),
-        audio_processing_(new VadAudioProc()),
+        audio_processing_(new AgcAudioProc()),
         vad_(new PitchBasedVad()),
         standalone_vad_(StandaloneVad::Create()),
         audio_content_fid_(NULL) {
     for (int n = 0; n < kMaxNumFrames; n++)
       video_vad_[n] = 0.5;
   }
 
   ~AgcStat() {
     if (audio_content_fid_ != NULL) {
       fclose(audio_content_fid_);
@@ skipping 59 matching lines @@
 
   void SetActivityThreshold(double activity_threshold) {
     activity_threshold_ = activity_threshold;
   }
 
  private:
   int video_index_;
   double activity_threshold_;
   double video_vad_[kMaxNumFrames];
   rtc::scoped_ptr<Histogram> audio_content_;
-  rtc::scoped_ptr<VadAudioProc> audio_processing_;
+  rtc::scoped_ptr<AgcAudioProc> audio_processing_;
   rtc::scoped_ptr<PitchBasedVad> vad_;
   rtc::scoped_ptr<StandaloneVad> standalone_vad_;
 
   FILE* audio_content_fid_;
 };
 
 
 void void_main(int argc, char* argv[]) {
   webrtc::AgcStat agc_stat;
 
@@ skipping 206 matching lines @@
       " one probability per frame.\n"
       "\nUsage:\n\n"
       "activity_metric input_pcm [options]\n"
       "where 'input_pcm' is the input audio sampled at 16 kHz in 16 bits "
       "format.\n\n";
   google::SetUsageMessage(kUsage);
   google::ParseCommandLineFlags(&argc, &argv, true);
   webrtc::void_main(argc, argv);
   return 0;
 }