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

Fix implicit conversion error in mixing test.

Browse Source 
TBR=mikhal

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3328 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
andrew@webrtc.org 2013-01-02 19:59:53 +00:00
parent b2b628d5cd
commit 201d4b61d1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -194,8 +194,9 @@ class MixingTest : public AfterInitializationFixture {
TEST_F(MixingTest, FourChannelsWithOnlyThreeMixed) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 3;
RunMixingTest(4, 0, 4, kInputValue, 1.15 * kExpectedOutput,
0.85 * kExpectedOutput);
RunMixingTest(4, 0, 4, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
}
// Ensure the mixing saturation protection is working. We can do this because
@ -207,8 +208,9 @@ 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, 1.15 * kExpectedOutput,
0.85 * kExpectedOutput);
RunMixingTest(3, 0, 3, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
}
TEST_F(MixingTest, SaturationProtectionHasNoEffectOnOneChannel) {
@ -218,28 +220,31 @@ 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,
0.95 * kExpectedOutput);
static_cast<int16_t>(0.95 * kExpectedOutput));
}
TEST_F(MixingTest, VerifyAnonymousAndNormalParticipantMixing) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 2;
RunMixingTest(1, 1, 1, kInputValue, 1.15 * kExpectedOutput,
0.85 * kExpectedOutput);
RunMixingTest(1, 1, 1, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
}
TEST_F(MixingTest, AnonymousParticipantsAreAlwaysMixed) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 4;
RunMixingTest(3, 1, 3, kInputValue, 1.15 * kExpectedOutput,
0.85 * kExpectedOutput);
RunMixingTest(3, 1, 3, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
}
TEST_F(MixingTest, VerifyStereoAndMonoMixing) {
const int16_t kInputValue = 1000;
const int16_t kExpectedOutput = kInputValue * 2;
RunMixingTest(2, 0, 1, kInputValue, 1.15 * kExpectedOutput,
0.85 * kExpectedOutput);
RunMixingTest(2, 0, 1, kInputValue,
static_cast<int16_t>(1.15 * kExpectedOutput),
static_cast<int16_t>(0.85 * kExpectedOutput));
}
} // namespace webrtc