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

Use array geometry in Beamformer

Browse Source 
R=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@8000 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
aluebs@webrtc.org
2015-01-05 21:58:58 +00:00
parent a37bf2c4fe
commit fb7a039e9d
6 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,7 +185,8 @@ AudioProcessingImpl::AudioProcessingImpl(const Config& config)
use_new_agc_(config.Get<ExperimentalAgc>().enabled),
#endif
transient_suppressor_enabled_(config.Get<ExperimentalNs>().enabled),
beamformer_enabled_(config.Get<Beamforming>().enabled) {
beamformer_enabled_(config.Get<Beamforming>().enabled),
array_geometry_(config.Get<Beamforming>().array_geometry) {
echo_cancellation_ = new EchoCancellationImpl(this, crit_);
component_list_.push_back(echo_cancellation_);
@ -400,7 +401,8 @@ int AudioProcessingImpl::MaybeInitializeLocked(int input_sample_rate_hz,
return kNoError;
}
if (beamformer_enabled_ &&
(num_input_channels < 2 || num_output_channels > 1)) {
(static_cast<size_t>(num_input_channels) != array_geometry_.size() ||
num_output_channels > 1)) {
return kBadNumberChannelsError;
}
return InitializeLocked(input_sample_rate_hz,
@ -995,11 +997,9 @@ int AudioProcessingImpl::InitializeTransient() {
void AudioProcessingImpl::InitializeBeamformer() {
if (beamformer_enabled_) {
#ifdef WEBRTC_BEAMFORMER
// TODO(aluebs): Don't use a hard-coded microphone spacing.
beamformer_.reset(new Beamformer(kChunkSizeMs,
split_rate_,
fwd_in_format_.num_channels(),
0.05f));
array_geometry_));
#else
assert(false);
#endif