Chromium Code Reviews| Index: media/audio/audio_input_controller.cc |
| diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc |
| index 45ab2c404043a1e892562b093d9fad6f86fc35cd..7f00dce0b4dbd113f7d1b22d6b936cae92503b8b 100644 |
| --- a/media/audio/audio_input_controller.cc |
| +++ b/media/audio/audio_input_controller.cc |
| @@ -8,7 +8,6 @@ |
| namespace { |
| const int kMaxInputChannels = 2; |
| -const int kMaxSamplesPerPacket = media::Limits::kMaxSampleRate; |
| } // namespace |
| @@ -31,15 +30,13 @@ AudioInputController::~AudioInputController() { |
| // static |
| scoped_refptr<AudioInputController> AudioInputController::Create( |
| EventHandler* event_handler, |
| - AudioParameters params, |
| - int samples_per_packet) { |
| + AudioParameters params) { |
| if (!params.IsValid() || |
|
scherkus (not reviewing)
2010/11/09 02:28:31
single line
Sergey Ulanov
2010/11/09 22:29:58
Done.
|
| - (params.channels > kMaxInputChannels) || |
| - (samples_per_packet > kMaxSamplesPerPacket) || (samples_per_packet < 0)) |
| + (params.channels > kMaxInputChannels)) |
| return NULL; |
| if (factory_) { |
| - return factory_->Create(event_handler, params, samples_per_packet); |
| + return factory_->Create(event_handler, params); |
| } |
| scoped_refptr<AudioInputController> controller(new AudioInputController( |
| @@ -50,7 +47,7 @@ scoped_refptr<AudioInputController> AudioInputController::Create( |
| controller->thread_.message_loop()->PostTask( |
| FROM_HERE, |
| NewRunnableMethod(controller.get(), &AudioInputController::DoCreate, |
| - params, samples_per_packet)); |
| + params)); |
| return controller; |
| } |
| @@ -75,10 +72,8 @@ void AudioInputController::Close() { |
| thread_.Stop(); |
| } |
| -void AudioInputController::DoCreate(AudioParameters params, |
| - uint32 samples_per_packet) { |
| - stream_ = AudioManager::GetAudioManager()->MakeAudioInputStream( |
| - params, samples_per_packet); |
| +void AudioInputController::DoCreate(AudioParameters params) { |
| + stream_ = AudioManager::GetAudioManager()->MakeAudioInputStream(params); |
| if (!stream_) { |
| // TODO(satish): Define error types. |