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/decoder_stream.cc

Issue 935243002: Decryptors can report kNoKey to WebMediaPlayer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Android changes Created 5 years, 10 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/decoder_stream.cc
diff --git a/media/filters/decoder_stream.cc b/media/filters/decoder_stream.cc
index f9fa8b2d8d7f2354a625412ff4e92b2edbdb2e38..3a366d8986198ff9058a94aa9bbd9d5e1a701d4c 100644
--- a/media/filters/decoder_stream.cc
+++ b/media/filters/decoder_stream.cc
@@ -83,7 +83,8 @@ void DecoderStream<StreamType>::Initialize(
DemuxerStream* stream,
const InitCB& init_cb,
const SetDecryptorReadyCB& set_decryptor_ready_cb,
- const StatisticsCB& statistics_cb) {
+ const StatisticsCB& statistics_cb,
+ const base::Closure& waiting_for_decryption_key_cb) {
FUNCTION_DVLOG(2);
DCHECK(task_runner_->BelongsToCurrentThread());
DCHECK_EQ(state_, STATE_UNINITIALIZED);
@@ -92,6 +93,7 @@ void DecoderStream<StreamType>::Initialize(
statistics_cb_ = statistics_cb;
init_cb_ = init_cb;
+ waiting_for_decryption_key_cb_ = waiting_for_decryption_key_cb;
stream_ = stream;
state_ = STATE_INITIALIZING;
@@ -212,7 +214,8 @@ void DecoderStream<StreamType>::SelectDecoder(
base::Bind(&DecoderStream<StreamType>::OnDecoderSelected,
weak_factory_.GetWeakPtr()),
base::Bind(&DecoderStream<StreamType>::OnDecodeOutputReady,
- weak_factory_.GetWeakPtr()));
+ weak_factory_.GetWeakPtr()),
+ waiting_for_decryption_key_cb_);
}
template <DemuxerStream::Type StreamType>

Powered by Google App Engine
This is Rietveld 408576698