Update PluginInstance for decrypt-and-decode video.

media/filters/decrypting_video_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_video_decoder.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
@@ skipping 38 matching lines @@
       &DecryptingVideoDecoder::DoRead, this, read_cb));
 }
 
 void DecryptingVideoDecoder::Reset(const base::Closure& closure) {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &DecryptingVideoDecoder::Reset, this, closure));
     return;
   }
 
+  DVLOG(2) << "Reset() - state: " << state_;
+
   DCHECK(state_ == kIdle ||
          state_ == kPendingDemuxerRead ||
          state_ == kPendingDecode ||
          state_ == kWaitingForKey ||
          state_ == kDecodeFinished) << state_;
   DCHECK(init_cb_.is_null());  // No Reset() during pending initialization.
   DCHECK(stop_cb_.is_null());  // No Reset() during pending Stop().
   DCHECK(reset_cb_.is_null());
 
   reset_cb_ = closure;
@@ skipping 19 matching lines @@
   DoReset();
 }
 
 void DecryptingVideoDecoder::Stop(const base::Closure& closure) {
   if (!message_loop_->BelongsToCurrentThread()) {
     message_loop_->PostTask(FROM_HERE, base::Bind(
         &DecryptingVideoDecoder::Stop, this, closure));
     return;
   }
 
+  DVLOG(2) << "Stop() - state: " << state_;
+
   DCHECK(stop_cb_.is_null());
   stop_cb_ = closure;
 
   // We need to call Decryptor::StopVideoDecoder() if we ever called
   // Decryptor::InitializeVideoDecoder() to cancel the pending initialization if
   // the initialization is still pending, or to stop the video decoder if
   // the initialization has completed.
   // When the state is kUninitialized and kDecryptorRequested,
   // InitializeVideoDecoder() has not been called, so we are okay.
   // When the state is kStopped, the video decoder should have already been
@@ skipping 43 matching lines @@
 }
 
 void DecryptingVideoDecoder::DoInitialize(
     const scoped_refptr<DemuxerStream>& stream,
     const PipelineStatusCB& status_cb,
     const StatisticsCB& statistics_cb) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kUninitialized) << state_;
   DCHECK(stream);
 
+  DVLOG(2) << "DoInitialize()";

[ddorwin, 2012/10/13 01:40:28]

Suggest eliminating the extra line below.
One way to combine all these debug lines and get log statements before a DCHECK
is to put this as the first line in the function.

[xhwang, 2012/10/15 19:53:01]

Done.

+
   const VideoDecoderConfig& config = stream->video_decoder_config();
   if (!config.IsValidConfig()) {
     DLOG(ERROR) << "Invalid video stream config: "
                 << config.AsHumanReadableString();
     status_cb.Run(PIPELINE_ERROR_DECODE);
     return;
   }
 
   // DecryptingVideoDecoder only accepts potentially encrypted stream.
   if (!config.is_encrypted()) {
@@ skipping 10 matching lines @@
   state_ = kDecryptorRequested;
   request_decryptor_notification_cb_.Run(
       BIND_TO_LOOP(&DecryptingVideoDecoder::SetDecryptor));
 }
 
 void DecryptingVideoDecoder::SetDecryptor(Decryptor* decryptor) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kDecryptorRequested) << state_;
   DCHECK(!init_cb_.is_null());
 
+  DVLOG(2) << "SetDecryptor()";
+
   if (!stop_cb_.is_null()) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     DoStop();
     return;
   }
 
   decryptor_ = decryptor;
 
   scoped_ptr<VideoDecoderConfig> scoped_config(new VideoDecoderConfig());
   scoped_config->CopyFrom(demuxer_stream_->video_decoder_config());
 
   state_ = kPendingDecoderInit;
   decryptor_->InitializeVideoDecoder(
       scoped_config.Pass(),
       BIND_TO_LOOP(&DecryptingVideoDecoder::FinishInitialization),
       BIND_TO_LOOP(&DecryptingVideoDecoder::OnKeyAdded));
 }
 
 void DecryptingVideoDecoder::FinishInitialization(bool success) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDecoderInit) << state_;
   DCHECK(!init_cb_.is_null());
   DCHECK(reset_cb_.is_null());  // No Reset() before initialization finished.
   DCHECK(read_cb_.is_null());  // No Read() before initialization finished.
 
