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

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: Comments! 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(mixer_map_.empty());
20 }
21
22 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() {
23 return new media::AudioRendererMixerInput(
24 base::Bind(
25 &AudioRendererMixerManager::GetMixer, base::Unretained(this)),
26 base::Bind(
27 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this)));
28 }
29
30 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
31 const media::AudioParameters& params) {
32 base::AutoLock auto_lock(mixer_map_lock_);
33
34 AudioRendererMixerMap::iterator it = mixer_map_.find(params);
35 if (it != mixer_map_.end()) {
36 it->second.ref_count++;
37 return it->second.mixer;
38 }
39
40 // Create output parameters for passing on to the output sink.
41 // TODO(dalecurtis): Set format and buffer size in AudioRendererImpl.
42 // TODO(dalecurtis): We don't care about the hardware in the ARMM tests, but
43 // is it okay for unit tests to call these methods?
scherkus (not reviewing) 2012/07/13 23:17:38 as discussed offline you can change this to refere
DaleCurtis 2012/07/14 00:39:26 Done.
44 AudioRendererMixerReference mixer_reference = {
45 new media::AudioRendererMixer(
scherkus (not reviewing) 2012/07/13 23:17:38 nit for code clarity -- can you break out these ob
DaleCurtis 2012/07/14 00:39:26 Done.
46 params, media::AudioParameters(
47 media::AudioParameters::AUDIO_PCM_LOW_LATENCY,
48 params.channel_layout(), media::GetAudioHardwareSampleRate(), 16,
49 media::GetAudioHardwareBufferSize()),
50 AudioDeviceFactory::Create()),
51 1};
52 mixer_map_[params] = mixer_reference;
53 return mixer_reference.mixer;
54 }
55
56 void AudioRendererMixerManager::RemoveMixer(
57 const media::AudioParameters& params) {
58 base::AutoLock auto_lock(mixer_map_lock_);
59
60 AudioRendererMixerMap::iterator it = mixer_map_.find(params);
61 DCHECK(it != mixer_map_.end());
62
63 // Only remove the mixer if AudioRendererMixerManager is the last owner.
64 it->second.ref_count--;
65 if (it->second.ref_count == 0) {
66 delete it->second.mixer;
67 mixer_map_.erase(it);
68 }
69 }
70
71 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698