Simplify audio_buffer APIs
Now there is only one API to get the data or the channels (one const and one no const) merged or by band.
The band is passed in as a parameter, instead of calling different methods.
BUG=webrtc:3146
R=andrew@webrtc.org, bjornv@webrtc.org, kwiberg@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/27249004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7790 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_processing/gain_control_impl.cc b/webrtc/modules/audio_processing/gain_control_impl.cc
index cf7df16..7ef0ae0 100644
--- a/webrtc/modules/audio_processing/gain_control_impl.cc
+++ b/webrtc/modules/audio_processing/gain_control_impl.cc
@@ -90,8 +90,8 @@
Handle* my_handle = static_cast<Handle*>(handle(i));
err = WebRtcAgc_AddMic(
my_handle,
- audio->low_pass_split_data(i),
- audio->high_pass_split_data(i),
+ audio->split_data(i, kBand0To8kHz),
+ audio->split_data(i, kBand8To16kHz),
static_cast<int16_t>(audio->samples_per_split_channel()));
if (err != apm_->kNoError) {
@@ -106,8 +106,8 @@
err = WebRtcAgc_VirtualMic(
my_handle,
- audio->low_pass_split_data(i),
- audio->high_pass_split_data(i),
+ audio->split_data(i, kBand0To8kHz),
+ audio->split_data(i, kBand8To16kHz),
static_cast<int16_t>(audio->samples_per_split_channel()),
analog_capture_level_,
&capture_level_out);
@@ -144,11 +144,11 @@
int err = WebRtcAgc_Process(
my_handle,
- audio->low_pass_split_data(i),
- audio->high_pass_split_data(i),
+ audio->split_data_const(i, kBand0To8kHz),
+ audio->split_data_const(i, kBand8To16kHz),
static_cast<int16_t>(audio->samples_per_split_channel()),
- audio->low_pass_split_data(i),
- audio->high_pass_split_data(i),
+ audio->split_data(i, kBand0To8kHz),
+ audio->split_data(i, kBand8To16kHz),
capture_levels_[i],
&capture_level_out,
apm_->echo_cancellation()->stream_has_echo(),