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

Unified Diff: media/audio/audio_manager_base.cc

Issue 9570014: Move some generic functions to AudioManagerBase to be inherited by platform-specific AudioManager*** (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased and fixed windows compiling Created 8 years, 9 months 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_manager_base.h ('k') | media/audio/linux/alsa_input.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_base.cc
diff --git a/media/audio/audio_manager_base.cc b/media/audio/audio_manager_base.cc
index 2957e966f525232551c74e9b240d277973ba9ff9..05ed044caef708b73ba09169f5e7c8ee8e44f8bd 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -9,18 +9,30 @@
#include "base/threading/thread.h"
#include "media/audio/audio_output_dispatcher.h"
#include "media/audio/audio_output_proxy.h"
+#include "media/audio/fake_audio_input_stream.h"
+#include "media/audio/fake_audio_output_stream.h"
static const int kStreamCloseDelaySeconds = 5;
+// Default maximum number of output streams that can be open simultaneously
+// for all platforms.
+static const int kDefaultMaxOutputStreams = 15;
+
+static const int kMaxInputChannels = 2;
+
const char AudioManagerBase::kDefaultDeviceName[] = "Default";
const char AudioManagerBase::kDefaultDeviceId[] = "default";
AudioManagerBase::AudioManagerBase()
- : num_active_input_streams_(0) {
+ : num_active_input_streams_(0),
+ max_num_output_streams_(kDefaultMaxOutputStreams),
+ num_output_streams_(0) {
}
AudioManagerBase::~AudioManagerBase() {
Shutdown();
+ // All the output streams should have been deleted.
+ DCHECK_EQ(0, num_output_streams_);
}
void AudioManagerBase::Init() {
@@ -39,6 +51,57 @@ scoped_refptr<base::MessageLoopProxy> AudioManagerBase::GetMessageLoop() {
return audio_thread_.get() ? audio_thread_->message_loop_proxy() : NULL;
}
+AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
+ const AudioParameters& params) {
+ if (!params.IsValid()) {
+ DLOG(ERROR) << "Audio parameters are invalid";
+ return NULL;
+ }
+
+ // Limit the number of audio streams opened. This is to prevent using
+ // excessive resources for a large number of audio streams. More
+ // importantly it prevents instability on certain systems.
+ // See bug: http://crbug.com/30242.
+ if (num_output_streams_ >= max_num_output_streams_) {
+ DLOG(ERROR) << "Number of opened audio streams " << num_output_streams_
+ << " exceed the max allowed number " << max_num_output_streams_;
+ return NULL;
+ }
+
+ AudioOutputStream* stream = NULL;
+ if (params.format == AudioParameters::AUDIO_MOCK) {
+ stream = FakeAudioOutputStream::MakeFakeStream(params);
+ } else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
+ num_output_streams_++;
+ stream = MakeLinearOutputStream(params);
+ } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+ num_output_streams_++;
+ stream = MakeLowLatencyOutputStream(params);
+ }
+
+ return stream;
+}
+
+AudioInputStream* AudioManagerBase::MakeAudioInputStream(
+ const AudioParameters& params, const std::string& device_id) {
+ if (!params.IsValid() || (params.channels > kMaxInputChannels) ||
+ device_id.empty()) {
+ DLOG(ERROR) << "Audio parameters are invalid for device " << device_id;
+ return NULL;
+ }
+
+ AudioInputStream* stream = NULL;
+ if (params.format == AudioParameters::AUDIO_MOCK) {
+ stream = FakeAudioInputStream::MakeFakeStream(params);
+ } else if (params.format == AudioParameters::AUDIO_PCM_LINEAR) {
+ stream = MakeLinearInputStream(params, device_id);
+ } else if (params.format == AudioParameters::AUDIO_PCM_LOW_LATENCY) {
+ stream = MakeLowLatencyInputStream(params, device_id);
+ }
+
+ return stream;
+}
+
AudioOutputStream* AudioManagerBase::MakeAudioOutputStreamProxy(
const AudioParameters& params) {
DCHECK(GetMessageLoop()->BelongsToCurrentThread());
@@ -62,6 +125,21 @@ void AudioManagerBase::GetAudioInputDeviceNames(
media::AudioDeviceNames* device_names) {
}
+void AudioManagerBase::ReleaseOutputStream(AudioOutputStream* stream) {
+ DCHECK(stream);
+ // TODO(xians) : Have a clearer destruction path for the AudioOutputStream.
+ // For example, pass the ownership to AudioManager so it can delete the
+ // streams.
+ num_output_streams_--;
+ delete stream;
+}
+
+void AudioManagerBase::ReleaseInputStream(AudioInputStream* stream) {
+ DCHECK(stream);
+ // TODO(xians) : Have a clearer destruction path for the AudioInputStream.
+ delete stream;
+}
+
void AudioManagerBase::IncreaseActiveInputStreamCount() {
base::AtomicRefCountInc(&num_active_input_streams_);
}
« no previous file with comments | « media/audio/audio_manager_base.h ('k') | media/audio/linux/alsa_input.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698