Update PluginInstance for decrypt-and-decode video.

webkit/media/crypto/ppapi/cdm_wrapper.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 <cstring>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 44 matching lines @@
 }
 
 // Configures a cdm::InputBuffer. |subsamples| must exist as long as
 // |input_buffer| is in use.
 void ConfigureInputBuffer(
     const pp::Buffer_Dev& encrypted_buffer,
     const PP_EncryptedBlockInfo& encrypted_block_info,
     std::vector<cdm::SubsampleEntry>* subsamples,
     cdm::InputBuffer* input_buffer) {
   PP_DCHECK(subsamples);
+  PP_DCHECK(!encrypted_buffer.is_null());
+
   input_buffer->data = reinterpret_cast<uint8_t*>(encrypted_buffer.data());
   input_buffer->data_size = encrypted_buffer.size();
   input_buffer->data_offset = encrypted_block_info.data_offset;
   input_buffer->key_id = encrypted_block_info.key_id;
   input_buffer->key_id_size = encrypted_block_info.key_id_size;
   input_buffer->iv = encrypted_block_info.iv;
   input_buffer->iv_size = encrypted_block_info.iv_size;
   input_buffer->num_subsamples = encrypted_block_info.num_subsamples;
 
   if (encrypted_block_info.num_subsamples > 0) {
@@ skipping 562 matching lines @@
                                            decoder_type,
                                            request_id));
 }
 
 void CdmWrapper::DecryptAndDecode(
     PP_DecryptorStreamType decoder_type,
     pp::Buffer_Dev encrypted_buffer,
     const PP_EncryptedBlockInfo& encrypted_block_info) {
   // TODO(tomfinegan): Remove this check when audio decoding is added.
   PP_DCHECK(decoder_type == PP_DECRYPTORSTREAMTYPE_VIDEO);
-
-  PP_DCHECK(!encrypted_buffer.is_null());
   PP_DCHECK(cdm_);
 
   cdm::InputBuffer input_buffer;
   std::vector<cdm::SubsampleEntry> subsamples;
-  ConfigureInputBuffer(encrypted_buffer,
-                       encrypted_block_info,
-                       &subsamples,
-                       &input_buffer);
+  if (!encrypted_buffer.is_null()) {
+    ConfigureInputBuffer(encrypted_buffer,
+                         encrypted_block_info,
+                         &subsamples,
+                         &input_buffer);
+  }
 
   LinkedVideoFrame video_frame(new VideoFrameImpl());
   cdm::Status status = cdm_->DecryptAndDecodeFrame(input_buffer,
                                                    video_frame.get());
   CallOnMain(callback_factory_.NewCallback(
       &CdmWrapper::DeliverFrame,
       status,
       video_frame,
       encrypted_block_info.tracking_info));
 }
@@ skipping 110 matching lines @@
     int32_t result,
     const cdm::Status& status,
     const LinkedVideoFrame& video_frame,
     const PP_DecryptTrackingInfo& tracking_info) {
   PP_DCHECK(result == PP_OK);
   PP_DecryptedFrameInfo decrypted_frame_info;
   decrypted_frame_info.tracking_info = tracking_info;
 
   switch (status) {
     case cdm::kSuccess:
-      PP_DCHECK(video_frame->format() == cdm::kI420 ||
+      PP_DCHECK(video_frame.get());
+      PP_DCHECK(video_frame->format() == cdm::kEmptyVideoFrame ||
+                video_frame->format() == cdm::kI420 ||
                 video_frame->format() == cdm::kYv12);
-      PP_DCHECK(video_frame.get() && video_frame->frame_buffer());
+
       decrypted_frame_info.result = PP_DECRYPTRESULT_SUCCESS;
       decrypted_frame_info.format =
           CdmVideoFormatToPpDecryptedFrameFormat(video_frame->format());
+
+      if (video_frame->format() == cdm::kEmptyVideoFrame)
+        break;
+
+      PP_DCHECK(video_frame->frame_buffer());
       decrypted_frame_info.width = video_frame->size().width;
       decrypted_frame_info.height = video_frame->size().height;
       decrypted_frame_info.plane_offsets[PP_DECRYPTEDFRAMEPLANES_Y] =
         video_frame->plane_offset(cdm::VideoFrame::kYPlane);
       decrypted_frame_info.plane_offsets[PP_DECRYPTEDFRAMEPLANES_U] =
         video_frame->plane_offset(cdm::VideoFrame::kUPlane);
       decrypted_frame_info.plane_offsets[PP_DECRYPTEDFRAMEPLANES_V] =
         video_frame->plane_offset(cdm::VideoFrame::kVPlane);
       decrypted_frame_info.strides[PP_DECRYPTEDFRAMEPLANES_Y] =
         video_frame->stride(cdm::VideoFrame::kYPlane);
@@ skipping 41 matching lines @@
 }  // namespace webkit_media
 
 namespace pp {
 
 // Factory function for your specialization of the Module object.
 Module* CreateModule() {
   return new webkit_media::CdmWrapperModule();
 }
 
 }  // namespace pp