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

Make ChannelBuffer aware of frequency bands

Browse Source 
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
This commit is contained in:
aluebs@webrtc.org
2015-02-10 22:52:15 +00:00
parent d7472b52d6
commit d35a5c3506
23 changed files with 430 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/common_audio/audio_ring_buffer_unittest.cc
View File

@ -25,7 +25,7 @@ void ReadAndWriteTest(const ChannelBuffer<float>& input,
size_t buffer_frames,
ChannelBuffer<float>* output) {
const size_t num_channels = input.num_channels();
const size_t total_frames = input.samples_per_channel();
const size_t total_frames = input.num_frames();
AudioRingBuffer buf(num_channels, buffer_frames);
scoped_ptr<float*[]> slice(new float*[num_channels]);
@ -91,17 +91,18 @@ TEST_F(AudioRingBufferTest, MoveReadPosition) {
const size_t kNumChannels = 1;
const float kInputArray[] = {1, 2, 3, 4};
const size_t kNumFrames = sizeof(kInputArray) / sizeof(*kInputArray);
ChannelBuffer<float> input(kInputArray, kNumFrames, kNumChannels);
ChannelBuffer<float> input(kNumFrames, kNumChannels);
input.SetDataForTesting(kInputArray, kNumFrames);
AudioRingBuffer buf(kNumChannels, kNumFrames);
buf.Write(input.channels(), kNumChannels, kNumFrames);
buf.MoveReadPosition(3);
ChannelBuffer<float> output(1, kNumChannels);
buf.Read(output.channels(), kNumChannels, 1);
EXPECT_EQ(4, output.data()[0]);
EXPECT_EQ(4, output.channels()[0][0]);
buf.MoveReadPosition(-3);
buf.Read(output.channels(), kNumChannels, 1);
EXPECT_EQ(2, output.data()[0]);
EXPECT_EQ(2, output.channels()[0][0]);
}
} // namespace webrtc