Simplified AudioOutputStream interface.

media/audio/linux/audio_manager_linux.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 "media/audio/linux/audio_manager_linux.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "media/audio/fake_audio_input_stream.h"
 #include "media/audio/fake_audio_output_stream.h"
 #include "media/audio/linux/alsa_input.h"
 #include "media/audio/linux/alsa_output.h"
 #include "media/audio/linux/alsa_wrapper.h"
 #include "media/base/limits.h"
 #include "media/base/media_switches.h"
 
 namespace {
 
 const int kMaxInputChannels = 2;
-const int kMaxSamplesPerPacket = media::Limits::kMaxSampleRate;
 
 }  // namespace
 
 // Implementation of AudioManager.
 bool AudioManagerLinux::HasAudioOutputDevices() {
   // TODO(ajwong): Make this actually query audio devices.
   return true;
 }
 
 bool AudioManagerLinux::HasAudioInputDevices() {
   // TODO(satish): Make this actually query audio devices.
   return true;
 }
 
 AudioOutputStream* AudioManagerLinux::MakeAudioOutputStream(
     AudioParameters params) {
   // Early return for testing hook.  Do this before checking for
   // |initialized_|.
   if (params.format == AudioParameters::AUDIO_MOCK) {
-    return FakeAudioOutputStream::MakeFakeStream();
+    return FakeAudioOutputStream::MakeFakeStream(params);
   }
 
   if (!initialized()) {
     return NULL;
   }
 
   std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAlsaOutputDevice)) {
     device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaOutputDevice);
   }
   AlsaPcmOutputStream* stream =
       new AlsaPcmOutputStream(device_name, params, wrapper_.get(), this,
                               GetMessageLoop());
 
   AutoLock l(lock_);
   active_streams_[stream] = scoped_refptr<AlsaPcmOutputStream>(stream);
   return stream;
 }
 
 AudioInputStream* AudioManagerLinux::MakeAudioInputStream(
-    AudioParameters params, int samples_per_packet) {
-  if (!params.IsValid() || params.channels > kMaxInputChannels ||
-      samples_per_packet < 0 || samples_per_packet > kMaxSamplesPerPacket)
+    AudioParameters params) {
+  if (!params.IsValid() || params.channels > kMaxInputChannels)
     return NULL;
 
   if (params.format == AudioParameters::AUDIO_MOCK) {
-    return FakeAudioInputStream::MakeFakeStream(params, samples_per_packet);
+    return FakeAudioInputStream::MakeFakeStream(params);
   } else if (params.format != AudioParameters::AUDIO_PCM_LINEAR) {
     return NULL;
   }
 
   if (!initialized())
     return NULL;
 
   std::string device_name = AlsaPcmOutputStream::kAutoSelectDevice;
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAlsaInputDevice)) {
     device_name = CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
         switches::kAlsaInputDevice);
   }
 
   AlsaPcmInputStream* stream = new AlsaPcmInputStream(
-      device_name, params, samples_per_packet, wrapper_.get());
+      device_name, params, wrapper_.get());
 
   return stream;
 }
 
 AudioManagerLinux::AudioManagerLinux() {
 }
 
 AudioManagerLinux::~AudioManagerLinux() {
   // Make sure we stop the thread first. If we let the default destructor to
   // destruct the members, we may destroy audio streams before stopping the
@@ skipping 21 matching lines @@
   if (stream) {
     AutoLock l(lock_);
     active_streams_.erase(stream);
   }
 }
 
 // static
 AudioManager* AudioManager::CreateAudioManager() {
   return new AudioManagerLinux();
 }