Make more VideoDecoders reinitializable.

media/filters/decrypting_video_decoder.cc

Index: media/filters/decrypting_video_decoder.cc
diff --git a/media/filters/decrypting_video_decoder.cc b/media/filters/decrypting_video_decoder.cc
index 62de8f5b6ed83e23e27deb2db2b85aceba726ef6..0c0572f753c768eef50031eacf7e6ece101d24db 100644
--- a/media/filters/decrypting_video_decoder.cc
+++ b/media/filters/decrypting_video_decoder.cc
@@ -39,32 +39,34 @@ void DecryptingVideoDecoder::Initialize(
     const StatisticsCB& statistics_cb) {
   DVLOG(2) << "Initialize()";
   DCHECK(message_loop_->BelongsToCurrentThread());
-  DCHECK_EQ(state_, kUninitialized) << state_;
+  DCHECK(state_ == kUninitialized ||
+         state_ == kIdle ||
+         state_ == kDecodeFinished) << state_;
+  DCHECK(read_cb_.is_null());
+  DCHECK(reset_cb_.is_null());
   DCHECK(stream);
+
   init_cb_ = BindToCurrentLoop(status_cb);
   weak_this_ = weak_factory_.GetWeakPtr();
+  demuxer_stream_ = stream;
+  statistics_cb_ = statistics_cb;
 
-  const VideoDecoderConfig& config = stream->video_decoder_config();
-  if (!config.IsValidConfig()) {
-    DLOG(ERROR) << "Invalid video stream config: "
-                << config.AsHumanReadableString();
-    base::ResetAndReturn(&init_cb_).Run(PIPELINE_ERROR_DECODE);
-    return;
-  }
+  const VideoDecoderConfig& config = demuxer_stream_->video_decoder_config();
+  DCHECK(config.IsValidConfig());
+  DCHECK(config.is_encrypted());
 
-  // DecryptingVideoDecoder only accepts potentially encrypted stream.
-  if (!config.is_encrypted()) {
-    base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
+  if (state_ == kUninitialized) {
+    state_ = kDecryptorRequested;
+    set_decryptor_ready_cb_.Run(BindToCurrentLoop(base::Bind(
+        &DecryptingVideoDecoder::SetDecryptor, weak_this_)));
     return;
   }
 
-  DCHECK(!demuxer_stream_);
-  demuxer_stream_ = stream;
-  statistics_cb_ = statistics_cb;
-
-  state_ = kDecryptorRequested;
-  set_decryptor_ready_cb_.Run(BindToCurrentLoop(base::Bind(
-      &DecryptingVideoDecoder::SetDecryptor, weak_this_)));
+  // Reinitialization.
+  decryptor_->DeinitializeDecoder(Decryptor::kVideo);
+  state_ = kPendingDecoderInit;
+  decryptor_->InitializeVideoDecoder(config, BindToCurrentLoop(base::Bind(
+      &DecryptingVideoDecoder::FinishInitialization, weak_this_)));
 }
 
 void DecryptingVideoDecoder::Read(const ReadCB& read_cb) {