diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 23:53:29 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-17 23:53:29 +0000 |
| commit | 9a620e3284c8d884389a3e3cae6f9c11eda3259c (patch) | |
| tree | 1b5ac006debc3522261440cfe3df1f0c921f8743 /media | |
| parent | b9a06b305d019ddf154669396fe9e02e651f5031 (diff) | |
| download | chromium_src-9a620e3284c8d884389a3e3cae6f9c11eda3259c.zip chromium_src-9a620e3284c8d884389a3e3cae6f9c11eda3259c.tar.gz chromium_src-9a620e3284c8d884389a3e3cae6f9c11eda3259c.tar.bz2 | |
Don't use an unretained read callback when calling AudioDecoder::Read().
BUG=143440
Review URL: https://chromiumcodereview.appspot.com/10857066
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152192 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/filters/audio_renderer_impl.cc | 6 | ||||
| -rw-r--r-- | media/filters/audio_renderer_impl.h | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/media/filters/audio_renderer_impl.cc b/media/filters/audio_renderer_impl.cc index 384935e..948e688 100644 --- a/media/filters/audio_renderer_impl.cc +++ b/media/filters/audio_renderer_impl.cc @@ -26,9 +26,7 @@ AudioRendererImpl::AudioRendererImpl(media::AudioRendererSink* sink) stopped_(false), sink_(sink), is_initialized_(false), - underflow_disabled_(false), - read_cb_(base::Bind(&AudioRendererImpl::DecodedAudioReady, - base::Unretained(this))) { + underflow_disabled_(false) { } void AudioRendererImpl::Play(const base::Closure& callback) { @@ -292,7 +290,7 @@ void AudioRendererImpl::ScheduleRead_Locked() { if (pending_read_ || state_ == kPaused) return; pending_read_ = true; - decoder_->Read(read_cb_); + decoder_->Read(base::Bind(&AudioRendererImpl::DecodedAudioReady, this)); } void AudioRendererImpl::SetPlaybackRate(float playback_rate) { diff --git a/media/filters/audio_renderer_impl.h b/media/filters/audio_renderer_impl.h index 68f3250..83e7689 100644 --- a/media/filters/audio_renderer_impl.h +++ b/media/filters/audio_renderer_impl.h @@ -212,8 +212,6 @@ class MEDIA_EXPORT AudioRendererImpl bool underflow_disabled_; - AudioDecoder::ReadCB read_cb_; - DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl); }; |