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

Unified Diff: media/filters/ffmpeg_video_decoder.cc

Issue 10969028: Add video decoding methods in Decryptor and add DecryptingVideoDecoder. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: resolve ddorwin's comments and have a question about force posting task! Created 8 years, 3 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 f05fa3f98e36b743b761173552a35f7a85c8defa..851674a4da3b2b27eb3447b504bdb4704069101c 100644
--- a/media/filters/ffmpeg_video_decoder.cc
+++ b/media/filters/ffmpeg_video_decoder.cc
@@ -179,11 +179,12 @@ void FFmpegVideoDecoder::Reset(const base::Closure& closure) {
return;
}
+ DCHECK(reset_cb_.is_null());
+ reset_cb_ = closure;
+
if (decryptor_)
decryptor_->CancelDecrypt();
- reset_cb_ = closure;
-
// Defer the reset if a read is pending.
if (!read_cb_.is_null())
return;
@@ -207,11 +208,12 @@ void FFmpegVideoDecoder::Stop(const base::Closure& closure) {
return;
}
+ DCHECK(stop_cb_.is_null());
+ stop_cb_ = closure;
+
if (decryptor_)
decryptor_->CancelDecrypt();
- stop_cb_ = closure;
-
// Defer stopping if a read is pending.
if (!read_cb_.is_null())
return;

Powered by Google App Engine
This is Rietveld 408576698