zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix constness of AudioBuffer accessors.

Browse Source 
Don't return non-const pointers from const accessors and deal with the
spillover. Provide overloaded versions as needed.

Inspired by kwiberg:
https://webrtc-codereview.appspot.com/12379005/

R=bjornv@webrtc.org, kwiberg@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6030 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org
2014-04-30 16:44:13 +00:00
parent 740e6b339a
commit 65f933899b
12 changed files with 64 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -228,7 +228,7 @@ void AudioBuffer::InitForNewData() {
is_muted_ = false;
}
int16_t* AudioBuffer::data(int channel) const {
const int16_t* AudioBuffer::data(int channel) const {
assert(channel >= 0 && channel < num_proc_channels_);
if (data_ != NULL) {
return data_;
@ -237,7 +237,12 @@ int16_t* AudioBuffer::data(int channel) const {
return channels_->channel(channel);
}
int16_t* AudioBuffer::low_pass_split_data(int channel) const {
int16_t* AudioBuffer::data(int channel) {
const AudioBuffer* t = this;
return const_cast<int16_t*>(t->data(channel));
}
const int16_t* AudioBuffer::low_pass_split_data(int channel) const {
assert(channel >= 0 && channel < num_proc_channels_);
if (split_channels_.get() == NULL) {
return data(channel);
@ -246,7 +251,12 @@ int16_t* AudioBuffer::low_pass_split_data(int channel) const {
return split_channels_->low_channel(channel);
}
int16_t* AudioBuffer::high_pass_split_data(int channel) const {
int16_t* AudioBuffer::low_pass_split_data(int channel) {
const AudioBuffer* t = this;
return const_cast<int16_t*>(t->low_pass_split_data(channel));
}
const int16_t* AudioBuffer::high_pass_split_data(int channel) const {
assert(channel >= 0 && channel < num_proc_channels_);
if (split_channels_.get() == NULL) {
return NULL;
@ -255,19 +265,24 @@ int16_t* AudioBuffer::high_pass_split_data(int channel) const {
return split_channels_->high_channel(channel);
}
int16_t* AudioBuffer::mixed_data(int channel) const {
int16_t* AudioBuffer::high_pass_split_data(int channel) {
const AudioBuffer* t = this;
return const_cast<int16_t*>(t->high_pass_split_data(channel));
}
const int16_t* AudioBuffer::mixed_data(int channel) const {
assert(channel >= 0 && channel < num_mixed_channels_);
return mixed_channels_->channel(channel);
}
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);
}
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_) {
return NULL;
@ -280,7 +295,7 @@ const float* AudioBuffer::keyboard_data() const {
return keyboard_data_;
}
SplitFilterStates* AudioBuffer::filter_states(int channel) const {
SplitFilterStates* AudioBuffer::filter_states(int channel) {
assert(channel >= 0 && channel < num_proc_channels_);
return &filter_states_[channel];
}