| Index: media/audio/audio_input_unittest.cc
|
| diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc
|
| index 6a67f0c72daa012fc200315550653a20fdf1451d..82cb887f242f4baec8f3629f8ae784fc95a709b7 100644
|
| --- a/media/audio/audio_input_unittest.cc
|
| +++ b/media/audio/audio_input_unittest.cc
|
| @@ -104,8 +104,8 @@ bool CanRunAudioTests() {
|
| AudioInputStream* CreateTestAudioInputStream() {
|
| AudioManager* audio_man = AudioManager::GetAudioManager();
|
| AudioInputStream* ais = audio_man->MakeAudioInputStream(
|
| - AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, 2, kSamplingRate, 16),
|
| - kSamplesPerPacket);
|
| + AudioParameters(AudioParameters::AUDIO_PCM_LINEAR, 2, kSamplingRate,
|
| + 16, kSamplesPerPacket));
|
| EXPECT_TRUE(NULL != ais);
|
| return ais;
|
| }
|
| @@ -119,21 +119,21 @@ TEST(AudioInputTest, SanityOnMakeParams) {
|
| AudioManager* audio_man = AudioManager::GetAudioManager();
|
| AudioParameters::Format fmt = AudioParameters::AUDIO_PCM_LINEAR;
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, 8, 8000, 16), 0));
|
| + AudioParameters(fmt, 8, 8000, 16, kSamplesPerPacket)));
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, 1, 1024 * 1024, 16), 0));
|
| + AudioParameters(fmt, 1, 1024 * 1024, 16, kSamplesPerPacket)));
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, 2, 8000, 80), 0));
|
| + AudioParameters(fmt, 2, 8000, 80, kSamplesPerPacket)));
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, 2, 8000, 80), 1024 * 4096));
|
| + AudioParameters(fmt, 2, 8000, 80, 1000 * kSamplesPerPacket)));
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, -2, 8000, 16), 0));
|
| + AudioParameters(fmt, -2, 8000, 16, kSamplesPerPacket)));
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, 2, -8000, 16), 0));
|
| + AudioParameters(fmt, 2, -8000, 16, kSamplesPerPacket)));
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, 2, 8000, -16), 0));
|
| + AudioParameters(fmt, 2, 8000, -16, kSamplesPerPacket)));
|
| EXPECT_TRUE(NULL == audio_man->MakeAudioInputStream(
|
| - AudioParameters(fmt, 2, 8000, 16), -1024));
|
| + AudioParameters(fmt, 2, 8000, 16, -1024)));
|
| }
|
|
|
| // Test create and close of an AudioInputStream without recording audio.
|
|
|