Encrypted Media: DecryptingXxx::SetDecryptor() accepts NULL decryptor.

media/filters/decrypting_audio_decoder.cc

Index: media/filters/decrypting_audio_decoder.cc
diff --git a/media/filters/decrypting_audio_decoder.cc b/media/filters/decrypting_audio_decoder.cc
index f908d9b504cb4ddaa09743c7c02b767973ec90cc..88e3327ecfc69595efbda6bf424728853a77dadc 100644
--- a/media/filters/decrypting_audio_decoder.cc
+++ b/media/filters/decrypting_audio_decoder.cc
@@ -173,6 +173,13 @@ void DecryptingAudioDecoder::SetDecryptor(Decryptor* decryptor) {
   DCHECK(!set_decryptor_ready_cb_.is_null());
 
   set_decryptor_ready_cb_.Reset();
+
+  if (!decryptor) {
+    base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
+    state_ = kDecodeFinished;

[qinmin, 2013/06/18 22:09:20]

why the state_ value is different between DecryptingAudioDecoder and
DecryptingVideoDecoder

[xhwang, 2013/06/18 22:34:23]

The classic answer is "for historical reasons".

Long story: It used to be kDecodeFinished in both which inherited it from
FFmpegVideoDecodre. Then when I was refactoring the video path in media
pipeline, I added kError in VideoDecoders because that makes more sense. Audio
path, however, is not updated yet. I don't intent to refactor the audio path
right now and would like to just follow what the current code is doing.

[ddorwin, 2013/06/19 00:06:50]

Do we have a bug tracking this?

[xhwang, 2013/06/19 00:37:45]

Done.

+    return;
+  }
+
   decryptor_ = decryptor;
 
   const AudioDecoderConfig& input_config =