commit 7036325d02854edf67e02610a94ad60801322566
author kwiberg@webrtc.org <kwiberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jul 17 08:18:33 2014 +0000
committer kwiberg@webrtc.org <kwiberg@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Jul 17 08:18:33 2014 +0000
tree fe2664853b8c6da737f69c39ddcea5ca9d25f7d6
parent bde2bcb7526de9c7b9f4edf7f0f25b257200f648

AudioBuffer: Let ChannelBuffer handle bounds checking of channel parameter

R=aluebs@webrtc.org, minyue@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6714 4adac7df-926f-26a2-2b94-8c16560cd09d

modules/audio_processing/audio_buffer.cc

diff --git a/modules/audio_processing/audio_buffer.cc b/modules/audio_processing/audio_buffer.cc
index 35e1eb7..7f579b0 100644
--- a/modules/audio_processing/audio_buffer.cc
+++ b/modules/audio_processing/audio_buffer.cc
@@ -285,7 +285,6 @@
 }
 
 const int16_t* AudioBuffer::data(int channel) const {
-  assert(channel >= 0 && channel < num_proc_channels_);
   return channels_->ibuf()->channel(channel);
 }
 
@@ -295,7 +294,6 @@
 }
 
 const float* AudioBuffer::data_f(int channel) const {
-  assert(channel >= 0 && channel < num_proc_channels_);
   return channels_->fbuf()->channel(channel);
 }
 
@@ -305,7 +303,6 @@
 }
 
 const int16_t* AudioBuffer::low_pass_split_data(int channel) const {
-  assert(channel >= 0 && channel < num_proc_channels_);
   return split_channels_.get() ? split_channels_->low_channel(channel)
                                : data(channel);
 }
@@ -316,7 +313,6 @@
 }
 
 const float* AudioBuffer::low_pass_split_data_f(int channel) const {
-  assert(channel >= 0 && channel < num_proc_channels_);
   return split_channels_.get() ? split_channels_->low_channel_f(channel)
                                : data_f(channel);
 }
@@ -327,7 +323,6 @@
 }
 
 const int16_t* AudioBuffer::high_pass_split_data(int channel) const {
-  assert(channel >= 0 && channel < num_proc_channels_);
   return split_channels_.get() ? split_channels_->high_channel(channel) : NULL;
 }
 
@@ -337,7 +332,6 @@
 }
 
 const float* AudioBuffer::high_pass_split_data_f(int channel) const {
-  assert(channel >= 0 && channel < num_proc_channels_);
   return split_channels_.get() ? split_channels_->high_channel_f(channel)
                                : NULL;
 }
@@ -348,19 +342,14 @@
 }
 
 const int16_t* AudioBuffer::mixed_data(int channel) const {
-  assert(channel >= 0 && channel < num_mixed_channels_);
-
   return mixed_channels_->channel(channel);
 }
 
 const int16_t* AudioBuffer::mixed_low_pass_data(int channel) const {
-  assert(channel >= 0 && channel < num_mixed_low_pass_channels_);
-
   return mixed_low_pass_channels_->channel(channel);
 }
 
 const int16_t* AudioBuffer::low_pass_reference(int channel) const {
-  assert(channel >= 0 && channel < num_proc_channels_);
   if (!reference_copied_) {
     return NULL;
   }

modules/audio_processing/common.h

diff --git a/modules/audio_processing/common.h b/modules/audio_processing/common.h
index 42454df..10249cc 100644
--- a/modules/audio_processing/common.h
+++ b/modules/audio_processing/common.h
@@ -55,7 +55,7 @@
 
   T* data() { return data_.get(); }
   T* channel(int i) {
-    assert(i < num_channels_);
+    assert(i >= 0 && i < num_channels_);
     return channels_[i];
   }
   T** channels() { return channels_.get(); }