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

Unified Diff: media/audio/audio_manager_base.cc

Issue 11298006: Browser-wide audio mirroring for TabCapture API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: last nit Created 8 years 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/audio_parameters.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 eca877311558b6d421ac59d0d83b3007177869ad..633303916ef6eb8ea0b50df25ca2547286b54c03 100644
--- a/media/audio/audio_manager_base.cc
+++ b/media/audio/audio_manager_base.cc
@@ -14,6 +14,8 @@
#include "media/audio/audio_util.h"
#include "media/audio/fake_audio_input_stream.h"
#include "media/audio/fake_audio_output_stream.h"
+#include "media/audio/virtual_audio_input_stream.h"
+#include "media/audio/virtual_audio_output_stream.h"
#include "media/base/media_switches.h"
// TODO(dalecurtis): Temporarily disabled while switching pipeline to use float,
@@ -45,7 +47,8 @@ AudioManagerBase::AudioManagerBase()
max_num_input_streams_(kDefaultMaxInputStreams),
num_output_streams_(0),
num_input_streams_(0),
- audio_thread_(new base::Thread("AudioThread")) {
+ audio_thread_(new base::Thread("AudioThread")),
+ virtual_audio_input_stream_(NULL) {
#if defined(OS_WIN)
audio_thread_->init_com_with_mta(true);
#endif
@@ -100,7 +103,16 @@ AudioOutputStream* AudioManagerBase::MakeAudioOutputStream(
!HasAudioOutputDevices();
AudioOutputStream* stream = NULL;
- if (audio_output_disabled) {
+ if (virtual_audio_input_stream_) {
+#if defined(OS_IOS)
+ // We do not currently support iOS. It does not link.
+ NOTIMPLEMENTED();
+ return NULL;
+#else
+ stream = VirtualAudioOutputStream::MakeStream(this, params, message_loop_,
+ virtual_audio_input_stream_);
+#endif
+ } else if (audio_output_disabled) {
stream = FakeAudioOutputStream::MakeFakeStream(this, params);
} else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) {
stream = MakeLinearOutputStream(params);
@@ -130,7 +142,31 @@ AudioInputStream* AudioManagerBase::MakeAudioInputStream(
}
AudioInputStream* stream = NULL;
- if (params.format() == AudioParameters::AUDIO_FAKE) {
+ if (params.format() == AudioParameters::AUDIO_VIRTUAL) {
+#if defined(OS_IOS)
+ // We do not currently support iOS.
+ NOTIMPLEMENTED();
+ return NULL;
+#else
+ // TODO(justinlin): Currently, audio mirroring will only work for the first
+ // request. Subsequent requests will not get audio.
+ if (!virtual_audio_input_stream_) {
+ virtual_audio_input_stream_ =
+ VirtualAudioInputStream::MakeStream(this, params, message_loop_);
+ stream = virtual_audio_input_stream_;
+ DVLOG(1) << "Virtual audio input stream created.";
+
+ // Make all current output streams recreate themselves as
+ // VirtualAudioOutputStreams that will attach to the above
+ // VirtualAudioInputStream.
+ message_loop_->PostTask(FROM_HERE, base::Bind(
+ &AudioManagerBase::NotifyAllOutputDeviceChangeListeners,
+ base::Unretained(this)));
+ } else {
+ stream = NULL;
+ }
+#endif
+ } else if (params.format() == AudioParameters::AUDIO_FAKE) {
stream = FakeAudioInputStream::MakeFakeStream(this, params);
} else if (params.format() == AudioParameters::AUDIO_PCM_LINEAR) {
stream = MakeLinearInputStream(params, device_id);
@@ -244,6 +280,18 @@ void AudioManagerBase::ReleaseOutputStream(AudioOutputStream* stream) {
void AudioManagerBase::ReleaseInputStream(AudioInputStream* stream) {
DCHECK(stream);
// TODO(xians) : Have a clearer destruction path for the AudioInputStream.
+
+ if (virtual_audio_input_stream_ == stream) {
+ DVLOG(1) << "Virtual audio input stream stopping.";
+ virtual_audio_input_stream_->Stop();
+ virtual_audio_input_stream_ = NULL;
+
+ // Make all VirtualAudioOutputStreams unregister from the
+ // VirtualAudioInputStream and recreate themselves as regular audio streams
+ // to return sound to hardware.
+ NotifyAllOutputDeviceChangeListeners();
+ }
+
num_input_streams_--;
delete stream;
}
« no previous file with comments | « media/audio/audio_manager_base.h ('k') | media/audio/audio_parameters.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698