Change VideoDecoder::ReadCB to take const scoped_refptr<VideoFrame>&.

BUG=none
TEST=media_unittests, media layout tests.


Review URL: https://chromiumcodereview.appspot.com/10559074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143192 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 8 insertions, 8 deletions

diff --git a/content/renderer/media/capture_video_decoder_unittest.cc b/content/renderer/media/capture_video_decoder_unittest.cc
index 6853caf..9e05abb 100644
--- a/content/renderer/media/capture_video_decoder_unittest.cc
+++ b/content/renderer/media/capture_video_decoder_unittest.cc
@@ -154,7 +154,7 @@ class CaptureVideoDecoderTest : public ::testing::Test {
   }
 
   MOCK_METHOD2(FrameReady, void(media::VideoDecoder::DecoderStatus status,
-                                scoped_refptr<media::VideoFrame>));
+                                const scoped_refptr<media::VideoFrame>&));
 
   // Fixture members.
   scoped_refptr<CaptureVideoDecoder> decoder_;
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc
index a2f94ba..c5bb85b 100644
--- a/content/renderer/media/rtc_video_decoder_unittest.cc
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc
@@ -155,7 +155,7 @@ class RTCVideoDecoderTest : public testing::Test {
   }
 
   MOCK_METHOD2(FrameReady, void(media::VideoDecoder::DecoderStatus status,
-                                scoped_refptr<media::VideoFrame>));
+                                const scoped_refptr<media::VideoFrame>&));
 
   // Fixture members.
   scoped_refptr<RTCVideoDecoder> decoder_;
diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h
index 31589d1..c550033 100644
--- a/media/base/video_decoder.h
+++ b/media/base/video_decoder.h
@@ -47,7 +47,8 @@ class MEDIA_EXPORT VideoDecoder
   // frames contain decoded video data or may indicate the end of the stream.
   // NULL video frames indicate an aborted read. This can happen if the
   // DemuxerStream gets flushed and doesn't have any more data to return.
-  typedef base::Callback<void(DecoderStatus, scoped_refptr<VideoFrame>)> ReadCB;
+  typedef base::Callback<void(DecoderStatus,
+                              const scoped_refptr<VideoFrame>&)> ReadCB;
   virtual void Read(const ReadCB& read_cb) = 0;
 
   // Reset decoder state, fulfilling all pending ReadCB and dropping extra
diff --git a/media/filters/ffmpeg_video_decoder_unittest.cc b/media/filters/ffmpeg_video_decoder_unittest.cc
index 26f7f8b..a30b528 100644
--- a/media/filters/ffmpeg_video_decoder_unittest.cc
+++ b/media/filters/ffmpeg_video_decoder_unittest.cc
@@ -208,7 +208,7 @@ class FFmpegVideoDecoderTest : public testing::Test {
   }
 
   MOCK_METHOD2(FrameReady, void(VideoDecoder::DecoderStatus,
-                                scoped_refptr<VideoFrame>));
+                                const scoped_refptr<VideoFrame>&));
 
   MessageLoop message_loop_;
   scoped_ptr<Decryptor> decryptor_;
@@ -508,8 +508,7 @@ TEST_F(FFmpegVideoDecoderTest, Reset_DuringPendingRead) {
   // Reset the decoder.
   Reset();
 
-  EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk,
-                                scoped_refptr<VideoFrame>()));
+  EXPECT_CALL(*this, FrameReady(VideoDecoder::kOk, IsNull()));
 
   read_cb.Run(i_frame_buffer_);
   message_loop_.RunAllPending();
diff --git a/media/filters/video_renderer_base.cc b/media/filters/video_renderer_base.cc
index b0672f5..f6cfe7f 100644
--- a/media/filters/video_renderer_base.cc
+++ b/media/filters/video_renderer_base.cc
@@ -359,7 +359,7 @@ VideoRendererBase::~VideoRendererBase() {
 }
 
 void VideoRendererBase::FrameReady(VideoDecoder::DecoderStatus status,
-                                   scoped_refptr<VideoFrame> frame) {
+                                   const scoped_refptr<VideoFrame>& frame) {
   base::AutoLock auto_lock(lock_);
   DCHECK_NE(state_, kUninitialized);
 
diff --git a/media/filters/video_renderer_base.h b/media/filters/video_renderer_base.h
index 9197b51..ed8472d 100644
--- a/media/filters/video_renderer_base.h
+++ b/media/filters/video_renderer_base.h
@@ -80,7 +80,7 @@ class MEDIA_EXPORT VideoRendererBase
   // Callback from the video decoder delivering decoded video frames and
   // reporting video decoder status.
   void FrameReady(VideoDecoder::DecoderStatus status,
-                  scoped_refptr<VideoFrame> frame);
+                  const scoped_refptr<VideoFrame>& frame);
 
   // Helper method that schedules an asynchronous read from the decoder as long
   // as there isn't a pending read and we have capacity.