+  DVLOG(2) << "FinishInitialization()";
+
   if (!stop_cb_.is_null()) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     DoStop();
     return;
   }
 
   if (!success) {
     base::ResetAndReturn(&init_cb_).Run(DECODER_ERROR_NOT_SUPPORTED);
     state_ = kStopped;
     return;
   }
 
   // Success!
   state_ = kIdle;
   base::ResetAndReturn(&init_cb_).Run(PIPELINE_OK);
 }
 
 void DecryptingVideoDecoder::DoRead(const ReadCB& read_cb) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK(state_ == kIdle || state_ == kDecodeFinished) << state_;
   DCHECK(!read_cb.is_null());
   CHECK(read_cb_.is_null()) << "Overlapping decodes are not supported.";
 
+  DVLOG(3) << "DoRead()";
+
   // Return empty frames if decoding has finished.
   if (state_ == kDecodeFinished) {
     read_cb.Run(kOk, VideoFrame::CreateEmptyFrame());
     return;
   }
 
   read_cb_ = read_cb;
   state_ = kPendingDemuxerRead;
   ReadFromDemuxerStream();
 }
@@ skipping 20 matching lines @@
 }
 
 void DecryptingVideoDecoder::DoDecryptAndDecodeBuffer(
     DemuxerStream::Status status,
     const scoped_refptr<DecoderBuffer>& buffer) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDemuxerRead) << state_;
   DCHECK(!read_cb_.is_null());
   DCHECK_EQ(buffer != NULL, status == DemuxerStream::kOk) << status;
 
+  DVLOG(3) << "DoDecryptAndDecodeBuffer()";
+
   if (!reset_cb_.is_null() || !stop_cb_.is_null()) {
     base::ResetAndReturn(&read_cb_).Run(kOk, NULL);
     if (!reset_cb_.is_null())
       DoReset();
     if (!stop_cb_.is_null())
       DoStop();
     return;
   }
 
   if (status == DemuxerStream::kAborted) {
+    DVLOG(2) << "DoDecryptAndDecodeBuffer() - kAborted";
+    state_ = kIdle;
     base::ResetAndReturn(&read_cb_).Run(kOk, NULL);
-    state_ = kIdle;
     return;
   }
 
   if (status == DemuxerStream::kConfigChanged) {
     // TODO(xhwang): Add config change support.
     // The |state_| is chosen to be kDecodeFinished here to be consistent with
     // the implementation of FFmpegVideoDecoder.
+    DVLOG(2) << "DoDecryptAndDecodeBuffer() - kConfigChanged";
     state_ = kDecodeFinished;
     base::ResetAndReturn(&read_cb_).Run(kDecodeError, NULL);
     return;
   }
 
   DCHECK_EQ(status, DemuxerStream::kOk);
   pending_buffer_to_decode_ = buffer;
   state_ = kPendingDecode;
   DecodePendingBuffer();
 }
@@ skipping 22 matching lines @@
 
 void DecryptingVideoDecoder::DoDeliverFrame(
     int buffer_size,
     Decryptor::Status status,
     const scoped_refptr<VideoFrame>& frame) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(state_, kPendingDecode) << state_;
   DCHECK(!read_cb_.is_null());
   DCHECK(pending_buffer_to_decode_);
 
+  DVLOG(3) << "DoDeliverFrame()";
+
   bool need_to_try_again_if_nokey_is_returned = key_added_while_pending_decode_;
   key_added_while_pending_decode_ = false;
 
   if (!reset_cb_.is_null() || !stop_cb_.is_null()) {
     pending_buffer_to_decode_ = NULL;
     base::ResetAndReturn(&read_cb_).Run(kOk, NULL);
     if (!reset_cb_.is_null())
       DoReset();
     if (!stop_cb_.is_null())
       DoStop();
@@ skipping 34 matching lines @@
   }
 
   DCHECK_EQ(status, Decryptor::kSuccess);
   state_ = frame->IsEndOfStream() ? kDecodeFinished : kIdle;
   base::ResetAndReturn(&read_cb_).Run(kOk, frame);
 }
 
 void DecryptingVideoDecoder::OnKeyAdded() {
   DCHECK(message_loop_->BelongsToCurrentThread());
 
+  DVLOG(2) << "OnKeyAdded()";
+
   if (state_ == kPendingDecode) {
     key_added_while_pending_decode_ = true;
     return;
   }
 
   if (state_ == kWaitingForKey) {
     state_ = kPendingDecode;
     DecodePendingBuffer();
   }
 }
 
 void DecryptingVideoDecoder::DoReset() {
   DCHECK(init_cb_.is_null());
   DCHECK(read_cb_.is_null());
   state_ = kIdle;
   base::ResetAndReturn(&reset_cb_).Run();
 }
 
 void DecryptingVideoDecoder::DoStop() {
   DCHECK(init_cb_.is_null());
   DCHECK(read_cb_.is_null());
   state_ = kStopped;
   base::ResetAndReturn(&stop_cb_).Run();
 }
 
 }  // namespace media