From 23730a6e56a168d1879203e4b3819bb36e3d8f1f Mon Sep 17 00:00:00 2001 From: "Torne (Richard Coles)" Date: Fri, 21 Mar 2014 14:25:57 +0000 Subject: Merge from Chromium at DEPS revision 258528 This commit was generated by merge_to_master.py. Change-Id: Id197cbdde2c2881915f096c0426c741416884783 --- media/audio/audio_parameters_unittest.cc | 38 ++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) (limited to 'media/audio/audio_parameters_unittest.cc') diff --git a/media/audio/audio_parameters_unittest.cc b/media/audio/audio_parameters_unittest.cc index f0d37129eb..390b205a09 100644 --- a/media/audio/audio_parameters_unittest.cc +++ b/media/audio/audio_parameters_unittest.cc @@ -63,6 +63,10 @@ TEST(AudioParameters, GetBytesPerBuffer) { EXPECT_EQ(800, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, 1000, 16, 200) .GetBytesPerBuffer()); + EXPECT_EQ(300, AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, + 1000, 8, 100) + .GetBytesPerBuffer()); } TEST(AudioParameters, GetBytesPerSecond) { @@ -119,6 +123,23 @@ TEST(AudioParameters, Compare) { AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_STEREO, 2000, 16, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, 1000, 8, 100), AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_MONO, @@ -152,6 +173,23 @@ TEST(AudioParameters, Compare) { CHANNEL_LAYOUT_STEREO, 2000, 16, 100), AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO, 2000, 16, 200), + + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 8, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 1000, 16, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 8, 200), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 100), + AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, + CHANNEL_LAYOUT_STEREO_AND_KEYBOARD_MIC, 2000, 16, 200), }; for (size_t i = 0; i < arraysize(values); ++i) { -- cgit v1.2.3