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

Side by Side Diff: media/base/audio_renderer_mixer_input.cc

Issue 10698066: Switch to pcm_low_latency and enable resampling. (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
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 "media/base/audio_renderer_mixer_input.h" 5 #include "media/base/audio_renderer_mixer_input.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "media/base/audio_renderer_mixer.h" 8 #include "media/base/audio_renderer_mixer.h"
9 9
10 namespace media { 10 namespace media {
11 11
12 AudioRendererMixerInput::AudioRendererMixerInput( 12 AudioRendererMixerInput::AudioRendererMixerInput(
13 const scoped_refptr<AudioRendererMixer>& mixer) 13 const GetMixerCB& get_mixer_cb, const RemoveMixerCB& remove_mixer_cb)
14 : playing_(false), 14 : playing_(false),
15 initialized_(false), 15 initialized_(false),
16 volume_(1.0f), 16 volume_(1.0f),
17 mixer_(mixer), 17 get_mixer_cb_(get_mixer_cb),
18 remove_mixer_cb_(remove_mixer_cb),
18 callback_(NULL) { 19 callback_(NULL) {
19 } 20 }
20 21
21 AudioRendererMixerInput::~AudioRendererMixerInput() { 22 AudioRendererMixerInput::~AudioRendererMixerInput() {
22 if (!initialized_) 23 // Mixer is no longer safe to use after |remove_mixer_cb_| has been called.
23 return; 24 remove_mixer_cb_.Run(params_);
24
25 // Clean up |audio_data_|.
26 for (size_t i = 0; i < audio_data_.size(); ++i)
27 delete [] audio_data_[i];
28 audio_data_.clear();
29 } 25 }
30 26
31 void AudioRendererMixerInput::Initialize( 27 void AudioRendererMixerInput::Initialize(
32 const AudioParameters& params, 28 const AudioParameters& params,
33 AudioRendererSink::RenderCallback* callback) { 29 AudioRendererSink::RenderCallback* callback) {
34 DCHECK(!initialized_); 30 DCHECK(!initialized_);
35 31 params_ = params;
36 // TODO(dalecurtis): If we switch to AVX/SSE optimization, we'll need to 32 mixer_ = get_mixer_cb_.Run(params_);
37 // allocate these on 32-byte boundaries and ensure they're sized % 32 bytes.
38 audio_data_.reserve(params.channels());
39 for (int i = 0; i < params.channels(); ++i)
40 audio_data_.push_back(new float[params.frames_per_buffer()]);
41
42 callback_ = callback; 33 callback_ = callback;
43 initialized_ = true; 34 initialized_ = true;
44 } 35 }
45 36
46 void AudioRendererMixerInput::Start() { 37 void AudioRendererMixerInput::Start() {
47 DCHECK(initialized_); 38 DCHECK(initialized_);
48 mixer_->AddMixerInput(this); 39 mixer_->AddMixerInput(this);
49 } 40 }
50 41
51 void AudioRendererMixerInput::Stop() { 42 void AudioRendererMixerInput::Stop() {
(...skipping 15 matching lines...) Expand all
67 bool AudioRendererMixerInput::SetVolume(double volume) { 58 bool AudioRendererMixerInput::SetVolume(double volume) {
68 volume_ = volume; 59 volume_ = volume;
69 return true; 60 return true;
70 } 61 }
71 62
72 void AudioRendererMixerInput::GetVolume(double* volume) { 63 void AudioRendererMixerInput::GetVolume(double* volume) {
73 *volume = volume_; 64 *volume = volume_;
74 } 65 }
75 66
76 } // namespace media 67 } // namespace media
OLDNEW
« no previous file with comments | « media/base/audio_renderer_mixer_input.h ('k') | media/base/audio_renderer_mixer_input_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698