Convert Filter::Seek() to use new callback system.

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 <deque>
 
 #include "base/bind.h"
 #include "base/task.h"
@@ skipping 165 matching lines @@
 
   AutoCallbackRunner done_runner(flush_callback_.release());
 
   // Everything in the presentation time queue is invalid, clear the queue.
   pts_stream_.Flush();
 
   // Mark flush operation had been done.
   state_ = kNormal;
 }
 
-void FFmpegVideoDecoder::Seek(base::TimeDelta time,
-                              FilterCallback* callback) {
+void FFmpegVideoDecoder::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
   if (MessageLoop::current() != message_loop_) {
      message_loop_->PostTask(FROM_HERE,
-                              NewRunnableMethod(this,
-                                                &FFmpegVideoDecoder::Seek,
-                                                time,
-                                                callback));
+                              NewRunnableMethod(this, &FFmpegVideoDecoder::Seek,

[Ami GONE FROM CHROMIUM, 2011/05/12 20:42:16]

indent is off (before your CL).

[acolwell GONE FROM CHROMIUM, 2011/05/12 22:30:40]

Done.

+                                                time, cb));
      return;
   }
 
   DCHECK_EQ(MessageLoop::current(), message_loop_);
-  DCHECK(!seek_callback_.get());
+  DCHECK(seek_cb_.is_null());
 
   pts_stream_.Seek(time);
-  seek_callback_.reset(callback);
+  seek_cb_ = cb;
   decode_engine_->Seek();
 }
 
 void FFmpegVideoDecoder::OnSeekComplete() {
   DCHECK_EQ(MessageLoop::current(), message_loop_);
-  DCHECK(seek_callback_.get());
+  DCHECK(!seek_cb_.is_null());
 
-  AutoCallbackRunner done_runner(seek_callback_.release());
+  CopyAndResetCB(seek_cb_).Run(PIPELINE_OK);
 }
 
 void FFmpegVideoDecoder::OnError() {
   VideoFrameReady(NULL);
 }
 
 void FFmpegVideoDecoder::OnFormatChange(VideoStreamInfo stream_info) {
   NOTIMPLEMENTED();
 }
 
@@ skipping 152 matching lines @@
       VideoFrameReady(video_frame);
   }
 }
 
 void FFmpegVideoDecoder::SetVideoDecodeEngineForTest(
     VideoDecodeEngine* engine) {
   decode_engine_.reset(engine);
 }
 
 }  // namespace media