Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Unified Diff: media/audio/audio_input_controller.cc

Issue 4661001: Simplified AudioOutputStream interface. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: - Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/audio/audio_input_controller.h ('k') | media/audio/audio_input_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..b5c9df2b8b670bc62e9da2de38d6752fda9f8ab5 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,12 @@ AudioInputController::~AudioInputController() {
// static
scoped_refptr<AudioInputController> AudioInputController::Create(
EventHandler* event_handler,
- AudioParameters params,
- int samples_per_packet) {
- if (!params.IsValid() ||
- (params.channels > kMaxInputChannels) ||
- (samples_per_packet > kMaxSamplesPerPacket) || (samples_per_packet < 0))
+ AudioParameters params) {
+ if (!params.IsValid() || (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 +46,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 +71,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.
« no previous file with comments | « media/audio/audio_input_controller.h ('k') | media/audio/audio_input_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698