Simplified AudioOutputStream interface.

media/audio/audio_input_unittest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/environment.h"
 #include "base/message_loop.h"
 #include "base/platform_thread.h"
 #include "base/scoped_ptr.h"
 #include "media/audio/audio_io.h"
@@ skipping 86 matching lines @@
   AudioManager* audio_man = AudioManager::GetAudioManager();
   if (NULL == audio_man)
     return false;
 
   return audio_man->HasAudioInputDevices();
 }
 
 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;
 }
 
 }  // namespace.
 
 // Test that AudioInputStream rejects out of range parameters.
 TEST(AudioInputTest, SanityOnMakeParams) {
   if (!CanRunAudioTests())
     return;
   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.
 TEST(AudioInputTest, CreateAndClose) {
   if (!CanRunAudioTests())
     return;
   AudioInputStream* ais = CreateTestAudioInputStream();
   ais->Close();
 }
 
@@ skipping 52 matching lines @@
   // Verify at least 500ms worth of audio was recorded, after giving sufficient
   // extra time.
   message_loop.PostDelayedTask(FROM_HERE, new MessageLoop::QuitTask(), 590);
   message_loop.Run();
   EXPECT_GE(test_callback.callback_count(), 10);
   EXPECT_FALSE(test_callback.had_error());
 
   ais->Stop();
   ais->Close();
 }