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

Reverting two mixing test patches: seems to introduce a persistent problem for win voe_auto_test (wrapping problem?)

Browse Source 
Revert "Further relax thresholds in mixing test."

This reverts commit 53c7e973a02d65e0b4981129e7ccfc145d955eda.

Revert "Fix implicit conversion error in mixing test."

This reverts commit 68d7e2258082d7d2b9461061e03e2f2d6ae78c4f.

TBR=andrew@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3331 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org
2013-01-03 14:33:00 +00:00
parent 5c8d9d30e2
commit 6f62836ccf
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
webrtc/voice_engine/test/auto_test/standard/mixing_test.cc
View File

@ -189,14 +189,13 @@ class MixingTest : public AfterInitializationFixture {
};
// These tests assume a maximum of three mixed participants. We typically allow
// a +/- 15% range around the expected output level to account for distortion
// a +/- 10% range around the expected output level to account for distortion
// from coding and processing in the loopback chain.
TEST_F(MixingTest, FourChannelsWithOnlyThreeMixed) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 3;
RunMixingTest(4, 0, 4, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
RunMixingTest(4, 0, 4, kInputValue, 1.1 * kExpectedOutput,
0.9 * kExpectedOutput);
}
// Ensure the mixing saturation protection is working. We can do this because
@ -208,9 +207,8 @@ TEST_F(MixingTest, VerifySaturationProtection) {
// If this isn't satisfied, we're not testing anything.
ASSERT_GT(kInputValue * 3, kInt16Max);
ASSERT_LT(1.1 * kExpectedOutput, kInt16Max);
RunMixingTest(3, 0, 3, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
RunMixingTest(3, 0, 3, kInputValue, 1.1 * kExpectedOutput,
0.9 * kExpectedOutput);
}
TEST_F(MixingTest, SaturationProtectionHasNoEffectOnOneChannel) {
@ -220,31 +218,28 @@ TEST_F(MixingTest, SaturationProtectionHasNoEffectOnOneChannel) {
ASSERT_GT(0.95 * kExpectedOutput, kLimiterHeadroom);
// Tighter constraints are required here to properly test this.
RunMixingTest(1, 0, 1, kInputValue, kExpectedOutput,
static_cast<int16_t>(0.95 * kExpectedOutput));
0.95 * kExpectedOutput);
}
TEST_F(MixingTest, VerifyAnonymousAndNormalParticipantMixing) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 2;
RunMixingTest(1, 1, 1, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
RunMixingTest(1, 1, 1, kInputValue, 1.1 * kExpectedOutput,
0.9 * kExpectedOutput);
}
TEST_F(MixingTest, AnonymousParticipantsAreAlwaysMixed) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 4;
RunMixingTest(3, 1, 3, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
RunMixingTest(3, 1, 3, kInputValue, 1.1 * kExpectedOutput,
0.9 * kExpectedOutput);
}
TEST_F(MixingTest, VerifyStereoAndMonoMixing) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 2;
RunMixingTest(2, 0, 1, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
RunMixingTest(2, 0, 1, kInputValue, 1.1 * kExpectedOutput,
0.9 * kExpectedOutput);
}
} // namespace webrtc