diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 03:07:19 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-11 03:07:19 +0000 |
| commit | 9ade381f46175dead00a1cc9ffc3328230e8c982 (patch) | |
| tree | 64c6caf04643408b2e25bce192f03c9b7b93eaa2 /media/audio/audio_input_unittest.cc | |
| parent | adc19c0eeac9f3caaae4e35bd64e79e6b6e72a0f (diff) | |
| download | chromium_src-9ade381f46175dead00a1cc9ffc3328230e8c982.zip chromium_src-9ade381f46175dead00a1cc9ffc3328230e8c982.tar.gz chromium_src-9ade381f46175dead00a1cc9ffc3328230e8c982.tar.bz2 | |
Simplified AudioOutputStream interface.
1. Removed packet_size parameter from Open().
2. Removed OnClose() from the callback. Now the callback is guaranteed to be called only between Start() and Stop().
3. Added samples_per_packet in the AudioParameters struct.
BUG=39825
TEST=Unittests
Review URL: http://codereview.chromium.org/4661001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_input_unittest.cc')
| -rw-r--r-- | media/audio/audio_input_unittest.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/media/audio/audio_input_unittest.cc b/media/audio/audio_input_unittest.cc index 6a67f0c..82cb887 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. |