zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 518c683f3e413523a458a94b533274bd7f29992d.

Breaks Linux-Asan bot
https://uberchromegw.corp.google.com/i/client.webrtc/builders/Linux%20Asan/builds/4348/steps/libjingle_peerconnection_unittest/logs/stdio

BUG=
TBR=aluebs@webrtc.org

Review URL: https://codereview.webrtc.org/1208793002.

Cr-Commit-Position: refs/heads/master@{#9503}
This commit is contained in:
Bjorn Volcker
2015-06-25 08:46:02 +02:00
parent 518c683f3e
commit 51c7cbb86a
38 changed files with 565 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
webrtc/tools/agc/activity_metric.cc
View File

@ -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 VadAudioProc()),
audio_processing_(new AgcAudioProc()),
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<VadAudioProc> audio_processing_;
rtc::scoped_ptr<AgcAudioProc> audio_processing_;
rtc::scoped_ptr<PitchBasedVad> vad_;
rtc::scoped_ptr<StandaloneVad> standalone_vad_;