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

media/filters/ffmpeg_video_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_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/task.h"
@@ skipping 157 matching lines @@
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK(!seek_cb_.is_null());
 
   ResetAndRunCB(&seek_cb_, PIPELINE_OK);
 }
 
 void FFmpegVideoDecoder::OnError() {
   VideoFrameReady(NULL);
 }
 
-void FFmpegVideoDecoder::OnReadComplete(Buffer* buffer_in) {
-  scoped_refptr<Buffer> buffer(buffer_in);
+void FFmpegVideoDecoder::OnReadComplete(const scoped_refptr<Buffer>& buffer) {
   message_loop_->PostTask(FROM_HERE, base::Bind(
       &FFmpegVideoDecoder::OnReadCompleteTask, this, buffer));
 }
 
-void FFmpegVideoDecoder::OnReadCompleteTask(scoped_refptr<Buffer> buffer) {
+void FFmpegVideoDecoder::OnReadCompleteTask(

[Ami GONE FROM CHROMIUM, 2011/11/01 19:30:58]

Elsewhere (i.e. FFmpegVideoDecoder::Seek) this file uses the idiom of
dispatching-to-self if on the wrong loop; wanna drop this *Task() method to do
the same?

+    const scoped_refptr<Buffer>& buffer) {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
   DCHECK_NE(state_, kStopped);  // because of Flush() before Stop().
 
   // During decode, because reads are issued asynchronously, it is possible to
   // receive multiple end of stream buffers since each read is acked. When the
   // first end of stream buffer is read, FFmpeg may still have frames queued
   // up in the decoder so we need to go through the decode loop until it stops
   // giving sensible data.  After that, the decoder should output empty
   // frames.  There are three states the decoder can be in:
   //
@@ skipping 116 matching lines @@
     decode_engine_->ProduceVideoFrame(video_frame);
   }
 }
 
 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest(
     VideoDecodeEngine* engine) {
   decode_engine_.reset(engine);
 }
 
 }  // namespace media