OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/media/render_audiosourceprovider.h" | 5 #include "content/renderer/media/render_audiosourceprovider.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "content/renderer/media/audio_device_factory.h" | 12 #include "content/renderer/media/audio_device_factory.h" |
13 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 13 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| 14 #include "content/renderer/media/renderer_audio_output_device.h" |
14 #include "content/renderer/render_thread_impl.h" | 15 #include "content/renderer/render_thread_impl.h" |
15 #include "media/base/audio_renderer_mixer_input.h" | 16 #include "media/base/audio_renderer_mixer_input.h" |
16 #include "media/base/media_switches.h" | 17 #include "media/base/media_switches.h" |
17 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvide
rClient.h" | 18 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAudioSourceProvide
rClient.h" |
18 | 19 |
19 using std::vector; | 20 using std::vector; |
20 using WebKit::WebVector; | 21 using WebKit::WebVector; |
21 | 22 |
22 namespace content { | 23 namespace content { |
23 | 24 |
24 RenderAudioSourceProvider::RenderAudioSourceProvider() | 25 RenderAudioSourceProvider::RenderAudioSourceProvider(int source_render_view_id) |
25 : is_initialized_(false), | 26 : is_initialized_(false), |
26 channels_(0), | 27 channels_(0), |
27 sample_rate_(0), | 28 sample_rate_(0), |
28 is_running_(false), | 29 is_running_(false), |
29 renderer_(NULL), | 30 renderer_(NULL), |
30 client_(NULL) { | 31 client_(NULL) { |
31 // We create an AudioRendererSink here, but we don't yet know the audio format | 32 // We create an AudioRendererSink here, but we don't yet know the audio format |
32 // (sample-rate, etc.) at this point. Later, when Initialize() is called, we | 33 // (sample-rate, etc.) at this point. Later, when Initialize() is called, we |
33 // have the audio format information and call AudioRendererSink::Initialize() | 34 // have the audio format information and call AudioRendererSink::Initialize() |
34 // to fully initialize it. | 35 // to fully initialize it. |
35 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 36 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
36 #if defined(OS_WIN) || defined(OS_MAC) | 37 #if defined(OS_WIN) || defined(OS_MAC) |
37 const bool use_mixing = | 38 const bool use_mixing = |
38 !cmd_line->HasSwitch(switches::kDisableRendererSideMixing); | 39 !cmd_line->HasSwitch(switches::kDisableRendererSideMixing); |
39 #else | 40 #else |
40 const bool use_mixing = | 41 const bool use_mixing = |
41 cmd_line->HasSwitch(switches::kEnableRendererSideMixing); | 42 cmd_line->HasSwitch(switches::kEnableRendererSideMixing); |
42 #endif | 43 #endif |
43 | 44 |
44 if (use_mixing) { | 45 if (use_mixing) { |
45 default_sink_ = RenderThreadImpl::current()-> | 46 default_sink_ = RenderThreadImpl::current()-> |
46 GetAudioRendererMixerManager()->CreateInput(); | 47 GetAudioRendererMixerManager()->CreateInput(); |
| 48 // TODO(miu): Partition mixer instances per RenderView. |
47 } else { | 49 } else { |
48 default_sink_ = AudioDeviceFactory::NewOutputDevice(); | 50 scoped_refptr<RendererAudioOutputDevice> device = |
| 51 AudioDeviceFactory::NewOutputDevice(); |
| 52 // The RenderView creating RenderAudioSourceProvider will be the source of |
| 53 // the audio (WebMediaPlayer is always associated with a document in a frame |
| 54 // at the time RenderAudioSourceProvider is instantiated). |
| 55 device->SetSourceRenderView(source_render_view_id); |
| 56 default_sink_ = device; |
49 } | 57 } |
50 } | 58 } |
51 | 59 |
52 void RenderAudioSourceProvider::setClient( | 60 void RenderAudioSourceProvider::setClient( |
53 WebKit::WebAudioSourceProviderClient* client) { | 61 WebKit::WebAudioSourceProviderClient* client) { |
54 // Synchronize with other uses of client_ and default_sink_. | 62 // Synchronize with other uses of client_ and default_sink_. |
55 base::AutoLock auto_lock(sink_lock_); | 63 base::AutoLock auto_lock(sink_lock_); |
56 | 64 |
57 if (client && client != client_) { | 65 if (client && client != client_) { |
58 // Detach the audio renderer from normal playback. | 66 // Detach the audio renderer from normal playback. |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
152 // Inform WebKit about the audio stream format. | 160 // Inform WebKit about the audio stream format. |
153 client_->setFormat(channels_, sample_rate_); | 161 client_->setFormat(channels_, sample_rate_); |
154 } | 162 } |
155 | 163 |
156 is_initialized_ = true; | 164 is_initialized_ = true; |
157 } | 165 } |
158 | 166 |
159 RenderAudioSourceProvider::~RenderAudioSourceProvider() {} | 167 RenderAudioSourceProvider::~RenderAudioSourceProvider() {} |
160 | 168 |
161 } // namespace content | 169 } // namespace content |
OLD | NEW |