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

Unified Diff: webkit/media/crypto/proxy_decryptor.cc

Issue 10964055: Call Decryptor::Stop() in FFmpegVideoDecoder::Reset(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase 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
« no previous file with comments | « webkit/media/crypto/proxy_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/proxy_decryptor.cc
diff --git a/webkit/media/crypto/proxy_decryptor.cc b/webkit/media/crypto/proxy_decryptor.cc
index bdbabbf21fe8095577573c9c672870ae281110f3..ce01925ac5960e66d7ce4b0a3aee45d99ca371aa 100644
--- a/webkit/media/crypto/proxy_decryptor.cc
+++ b/webkit/media/crypto/proxy_decryptor.cc
@@ -166,14 +166,14 @@ void ProxyDecryptor::Decrypt(
base::MessageLoopProxy::current(), encrypted, decrypt_cb));
}
-void ProxyDecryptor::Stop() {
+void ProxyDecryptor::CancelDecrypt() {
DVLOG(1) << "Stop()";
std::vector<base::Closure> closures_to_run;
{
base::AutoLock auto_lock(lock_);
if (decryptor_.get())
- decryptor_->Stop();
+ decryptor_->CancelDecrypt();
stopped_ = true;
std::swap(pending_decrypt_closures_, closures_to_run);
}
« no previous file with comments | « webkit/media/crypto/proxy_decryptor.h ('k') | webkit/media/crypto/proxy_decryptor_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698