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

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: Remove new mixer address != old mixer address test. 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/base/audio_renderer_mixer.h"
11 #include "media/base/audio_renderer_mixer_input.h"
12
13 namespace content {
14
15 AudioRendererMixerManager::AudioRendererMixerManager(int hardware_sample_rate,
16 int hardware_buffer_size)
17 : hardware_sample_rate_(hardware_sample_rate),
18 hardware_buffer_size_(hardware_buffer_size) {
19 }
20
21 AudioRendererMixerManager::~AudioRendererMixerManager() {
22 DCHECK(mixers_.empty());
23 }
24
25 media::AudioRendererMixerInput* AudioRendererMixerManager::CreateInput() {
26 return new media::AudioRendererMixerInput(
27 base::Bind(
28 &AudioRendererMixerManager::GetMixer, base::Unretained(this)),
29 base::Bind(
30 &AudioRendererMixerManager::RemoveMixer, base::Unretained(this)));
31 }
32
33 media::AudioRendererMixer* AudioRendererMixerManager::GetMixer(
34 const media::AudioParameters& params) {
35 base::AutoLock auto_lock(mixers_lock_);
36
37 AudioRendererMixerMap::iterator it = mixers_.find(params);
38 if (it != mixers_.end()) {
39 it->second.ref_count++;
40 return it->second.mixer;
41 }
42
43 // 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
45 // know that works well for WebAudio and WebRTC.
46 media::AudioParameters output_params(
47 media::AudioParameters::AUDIO_PCM_LOW_LATENCY, params.channel_layout(),
48 hardware_sample_rate_, 16, hardware_buffer_size_);
49
50 media::AudioRendererMixer* mixer = new media::AudioRendererMixer(
51 params, output_params, AudioDeviceFactory::Create());
52
53 AudioRendererMixerReference mixer_reference = { mixer, 1 };
54 mixers_[params] = mixer_reference;
55 return mixer;
56 }
57
58 void AudioRendererMixerManager::RemoveMixer(
59 const media::AudioParameters& params) {
60 base::AutoLock auto_lock(mixers_lock_);
61
62 AudioRendererMixerMap::iterator it = mixers_.find(params);
63 DCHECK(it != mixers_.end());
64
65 // Only remove the mixer if AudioRendererMixerManager is the last owner.
66 it->second.ref_count--;
67 if (it->second.ref_count == 0) {
68 delete it->second.mixer;
69 mixers_.erase(it);
70 }
71 }
72
73 } // 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