media/filters/decrypting_video_decoder.cc - Issue 11226019: Encrypted Media: Replace DecryptorClient with key event callbacks.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: tests updated; ready for review 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

« media/crypto/aes_decryptor.h ('K') | « media/filters/decrypting_demuxer_stream_unittest.cc ('k') | media/filters/decrypting_video_decoder_unittest.cc » ('j') | media/filters/decrypting_video_decoder_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | 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 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!