From 6f62836ccfd3d443e24dd7a434a44f8b20337b23 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Thu, 3 Jan 2013 14:33:00 +0000 Subject: [PATCH] Reverting two mixing test patches: seems to introduce a persistent problem for win voe_auto_test (wrapping problem?) 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 --- .../test/auto_test/standard/mixing_test.cc | 29 ++++++++----------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc b/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc index 1d36b82d7c..6a90c07e68 100644 --- a/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc +++ b/webrtc/voice_engine/test/auto_test/standard/mixing_test.cc @@ -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(1.15 * kExpectedOutput), - static_cast(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(1.15 * kExpectedOutput), - static_cast(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(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(1.15 * kExpectedOutput), - static_cast(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(1.15 * kExpectedOutput), - static_cast(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(1.15 * kExpectedOutput), - static_cast(0.85 * kExpectedOutput)); + RunMixingTest(2, 0, 1, kInputValue, 1.1 * kExpectedOutput, + 0.9 * kExpectedOutput); } } // namespace webrtc