Update PluginInstance for decrypt-and-decode video.

- Hook up PpapiDecryptor and PluginInstance in terms of decrypt-and-decode calls.
- Enable empty input buffer and empty video frame to be passed to/from the plugin. This is used for end-of-stream buffer/frames.
- Add logs in DecryptingVideoDecoder.
    
BUG=141780,141784
TEST=Decrypt-and-decode of video is working with a fake video decoder in clearkey CDM.

Review URL: https://chromiumcodereview.appspot.com/11091005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162657 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 8 insertions, 0 deletions

diff --git a/ppapi/cpp/private/content_decryptor_private.h b/ppapi/cpp/private/content_decryptor_private.h
index 0f5abe5..be70158 100644
--- a/ppapi/cpp/private/content_decryptor_private.h
+++ b/ppapi/cpp/private/content_decryptor_private.h
@@ -43,6 +43,7 @@ class ContentDecryptor_Private {
                                    uint32_t request_id) = 0;
   virtual void ResetDecoder(PP_DecryptorStreamType decoder_type,
                             uint32_t request_id) = 0;
+  // Null |encrypted_frame| means end-of-stream buffer.
   virtual void DecryptAndDecode(
       PP_DecryptorStreamType decoder_type,
       pp::Buffer_Dev encrypted_buffer,
diff --git a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
index 7608dfe..29190af 100644
--- a/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
+++ b/ppapi/proxy/ppp_content_decryptor_private_proxy.cc
@@ -100,6 +100,13 @@ bool InitializePppDecryptorBuffer(PP_Instance instance,
     return false;
   }
 
+  if (resource == 0) {
+    buffer->resource = HostResource();
+    buffer->handle = base::SharedMemoryHandle();
+    buffer->size = 0;
+    return true;
+  }
+
   if (!AddRefResourceForPlugin(dispatcher, resource))
     return false;