diff options
| author | aluebs <aluebs@webrtc.org> | 2015-06-24 18:45:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-25 01:46:03 +0000 |
| commit | 518c683f3e413523a458a94b533274bd7f29992d (patch) | |
| tree | 63d53981b3181659cc9344491af65722514214b8 /webrtc/tools | |
| parent | ac4234ccfc964208163d6152977cc1d015448bbb (diff) | |
| download | webrtc-518c683f3e413523a458a94b533274bd7f29992d.tar.gz | |
Pull the Voice Activity Detector out from the AGC
This change generates bit-exact values when running through audioproc_f than before.
This change was originally uploaded here:
* https://codereview.webrtc.org/1181933002/
* https://codereview.webrtc.org/1177043017/
And reverted because of an ASAN problem in Chrome here:
* https://codereview.webrtc.org/1192863006/
* https://codereview.webrtc.org/1194963003/
TBR=andrew@webrtc.org
Review URL: https://codereview.webrtc.org/1211563003
Cr-Commit-Position: refs/heads/master@{#9502}
Diffstat (limited to 'webrtc/tools')
| -rw-r--r-- | webrtc/tools/agc/activity_metric.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/webrtc/tools/agc/activity_metric.cc b/webrtc/tools/agc/activity_metric.cc index 57e2ad615f..fb50daf2ba 100644 --- a/webrtc/tools/agc/activity_metric.cc +++ b/webrtc/tools/agc/activity_metric.cc @@ -18,12 +18,12 @@ #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; @@ -75,7 +75,7 @@ class AgcStat { : video_index_(0), activity_threshold_(kDefaultActivityThreshold), audio_content_(Histogram::Create(kAgcAnalWindowSamples)), - audio_processing_(new AgcAudioProc()), + audio_processing_(new VadAudioProc()), vad_(new PitchBasedVad()), standalone_vad_(StandaloneVad::Create()), audio_content_fid_(NULL) { @@ -155,7 +155,7 @@ class AgcStat { double activity_threshold_; double video_vad_[kMaxNumFrames]; rtc::scoped_ptr<Histogram> audio_content_; - rtc::scoped_ptr<AgcAudioProc> audio_processing_; + rtc::scoped_ptr<VadAudioProc> audio_processing_; rtc::scoped_ptr<PitchBasedVad> vad_; rtc::scoped_ptr<StandaloneVad> standalone_vad_; |