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

Unified Diff: media/filters/decrypting_video_decoder.cc

Issue 11144036: Update Decryptor interface to support audio decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove leftover unretained Created 8 years, 2 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 | « media/crypto/aes_decryptor_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index f2e0a33673cf74e4c88aabf4d51908198384da2a..b8200300b89d7ea3b555f4c48e7156525fd93edf 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -67,7 +67,7 @@ void DecryptingVideoDecoder::Reset(const base::Closure& closure) {
reset_cb_ = closure;
- decryptor_->CancelDecryptAndDecodeVideo();
+ decryptor_->ResetDecoder(Decryptor::kVideo);
// Reset() cannot complete if the read callback is still pending.
// Defer the resetting process in this case. The |reset_cb_| will be fired
@@ -102,7 +102,7 @@ void DecryptingVideoDecoder::Stop(const base::Closure& closure) {
// render thread to be processing messages to complete (such as PPAPI
// callbacks).
if (decryptor_)
- decryptor_->StopVideoDecoder();
+ decryptor_->DeinitializeDecoder(Decryptor::kVideo);
if (!request_decryptor_notification_cb_.is_null()) {
base::ResetAndReturn(&request_decryptor_notification_cb_).Run(
DecryptorNotificationCB());
« no previous file with comments | « media/crypto/aes_decryptor_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698