Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(869)

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 9718013: Merge FilterStatusCB into PipelineStatusCB. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep ResetAndRunCB in filters.h. Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/filters/ffmpeg_video_decoder.cc
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
index dfb1864c191ba0a73ed60922b636f589c2f511ef..d7fbd1458af243a90a6f7d71941d80397975fcea 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -139,14 +139,15 @@ void FFmpegVideoDecoder::Stop(const base::Closure& callback) {
callback.Run();
}
-void FFmpegVideoDecoder::Seek(base::TimeDelta time, const FilterStatusCB& cb) {
+void FFmpegVideoDecoder::Seek(base::TimeDelta time,
+ const PipelineStatusCB& status_cb) {
Ami GONE FROM CHROMIUM 2012/03/17 17:27:11 s/status_// to match .h file.
xhwang 2012/03/17 19:20:52 Done.
if (MessageLoop::current() != message_loop_) {
message_loop_->PostTask(FROM_HERE, base::Bind(
- &FFmpegVideoDecoder::Seek, this, time, cb));
+ &FFmpegVideoDecoder::Seek, this, time, status_cb));
return;
}
- cb.Run(PIPELINE_OK);
+ status_cb.Run(PIPELINE_OK);
}
void FFmpegVideoDecoder::Pause(const base::Closure& callback) {

Powered by Google App Engine
This is Rietveld 408576698