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

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

Issue 10636036: Enable renderer side mixing behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add virtual GetAudioHardwareParameters() method. Created 8 years, 5 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
(Empty)
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
3 // found in the LICENSE file.
4
5 #include "content/renderer/media/audio_renderer_mixer_manager.h"
6
7 #include "base/bind.h"
8 #include "base/bind_helpers.h"
9 #include "content/renderer/media/audio_device_factory.h"
10 #include "media/audio/audio_util.h"
11 #include "media/base/audio_renderer_mixer.h"
12 #include "media/base/audio_renderer_mixer_input.h"
13
14 namespace content {
15
16 AudioRendererMixerManager::AudioRendererMixerManager() {}
17
18 AudioRendererMixerManager::~AudioRendererMixerManager() {
19 DCHECK(mixers_.empty());
20 }
21
22 media::AudioParameters AudioRendererMixerManager::GetAudioHardwareParameters(
23 const media::AudioParameters& params) {
24 // Create output parameters based on the audio hardware configuration for
25 // passing on to the output sink. Force to 16-bit output for now since we
26 // know that works well for WebAudio and WebRTC.
27 // TODO(dalecurtis): Set format and buffer size in AudioRendererImpl once
28 // renderer side mixing is no longer behind a flag.
29 // TODO(dalecurtis): Ideally we shouldn't be calling the GetAudioHardware*
30 // methods directly, but pulling them from an AudioManager instance. For unit
31 // tests we would setup a fake AudioManager with a fake hardware config. See
32 // http://crbug.com/137326.
33 return media::AudioParameters(
34 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(),
35 media::GetAudioHardwareSampleRate(), 16,
36 media::GetAudioHardwareBufferSize());
scherkus (not reviewing) 2012/07/16 20:52:59 Two things: - This is kinda ugly - I just reme
DaleCurtis 2012/07/16 22:25:59 SGTM. Done!
37 }
38
39 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() {
40 return new media::AudioRendererMixerInput(
41 base::Bind(
42 &AudioRendererMixerManager::GetMixer, base::Unretained(this)),
43 base::Bind(
44 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this)));
45 }
46
47 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
48 const media::AudioParameters& params) {
49 base::AutoLock auto_lock(mixers_lock_);
50
51 AudioRendererMixerMap::iterator it = mixers_.find(params);
52 if (it != mixers_.end()) {
53 it->second.ref_count++;
54 return it->second.mixer;
55 }
56
57 media::AudioRendererMixer* mixer = new media::AudioRendererMixer(
58 params, GetAudioHardwareParameters(params), AudioDeviceFactory::Create());
59
60 AudioRendererMixerReference mixer_reference = { mixer, 1 };
61 mixers_[params] = mixer_reference;
62 return mixer;
63 }
64
65 void AudioRendererMixerManager::RemoveMixer(
66 const media::AudioParameters& params) {
67 base::AutoLock auto_lock(mixers_lock_);
68
69 AudioRendererMixerMap::iterator it = mixers_.find(params);
70 DCHECK(it != mixers_.end());
71
72 // Only remove the mixer if AudioRendererMixerManager is the last owner.
73 it->second.ref_count--;
74 if (it->second.ref_count == 0) {
75 delete it->second.mixer;
76 mixers_.erase(it);
77 }
78 }
79
80 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/audio_renderer_mixer_manager.h ('k') | content/renderer/media/audio_renderer_mixer_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698