generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

AudioBuffer: Let ChannelBuffer handle bounds checking of channel parameter

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

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6714 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kwiberg@webrtc.org 2014-07-17 08:18:33 +00:00
parent 2ade42bd96
commit af93fc08a1
2 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
webrtc/modules/audio_processing/audio_buffer.cc
View File

@ -285,7 +285,6 @@ void AudioBuffer::InitForNewData() {
} }
const int16_t* AudioBuffer::data(int channel) const { const int16_t* AudioBuffer::data(int channel) const {
assert(channel >= 0 && channel < num_proc_channels_);
return channels_->ibuf()->channel(channel); return channels_->ibuf()->channel(channel);
} }
@ -295,7 +294,6 @@ int16_t* AudioBuffer::data(int channel) {
} }
const float* AudioBuffer::data_f(int channel) const { const float* AudioBuffer::data_f(int channel) const {
assert(channel >= 0 && channel < num_proc_channels_);
return channels_->fbuf()->channel(channel); return channels_->fbuf()->channel(channel);
} }
@ -305,7 +303,6 @@ float* AudioBuffer::data_f(int channel) {
} }
const int16_t* AudioBuffer::low_pass_split_data(int channel) const { 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) return split_channels_.get() ? split_channels_->low_channel(channel)
: data(channel); : data(channel);
} }
@ -316,7 +313,6 @@ int16_t* AudioBuffer::low_pass_split_data(int channel) {
} }
const float* AudioBuffer::low_pass_split_data_f(int channel) const { 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) return split_channels_.get() ? split_channels_->low_channel_f(channel)
: data_f(channel); : data_f(channel);
} }
@ -327,7 +323,6 @@ float* AudioBuffer::low_pass_split_data_f(int channel) {
} }
const int16_t* AudioBuffer::high_pass_split_data(int channel) const { 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; return split_channels_.get() ? split_channels_->high_channel(channel) : NULL;
} }
@ -337,7 +332,6 @@ int16_t* AudioBuffer::high_pass_split_data(int channel) {
} }
const float* AudioBuffer::high_pass_split_data_f(int channel) const { 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) return split_channels_.get() ? split_channels_->high_channel_f(channel)
: NULL; : NULL;
} }
@ -348,19 +342,14 @@ float* AudioBuffer::high_pass_split_data_f(int channel) {
} }
const int16_t* AudioBuffer::mixed_data(int channel) const { const int16_t* AudioBuffer::mixed_data(int channel) const {
assert(channel >= 0 && channel < num_mixed_channels_);
return mixed_channels_->channel(channel); return mixed_channels_->channel(channel);
} }
const int16_t* AudioBuffer::mixed_low_pass_data(int channel) const { 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); return mixed_low_pass_channels_->channel(channel);
} }
const int16_t* AudioBuffer::low_pass_reference(int channel) const { const int16_t* AudioBuffer::low_pass_reference(int channel) const {
assert(channel >= 0 && channel < num_proc_channels_);
if (!reference_copied_) { if (!reference_copied_) {
return NULL; return NULL;
} }

2
webrtc/modules/audio_processing/common.h
View File

@ -55,7 +55,7 @@ class ChannelBuffer {
T* data() { return data_.get(); } T* data() { return data_.get(); }
T* channel(int i) { T* channel(int i) {
assert(i < num_channels_); assert(i >= 0 && i < num_channels_);
return channels_[i]; return channels_[i];
} }
T** channels() { return channels_.get(); } T** channels() { return channels_.get(); }