generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove build-time beamformer flags.

Browse Source 
RealFourier is now unconditionally enabled since we can fall back to the
Ooura FFT. We no longer need to condition users on rtc_use_openmax_dl.

R=aluebs@webrtc.org, mgraczyk@google.com

Review URL: https://webrtc-codereview.appspot.com/50439004

Cr-Commit-Position: refs/heads/master@{#8799}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8799 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2015-03-20 00:28:22 +00:00
parent 04c50981f8
commit bd8c865f43
4 changed files with 46 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webrtc/modules/audio_processing/BUILD.gn
View File

@ -76,6 +76,8 @@ source_set("audio_processing") {
"beamformer/covariance_matrix_generator.cc",
"beamformer/covariance_matrix_generator.h",
"beamformer/matrix.h",
"beamformer/nonlinear_beamformer.cc",
"beamformer/nonlinear_beamformer.h",
"common.h",
"echo_cancellation_impl.cc",
"echo_cancellation_impl.h",
@ -165,14 +167,6 @@ source_set("audio_processing") {
]
}
if (rtc_use_openmax_dl) {
defines += [ "WEBRTC_BEAMFORMER" ]
sources += [
"beamformer/nonlinear_beamformer.cc",
"beamformer/nonlinear_beamformer.h",
]
}
if (current_cpu == "x86" || current_cpu == "x64") {
deps += [ ":audio_processing_sse2" ]
}

9
webrtc/modules/audio_processing/audio_processing.gypi
View File

@ -86,6 +86,8 @@
'beamformer/covariance_matrix_generator.cc',
'beamformer/covariance_matrix_generator.h',
'beamformer/matrix.h',
'beamformer/nonlinear_beamformer.cc',
'beamformer/nonlinear_beamformer.h',
'common.h',
'echo_cancellation_impl.cc',
'echo_cancellation_impl.h',
@ -174,13 +176,6 @@
'ns/windows_private.h',
],
}],
['rtc_use_openmax_dl==1', {
'defines': ['WEBRTC_BEAMFORMER'],
'sources': [
'beamformer/nonlinear_beamformer.cc',
'beamformer/nonlinear_beamformer.h',
],
}],
['target_arch=="ia32" or target_arch=="x64"', {
'dependencies': ['audio_processing_sse2',],
}],

6
webrtc/modules/audio_processing/audio_processing_impl.cc
View File

@ -599,12 +599,10 @@ int AudioProcessingImpl::ProcessStreamLocked() {
ca->SplitIntoFrequencyBands();
}
#ifdef WEBRTC_BEAMFORMER
if (beamformer_enabled_) {
beamformer_->ProcessChunk(ca->split_data_f(), ca->split_data_f());
ca->set_num_channels(1);
}
#endif
RETURN_ON_ERR(high_pass_filter_->ProcessCaptureAudio(ca));
RETURN_ON_ERR(gain_control_->AnalyzeCaptureAudio(ca));
@ -986,14 +984,10 @@ int AudioProcessingImpl::InitializeTransient() {
void AudioProcessingImpl::InitializeBeamformer() {
if (beamformer_enabled_) {
#ifdef WEBRTC_BEAMFORMER
if (!beamformer_) {
beamformer_.reset(new NonlinearBeamformer(array_geometry_));
}
beamformer_->Initialize(kChunkSizeMs, split_rate_);
#else
assert(false);
#endif
}
}

86
webrtc/modules/audio_processing/audio_processing_tests.gypi
View File

@ -7,6 +7,48 @@
# be found in the AUTHORS file in the root of the source tree.
{
'targets': [
{
'target_name': 'transient_suppression_test',
'type': 'executable',
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/modules/modules.gyp:audio_processing',
],
'sources': [
'transient/transient_suppression_test.cc',
'transient/file_utils.cc',
'transient/file_utils.h',
],
}, # transient_suppression_test
{
'target_name': 'click_annotate',
'type': 'executable',
'dependencies': [
'<(webrtc_root)/modules/modules.gyp:audio_processing',
],
'sources': [
'transient/click_annotate.cc',
'transient/file_utils.cc',
'transient/file_utils.h',
],
}, # click_annotate
{
'target_name': 'nonlinear_beamformer_test',
'type': 'executable',
'dependencies': [
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/modules/modules.gyp:audio_processing',
],
'sources': [
'beamformer/nonlinear_beamformer_test.cc',
'beamformer/pcm_utils.cc',
'beamformer/pcm_utils.h',
],
}, # nonlinear_beamformer_test
],
'conditions': [
['enable_protobuf==1', {
'targets': [
@ -56,50 +98,6 @@
],
'sources': [ 'test/unpack.cc', ],
},
{
'target_name': 'transient_suppression_test',
'type': 'executable',
'dependencies': [
'<(DEPTH)/testing/gtest.gyp:gtest',
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/test/test.gyp:test_support',
'<(webrtc_root)/modules/modules.gyp:audio_processing',
],
'sources': [
'transient/transient_suppression_test.cc',
'transient/file_utils.cc',
'transient/file_utils.h',
],
}, # transient_suppression_test
{
'target_name': 'click_annotate',
'type': 'executable',
'dependencies': [
'<(webrtc_root)/modules/modules.gyp:audio_processing',
],
'sources': [
'transient/click_annotate.cc',
'transient/file_utils.cc',
'transient/file_utils.h',
],
}, # click_annotate
],
}],
['rtc_use_openmax_dl==1', {
'targets': [
{
'target_name': 'nonlinear_beamformer_test',
'type': 'executable',
'dependencies': [
'<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
'<(webrtc_root)/modules/modules.gyp:audio_processing',
],
'sources': [
'beamformer/nonlinear_beamformer_test.cc',
'beamformer/pcm_utils.cc',
'beamformer/pcm_utils.h',
],
}, # nonlinear_beamformer_test
],
}],
],