Decryptors can report kNoKey to WebMediaPlayer

media/filters/decrypting_audio_decoder.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/decrypting_audio_decoder.h"
 
 #include <cstdlib>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 28 matching lines @@
       state_(kUninitialized),
       set_decryptor_ready_cb_(set_decryptor_ready_cb),
       decryptor_(NULL),
       key_added_while_decode_pending_(false),
       weak_factory_(this) {}
 
 std::string DecryptingAudioDecoder::GetDisplayName() const {
   return "DecryptingAudioDecoder";
 }
 
-void DecryptingAudioDecoder::Initialize(const AudioDecoderConfig& config,
-                                        const PipelineStatusCB& status_cb,
-                                        const OutputCB& output_cb) {
+void DecryptingAudioDecoder::Initialize(
+    const AudioDecoderConfig& config,
+    const PipelineStatusCB& status_cb,
+    const OutputCB& output_cb,
+    const base::Closure& waiting_for_encryption_key_cb) {
   DVLOG(2) << "Initialize()";
   DCHECK(task_runner_->BelongsToCurrentThread());
   DCHECK(decode_cb_.is_null());
   DCHECK(reset_cb_.is_null());
 
   weak_this_ = weak_factory_.GetWeakPtr();
   init_cb_ = BindToCurrentLoop(status_cb);
   output_cb_ = BindToCurrentLoop(output_cb);
+  waiting_for_encryption_key_cb_ = waiting_for_encryption_key_cb;
 
   if (!config.IsValidConfig()) {
     DLOG(ERROR) << "Invalid audio stream config.";
     base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_DECODE);
     return;
   }
 
   // DecryptingAudioDecoder only accepts potentially encrypted stream.
   if (!config.is_encrypted()) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
@@ skipping 211 matching lines @@
     // pending buffer again when new key is added to the decryptor.
     pending_buffer_to_decode_ = scoped_pending_buffer_to_decode;
 
     if (need_to_try_again_if_nokey_is_returned) {
       // The |state_| is still kPendingDecode.
       DecodePendingBuffer();
       return;
     }
 
     state_ = kWaitingForKey;
+    waiting_for_encryption_key_cb_.Run();
     return;
   }
 
   if (status == Decryptor::kNeedMoreData) {
     DVLOG(2) << "DeliverFrame() - kNeedMoreData";
     state_ = scoped_pending_buffer_to_decode->end_of_stream() ? kDecodeFinished
                                                               : kIdle;
     base::ResetAndReturn(&decode_cb_).Run(kOk);
     return;
   }
@@ skipping 55 matching lines @@
     }
 
     frame->set_timestamp(current_time);
     timestamp_helper_->AddFrames(frame->frame_count());
 
     output_cb_.Run(frame);
   }
 }
 
 }  // namespace media