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

Updated resampler unit test with stereo.

Browse Source 
I needed to run valgrind on this particular test, to exclude from valgrind warnings in ACM. Test passes valgrind without problems.
Review URL: http://webrtc-codereview.appspot.com/332010

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1278 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tina.legrand@webrtc.org 2011-12-22 08:28:05 +00:00
parent 8edb39db30
commit 5c43b1b861
1 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common_audio/resampler/resampler_unittest.cc
View File

@ -36,7 +36,8 @@ const int kRates[] = {
kMaxRate kMaxRate
}; };
const size_t kRatesSize = sizeof(kRates) / sizeof(*kRates); const size_t kRatesSize = sizeof(kRates) / sizeof(*kRates);
const size_t kDataSize = kMaxRate / 100; const int kMaxChannels = 2;
const size_t kDataSize = static_cast<size_t> (kMaxChannels * kMaxRate / 100);
// TODO(andrew): should we be supporting these combinations? // TODO(andrew): should we be supporting these combinations?
bool ValidRates(int in_rate, int out_rate) { bool ValidRates(int in_rate, int out_rate) {
@ -91,6 +92,8 @@ TEST_F(ResamplerTest, Reset) {
} }
} }
// TODO(tlegrand): Replace code inside the two tests below with a function
// with number of channels and ResamplerType as input.
TEST_F(ResamplerTest, Synchronous) { TEST_F(ResamplerTest, Synchronous) {
for (size_t i = 0; i < kRatesSize; ++i) { for (size_t i = 0; i < kRatesSize; ++i) {
for (size_t j = 0; j < kRatesSize; ++j) { for (size_t j = 0; j < kRatesSize; ++j) {
@ -110,8 +113,31 @@ TEST_F(ResamplerTest, Synchronous) {
} }
} }
} }
}
// TODO(andrew): test stereo. TEST_F(ResamplerTest, SynchronousStereo) {
// Number of channels is 2, stereo mode.
const int kChannels = 2;
for (size_t i = 0; i < kRatesSize; ++i) {
for (size_t j = 0; j < kRatesSize; ++j) {
std::ostringstream ss;
ss << "Input rate: " << kRates[i] << ", output rate: " << kRates[j];
SCOPED_TRACE(ss.str());
if (ValidRates(kRates[i], kRates[j])) {
int in_length = kChannels * kRates[i] / 100;
int out_length = 0;
EXPECT_EQ(0, rs_.Reset(kRates[i], kRates[j],
kResamplerSynchronousStereo));
EXPECT_EQ(0, rs_.Push(data_in_, in_length, data_out_, kDataSize,
out_length));
EXPECT_EQ(kChannels * kRates[j] / 100, out_length);
} else {
EXPECT_EQ(-1, rs_.Reset(kRates[i], kRates[j],
kResamplerSynchronousStereo));
}
}
}
} }
} // namespace } // namespace
} // namespace webrtc } // namespace webrtc