Commit 9a620e32 authored by scherkus@chromium.org's avatar scherkus@chromium.org

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
parent b9a06b30
...@@ -26,9 +26,7 @@ AudioRendererImpl::AudioRendererImpl(media::AudioRendererSink* sink) ...@@ -26,9 +26,7 @@ AudioRendererImpl::AudioRendererImpl(media::AudioRendererSink* sink)
stopped_(false), stopped_(false),
sink_(sink), sink_(sink),
is_initialized_(false), is_initialized_(false),
underflow_disabled_(false), underflow_disabled_(false) {
read_cb_(base::Bind(&AudioRendererImpl::DecodedAudioReady,
base::Unretained(this))) {
} }
void AudioRendererImpl::Play(const base::Closure& callback) { void AudioRendererImpl::Play(const base::Closure& callback) {
...@@ -292,7 +290,7 @@ void AudioRendererImpl::ScheduleRead_Locked() { ...@@ -292,7 +290,7 @@ void AudioRendererImpl::ScheduleRead_Locked() {
if (pending_read_ || state_ == kPaused) if (pending_read_ || state_ == kPaused)
return; return;
pending_read_ = true; pending_read_ = true;
decoder_->Read(read_cb_); decoder_->Read(base::Bind(&AudioRendererImpl::DecodedAudioReady, this));
} }
void AudioRendererImpl::SetPlaybackRate(float playback_rate) { void AudioRendererImpl::SetPlaybackRate(float playback_rate) {
......
...@@ -212,8 +212,6 @@ class MEDIA_EXPORT AudioRendererImpl ...@@ -212,8 +212,6 @@ class MEDIA_EXPORT AudioRendererImpl
bool underflow_disabled_; bool underflow_disabled_;
AudioDecoder::ReadCB read_cb_;
DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl); DISALLOW_COPY_AND_ASSIGN(AudioRendererImpl);
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment