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/audio_renderer_mixer_manager.h" | 5 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "content/renderer/media/audio_device_factory.h" | 9 #include "content/renderer/media/audio_device_factory.h" |
10 #include "media/base/audio_renderer_mixer.h" | 10 #include "media/base/audio_renderer_mixer.h" |
11 #include "media/base/audio_renderer_mixer_input.h" | 11 #include "media/base/audio_renderer_mixer_input.h" |
12 | 12 |
13 namespace content { | 13 namespace content { |
14 | 14 |
15 AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate, | 15 AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate, |
16 int hardware_buffer_size) | 16 int hardware_buffer_size) |
17 : hardware_sample_rate_(hardware_sample_rate), | 17 : hardware_sample_rate_(hardware_sample_rate), |
18 hardware_buffer_size_(hardware_buffer_size) { | 18 hardware_buffer_size_(hardware_buffer_size) { |
19 } | 19 } |
20 | 20 |
21 AudioRendererMixerManager::~AudioRendererMixerManager() { | 21 AudioRendererMixerManager::~AudioRendererMixerManager() { |
22 DCHECK(mixers_.empty()); | 22 DCHECK(mixers_.empty()); |
23 } | 23 } |
24 | 24 |
25 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() { | 25 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput( |
| 26 int render_view_id) { |
26 return new media::AudioRendererMixerInput( | 27 return new media::AudioRendererMixerInput( |
27 base::Bind( | 28 base::Bind( |
28 &AudioRendererMixerManager::GetMixer, base::Unretained(this)), | 29 &AudioRendererMixerManager::GetMixer, |
| 30 base::Unretained(this), |
| 31 render_view_id), |
29 base::Bind( | 32 base::Bind( |
30 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this))); | 33 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this))); |
31 } | 34 } |
32 | 35 |
33 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer( | 36 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer( |
| 37 int render_view_id, |
34 const media::AudioParameters& params) { | 38 const media::AudioParameters& params) { |
35 base::AutoLock auto_lock(mixers_lock_); | 39 base::AutoLock auto_lock(mixers_lock_); |
36 | 40 |
37 AudioRendererMixerMap::iterator it = mixers_.find(params); | 41 AudioRendererMixerMap::iterator it = mixers_.find(params); |
38 if (it != mixers_.end()) { | 42 if (it != mixers_.end()) { |
39 it->second.ref_count++; | 43 it->second.ref_count++; |
40 return it->second.mixer; | 44 return it->second.mixer; |
41 } | 45 } |
42 | 46 |
43 // Create output parameters based on the audio hardware configuration for | 47 // Create output parameters based on the audio hardware configuration for |
44 // passing on to the output sink. Force to 16-bit output for now since we | 48 // passing on to the output sink. Force to 16-bit output for now since we |
45 // know that works well for WebAudio and WebRTC. | 49 // know that works well for WebAudio and WebRTC. |
46 media::AudioParameters output_params( | 50 media::AudioParameters output_params( |
47 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(), | 51 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(), |
48 hardware_sample_rate_, 16, hardware_buffer_size_); | 52 hardware_sample_rate_, 16, hardware_buffer_size_); |
49 | 53 |
50 media::AudioRendererMixer* mixer = new media::AudioRendererMixer( | 54 media::AudioRendererMixer* mixer = new media::AudioRendererMixer( |
51 params, output_params, AudioDeviceFactory::NewOutputDevice()); | 55 params, |
| 56 output_params, |
| 57 AudioDeviceFactory::NewOutputDevice(render_view_id)); |
52 | 58 |
53 AudioRendererMixerReference mixer_reference = { mixer, 1 }; | 59 AudioRendererMixerReference mixer_reference = { mixer, 1 }; |
54 mixers_[params] = mixer_reference; | 60 mixers_[params] = mixer_reference; |
55 return mixer; | 61 return mixer; |
56 } | 62 } |
57 | 63 |
58 void AudioRendererMixerManager::RemoveMixer( | 64 void AudioRendererMixerManager::RemoveMixer( |
59 const media::AudioParameters& params) { | 65 const media::AudioParameters& params) { |
60 base::AutoLock auto_lock(mixers_lock_); | 66 base::AutoLock auto_lock(mixers_lock_); |
61 | 67 |
62 AudioRendererMixerMap::iterator it = mixers_.find(params); | 68 AudioRendererMixerMap::iterator it = mixers_.find(params); |
63 DCHECK(it != mixers_.end()); | 69 DCHECK(it != mixers_.end()); |
64 | 70 |
65 // Only remove the mixer if AudioRendererMixerManager is the last owner. | 71 // Only remove the mixer if AudioRendererMixerManager is the last owner. |
66 it->second.ref_count--; | 72 it->second.ref_count--; |
67 if (it->second.ref_count == 0) { | 73 if (it->second.ref_count == 0) { |
68 delete it->second.mixer; | 74 delete it->second.mixer; |
69 mixers_.erase(it); | 75 mixers_.erase(it); |
70 } | 76 } |
71 } | 77 } |
72 | 78 |
73 } // namespace content | 79 } // namespace content |
OLD | NEW |