diff options
author | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 23:58:10 +0000 |
---|---|---|
committer | crogers@google.com <crogers@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-25 23:58:10 +0000 |
commit | 2633b33afc7f725e509d98de77031d0648ed8ec6 (patch) | |
tree | a85e4d6715de51ebead5f50d559d3f6510ea0c76 /content/renderer/renderer_webaudiodevice_impl.cc | |
parent | 8fe08cbe81036e7661b30ab1fdcb8edf9f1d99a7 (diff) | |
download | chromium_src-2633b33afc7f725e509d98de77031d0648ed8ec6.zip chromium_src-2633b33afc7f725e509d98de77031d0648ed8ec6.tar.gz chromium_src-2633b33afc7f725e509d98de77031d0648ed8ec6.tar.bz2 |
Land Henrik's patch: http://codereview.chromium.org/6721027/
BUG=none
TEST=none
TBR=crogers@google.com
Review URL: http://codereview.chromium.org/6745026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/renderer_webaudiodevice_impl.cc')
-rw-r--r-- | content/renderer/renderer_webaudiodevice_impl.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/content/renderer/renderer_webaudiodevice_impl.cc b/content/renderer/renderer_webaudiodevice_impl.cc index 5c008c5..b12b2c1 100644 --- a/content/renderer/renderer_webaudiodevice_impl.cc +++ b/content/renderer/renderer_webaudiodevice_impl.cc @@ -10,8 +10,7 @@ using WebKit::WebVector; RendererWebAudioDeviceImpl::RendererWebAudioDeviceImpl(size_t buffer_size, int channels, double sample_rate, WebAudioDevice::RenderCallback* callback) : client_callback_(callback) { - audio_device_.reset( - new AudioDevice(buffer_size, channels, sample_rate, this)); + audio_device_ = new AudioDevice(buffer_size, channels, sample_rate, this); } RendererWebAudioDeviceImpl::~RendererWebAudioDeviceImpl() { @@ -26,13 +25,13 @@ void RendererWebAudioDeviceImpl::stop() { audio_device_->Stop(); } -double RendererWebAudioDeviceImpl::sampleRate() -{ +double RendererWebAudioDeviceImpl::sampleRate() { return 44100.0; } void RendererWebAudioDeviceImpl::Render(const std::vector<float*>& audio_data, - size_t number_of_frames) { + size_t number_of_frames, + size_t audio_delay_milliseconds) { // Make the client callback to get rendered audio. DCHECK(client_callback_); if (client_callback_) { |