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

Unified Diff: media/filters/decrypting_demuxer_stream.cc

Issue 416333011: Allow setContentDecryptionModule() to get called when setting is done. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: const & Created 6 years, 5 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/decrypting_demuxer_stream.cc
diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc
index 4ec6c530b2411efdbb170350c544a22dfa687e7a..93fc3a9d41c87e183e8b206af942a11c3b764ff4 100644
--- a/media/filters/decrypting_demuxer_stream.cc
+++ b/media/filters/decrypting_demuxer_stream.cc
@@ -160,7 +160,8 @@ DecryptingDemuxerStream::~DecryptingDemuxerStream() {
pending_buffer_to_decrypt_ = NULL;
}
-void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) {
+void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor,
+ const base::Closure& done_cb) {
DVLOG(2) << __FUNCTION__;
DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK_EQ(state_, kDecryptorRequested) << state_;
@@ -172,6 +173,7 @@ void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) {
if (!decryptor) {
state_ = kUninitialized;
base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
+ done_cb.Run();
ddorwin 2014/07/30 22:35:46 ditto
return;
}
@@ -184,6 +186,7 @@ void DecryptingDemuxerStream::SetDecryptor(Decryptor* decryptor) {
state_ = kIdle;
base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
+ done_cb.Run();
}
void DecryptingDemuxerStream::DecryptBuffer(

Powered by Google App Engine
This is Rietveld 408576698