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

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

Issue 11359196: Associate audio streams with their source/destination RenderView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restored AudioDeviceFactory. Created new RendererAudioOutputDevice. 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 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 "content/renderer/media/renderer_audio_output_device.h"
10 #include "media/base/audio_renderer_mixer.h" 11 #include "media/base/audio_renderer_mixer.h"
11 #include "media/base/audio_renderer_mixer_input.h" 12 #include "media/base/audio_renderer_mixer_input.h"
12 13
13 namespace content { 14 namespace content {
14 15
15 AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate, 16 AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate,
16 int hardware_buffer_size) 17 int hardware_buffer_size)
17 : hardware_sample_rate_(hardware_sample_rate), 18 : hardware_sample_rate_(hardware_sample_rate),
18 hardware_buffer_size_(hardware_buffer_size) { 19 hardware_buffer_size_(hardware_buffer_size),
20 sink_for_testing_(NULL) {
19 } 21 }
20 22
21 AudioRendererMixerManager::~AudioRendererMixerManager() { 23 AudioRendererMixerManager::~AudioRendererMixerManager() {
22 DCHECK(mixers_.empty()); 24 DCHECK(mixers_.empty());
23 } 25 }
24 26
25 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() { 27 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() {
26 return new media::AudioRendererMixerInput( 28 return new media::AudioRendererMixerInput(
27 base::Bind( 29 base::Bind(
28 &AudioRendererMixerManager::GetMixer, base::Unretained(this)), 30 &AudioRendererMixerManager::GetMixer, base::Unretained(this)),
29 base::Bind( 31 base::Bind(
30 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this))); 32 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this)));
31 } 33 }
32 34
35 void AudioRendererMixerManager::SetAudioRendererSinkForTesting(
36 media::AudioRendererSink* sink) {
37 sink_for_testing_ = sink;
38 }
39
33 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer( 40 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
34 const media::AudioParameters& params) { 41 const media::AudioParameters& params) {
35 base::AutoLock auto_lock(mixers_lock_); 42 base::AutoLock auto_lock(mixers_lock_);
36 43
37 AudioRendererMixerMap::iterator it = mixers_.find(params); 44 AudioRendererMixerMap::iterator it = mixers_.find(params);
38 if (it != mixers_.end()) { 45 if (it != mixers_.end()) {
39 it->second.ref_count++; 46 it->second.ref_count++;
40 return it->second.mixer; 47 return it->second.mixer;
41 } 48 }
42 49
43 // Create output parameters based on the audio hardware configuration for 50 // 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 51 // passing on to the output sink. Force to 16-bit output for now since we
45 // know that works well for WebAudio and WebRTC. 52 // know that works well for WebAudio and WebRTC.
46 media::AudioParameters output_params( 53 media::AudioParameters output_params(
47 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(), 54 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(),
48 hardware_sample_rate_, 16, hardware_buffer_size_); 55 hardware_sample_rate_, 16, hardware_buffer_size_);
49 56
50 // If we've created invalid output parameters, simply pass on the input params 57 // If we've created invalid output parameters, simply pass on the input params
51 // and let the browser side handle automatic fallback. 58 // and let the browser side handle automatic fallback.
52 if (!output_params.IsValid()) 59 if (!output_params.IsValid())
53 output_params = params; 60 output_params = params;
54 61
55 media::AudioRendererMixer* mixer = new media::AudioRendererMixer( 62 media::AudioRendererMixer* mixer = new media::AudioRendererMixer(
56 params, output_params, AudioDeviceFactory::NewOutputDevice()); 63 params, output_params,
64 sink_for_testing_ ?
65 sink_for_testing_ :
66 AudioDeviceFactory::NewOutputDevice());
57 67
58 AudioRendererMixerReference mixer_reference = { mixer, 1 }; 68 AudioRendererMixerReference mixer_reference = { mixer, 1 };
59 mixers_[params] = mixer_reference; 69 mixers_[params] = mixer_reference;
60 return mixer; 70 return mixer;
61 } 71 }
62 72
63 void AudioRendererMixerManager::RemoveMixer( 73 void AudioRendererMixerManager::RemoveMixer(
64 const media::AudioParameters& params) { 74 const media::AudioParameters& params) {
65 base::AutoLock auto_lock(mixers_lock_); 75 base::AutoLock auto_lock(mixers_lock_);
66 76
67 AudioRendererMixerMap::iterator it = mixers_.find(params); 77 AudioRendererMixerMap::iterator it = mixers_.find(params);
68 DCHECK(it != mixers_.end()); 78 DCHECK(it != mixers_.end());
69 79
70 // Only remove the mixer if AudioRendererMixerManager is the last owner. 80 // Only remove the mixer if AudioRendererMixerManager is the last owner.
71 it->second.ref_count--; 81 it->second.ref_count--;
72 if (it->second.ref_count == 0) { 82 if (it->second.ref_count == 0) {
73 delete it->second.mixer; 83 delete it->second.mixer;
74 mixers_.erase(it); 84 mixers_.erase(it);
75 } 85 }
76 } 86 }
77 87
78 } // namespace content 88 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698