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

Reenables several NetEq unittests on android.

Browse Source 
Several unittests were disabled on android, this CL will reenable them. One of
the tests was accidentally disabled on all platforms, and now no longer gives a
bitexact result.

BUG=webrtc:3343,webrtc:5349

Review URL: https://codereview.webrtc.org/1532903002

Cr-Commit-Position: refs/heads/master@{#11323}
This commit is contained in:
ivoc
2016-01-20 07:26:24 -08:00
committed by Commit bot
parent 32f81542c2
commit 72c08edced
7 changed files with 58 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
webrtc/modules/audio_coding/neteq/neteq_stereo_unittest.cc
View File

@ -161,7 +161,7 @@ class NetEqStereoTest : public ::testing::TestWithParam<TestParameters> {
return next_send_time;
}
void VerifyOutput(size_t num_samples) {
virtual void VerifyOutput(size_t num_samples) {
for (size_t i = 0; i < num_samples; ++i) {
for (size_t j = 0; j < num_channels_; ++j) {
ASSERT_EQ(output_[i], output_multi_channel_[i * num_channels_ + j]) <<
@ -275,12 +275,7 @@ class NetEqStereoTestNoJitter : public NetEqStereoTest {
}
};
#if defined(WEBRTC_ANDROID)
#define MAYBE_RunTest DISABLED_RunTest
#else
#define MAYBE_RunTest RunTest
#endif
TEST_P(NetEqStereoTestNoJitter, MAYBE_RunTest) {
TEST_P(NetEqStereoTestNoJitter, RunTest) {
RunTest(8);
}
@ -305,7 +300,7 @@ class NetEqStereoTestPositiveDrift : public NetEqStereoTest {
double drift_factor;
};
TEST_P(NetEqStereoTestPositiveDrift, MAYBE_RunTest) {
TEST_P(NetEqStereoTestPositiveDrift, RunTest) {
RunTest(100);
}
@ -318,7 +313,7 @@ class NetEqStereoTestNegativeDrift : public NetEqStereoTestPositiveDrift {
}
};
TEST_P(NetEqStereoTestNegativeDrift, MAYBE_RunTest) {
TEST_P(NetEqStereoTestNegativeDrift, RunTest) {
RunTest(100);
}
@ -346,7 +341,7 @@ class NetEqStereoTestDelays : public NetEqStereoTest {
int frame_index_;
};
TEST_P(NetEqStereoTestDelays, MAYBE_RunTest) {
TEST_P(NetEqStereoTestDelays, RunTest) {
RunTest(1000);
}
@ -362,13 +357,25 @@ class NetEqStereoTestLosses : public NetEqStereoTest {
return (++frame_index_) % kLossInterval == 0;
}
// TODO(hlundin): NetEq is not giving bitexact results for these cases.
virtual void VerifyOutput(size_t num_samples) {
for (size_t i = 0; i < num_samples; ++i) {
auto first_channel_sample = output_multi_channel_[i * num_channels_];
for (size_t j = 0; j < num_channels_; ++j) {
const int kErrorMargin = 200;
EXPECT_NEAR(output_[i], output_multi_channel_[i * num_channels_ + j],
kErrorMargin)
<< "Diff in sample " << i << ", channel " << j << ".";
EXPECT_EQ(first_channel_sample,
output_multi_channel_[i * num_channels_ + j]);
}
}
}
int frame_index_;
};
// TODO(pbos): Enable on non-Android, this went failing while being accidentally
// disabled on all platforms and not just Android.
// https://bugs.chromium.org/p/webrtc/issues/detail?id=5387
TEST_P(NetEqStereoTestLosses, DISABLED_RunTest) {
TEST_P(NetEqStereoTestLosses, RunTest) {
RunTest(100);
}