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

Unified Diff: media/filters/decrypting_video_decoder.cc

Issue 11226019: Encrypted Media: Replace DecryptorClient with key event callbacks. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase again Created 8 years 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/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index ebb72c2ab09dc6883948d74ac793d8f37d1097a6..7117d753384fa7ab80d6323ceabe14a627f6a6fe 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -125,7 +125,7 @@ void DecryptingVideoDecoder::Stop(const base::Closure& closure) {
// render thread to be processing messages to complete (such as PPAPI
// callbacks).
if (decryptor_) {
- decryptor_->RegisterKeyAddedCB(Decryptor::kVideo, Decryptor::KeyAddedCB());
+ decryptor_->RegisterNewKeyCB(Decryptor::kVideo, Decryptor::NewKeyCB());
decryptor_->DeinitializeDecoder(Decryptor::kVideo);
decryptor_ = NULL;
}
@@ -187,7 +187,7 @@ void DecryptingVideoDecoder::FinishInitialization(bool success) {
return;
}
- decryptor_->RegisterKeyAddedCB(Decryptor::kVideo, BindToCurrentLoop(
+ decryptor_->RegisterNewKeyCB(Decryptor::kVideo, BindToCurrentLoop(
base::Bind(&DecryptingVideoDecoder::OnKeyAdded, this)));
// Success!

Powered by Google App Engine
This is Rietveld 408576698