d35a5c3506
Now the ChannelBuffer has 2 separate arrays, one for the full-band data and one for the splitted one. The corresponding accessors are added to the ChannelBuffer. This is done to avoid having to refresh the bands pointers in AudioBuffer. It will also allow us to have a general accessor like data()[band][channel][sample]. All the files using the ChannelBuffer needed to be re-factored. Tested with modules_unittests, common_audio_unittests, audioproc, audioproc_f, voe_cmd_test. R=andrew@webrtc.org, kwiberg@webrtc.org Review URL: https://webrtc-codereview.appspot.com/36999004 Cr-Commit-Position: refs/heads/master@{#8318} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8318 4adac7df-926f-26a2-2b94-8c16560cd09d
74 lines
1.9 KiB
C++
74 lines
1.9 KiB
C++
/*
|
|
* Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#include "webrtc/common_audio/channel_buffer.h"
|
|
|
|
namespace webrtc {
|
|
|
|
IFChannelBuffer::IFChannelBuffer(int num_frames,
|
|
int num_channels,
|
|
int num_bands)
|
|
: ivalid_(true),
|
|
ibuf_(num_frames, num_channels, num_bands),
|
|
fvalid_(true),
|
|
fbuf_(num_frames, num_channels, num_bands) {}
|
|
|
|
ChannelBuffer<int16_t>* IFChannelBuffer::ibuf() {
|
|
RefreshI();
|
|
fvalid_ = false;
|
|
return &ibuf_;
|
|
}
|
|
|
|
ChannelBuffer<float>* IFChannelBuffer::fbuf() {
|
|
RefreshF();
|
|
ivalid_ = false;
|
|
return &fbuf_;
|
|
}
|
|
|
|
const ChannelBuffer<int16_t>* IFChannelBuffer::ibuf_const() const {
|
|
RefreshI();
|
|
return &ibuf_;
|
|
}
|
|
|
|
const ChannelBuffer<float>* IFChannelBuffer::fbuf_const() const {
|
|
RefreshF();
|
|
return &fbuf_;
|
|
}
|
|
|
|
void IFChannelBuffer::RefreshF() const {
|
|
if (!fvalid_) {
|
|
assert(ivalid_);
|
|
const int16_t* const* int_channels = ibuf_.channels();
|
|
float* const* float_channels = fbuf_.channels();
|
|
for (int i = 0; i < ibuf_.num_channels(); ++i) {
|
|
for (int j = 0; j < ibuf_.num_frames(); ++j) {
|
|
float_channels[i][j] = int_channels[i][j];
|
|
}
|
|
}
|
|
fvalid_ = true;
|
|
}
|
|
}
|
|
|
|
void IFChannelBuffer::RefreshI() const {
|
|
if (!ivalid_) {
|
|
assert(fvalid_);
|
|
int16_t* const* int_channels = ibuf_.channels();
|
|
const float* const* float_channels = fbuf_.channels();
|
|
for (int i = 0; i < ibuf_.num_channels(); ++i) {
|
|
FloatS16ToS16(float_channels[i],
|
|
ibuf_.num_frames(),
|
|
int_channels[i]);
|
|
}
|
|
ivalid_ = true;
|
|
}
|
|
}
|
|
|
|
} // namespace webrtc
|