Support 48kHz in Noise Suppression
Doing the same for the 16-24kHz band than was done in the 8-16kHz.
Results look and sound as nice.
BUG=webrtc:3146
R=andrew@webrtc.org, bjornv@webrtc.org, kwiberg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/29139004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7865 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_processing/noise_suppression_impl.cc b/webrtc/modules/audio_processing/noise_suppression_impl.cc
index 4e056dd..05ef910 100644
--- a/webrtc/modules/audio_processing/noise_suppression_impl.cc
+++ b/webrtc/modules/audio_processing/noise_suppression_impl.cc
@@ -66,19 +66,13 @@
for (int i = 0; i < num_handles(); ++i) {
Handle* my_handle = static_cast<Handle*>(handle(i));
- int err = WebRtcNs_Analyze(my_handle,
- audio->split_data_f(i, kBand0To8kHz));
- if (err != apm_->kNoError) {
- return GetHandleError(my_handle);
- }
+ WebRtcNs_Analyze(my_handle, audio->split_bands_const_f(i)[kBand0To8kHz]);
}
#endif
return apm_->kNoError;
}
int NoiseSuppressionImpl::ProcessCaptureAudio(AudioBuffer* audio) {
- int err = apm_->kNoError;
-
if (!is_component_enabled()) {
return apm_->kNoError;
}
@@ -88,24 +82,17 @@
for (int i = 0; i < num_handles(); ++i) {
Handle* my_handle = static_cast<Handle*>(handle(i));
#if defined(WEBRTC_NS_FLOAT)
- err = WebRtcNs_Process(my_handle,
- audio->split_data_f(i, kBand0To8kHz),
- audio->split_data_f(i, kBand8To16kHz),
- audio->split_data_f(i, kBand0To8kHz),
- audio->split_data_f(i, kBand8To16kHz));
+ WebRtcNs_Process(my_handle,
+ audio->split_bands_const_f(i),
+ audio->num_bands(),
+ audio->split_bands_f(i));
#elif defined(WEBRTC_NS_FIXED)
- err = WebRtcNsx_Process(my_handle,
- audio->split_data(i, kBand0To8kHz),
- audio->split_data(i, kBand8To16kHz),
- audio->split_data(i, kBand0To8kHz),
- audio->split_data(i, kBand8To16kHz));
+ WebRtcNsx_Process(my_handle,
+ audio->split_bands_const(i),
+ audio->num_bands(),
+ audio->split_bands(i));
#endif
-
- if (err != apm_->kNoError) {
- return GetHandleError(my_handle);
- }
}
-
return apm_->kNoError;
}