diff options
Diffstat (limited to 'content')
52 files changed, 204 insertions, 149 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index 78a971b..466c177 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -206,7 +206,7 @@ void ImmediateShutdownAndExitProcess() { } // static -AudioManager* BrowserMainLoop::GetAudioManager() { +media::AudioManager* BrowserMainLoop::GetAudioManager() { return g_current_browser_main_loop->audio_manager_.get(); } @@ -327,7 +327,7 @@ void BrowserMainLoop::MainMessageLoopStart() { hi_res_timer_manager_.reset(new HighResolutionTimerManager); network_change_notifier_.reset(net::NetworkChangeNotifier::Create()); - audio_manager_.reset(AudioManager::Create()); + audio_manager_.reset(media::AudioManager::Create()); online_state_observer_.reset(new BrowserOnlineStateObserver); #if defined(OS_WIN) diff --git a/content/browser/browser_main_loop.h b/content/browser/browser_main_loop.h index 138d11e..f43e6eb 100644 --- a/content/browser/browser_main_loop.h +++ b/content/browser/browser_main_loop.h @@ -14,7 +14,6 @@ #include "ui/base/win/scoped_ole_initializer.h" #endif -class AudioManager; class BrowserOnlineStateObserver; class CommandLine; class HighResolutionTimerManager; @@ -25,6 +24,10 @@ namespace base { class SystemMonitor; } +namespace media { +class AudioManager; +} + namespace net { class NetworkChangeNotifier; } @@ -66,7 +69,7 @@ class BrowserMainLoop { int GetResultCode() const { return result_code_; } // Can be called on any thread. - static AudioManager* GetAudioManager(); + static media::AudioManager* GetAudioManager(); private: // For ShutdownThreadsAndCleanUp. @@ -89,7 +92,7 @@ class BrowserMainLoop { scoped_ptr<base::SystemMonitor> system_monitor_; scoped_ptr<HighResolutionTimerManager> hi_res_timer_manager_; scoped_ptr<net::NetworkChangeNotifier> network_change_notifier_; - scoped_ptr<AudioManager> audio_manager_; + scoped_ptr<media::AudioManager> audio_manager_; // Per-process listener for online state changes. scoped_ptr<BrowserOnlineStateObserver> online_state_observer_; #if defined(OS_WIN) diff --git a/content/browser/renderer_host/media/audio_input_device_manager.cc b/content/browser/renderer_host/media/audio_input_device_manager.cc index d30ec3b..00e37f9a 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager.cc @@ -21,7 +21,8 @@ const char AudioInputDeviceManager::kInvalidDeviceId[] = ""; // Starting id for the first capture session. const int kFirstSessionId = AudioInputDeviceManager::kFakeOpenSessionId + 1; -AudioInputDeviceManager::AudioInputDeviceManager(AudioManager* audio_manager) +AudioInputDeviceManager::AudioInputDeviceManager( + media::AudioManager* audio_manager) : listener_(NULL), next_capture_session_id_(kFirstSessionId), audio_manager_(audio_manager) { @@ -127,7 +128,7 @@ void AudioInputDeviceManager::Start( // the callback immediately. if (session_id == kFakeOpenSessionId) { event_handler->OnDeviceStarted(session_id, - AudioManagerBase::kDefaultDeviceId); + media::AudioManagerBase::kDefaultDeviceId); return; } diff --git a/content/browser/renderer_host/media/audio_input_device_manager.h b/content/browser/renderer_host/media/audio_input_device_manager.h index 5c8a396..96bff65 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager.h +++ b/content/browser/renderer_host/media/audio_input_device_manager.h @@ -21,7 +21,9 @@ #include "content/common/media/media_stream_options.h" #include "media/audio/audio_device_name.h" +namespace media { class AudioManager; +} namespace media_stream { @@ -39,7 +41,7 @@ class CONTENT_EXPORT AudioInputDeviceManager static const int kInvalidSessionId; static const char kInvalidDeviceId[]; - explicit AudioInputDeviceManager(AudioManager* audio_manager); + explicit AudioInputDeviceManager(media::AudioManager* audio_manager); // MediaStreamProvider implementation, called on IO thread. virtual void Register(MediaStreamProviderListener* listener) OVERRIDE; @@ -72,7 +74,7 @@ class CONTENT_EXPORT AudioInputDeviceManager typedef std::map<int, media::AudioDeviceName> AudioInputDeviceMap; AudioInputDeviceMap devices_; // TODO(tommi): Is it necessary to store this as a member? - AudioManager* audio_manager_; + media::AudioManager* audio_manager_; DISALLOW_COPY_AND_ASSIGN(AudioInputDeviceManager); }; diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc index 173606a..fe57150 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc @@ -105,7 +105,7 @@ class AudioInputDeviceManagerTest : public testing::Test { message_loop_.reset(new MessageLoop(MessageLoop::TYPE_IO)); io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, message_loop_.get())); - audio_manager_.reset(AudioManager::Create()); + audio_manager_.reset(media::AudioManager::Create()); manager_ = new AudioInputDeviceManager(audio_manager_.get()); audio_input_listener_.reset(new MockAudioInputDeviceManagerListener()); @@ -129,7 +129,7 @@ class AudioInputDeviceManagerTest : public testing::Test { scoped_ptr<BrowserThreadImpl> io_thread_; scoped_refptr<AudioInputDeviceManager> manager_; scoped_ptr<MockAudioInputDeviceManagerListener> audio_input_listener_; - scoped_ptr<AudioManager> audio_manager_; + scoped_ptr<media::AudioManager> audio_manager_; private: DISALLOW_COPY_AND_ASSIGN(AudioInputDeviceManagerTest); @@ -414,11 +414,11 @@ TEST_F(AudioInputDeviceManagerTest, StartDeviceTwice) { manager_->Start(second_session_id, second_event_handler.get()); EXPECT_CALL(*first_event_handler, DeviceStarted(first_session_id, - AudioManagerBase::kDefaultDeviceId)) + media::AudioManagerBase::kDefaultDeviceId)) .Times(1); EXPECT_CALL(*second_event_handler, DeviceStarted(second_session_id, - AudioManagerBase::kDefaultDeviceId)) + media::AudioManagerBase::kDefaultDeviceId)) .Times(1); message_loop_->RunAllPending(); @@ -502,7 +502,7 @@ TEST_F(AudioInputDeviceManagerTest, StartSessionTwice) { manager_->Start(session_id, audio_input_event_handler.get()); EXPECT_CALL(*audio_input_event_handler, DeviceStarted(session_id, - AudioManagerBase::kDefaultDeviceId)) + media::AudioManagerBase::kDefaultDeviceId)) .Times(1); message_loop_->RunAllPending(); diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.cc b/content/browser/renderer_host/media/audio_input_renderer_host.cc index 121a5ac..3465202 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_input_renderer_host.cc @@ -25,7 +25,7 @@ AudioInputRendererHost::AudioEntry::~AudioEntry() {} AudioInputRendererHost::AudioInputRendererHost( content::ResourceContext* resource_context, - AudioManager* audio_manager) + media::AudioManager* audio_manager) : resource_context_(resource_context), audio_manager_(audio_manager) { } @@ -114,8 +114,8 @@ void AudioInputRendererHost::DoCompleteCreation( return; } - AudioInputSyncWriter* writer = - static_cast<AudioInputSyncWriter*>(entry->writer.get()); + media::AudioInputSyncWriter* writer = + static_cast<media::AudioInputSyncWriter*>(entry->writer.get()); #if defined(OS_WIN) base::SyncSocket::Handle foreign_socket_handle; @@ -197,16 +197,15 @@ void AudioInputRendererHost::OnStartDevice(int stream_id, int session_id) { audio_input_man->Start(session_id, this); } -void AudioInputRendererHost::OnCreateStream(int stream_id, - const AudioParameters& params, - const std::string& device_id, - bool automatic_gain_control) { +void AudioInputRendererHost::OnCreateStream( + int stream_id, const media::AudioParameters& params, + const std::string& device_id, bool automatic_gain_control) { VLOG(1) << "AudioInputRendererHost::OnCreateStream(stream_id=" << stream_id << ")"; DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK(LookupById(stream_id) == NULL); - AudioParameters audio_params(params); + media::AudioParameters audio_params(params); DCHECK_GT(audio_params.frames_per_buffer(), 0); uint32 buffer_size = audio_params.GetBytesPerBuffer(); @@ -214,7 +213,7 @@ void AudioInputRendererHost::OnCreateStream(int stream_id, // Create a new AudioEntry structure. scoped_ptr<AudioEntry> entry(new AudioEntry()); - uint32 mem_size = sizeof(AudioInputBufferParameters) + buffer_size; + uint32 mem_size = sizeof(media::AudioInputBufferParameters) + buffer_size; // Create the shared memory and share it with the renderer process // using a new SyncWriter object. @@ -224,8 +223,8 @@ void AudioInputRendererHost::OnCreateStream(int stream_id, return; } - scoped_ptr<AudioInputSyncWriter> writer( - new AudioInputSyncWriter(&entry->shared_memory)); + scoped_ptr<media::AudioInputSyncWriter> writer( + new media::AudioInputSyncWriter(&entry->shared_memory)); if (!writer->Init()) { SendErrorMessage(stream_id); diff --git a/content/browser/renderer_host/media/audio_input_renderer_host.h b/content/browser/renderer_host/media/audio_input_renderer_host.h index 5a9cc6b..f8351c8 100644 --- a/content/browser/renderer_host/media/audio_input_renderer_host.h +++ b/content/browser/renderer_host/media/audio_input_renderer_host.h @@ -68,8 +68,10 @@ namespace content { class ResourceContext; } +namespace media { class AudioManager; class AudioParameters; +} class CONTENT_EXPORT AudioInputRendererHost : public content::BrowserMessageFilter, @@ -99,7 +101,7 @@ class CONTENT_EXPORT AudioInputRendererHost // Called from UI thread from the owner of this object. AudioInputRendererHost(content::ResourceContext* resource_context, - AudioManager* audio_manager); + media::AudioManager* audio_manager); // content::BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; @@ -139,7 +141,7 @@ class CONTENT_EXPORT AudioInputRendererHost // successful this object would keep an internal entry of the stream for the // required properties. void OnCreateStream(int stream_id, - const AudioParameters& params, + const media::AudioParameters& params, const std::string& device_id, bool automatic_gain_control); @@ -197,7 +199,7 @@ class CONTENT_EXPORT AudioInputRendererHost // Used to get an instance of AudioInputDeviceManager. content::ResourceContext* resource_context_; - AudioManager* audio_manager_; + media::AudioManager* audio_manager_; // A map of stream IDs to audio sources. typedef std::map<int, AudioEntry*> AudioEntryMap; diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.cc b/content/browser/renderer_host/media/audio_input_sync_writer.cc index d720017..87751d7 100644 --- a/content/browser/renderer_host/media/audio_input_sync_writer.cc +++ b/content/browser/renderer_host/media/audio_input_sync_writer.cc @@ -9,6 +9,8 @@ #include "base/process_util.h" #include "base/shared_memory.h" +namespace media { + AudioInputSyncWriter::AudioInputSyncWriter(base::SharedMemory* shared_memory) : shared_memory_(shared_memory) { } @@ -64,3 +66,5 @@ bool AudioInputSyncWriter::PrepareForeignSocketHandle( } #endif + +} // namespace media diff --git a/content/browser/renderer_host/media/audio_input_sync_writer.h b/content/browser/renderer_host/media/audio_input_sync_writer.h index 77acd50..1b7a609 100644 --- a/content/browser/renderer_host/media/audio_input_sync_writer.h +++ b/content/browser/renderer_host/media/audio_input_sync_writer.h @@ -15,6 +15,7 @@ namespace base { class SharedMemory; } +namespace media { // A AudioInputController::SyncWriter implementation using SyncSocket. This // is used by AudioInputController to provide a low latency data source for // transmitting audio packets between the browser process and the renderer @@ -51,4 +52,6 @@ class AudioInputSyncWriter : public media::AudioInputController::SyncWriter { DISALLOW_IMPLICIT_CONSTRUCTORS(AudioInputSyncWriter); }; +} // namespace media + #endif // CONTENT_BROWSER_RENDERER_HOST_MEDIA_AUDIO_INPUT_SYNC_WRITER_H_ diff --git a/content/browser/renderer_host/media/audio_renderer_host.cc b/content/browser/renderer_host/media/audio_renderer_host.cc index 290b94a..c59ef44 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.cc +++ b/content/browser/renderer_host/media/audio_renderer_host.cc @@ -27,7 +27,7 @@ AudioRendererHost::AudioEntry::~AudioEntry() {} /////////////////////////////////////////////////////////////////////////////// // AudioRendererHost implementations. AudioRendererHost::AudioRendererHost( - AudioManager* audio_manager, + media::AudioManager* audio_manager, content::MediaObserver* media_observer) : audio_manager_(audio_manager), media_observer_(media_observer) { @@ -192,11 +192,11 @@ bool AudioRendererHost::OnMessageReceived(const IPC::Message& message, } void AudioRendererHost::OnCreateStream( - int stream_id, const AudioParameters& params) { + int stream_id, const media::AudioParameters& params) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); DCHECK(LookupById(stream_id) == NULL); - AudioParameters audio_params(params); + media::AudioParameters audio_params(params); DCHECK_GT(audio_params.frames_per_buffer(), 0); uint32 buffer_size = audio_params.GetBytesPerBuffer(); diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h index a506531..cea2f3a 100644 --- a/content/browser/renderer_host/media/audio_renderer_host.h +++ b/content/browser/renderer_host/media/audio_renderer_host.h @@ -53,14 +53,16 @@ #include "media/audio/audio_output_controller.h" #include "media/audio/simple_sources.h" -class AudioManager; -class AudioParameters; - namespace content { class MediaObserver; class ResourceContext; } // namespace content +namespace media { +class AudioManager; +class AudioParameters; +} + class CONTENT_EXPORT AudioRendererHost : public content::BrowserMessageFilter, public media::AudioOutputController::EventHandler { @@ -89,7 +91,7 @@ class CONTENT_EXPORT AudioRendererHost typedef std::map<int, AudioEntry*> AudioEntryMap; // Called from UI thread from the owner of this object. - AudioRendererHost(AudioManager* audio_manager, + AudioRendererHost(media::AudioManager* audio_manager, content::MediaObserver* media_observer); // content::BrowserMessageFilter implementation. @@ -121,7 +123,7 @@ class CONTENT_EXPORT AudioRendererHost // Creates an audio output stream with the specified format. If this call is // successful this object would keep an internal entry of the stream for the // required properties. - void OnCreateStream(int stream_id, const AudioParameters& params); + void OnCreateStream(int stream_id, const media::AudioParameters& params); // Play the audio stream referenced by |stream_id|. void OnPlayStream(int stream_id); @@ -178,7 +180,7 @@ class CONTENT_EXPORT AudioRendererHost // A map of stream IDs to audio sources. AudioEntryMap audio_entries_; - AudioManager* audio_manager_; + media::AudioManager* audio_manager_; content::MediaObserver* media_observer_; DISALLOW_COPY_AND_ASSIGN(AudioRendererHost); diff --git a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc index 71a5063..6a1287a 100644 --- a/content/browser/renderer_host/media/audio_renderer_host_unittest.cc +++ b/content/browser/renderer_host/media/audio_renderer_host_unittest.cc @@ -43,7 +43,7 @@ static bool IsRunningHeadless() { class MockAudioRendererHost : public AudioRendererHost { public: explicit MockAudioRendererHost( - AudioManager* audio_manager, + media::AudioManager* audio_manager, content::MediaObserver* media_observer) : AudioRendererHost(audio_manager, media_observer), shared_memory_length_(0) { @@ -161,7 +161,7 @@ class AudioRendererHostTest : public testing::Test { message_loop_.get())); ui_thread_.reset(new BrowserThreadImpl(BrowserThread::UI, message_loop_.get())); - audio_manager_.reset(AudioManager::Create()); + audio_manager_.reset(media::AudioManager::Create()); observer_.reset(new MockMediaObserver()); host_ = new MockAudioRendererHost(audio_manager_.get(), observer_.get()); @@ -195,15 +195,16 @@ class AudioRendererHostTest : public testing::Test { EXPECT_CALL(*host_, OnStreamCreated(kStreamId, _)) .WillOnce(QuitMessageLoop(message_loop_.get())); - AudioParameters::Format format; + media::AudioParameters::Format format; if (mock_stream_) - format = AudioParameters::AUDIO_MOCK; + format = media::AudioParameters::AUDIO_MOCK; else - format = AudioParameters::AUDIO_PCM_LINEAR; + format = media::AudioParameters::AUDIO_PCM_LINEAR; - AudioParameters params(format, CHANNEL_LAYOUT_STEREO, - AudioParameters::kAudioCDSampleRate, 16, - AudioParameters::kAudioCDSampleRate / 10); + media::AudioParameters params( + format, CHANNEL_LAYOUT_STEREO, + media::AudioParameters::kAudioCDSampleRate, 16, + media::AudioParameters::kAudioCDSampleRate / 10); // Send a create stream message to the audio output stream and wait until // we receive the created message. @@ -279,7 +280,7 @@ class AudioRendererHostTest : public testing::Test { } // Called on the main thread. - static void PostQuitOnAudioThread(AudioManager* audio_manager, + static void PostQuitOnAudioThread(media::AudioManager* audio_manager, MessageLoop* message_loop) { audio_manager->GetMessageLoop()->PostTask(FROM_HERE, base::Bind(&PostQuitMessageLoop, message_loop)); @@ -290,7 +291,7 @@ class AudioRendererHostTest : public testing::Test { // current thread. It is used to synchronize with the audio thread when we are // closing an audio stream. void SyncWithAudioThread() { - // Don't use scoped_refptr to addref the AudioManager when posting + // Don't use scoped_refptr to addref the media::AudioManager when posting // to the thread that itself owns. message_loop_->PostTask( FROM_HERE, base::Bind(&PostQuitOnAudioThread, @@ -310,7 +311,7 @@ class AudioRendererHostTest : public testing::Test { scoped_ptr<MessageLoop> message_loop_; scoped_ptr<BrowserThreadImpl> io_thread_; scoped_ptr<BrowserThreadImpl> ui_thread_; - scoped_ptr<AudioManager> audio_manager_; + scoped_ptr<media::AudioManager> audio_manager_; DISALLOW_COPY_AND_ASSIGN(AudioRendererHostTest); }; @@ -361,7 +362,8 @@ TEST_F(AudioRendererHostTest, SetVolume) { // Expect the volume is set. if (IsRunningHeadless()) { - EXPECT_EQ(0.5, FakeAudioOutputStream::GetCurrentFakeStream()->volume()); + EXPECT_EQ(0.5, + media::FakeAudioOutputStream::GetCurrentFakeStream()->volume()); } Close(); } diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc index f48f826..67b7044 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.cc @@ -26,7 +26,7 @@ struct MediaStreamDispatcherHost::StreamRequest { MediaStreamDispatcherHost::MediaStreamDispatcherHost( content::ResourceContext* resource_context, int render_process_id, - AudioManager* audio_manager) + media::AudioManager* audio_manager) : resource_context_(resource_context), render_process_id_(render_process_id), audio_manager_(audio_manager) { diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host.h b/content/browser/renderer_host/media/media_stream_dispatcher_host.h index aa44969..1ecd13d 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host.h +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host.h @@ -30,7 +30,7 @@ class CONTENT_EXPORT MediaStreamDispatcherHost public: MediaStreamDispatcherHost(content::ResourceContext* resource_context, int render_process_id, - AudioManager* audio_manager); + media::AudioManager* audio_manager); virtual ~MediaStreamDispatcherHost(); // MediaStreamRequester implementation. @@ -80,7 +80,7 @@ class CONTENT_EXPORT MediaStreamDispatcherHost content::ResourceContext* resource_context_; int render_process_id_; - AudioManager* audio_manager_; + media::AudioManager* audio_manager_; struct StreamRequest; typedef std::map<std::string, StreamRequest> StreamMap; diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc index 9c699ed..50f7356 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc @@ -37,7 +37,7 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost { public: MockMediaStreamDispatcherHost(content::ResourceContext* resource_context, MessageLoop* message_loop, - AudioManager* audio_manager) + media::AudioManager* audio_manager) : MediaStreamDispatcherHost(resource_context, kProcessId, audio_manager), message_loop_(message_loop) {} virtual ~MockMediaStreamDispatcherHost() {} @@ -153,7 +153,7 @@ class MediaStreamDispatcherHostTest : public testing::Test { io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, message_loop_.get())); - audio_manager_.reset(AudioManager::Create()); + audio_manager_.reset(media::AudioManager::Create()); // Make sure we use fake devices to avoid long delays. MediaStreamManager::GetForResourceContext( @@ -201,7 +201,7 @@ class MediaStreamDispatcherHostTest : public testing::Test { scoped_ptr<MessageLoop> message_loop_; scoped_ptr<BrowserThreadImpl> ui_thread_; scoped_ptr<BrowserThreadImpl> io_thread_; - scoped_ptr<AudioManager> audio_manager_; + scoped_ptr<media::AudioManager> audio_manager_; content::MockResourceContext resource_context_; }; diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index 82c0763..994725b 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc @@ -101,7 +101,7 @@ struct MediaStreamManager::DeviceRequest { // static MediaStreamManager* MediaStreamManager::GetForResourceContext( content::ResourceContext* resource_context, - AudioManager* audio_manager) { + media::AudioManager* audio_manager) { MediaStreamManager* rv = static_cast<MediaStreamManager*>( resource_context->GetUserData(kMediaStreamManagerKeyName)); if (!rv) { @@ -111,7 +111,7 @@ MediaStreamManager* MediaStreamManager::GetForResourceContext( return rv; } -MediaStreamManager::MediaStreamManager(AudioManager* audio_manager) +MediaStreamManager::MediaStreamManager(media::AudioManager* audio_manager) : ALLOW_THIS_IN_INITIALIZER_LIST( device_settings_(new MediaStreamDeviceSettings(this))), enumeration_in_progress_(content::NUM_MEDIA_STREAM_DEVICE_TYPES, false), diff --git a/content/browser/renderer_host/media/media_stream_manager.h b/content/browser/renderer_host/media/media_stream_manager.h index b73e670..d1e9ccc 100644 --- a/content/browser/renderer_host/media/media_stream_manager.h +++ b/content/browser/renderer_host/media/media_stream_manager.h @@ -35,12 +35,14 @@ #include "content/common/media/media_stream_options.h" #include "content/common/content_export.h" -class AudioManager; - namespace content { class ResourceContext; } +namespace media { +class AudioManager; +} + namespace media_stream { class AudioInputDeviceManager; @@ -61,9 +63,9 @@ class CONTENT_EXPORT MediaStreamManager // been created yet, it will be constructed with the given AudioManager. static MediaStreamManager* GetForResourceContext( content::ResourceContext* resource_context, - AudioManager* audio_manager); + media::AudioManager* audio_manager); - explicit MediaStreamManager(AudioManager* audio_manager); + explicit MediaStreamManager(media::AudioManager* audio_manager); virtual ~MediaStreamManager(); // Used to access VideoCaptureManager. @@ -151,7 +153,7 @@ class CONTENT_EXPORT MediaStreamManager // All non-closed request. typedef std::map<std::string, DeviceRequest> DeviceRequests; DeviceRequests requests_; - AudioManager* audio_manager_; + media::AudioManager* audio_manager_; DISALLOW_COPY_AND_ASSIGN(MediaStreamManager); }; diff --git a/content/browser/renderer_host/media/video_capture_host.cc b/content/browser/renderer_host/media/video_capture_host.cc index 3efcd7c..09f6981 100644 --- a/content/browser/renderer_host/media/video_capture_host.cc +++ b/content/browser/renderer_host/media/video_capture_host.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. @@ -38,7 +38,7 @@ struct VideoCaptureHost::Entry { }; VideoCaptureHost::VideoCaptureHost(content::ResourceContext* resource_context, - AudioManager* audio_manager) + media::AudioManager* audio_manager) : resource_context_(resource_context), audio_manager_(audio_manager) { } diff --git a/content/browser/renderer_host/media/video_capture_host.h b/content/browser/renderer_host/media/video_capture_host.h index bea1657..5e59722 100644 --- a/content/browser/renderer_host/media/video_capture_host.h +++ b/content/browser/renderer_host/media/video_capture_host.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 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. // @@ -45,18 +45,20 @@ #include "content/public/browser/browser_message_filter.h" #include "ipc/ipc_message.h" -class AudioManager; - namespace content { class ResourceContext; } // namespace content +namespace media { +class AudioManager; +} + class CONTENT_EXPORT VideoCaptureHost : public content::BrowserMessageFilter, public VideoCaptureControllerEventHandler { public: explicit VideoCaptureHost(content::ResourceContext* resource_context, - AudioManager* audio_manager); + media::AudioManager* audio_manager); // content::BrowserMessageFilter implementation. virtual void OnChannelClosing() OVERRIDE; @@ -145,7 +147,7 @@ class CONTENT_EXPORT VideoCaptureHost // Used to get a pointer to VideoCaptureManager to start/stop capture devices. content::ResourceContext* resource_context_; - AudioManager* audio_manager_; + media::AudioManager* audio_manager_; DISALLOW_COPY_AND_ASSIGN(VideoCaptureHost); }; diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc index 4b91bf4..635b1bd 100644 --- a/content/browser/renderer_host/media/video_capture_host_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc @@ -72,7 +72,7 @@ class DumpVideo { class MockVideoCaptureHost : public VideoCaptureHost { public: MockVideoCaptureHost(content::ResourceContext* resource_context, - AudioManager* audio_manager) + media::AudioManager* audio_manager) : VideoCaptureHost(resource_context, audio_manager), return_buffers_(false), dump_video_(false) {} @@ -205,7 +205,7 @@ class VideoCaptureHostTest : public testing::Test { io_thread_.reset(new BrowserThreadImpl(BrowserThread::IO, message_loop_.get())); - audio_manager_.reset(AudioManager::Create()); + audio_manager_.reset(media::AudioManager::Create()); #ifndef TEST_REAL_CAPTURE_DEVICE media_stream::MediaStreamManager::GetForResourceContext( @@ -246,7 +246,7 @@ class VideoCaptureHostTest : public testing::Test { // Called on the main thread. static void PostQuitOnVideoCaptureManagerThread( MessageLoop* message_loop, content::ResourceContext* resource_context, - AudioManager* audio_manager) { + media:: AudioManager* audio_manager) { media_stream::MediaStreamManager* manager = media_stream::MediaStreamManager::GetForResourceContext( resource_context, audio_manager); @@ -362,7 +362,7 @@ class VideoCaptureHostTest : public testing::Test { scoped_ptr<MessageLoop> message_loop_; scoped_ptr<BrowserThreadImpl> ui_thread_; scoped_ptr<BrowserThreadImpl> io_thread_; - scoped_ptr<AudioManager> audio_manager_; + scoped_ptr<media::AudioManager> audio_manager_; content::MockResourceContext resource_context_; DISALLOW_COPY_AND_ASSIGN(VideoCaptureHostTest); diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc index a0dc2a3..91f37ae 100644 --- a/content/browser/renderer_host/render_message_filter.cc +++ b/content/browser/renderer_host/render_message_filter.cc @@ -692,7 +692,7 @@ void RenderMessageFilter::OnGetHardwareBufferSize(uint32* buffer_size) { void RenderMessageFilter::OnGetHardwareInputSampleRate(int* sample_rate) { // TODO(henrika): add support for all available input devices. *sample_rate = media::GetAudioInputHardwareSampleRate( - AudioManagerBase::kDefaultDeviceId); + media::AudioManagerBase::kDefaultDeviceId); } void RenderMessageFilter::OnGetHardwareSampleRate(int* sample_rate) { @@ -703,7 +703,7 @@ void RenderMessageFilter::OnGetHardwareInputChannelLayout( ChannelLayout* layout) { // TODO(henrika): add support for all available input devices. *layout = media::GetAudioInputHardwareChannelLayout( - AudioManagerBase::kDefaultDeviceId); + media::AudioManagerBase::kDefaultDeviceId); } void RenderMessageFilter::OnDownloadUrl(const IPC::Message& message, diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index a3fa88a..57edc18 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -471,7 +471,8 @@ void RenderProcessHostImpl::CreateMessageFilters() { #if !defined(OS_ANDROID) // TODO(dtrainor, klobag): Enable this when content::BrowserMainLoop gets // included in Android builds. Tracked via 115941. - AudioManager* audio_manager = content::BrowserMainLoop::GetAudioManager(); + media::AudioManager* audio_manager = + content::BrowserMainLoop::GetAudioManager(); channel_->AddFilter(new AudioInputRendererHost( resource_context, audio_manager)); channel_->AddFilter(new AudioRendererHost(audio_manager, media_observer)); diff --git a/content/browser/speech/input_tag_speech_dispatcher_host.cc b/content/browser/speech/input_tag_speech_dispatcher_host.cc index 7c10270..6ec3be0 100644 --- a/content/browser/speech/input_tag_speech_dispatcher_host.cc +++ b/content/browser/speech/input_tag_speech_dispatcher_host.cc @@ -118,7 +118,7 @@ InputTagSpeechDispatcherHost::InputTagSpeechDispatcherHost( int render_process_id, net::URLRequestContextGetter* context_getter, content::SpeechRecognitionPreferences* recognition_preferences, - AudioManager* audio_manager) + media::AudioManager* audio_manager) : render_process_id_(render_process_id), may_have_pending_requests_(false), context_getter_(context_getter), diff --git a/content/browser/speech/input_tag_speech_dispatcher_host.h b/content/browser/speech/input_tag_speech_dispatcher_host.h index 61d68b0..c988faf 100644 --- a/content/browser/speech/input_tag_speech_dispatcher_host.h +++ b/content/browser/speech/input_tag_speech_dispatcher_host.h @@ -10,7 +10,6 @@ #include "content/public/browser/browser_message_filter.h" #include "net/url_request/url_request_context_getter.h" -class AudioManager; struct InputTagSpeechHostMsg_StartRecognition_Params; namespace content { @@ -18,6 +17,10 @@ class SpeechRecognitionPreferences; struct SpeechRecognitionResult; } +namespace media { +class AudioManager; +} + namespace speech { class SpeechRecognitionManagerImpl; @@ -34,7 +37,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost int render_process_id, net::URLRequestContextGetter* context_getter, content::SpeechRecognitionPreferences* recognition_preferences, - AudioManager* audio_manager); + media::AudioManager* audio_manager); // Methods called by SpeechRecognitionManagerImpl. void SetRecognitionResult(int caller_id, @@ -66,7 +69,7 @@ class CONTENT_EXPORT InputTagSpeechDispatcherHost scoped_refptr<net::URLRequestContextGetter> context_getter_; scoped_refptr<content::SpeechRecognitionPreferences> recognition_preferences_; - AudioManager* audio_manager_; + media::AudioManager* audio_manager_; static SpeechRecognitionManagerImpl* manager_; diff --git a/content/browser/speech/speech_recognition_manager_impl.cc b/content/browser/speech/speech_recognition_manager_impl.cc index e9d9d01..7600b50 100644 --- a/content/browser/speech/speech_recognition_manager_impl.cc +++ b/content/browser/speech/speech_recognition_manager_impl.cc @@ -114,7 +114,7 @@ void SpeechRecognitionManagerImpl::ShowAudioInputSettings() { return; } - AudioManager* audio_manager = BrowserMainLoop::GetAudioManager(); + media::AudioManager* audio_manager = BrowserMainLoop::GetAudioManager(); DCHECK(audio_manager->CanShowAudioInputSettings()); if (audio_manager->CanShowAudioInputSettings()) audio_manager->ShowAudioInputSettings(); diff --git a/content/browser/speech/speech_recognizer_impl.cc b/content/browser/speech/speech_recognizer_impl.cc index 05f81e7..07bd75e 100644 --- a/content/browser/speech/speech_recognizer_impl.cc +++ b/content/browser/speech/speech_recognizer_impl.cc @@ -23,6 +23,7 @@ using content::SpeechRecognitionEventListener; using content::SpeechRecognitionResult; using content::SpeechRecognizer; using media::AudioInputController; +using media::AudioManager; namespace { @@ -137,13 +138,12 @@ void SpeechRecognizerImpl::StartRecognition() { endpointer_.SetEnvironmentEstimationMode(); AudioManager* audio_manager = (testing_audio_manager_ != NULL) ? - testing_audio_manager_ : - BrowserMainLoop::GetAudioManager(); + testing_audio_manager_ : BrowserMainLoop::GetAudioManager(); const int samples_per_packet = kAudioSampleRate * GoogleOneShotRemoteEngine::kAudioPacketIntervalMs / 1000; - AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, - kAudioSampleRate, kNumBitsPerAudioSample, - samples_per_packet); + media::AudioParameters params( + media::AudioParameters::AUDIO_PCM_LINEAR, kChannelLayout, + kAudioSampleRate, kNumBitsPerAudioSample, samples_per_packet); audio_controller_ = AudioInputController::Create(audio_manager, this, params); DCHECK(audio_controller_.get()); VLOG(1) << "SpeechRecognizer starting record."; diff --git a/content/browser/speech/speech_recognizer_impl.h b/content/browser/speech/speech_recognizer_impl.h index eed04bc..516dfea 100644 --- a/content/browser/speech/speech_recognizer_impl.h +++ b/content/browser/speech/speech_recognizer_impl.h @@ -22,6 +22,7 @@ struct SpeechRecognitionResult; namespace media { class AudioInputController; +class AudioManager; } namespace speech { @@ -91,10 +92,10 @@ class CONTENT_EXPORT SpeechRecognizerImpl // without blocking the IO thread. void CloseAudioControllerAsynchronously(); - void SetAudioManagerForTesting(AudioManager* audio_manager); + void SetAudioManagerForTesting(media::AudioManager* audio_manager); content::SpeechRecognitionEventListener* listener_; - AudioManager* testing_audio_manager_; + media::AudioManager* testing_audio_manager_; scoped_ptr<SpeechRecognitionEngine> recognition_engine_; Endpointer endpointer_; scoped_refptr<media::AudioInputController> audio_controller_; diff --git a/content/browser/speech/speech_recognizer_impl_unittest.cc b/content/browser/speech/speech_recognizer_impl_unittest.cc index d553064..01b7e4c 100644 --- a/content/browser/speech/speech_recognizer_impl_unittest.cc +++ b/content/browser/speech/speech_recognizer_impl_unittest.cc @@ -20,12 +20,16 @@ using content::BrowserThread; using content::BrowserThreadImpl; using media::AudioInputController; +using media::AudioInputStream; +using media::AudioManager; +using media::AudioOutputStream; +using media::AudioParameters; using media::TestAudioInputController; using media::TestAudioInputControllerFactory; namespace { -class MockAudioManager : public AudioManagerBase { +class MockAudioManager : public media::AudioManagerBase { public: MockAudioManager() { audio_thread_.reset(new base::Thread("MockAudioThread")); @@ -40,7 +44,7 @@ class MockAudioManager : public AudioManagerBase { media::AudioDeviceNames* device_names) OVERRIDE {} virtual AudioOutputStream* MakeAudioOutputStream( const AudioParameters& params) OVERRIDE { - return FakeAudioOutputStream::MakeFakeStream(this, params); + return media::FakeAudioOutputStream::MakeFakeStream(this, params); } virtual AudioOutputStream* MakeAudioOutputStreamProxy( const AudioParameters& params) OVERRIDE { @@ -49,7 +53,7 @@ class MockAudioManager : public AudioManagerBase { } virtual AudioInputStream* MakeAudioInputStream( const AudioParameters& params, const std::string& device_id) OVERRIDE { - return FakeAudioInputStream::MakeFakeStream(this, params); + return media::FakeAudioInputStream::MakeFakeStream(this, params); } virtual AudioOutputStream* MakeLinearOutputStream( const AudioParameters& params) OVERRIDE { diff --git a/content/common/media/audio_messages.h b/content/common/media/audio_messages.h index 0acb35c..ce0d4bd 100644 --- a/content/common/media/audio_messages.h +++ b/content/common/media/audio_messages.h @@ -23,7 +23,7 @@ IPC_ENUM_TRAITS(AudioStreamState) -IPC_STRUCT_TRAITS_BEGIN(AudioBuffersState) +IPC_STRUCT_TRAITS_BEGIN(media::AudioBuffersState) IPC_STRUCT_TRAITS_MEMBER(pending_bytes) IPC_STRUCT_TRAITS_MEMBER(hardware_delay_bytes) IPC_STRUCT_TRAITS_END() @@ -90,12 +90,12 @@ IPC_MESSAGE_CONTROL2(AudioInputMsg_NotifyDeviceStarted, // Request that got sent to browser for creating an audio output stream IPC_MESSAGE_CONTROL2(AudioHostMsg_CreateStream, int /* stream_id */, - AudioParameters /* params */) + media::AudioParameters /* params */) // Request that got sent to browser for creating an audio input stream IPC_MESSAGE_CONTROL4(AudioInputHostMsg_CreateStream, int /* stream_id */, - AudioParameters /* params */, + media::AudioParameters /* params */, std::string /* device_id */, bool /* automatic_gain_control */) diff --git a/content/common/media/audio_param_traits.cc b/content/common/media/audio_param_traits.cc index 049037f..7092540 100644 --- a/content/common/media/audio_param_traits.cc +++ b/content/common/media/audio_param_traits.cc @@ -7,6 +7,8 @@ #include "base/stringprintf.h" #include "media/audio/audio_parameters.h" +using media::AudioParameters; + namespace IPC { void ParamTraits<AudioParameters>::Write(Message* m, diff --git a/content/common/media/audio_param_traits.h b/content/common/media/audio_param_traits.h index 13c1139..578f9a3 100644 --- a/content/common/media/audio_param_traits.h +++ b/content/common/media/audio_param_traits.h @@ -9,13 +9,15 @@ #include "ipc/ipc_message.h" #include "ipc/ipc_param_traits.h" +namespace media { class AudioParameters; +} namespace IPC { template <> -struct ParamTraits<AudioParameters> { - typedef AudioParameters param_type; +struct ParamTraits<media::AudioParameters> { + typedef media::AudioParameters param_type; static void Write(Message* m, const param_type& p); static bool Read(const Message* m, PickleIterator* iter, param_type* r); static void Log(const param_type& p, std::string* l); diff --git a/content/renderer/media/audio_device.cc b/content/renderer/media/audio_device.cc index b1e5cdf..60e36a7 100644 --- a/content/renderer/media/audio_device.cc +++ b/content/renderer/media/audio_device.cc @@ -23,7 +23,7 @@ using media::AudioRendererSink; class AudioDevice::AudioThreadCallback : public AudioDeviceThread::Callback { public: - AudioThreadCallback(const AudioParameters& audio_parameters, + AudioThreadCallback(const media::AudioParameters& audio_parameters, base::SharedMemoryHandle memory, int memory_length, AudioRendererSink::RenderCallback* render_callback); @@ -49,7 +49,7 @@ AudioDevice::AudioDevice() filter_ = RenderThreadImpl::current()->audio_message_filter(); } -AudioDevice::AudioDevice(const AudioParameters& params, +AudioDevice::AudioDevice(const media::AudioParameters& params, RenderCallback* callback) : ScopedLoopObserver(ChildProcess::current()->io_message_loop()), audio_parameters_(params), @@ -61,7 +61,7 @@ AudioDevice::AudioDevice(const AudioParameters& params, filter_ = RenderThreadImpl::current()->audio_message_filter(); } -void AudioDevice::Initialize(const AudioParameters& params, +void AudioDevice::Initialize(const media::AudioParameters& params, RenderCallback* callback) { CHECK_EQ(0, stream_id_) << "AudioDevice::Initialize() must be called before Start()"; @@ -130,7 +130,7 @@ void AudioDevice::GetVolume(double* volume) { *volume = volume_; } -void AudioDevice::InitializeOnIOThread(const AudioParameters& params) { +void AudioDevice::InitializeOnIOThread(const media::AudioParameters& params) { DCHECK(message_loop()->BelongsToCurrentThread()); // Make sure we don't create the stream more than once. DCHECK_EQ(0, stream_id_); @@ -262,7 +262,7 @@ void AudioDevice::WillDestroyCurrentMessageLoop() { // AudioDevice::AudioThreadCallback AudioDevice::AudioThreadCallback::AudioThreadCallback( - const AudioParameters& audio_parameters, + const media::AudioParameters& audio_parameters, base::SharedMemoryHandle memory, int memory_length, media::AudioRendererSink::RenderCallback* render_callback) diff --git a/content/renderer/media/audio_device.h b/content/renderer/media/audio_device.h index 4cdb946..9410ce7 100644 --- a/content/renderer/media/audio_device.h +++ b/content/renderer/media/audio_device.h @@ -76,6 +76,10 @@ #include "media/audio/audio_parameters.h" #include "media/base/audio_renderer_sink.h" +namespace media { +class AudioParameters; +} + class CONTENT_EXPORT AudioDevice : NON_EXPORTED_BASE(public media::AudioRendererSink), public AudioMessageFilter::Delegate, @@ -86,11 +90,11 @@ class CONTENT_EXPORT AudioDevice // Minimal constructor where Initialize() must be called later. AudioDevice(); - AudioDevice(const AudioParameters& params, RenderCallback* callback); + AudioDevice(const media::AudioParameters& params, RenderCallback* callback); // AudioRendererSink implementation. - virtual void Initialize(const AudioParameters& params, + virtual void Initialize(const media::AudioParameters& params, RenderCallback* callback) OVERRIDE; // Starts audio playback. virtual void Start() OVERRIDE; @@ -132,7 +136,7 @@ class CONTENT_EXPORT AudioDevice // The following methods are tasks posted on the IO thread that needs to // be executed on that thread. They interact with AudioMessageFilter and // sends IPC messages on that thread. - void InitializeOnIOThread(const AudioParameters& params); + void InitializeOnIOThread(const media::AudioParameters& params); void PlayOnIOThread(); void PauseOnIOThread(bool flush); void ShutDownOnIOThread(); @@ -144,7 +148,7 @@ class CONTENT_EXPORT AudioDevice // If the IO loop dies before we do, we shut down the audio thread from here. virtual void WillDestroyCurrentMessageLoop() OVERRIDE; - AudioParameters audio_parameters_; + media::AudioParameters audio_parameters_; RenderCallback* callback_; diff --git a/content/renderer/media/audio_device_thread.cc b/content/renderer/media/audio_device_thread.cc index 77f37dcf..c3cb6ce 100644 --- a/content/renderer/media/audio_device_thread.cc +++ b/content/renderer/media/audio_device_thread.cc @@ -170,9 +170,9 @@ void AudioDeviceThread::Thread::Run() { // AudioDeviceThread::Callback implementation -AudioDeviceThread::Callback::Callback(const AudioParameters& audio_parameters, - base::SharedMemoryHandle memory, - int memory_length) +AudioDeviceThread::Callback::Callback( + const media::AudioParameters& audio_parameters, + base::SharedMemoryHandle memory, int memory_length) : audio_parameters_(audio_parameters), samples_per_ms_(audio_parameters.sample_rate() / 1000), bytes_per_ms_(audio_parameters.channels() * diff --git a/content/renderer/media/audio_device_thread.h b/content/renderer/media/audio_device_thread.h index 51c6fda..0b9f82e 100644 --- a/content/renderer/media/audio_device_thread.h +++ b/content/renderer/media/audio_device_thread.h @@ -35,7 +35,7 @@ class CONTENT_EXPORT AudioDeviceThread { // AudioDevice thread. class Callback { public: - Callback(const AudioParameters& audio_parameters, + Callback(const media::AudioParameters& audio_parameters, base::SharedMemoryHandle memory, int memory_length); virtual ~Callback(); @@ -54,7 +54,7 @@ class CONTENT_EXPORT AudioDeviceThread { // Protected so that derived classes can access directly. // The variables are 'const' since values are calculated/set in the // constructor and must never change. - const AudioParameters audio_parameters_; + const media::AudioParameters audio_parameters_; const int samples_per_ms_; const int bytes_per_ms_; diff --git a/content/renderer/media/audio_input_device.cc b/content/renderer/media/audio_input_device.cc index 11a3938..09c0ba7 100644 --- a/content/renderer/media/audio_input_device.cc +++ b/content/renderer/media/audio_input_device.cc @@ -21,7 +21,7 @@ class AudioInputDevice::AudioThreadCallback : public AudioDeviceThread::Callback { public: - AudioThreadCallback(const AudioParameters& audio_parameters, + AudioThreadCallback(const media::AudioParameters& audio_parameters, base::SharedMemoryHandle memory, int memory_length, CaptureCallback* capture_callback); @@ -37,7 +37,7 @@ class AudioInputDevice::AudioThreadCallback DISALLOW_COPY_AND_ASSIGN(AudioThreadCallback); }; -AudioInputDevice::AudioInputDevice(const AudioParameters& params, +AudioInputDevice::AudioInputDevice(const media::AudioParameters& params, CaptureCallback* callback, CaptureEventHandler* event_handler) : ScopedLoopObserver(ChildProcess::current()->io_message_loop()), @@ -117,7 +117,8 @@ void AudioInputDevice::InitializeOnIOThread() { // and create the stream when getting a OnDeviceReady() callback. if (!session_id_) { Send(new AudioInputHostMsg_CreateStream( - stream_id_, audio_parameters_, AudioManagerBase::kDefaultDeviceId, + stream_id_, audio_parameters_, + media::AudioManagerBase::kDefaultDeviceId, agc_is_enabled_)); } else { Send(new AudioInputHostMsg_StartDevice(stream_id_, session_id_)); @@ -297,7 +298,7 @@ void AudioInputDevice::WillDestroyCurrentMessageLoop() { // AudioInputDevice::AudioThreadCallback AudioInputDevice::AudioThreadCallback::AudioThreadCallback( - const AudioParameters& audio_parameters, + const media::AudioParameters& audio_parameters, base::SharedMemoryHandle memory, int memory_length, CaptureCallback* capture_callback) @@ -316,10 +317,10 @@ void AudioInputDevice::AudioThreadCallback::Process(int pending_data) { // The shared memory represents parameters, size of the data buffer and the // actual data buffer containing audio data. Map the memory into this // structure and parse out parameters and the data area. - AudioInputBuffer* buffer = - reinterpret_cast<AudioInputBuffer*>(shared_memory_.memory()); + media::AudioInputBuffer* buffer = + reinterpret_cast<media::AudioInputBuffer*>(shared_memory_.memory()); uint32 size = buffer->params.size; - DCHECK_EQ(size, memory_length_ - sizeof(AudioInputBufferParameters)); + DCHECK_EQ(size, memory_length_ - sizeof(media::AudioInputBufferParameters)); double volume = buffer->params.volume; int audio_delay_milliseconds = pending_data / bytes_per_ms_; diff --git a/content/renderer/media/audio_input_device.h b/content/renderer/media/audio_input_device.h index 99cd03c..ac68b96 100644 --- a/content/renderer/media/audio_input_device.h +++ b/content/renderer/media/audio_input_device.h @@ -118,7 +118,8 @@ class CONTENT_EXPORT AudioInputDevice }; // Methods called on main render thread ------------------------------------- - AudioInputDevice(const AudioParameters& params, CaptureCallback* callback, + AudioInputDevice(const media::AudioParameters& params, + CaptureCallback* callback, CaptureEventHandler* event_handler); virtual ~AudioInputDevice(); @@ -184,7 +185,7 @@ class CONTENT_EXPORT AudioInputDevice virtual void WillDestroyCurrentMessageLoop() OVERRIDE; // Format - AudioParameters audio_parameters_; + media::AudioParameters audio_parameters_; CaptureCallback* callback_; CaptureEventHandler* event_handler_; diff --git a/content/renderer/media/audio_renderer_impl.cc b/content/renderer/media/audio_renderer_impl.cc index 112be63..81d1cc6 100644 --- a/content/renderer/media/audio_renderer_impl.cc +++ b/content/renderer/media/audio_renderer_impl.cc @@ -61,7 +61,7 @@ bool AudioRendererImpl::OnInitialize(int bits_per_channel, // Please see: http://code.google.com/p/chromium/issues/detail?id=103627 // for more details. audio_parameters_.Reset( - AudioParameters::AUDIO_PCM_LINEAR, + media::AudioParameters::AUDIO_PCM_LINEAR, channel_layout, sample_rate, bits_per_channel, audio_hardware::GetHighLatencyOutputBufferSize(sample_rate)); diff --git a/content/renderer/media/audio_renderer_impl.h b/content/renderer/media/audio_renderer_impl.h index c2f8864..978f5a0 100644 --- a/content/renderer/media/audio_renderer_impl.h +++ b/content/renderer/media/audio_renderer_impl.h @@ -129,7 +129,7 @@ class CONTENT_EXPORT AudioRendererImpl // than nothing. base::Time earliest_end_time_; - AudioParameters audio_parameters_; + media::AudioParameters audio_parameters_; DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl); }; diff --git a/content/renderer/media/render_audiosourceprovider.cc b/content/renderer/media/render_audiosourceprovider.cc index 5159d4d..a627bfa 100644 --- a/content/renderer/media/render_audiosourceprovider.cc +++ b/content/renderer/media/render_audiosourceprovider.cc @@ -73,7 +73,7 @@ void RenderAudioSourceProvider::GetVolume(double* volume) { } void RenderAudioSourceProvider::Initialize( - const AudioParameters& params, RenderCallback* renderer) { + const media::AudioParameters& params, RenderCallback* renderer) { base::AutoLock auto_lock(sink_lock_); CHECK(!is_initialized_); renderer_ = renderer; diff --git a/content/renderer/media/render_audiosourceprovider.h b/content/renderer/media/render_audiosourceprovider.h index c0a3a88..6d842cb 100644 --- a/content/renderer/media/render_audiosourceprovider.h +++ b/content/renderer/media/render_audiosourceprovider.h @@ -60,7 +60,7 @@ class RenderAudioSourceProvider virtual bool SetVolume(double volume) OVERRIDE; virtual void GetVolume(double* volume) OVERRIDE; virtual void Initialize( - const AudioParameters& params, RenderCallback* renderer) OVERRIDE; + const media::AudioParameters& params, RenderCallback* renderer) OVERRIDE; private: // Set to true when Initialize() is called. diff --git a/content/renderer/media/renderer_webaudiodevice_impl.cc b/content/renderer/media/renderer_webaudiodevice_impl.cc index d054325..2a90144 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.cc +++ b/content/renderer/media/renderer_webaudiodevice_impl.cc @@ -8,7 +8,8 @@ using WebKit::WebAudioDevice; using WebKit::WebVector; RendererWebAudioDeviceImpl::RendererWebAudioDeviceImpl( - const AudioParameters& params, WebAudioDevice::RenderCallback* callback) + const media::AudioParameters& params, + WebAudioDevice::RenderCallback* callback) : is_running_(false), client_callback_(callback) { audio_device_ = new AudioDevice(params, this); diff --git a/content/renderer/media/renderer_webaudiodevice_impl.h b/content/renderer/media/renderer_webaudiodevice_impl.h index 7b66033..a70c0884 100644 --- a/content/renderer/media/renderer_webaudiodevice_impl.h +++ b/content/renderer/media/renderer_webaudiodevice_impl.h @@ -12,12 +12,15 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebAudioDevice.h" #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebVector.h" +namespace media { class AudioParameters; +} -class RendererWebAudioDeviceImpl : public WebKit::WebAudioDevice, - public AudioDevice::RenderCallback { +class RendererWebAudioDeviceImpl + : public WebKit::WebAudioDevice, + public AudioDevice::RenderCallback { public: - RendererWebAudioDeviceImpl(const AudioParameters& params, + RendererWebAudioDeviceImpl(const media::AudioParameters& params, WebKit::WebAudioDevice::RenderCallback* callback); virtual ~RendererWebAudioDeviceImpl(); diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc index a25bdca..1eeea33 100644 --- a/content/renderer/media/webrtc_audio_device_impl.cc +++ b/content/renderer/media/webrtc_audio_device_impl.cc @@ -11,6 +11,8 @@ #include "content/renderer/render_thread_impl.h" #include "media/audio/audio_util.h" +using media::AudioParameters; + static const int64 kMillisecondsBetweenProcessCalls = 5000; static const double kMaxVolumeLevel = 255.0; diff --git a/content/renderer/media/webrtc_audio_device_impl.h b/content/renderer/media/webrtc_audio_device_impl.h index c00e129..8900ebf 100644 --- a/content/renderer/media/webrtc_audio_device_impl.h +++ b/content/renderer/media/webrtc_audio_device_impl.h @@ -416,8 +416,8 @@ class CONTENT_EXPORT WebRtcAudioDeviceImpl webrtc::AudioTransport* audio_transport_callback_; // Cached values of utilized audio parameters. Platform dependent. - AudioParameters input_audio_parameters_; - AudioParameters output_audio_parameters_; + media::AudioParameters input_audio_parameters_; + media::AudioParameters output_audio_parameters_; // Cached value of the current audio delay on the input/capture side. int input_delay_ms_; diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc index 6c42f75..3ac06f2 100644 --- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc @@ -93,7 +93,7 @@ bool PepperPlatformAudioInputImpl::Initialize( plugin_delegate_ = plugin_delegate; client_ = client; - params_.Reset(AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, + params_.Reset(media::AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO, sample_rate, 16, frames_per_buffer); if (device_id.empty()) { @@ -127,7 +127,8 @@ void PepperPlatformAudioInputImpl::InitializeOnIOThread(int session_id) { if (!session_id) { // We will be notified by OnStreamCreated(). filter_->Send(new AudioInputHostMsg_CreateStream( - stream_id_, params_, AudioManagerBase::kDefaultDeviceId, false)); + stream_id_, params_, + media::AudioManagerBase::kDefaultDeviceId, false)); } else { // We will be notified by OnDeviceReady(). filter_->Send(new AudioInputHostMsg_StartDevice(stream_id_, session_id)); diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.h b/content/renderer/pepper/pepper_platform_audio_input_impl.h index 15681bb..384a7c6 100644 --- a/content/renderer/pepper/pepper_platform_audio_input_impl.h +++ b/content/renderer/pepper/pepper_platform_audio_input_impl.h @@ -15,7 +15,10 @@ #include "media/audio/audio_parameters.h" #include "webkit/plugins/ppapi/plugin_delegate.h" +namespace media { class AudioParameters; +} + class PepperPluginDelegateImpl; // PepperPlatformAudioInputImpl is operated on two threads: the main thread (the @@ -25,6 +28,7 @@ class PepperPluginDelegateImpl; // also sent on the main thread. Internally, this class sends audio input IPC // messages and receives AudioInputMessageFilter::Delegate notifications on the // I/O thread. + class PepperPlatformAudioInputImpl : public webkit::ppapi::PluginDelegate::PlatformAudioInput, public AudioInputMessageFilter::Delegate, @@ -102,7 +106,7 @@ class PepperPlatformAudioInputImpl bool shutdown_called_; // Initialized on the main thread and accessed on the I/O thread afterwards. - AudioParameters params_; + media::AudioParameters params_; DISALLOW_COPY_AND_ASSIGN(PepperPlatformAudioInputImpl); }; diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc index be636dc..bab8322 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc +++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc @@ -83,20 +83,20 @@ bool PepperPlatformAudioOutputImpl::Initialize( client_ = client; - AudioParameters::Format format; + media::AudioParameters::Format format; const int kMaxFramesForLowLatency = 2048; // Use the low latency back end if the client request is compatible, and // the sample count is low enough to justify using AUDIO_PCM_LOW_LATENCY. if (sample_rate == audio_hardware::GetOutputSampleRate() && frames_per_buffer <= kMaxFramesForLowLatency && frames_per_buffer % audio_hardware::GetOutputBufferSize() == 0) { - format = AudioParameters::AUDIO_PCM_LOW_LATENCY; + format = media::AudioParameters::AUDIO_PCM_LOW_LATENCY; } else { - format = AudioParameters::AUDIO_PCM_LINEAR; + format = media::AudioParameters::AUDIO_PCM_LINEAR; } - AudioParameters params(format, CHANNEL_LAYOUT_STEREO, sample_rate, - 16, frames_per_buffer); + media::AudioParameters params(format, CHANNEL_LAYOUT_STEREO, sample_rate, 16, + frames_per_buffer); ChildProcess::current()->io_message_loop()->PostTask( FROM_HERE, @@ -106,7 +106,7 @@ bool PepperPlatformAudioOutputImpl::Initialize( } void PepperPlatformAudioOutputImpl::InitializeOnIOThread( - const AudioParameters& params) { + const media::AudioParameters& params) { stream_id_ = filter_->AddDelegate(this); filter_->Send(new AudioHostMsg_CreateStream(stream_id_, params)); } diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.h b/content/renderer/pepper/pepper_platform_audio_output_impl.h index f1d5cba..b1609ef 100644 --- a/content/renderer/pepper/pepper_platform_audio_output_impl.h +++ b/content/renderer/pepper/pepper_platform_audio_output_impl.h @@ -10,7 +10,9 @@ #include "content/renderer/media/audio_message_filter.h" #include "webkit/plugins/ppapi/plugin_delegate.h" +namespace media{ class AudioParameters; +} namespace base { class MessageLoopProxy; @@ -44,7 +46,7 @@ class PepperPlatformAudioOutputImpl webkit::ppapi::PluginDelegate::PlatformAudioOutputClient* client); // I/O thread backends to above functions. - void InitializeOnIOThread(const AudioParameters& params); + void InitializeOnIOThread(const media::AudioParameters& params); void StartPlaybackOnIOThread(); void StopPlaybackOnIOThread(); void ShutDownOnIOThread(); diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc index 18c2008..7afb22d 100644 --- a/content/renderer/renderer_webkitplatformsupport_impl.cc +++ b/content/renderer/renderer_webkitplatformsupport_impl.cc @@ -658,11 +658,9 @@ RendererWebKitPlatformSupportImpl::createAudioDevice( layout = CHANNEL_LAYOUT_STEREO; } - AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY, - layout, - static_cast<int>(sampleRate), - 16, - bufferSize); + media::AudioParameters params( + media::AudioParameters::AUDIO_PCM_LOW_LATENCY, layout, + static_cast<int>(sampleRate), 16, bufferSize); return new RendererWebAudioDeviceImpl(params, callback); } diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc index cb37584..0f11917 100644 --- a/content/test/webrtc_audio_device_test.cc +++ b/content/test/webrtc_audio_device_test.cc @@ -164,7 +164,7 @@ void WebRTCAudioDeviceTest::InitializeIOThread(const char* thread_name) { io_thread_.reset(new content::TestBrowserThread(content::BrowserThread::IO, MessageLoop::current())); - audio_manager_.reset(AudioManager::Create()); + audio_manager_.reset(media::AudioManager::Create()); // Populate our resource context. test_request_context_ = new TestURLRequestContext(); @@ -221,7 +221,7 @@ void WebRTCAudioDeviceTest::OnGetHardwareInputSampleRate(int* sample_rate) { EXPECT_TRUE(audio_util_callback_); *sample_rate = audio_util_callback_ ? audio_util_callback_->GetAudioInputHardwareSampleRate( - AudioManagerBase::kDefaultDeviceId) : 0; + media::AudioManagerBase::kDefaultDeviceId) : 0; } void WebRTCAudioDeviceTest::OnGetHardwareInputChannelLayout( @@ -229,7 +229,7 @@ void WebRTCAudioDeviceTest::OnGetHardwareInputChannelLayout( EXPECT_TRUE(audio_util_callback_); *layout = audio_util_callback_ ? audio_util_callback_->GetAudioInputHardwareChannelLayout( - AudioManagerBase::kDefaultDeviceId) : CHANNEL_LAYOUT_NONE; + media::AudioManagerBase::kDefaultDeviceId) : CHANNEL_LAYOUT_NONE; } // IPC::Channel::Listener implementation. diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h index bd82c87..dfe9f27 100644 --- a/content/test/webrtc_audio_device_test.h +++ b/content/test/webrtc_audio_device_test.h @@ -20,7 +20,6 @@ #include "third_party/webrtc/common_types.h" class AudioInputRendererHost; -class AudioManager; class AudioRendererHost; class RenderThreadImpl; class WebRTCMockRenderProcess; @@ -38,6 +37,10 @@ class ResourceContext; class TestBrowserThread; } +namespace media { +class AudioManager; +} + namespace media_stream { class MediaStreamManager; } @@ -166,7 +169,7 @@ class WebRTCAudioDeviceTest scoped_ptr<WebRTCMockRenderProcess> mock_process_; scoped_ptr<MockMediaObserver> media_observer_; scoped_ptr<media_stream::MediaStreamManager> media_stream_manager_; - scoped_ptr<AudioManager> audio_manager_; + scoped_ptr<media::AudioManager> audio_manager_; scoped_ptr<content::MockResourceContext> resource_context_; scoped_refptr<net::URLRequestContext> test_request_context_; scoped_ptr<IPC::Channel> channel_; |