commit a7384a1126cda7ce726f73b023bad997627fc138
author aluebs@webrtc.org <aluebs@webrtc.org> Wed Dec 03 01:06:35 2014 +0000
committer aluebs@webrtc.org <aluebs@webrtc.org> Wed Dec 03 01:06:35 2014 +0000
tree 7a1f47489292645c24ea30edc9bd21ae8bf53b4e
parent ceca014b8b234e9552c09682aaed06e6101ae80e

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

webrtc/modules/audio_processing/audio_buffer.h

diff --git a/webrtc/modules/audio_processing/audio_buffer.h b/webrtc/modules/audio_processing/audio_buffer.h
index fe2cf36..59bb1ff 100644
--- a/webrtc/modules/audio_processing/audio_buffer.h
+++ b/webrtc/modules/audio_processing/audio_buffer.h
@@ -27,6 +27,12 @@
 class PushSincResampler;
 class IFChannelBuffer;
 
+enum Band {
+  kBand0To8kHz = 0,
+  kBand8To16kHz = 1,
+  kBand16To24kHz = 2
+};
+
 class AudioBuffer {
  public:
   // TODO(ajm): Switch to take ChannelLayouts.
@@ -46,17 +52,14 @@
   // in memory. Prefer to use the const variants of each accessor when
   // possible, since they incur less float<->int16 conversion overhead.
   int16_t* data(int channel);
-  const int16_t* data(int channel) const;
+  const int16_t* data_const(int channel) const;
   int16_t* const* channels();
-  const int16_t* const* channels() const;
-  int16_t* low_pass_split_data(int channel);
-  const int16_t* low_pass_split_data(int channel) const;
-  int16_t* high_pass_split_data(int channel);
-  const int16_t* high_pass_split_data(int channel) const;
-  int16_t* const* low_pass_split_channels();
-  const int16_t* const* low_pass_split_channels() const;
-  int16_t* const* high_pass_split_channels();
-  const int16_t* const* high_pass_split_channels() const;
+  const int16_t* const* channels_const() const;
+  int16_t* split_data(int channel, Band band);
+  const int16_t* split_data_const(int channel, Band band) const;
+  int16_t* const* split_channels(Band band);
+  const int16_t* const* split_channels_const(Band band) const;
+
   // Returns a pointer to the low-pass data downmixed to mono. If this data
   // isn't already available it re-calculates it.
   const int16_t* mixed_low_pass_data();
@@ -65,22 +68,13 @@
   // Float versions of the accessors, with automatic conversion back and forth
   // as necessary. The range of the numbers are the same as for int16_t.
   float* data_f(int channel);
-  const float* data_f(int channel) const;
-
+  const float* data_const_f(int channel) const;
   float* const* channels_f();
-  const float* const* channels_f() const;
-
-  float* low_pass_split_data_f(int channel);
-  const float* low_pass_split_data_f(int channel) const;
-  float* high_pass_split_data_f(int channel);
-  const float* high_pass_split_data_f(int channel) const;
-
-  float* const* low_pass_split_channels_f();
-  const float* const* low_pass_split_channels_f() const;
-  float* const* high_pass_split_channels_f();
-  const float* const* high_pass_split_channels_f() const;
-  float* const* super_high_pass_split_channels_f();
-  const float* const* super_high_pass_split_channels_f() const;
+  const float* const* channels_const_f() const;
+  float* split_data_f(int channel, Band band);
+  const float* split_data_const_f(int channel, Band band) const;
+  float* const* split_channels_f(Band band);
+  const float* const* split_channels_const_f(Band band) const;
 
   const float* keyboard_data() const;