diff options
author | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-04 17:54:09 +0000 |
---|---|---|
committer | andrew@webrtc.org <andrew@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-10-04 17:54:09 +0000 |
commit | e06943f2aeb970e7c11070c327ab3b3264e2722f (patch) | |
tree | 7aa11eefe700be92f67190b87888617a4f0e5688 /voice_engine/voe_base_impl.cc | |
parent | 3124b2ee18a305dd2117137bdbca05de95302ab9 (diff) | |
download | webrtc-e06943f2aeb970e7c11070c327ab3b3264e2722f.tar.gz |
Clean up AudioProcessing defaults and errors.
- Remove unneeded #defines and switch the remainder to consts.
- All AudioProcessing components are disabled by default, so remove
explicit disables.
- AudioProcessing uses a rational 16 kHz mono default, so no need to
explictly initialize.
- Add assert(false) to real-time errors which should not occur.
TESTED=trybots
R=bjornv@webrtc.org, xians@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/2253005
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@4924 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'voice_engine/voe_base_impl.cc')
-rw-r--r-- | voice_engine/voe_base_impl.cc | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/voice_engine/voe_base_impl.cc b/voice_engine/voe_base_impl.cc index 3b7a193c..ab78f774 100644 --- a/voice_engine/voe_base_impl.cc +++ b/voice_engine/voe_base_impl.cc @@ -468,22 +468,8 @@ int VoEBaseImpl::Init(AudioDeviceModule* external_adm, LOG_FERR1(LS_ERROR, set_device_sample_rate_hz, 48000); return -1; } - // Assume 16 kHz mono until the audio frames are received from the capture - // device, at which point this can be updated. - if (audioproc->set_sample_rate_hz(16000)) { - LOG_FERR1(LS_ERROR, set_sample_rate_hz, 16000); - return -1; - } - if (audioproc->set_num_channels(1, 1) != 0) { - LOG_FERR2(LS_ERROR, set_num_channels, 1, 1); - return -1; - } - if (audioproc->set_num_reverse_channels(1) != 0) { - LOG_FERR1(LS_ERROR, set_num_reverse_channels, 1); - return -1; - } - // Configure AudioProcessing components. All are disabled by default. + // Configure AudioProcessing components. if (audioproc->high_pass_filter()->Enable(true) != 0) { LOG_FERR1(LS_ERROR, high_pass_filter()->Enable, true); return -1; |