Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(776)

Unified Diff: media/audio/audio_util_unittest.cc

Issue 12082111: Delete AudioOutputMixer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix .gyp Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_util.cc ('k') | media/media.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_util_unittest.cc
diff --git a/media/audio/audio_util_unittest.cc b/media/audio/audio_util_unittest.cc
index 2643b999acf4dfd517878ffb16a6757aaf3015da..679243cfca70a00b8f7bf97e1c4dfad280ad6b41 100644
--- a/media/audio/audio_util_unittest.cc
+++ b/media/audio/audio_util_unittest.cc
@@ -79,86 +79,4 @@ TEST(AudioUtilTest, AdjustVolume_s32) {
EXPECT_EQ(0, expected_test);
}
-TEST(AudioUtilTest, MixStreams_u8_QuarterVolume) {
- // Test MixStreams() on 8 bit samples.
- uint8 dst_u8[kNumberOfSamples] = { 14, 0x44, 0x80, 0xff };
- uint8 src_u8[kNumberOfSamples] = { 4, 0x40, 0x80, 0xff };
- uint8 expected_u8[kNumberOfSamples] = { 0, /* saturation */
- (0x44 - 128) + (0x40 - 128) / 4 + 128,
- (0x80 - 128) + (0x80 - 128) / 4 + 128,
- 0xff /* saturation */ };
- media::MixStreams(dst_u8, src_u8, sizeof(dst_u8), sizeof(src_u8[0]), 0.25f);
- int expected_test = memcmp(dst_u8, expected_u8, sizeof(expected_u8));
- EXPECT_EQ(0, expected_test);
-}
-
-TEST(AudioUtilTest, MixStreams_u8_FullVolume) {
- // Test MixStreams() on 8 bit samples.
- uint8 dst_u8[kNumberOfSamples] = { 44, 0x44, 0x80, 0xff };
- uint8 src_u8[kNumberOfSamples] = { 4, 0x40, 0x80, 0xff };
- uint8 expected_u8[kNumberOfSamples] = { 0, /* saturation */
- (0x44 - 128) + (0x40 - 128) + 128,
- (0x80 - 128) + (0x80 - 128) + 128,
- 0xff /* saturation */ };
- media::MixStreams(dst_u8, src_u8, sizeof(dst_u8), sizeof(src_u8[0]), 1.0f);
- int expected_test = memcmp(dst_u8, expected_u8, sizeof(expected_u8));
- EXPECT_EQ(0, expected_test);
-}
-
-TEST(AudioUtilTest, MixStreams_s16_QuarterVolume) {
- // Test MixStreams() on 16 bit samples.
- int16 dst_s16[kNumberOfSamples] = { -4, 0x40, -32760, 32760 };
- int16 src_s16[kNumberOfSamples] = { -4, 0x40, -123, 123 };
- int16 expected_s16[kNumberOfSamples] = { -5, 0x50, -32768, 32767 };
- media::MixStreams(dst_s16,
- src_s16,
- sizeof(dst_s16),
- sizeof(src_s16[0]),
- 0.25f);
- int expected_test = memcmp(dst_s16, expected_s16, sizeof(expected_s16));
- EXPECT_EQ(0, expected_test);
-}
-
-TEST(AudioUtilTest, MixStreams_s16_FullVolume) {
- // Test MixStreams() on 16 bit samples.
- int16 dst_s16[kNumberOfSamples] = { -4, 0x40, -32760, 32760 };
- int16 src_s16[kNumberOfSamples] = { -4, 0x40, -123, 123 };
- int16 expected_s16[kNumberOfSamples] = { -8, 0x80, -32768, 32767 };
- media::MixStreams(dst_s16,
- src_s16,
- sizeof(dst_s16),
- sizeof(src_s16[0]),
- 1.0f);
- int expected_test = memcmp(dst_s16, expected_s16, sizeof(expected_s16));
- EXPECT_EQ(0, expected_test);
-}
-
-TEST(AudioUtilTest, MixStreams_s32_QuarterVolume) {
- // Test MixStreams() on 32 bit samples.
- int32 dst_s32[kNumberOfSamples] = { -4, 0x40, -32768, 2147483640 };
- int32 src_s32[kNumberOfSamples] = { -4, 0x40, -32768, 123 };
- int32 expected_s32[kNumberOfSamples] = { -5, 0x50, -40960, 2147483647 };
- media::MixStreams(dst_s32,
- src_s32,
- sizeof(dst_s32),
- sizeof(src_s32[0]),
- 0.25f);
- int expected_test = memcmp(dst_s32, expected_s32, sizeof(expected_s32));
- EXPECT_EQ(0, expected_test);
-}
-
-TEST(AudioUtilTest, MixStreams_s32_FullVolume) {
- // Test MixStreams() on 32 bit samples.
- int32 dst_s32[kNumberOfSamples] = { -4, 0x40, -32768, 2147483640 };
- int32 src_s32[kNumberOfSamples] = { -4, 0x40, -32768, 123 };
- int32 expected_s32[kNumberOfSamples] = { -8, 0x80, -65536, 2147483647 };
- media::MixStreams(dst_s32,
- src_s32,
- sizeof(dst_s32),
- sizeof(src_s32[0]),
- 1.0);
- int expected_test = memcmp(dst_s32, expected_s32, sizeof(expected_s32));
- EXPECT_EQ(0, expected_test);
-}
-
} // namespace media
« no previous file with comments | « media/audio/audio_util.cc ('k') | media/media.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698