| Index: media/filters/decrypting_demuxer_stream.cc
|
| diff --git a/media/filters/decrypting_demuxer_stream.cc b/media/filters/decrypting_demuxer_stream.cc
|
| index 601fd4681b7b9b6114971556ead33faf0152b55c..7a6f43ce797854d65faf80280956a061fa244efc 100644
|
| --- a/media/filters/decrypting_demuxer_stream.cc
|
| +++ b/media/filters/decrypting_demuxer_stream.cc
|
| @@ -30,14 +30,17 @@ static bool IsStreamValidAndEncrypted(DemuxerStream* stream) {
|
|
|
| DecryptingDemuxerStream::DecryptingDemuxerStream(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
|
| - const SetDecryptorReadyCB& set_decryptor_ready_cb)
|
| + const SetDecryptorReadyCB& set_decryptor_ready_cb,
|
| + const base::Closure& waiting_for_decryption_key_cb)
|
| : task_runner_(task_runner),
|
| state_(kUninitialized),
|
| + waiting_for_decryption_key_cb_(waiting_for_decryption_key_cb),
|
| demuxer_stream_(NULL),
|
| set_decryptor_ready_cb_(set_decryptor_ready_cb),
|
| decryptor_(NULL),
|
| key_added_while_decrypt_pending_(false),
|
| - weak_factory_(this) {}
|
| + weak_factory_(this) {
|
| +}
|
|
|
| void DecryptingDemuxerStream::Initialize(DemuxerStream* stream,
|
| const PipelineStatusCB& status_cb) {
|
| @@ -311,6 +314,7 @@ void DecryptingDemuxerStream::DeliverBuffer(
|
| }
|
|
|
| state_ = kWaitingForKey;
|
| + waiting_for_decryption_key_cb_.Run();
|
| return;
|
| }
|
|
|
|
|