Change DemuxerStream::ReadCallback to use ref-counted buffers.

media/filters/ffmpeg_audio_decoder.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_audio_decoder.h"
 
 #include "base/bind.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/data_buffer.h"
 #include "media/base/demuxer.h"
@@ skipping 232 matching lines @@
 }
 
 void FFmpegAudioDecoder::ReadFromDemuxerStream() {
   DCHECK(!output_buffers_.empty())
       << "Reads should only occur if there are output buffers.";
 
   pending_reads_++;
   demuxer_stream_->Read(base::Bind(&FFmpegAudioDecoder::DecodeBuffer, this));
 }
 
-void FFmpegAudioDecoder::DecodeBuffer(Buffer* buffer) {
-  // TODO(scherkus): change DemuxerStream::Read() to use scoped_refptr<> for
-  // callback.
-  scoped_refptr<Buffer> ref_buffer(buffer);
+void FFmpegAudioDecoder::DecodeBuffer(const scoped_refptr<Buffer>& buffer) {
   message_loop_->PostTask(
       FROM_HERE,
-      base::Bind(&FFmpegAudioDecoder::DoDecodeBuffer, this, ref_buffer));
+      base::Bind(&FFmpegAudioDecoder::DoDecodeBuffer, this, buffer));
 }
 
 void FFmpegAudioDecoder::UpdateDurationAndTimestamp(
     const Buffer* input,
     DataBuffer* output) {
   // Always calculate duration based on the actual number of samples decoded.
   base::TimeDelta duration = CalculateDuration(output->GetDataSize());
   output->SetDuration(duration);
 
   // Use the incoming timestamp if it's valid.
@@ skipping 13 matching lines @@
 
 base::TimeDelta FFmpegAudioDecoder::CalculateDuration(int size) {
   int64 denominator = ChannelLayoutToChannelCount(channel_layout_) *
       bits_per_channel_ / 8 * samples_per_second_;
   double microseconds = size /
       (denominator / static_cast<double>(base::Time::kMicrosecondsPerSecond));
   return base::TimeDelta::FromMicroseconds(static_cast<int64>(microseconds));
 }
 
 }  // namespace media