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

Side by Side Diff: content/renderer/media/audio_renderer_mixer_manager.cc

Issue 10835025: Plumb render view ID to media observer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 void MyFunc(int i, const std::string& str) {}
14
13 namespace content { 15 namespace content {
14 16
15 AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate, 17 AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate,
16 int hardware_buffer_size) 18 int hardware_buffer_size)
17 : hardware_sample_rate_(hardware_sample_rate), 19 : hardware_sample_rate_(hardware_sample_rate),
18 hardware_buffer_size_(hardware_buffer_size) { 20 hardware_buffer_size_(hardware_buffer_size) {
21 base::Callback<void(const std::string&)> cb = base::Bind(&MyFunc, 23);
22 cb.Run("hello world");
19 } 23 }
20 24
21 AudioRendererMixerManager::~AudioRendererMixerManager() { 25 AudioRendererMixerManager::~AudioRendererMixerManager() {
22 DCHECK(mixers_.empty()); 26 DCHECK(mixers_.empty());
23 } 27 }
24 28
25 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() { 29 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput(
30 RenderView* render_view) {
26 return new media::AudioRendererMixerInput( 31 return new media::AudioRendererMixerInput(
27 base::Bind( 32 base::Bind(
28 &AudioRendererMixerManager::GetMixer, base::Unretained(this)), 33 &AudioRendererMixerManager::GetMixer,
34 base::Unretained(this),
35 base::Unretained(render_view)),
29 base::Bind( 36 base::Bind(
30 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this))); 37 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this)));
31 } 38 }
32 39
33 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer( 40 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
41 RenderView* render_view,
34 const media::AudioParameters& params) { 42 const media::AudioParameters& params) {
35 base::AutoLock auto_lock(mixers_lock_); 43 base::AutoLock auto_lock(mixers_lock_);
36 44
37 AudioRendererMixerMap::iterator it = mixers_.find(params); 45 AudioRendererMixerMap::iterator it = mixers_.find(params);
38 if (it != mixers_.end()) { 46 if (it != mixers_.end()) {
39 it->second.ref_count++; 47 it->second.ref_count++;
40 return it->second.mixer; 48 return it->second.mixer;
41 } 49 }
42 50
43 // Create output parameters based on the audio hardware configuration for 51 // 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 52 // passing on to the output sink. Force to 16-bit output for now since we
45 // know that works well for WebAudio and WebRTC. 53 // know that works well for WebAudio and WebRTC.
46 media::AudioParameters output_params( 54 media::AudioParameters output_params(
47 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(), 55 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(),
48 hardware_sample_rate_, 16, hardware_buffer_size_); 56 hardware_sample_rate_, 16, hardware_buffer_size_);
49 57
50 media::AudioRendererMixer* mixer = new media::AudioRendererMixer( 58 media::AudioRendererMixer* mixer = new media::AudioRendererMixer(
51 params, output_params, AudioDeviceFactory::Create()); 59 params, output_params, AudioDeviceFactory::Create(render_view));
52 60
53 AudioRendererMixerReference mixer_reference = { mixer, 1 }; 61 AudioRendererMixerReference mixer_reference = { mixer, 1 };
54 mixers_[params] = mixer_reference; 62 mixers_[params] = mixer_reference;
55 return mixer; 63 return mixer;
56 } 64 }
57 65
58 void AudioRendererMixerManager::RemoveMixer( 66 void AudioRendererMixerManager::RemoveMixer(
59 const media::AudioParameters& params) { 67 const media::AudioParameters& params) {
60 base::AutoLock auto_lock(mixers_lock_); 68 base::AutoLock auto_lock(mixers_lock_);
61 69
62 AudioRendererMixerMap::iterator it = mixers_.find(params); 70 AudioRendererMixerMap::iterator it = mixers_.find(params);
63 DCHECK(it != mixers_.end()); 71 DCHECK(it != mixers_.end());
64 72
65 // Only remove the mixer if AudioRendererMixerManager is the last owner. 73 // Only remove the mixer if AudioRendererMixerManager is the last owner.
66 it->second.ref_count--; 74 it->second.ref_count--;
67 if (it->second.ref_count == 0) { 75 if (it->second.ref_count == 0) {
68 delete it->second.mixer; 76 delete it->second.mixer;
69 mixers_.erase(it); 77 mixers_.erase(it);
70 } 78 }
71 } 79 }
72 80
73 } // namespace content 81 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/audio_renderer_mixer_manager.h ('k') | content/renderer/media/media_stream_dependency_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698