Add PPAPI CDM video decoder initialization.

ppapi/proxy/ppp_content_decryptor_private_proxy.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 "ppapi/proxy/ppp_content_decryptor_private_proxy.h"
 
 #include "base/platform_file.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/ppb_core.h"
 #include "ppapi/proxy/content_decryptor_private_serializer.h"
@@ skipping 73 matching lines @@
   const PPB_Core* core = static_cast<const PPB_Core*>(
       dispatcher->local_get_interface()(PPB_CORE_INTERFACE));
   if (!core) {
     NOTREACHED();
     return PP_FALSE;
   }
   core->AddRefResource(resource);
   return PP_TRUE;
 }
 
+bool InitializePppDecryptorBuffer(PP_Instance instance,
+                                  HostDispatcher* dispatcher,
+                                  PP_Resource resource,
+                                  PPPDecryptor_Buffer* buffer) {
+  if (!buffer) {
+    NOTREACHED();
+    return false;
+  }
+
+  if (!AddRefResourceForPlugin(dispatcher, resource))
+    return false;
+
+  HostResource host_resource;
+  host_resource.SetHostResource(instance, resource);
+
+  uint32_t size = 0;
+  if (DescribeHostBufferResource(resource, &size) == PP_FALSE)
+    return false;
+
+  base::SharedMemoryHandle handle;
+  if (ShareHostBufferResourceToPlugin(dispatcher,
+                                      resource,
+                                      &handle) == PP_FALSE)
+    return false;
+
+  buffer->resource = host_resource;
+  buffer->handle = handle;
+  buffer->size = size;
+  return true;
+}
+
 void GenerateKeyRequest(PP_Instance instance,
                         PP_Var key_system,
                         PP_Var init_data) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
     return;
   }
 
   dispatcher->Send(
@@ skipping 31 matching lines @@
   }
 
   dispatcher->Send(
       new PpapiMsg_PPPContentDecryptor_CancelKeyRequest(
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
           SerializedVarSendInput(dispatcher, session_id)));
 }
 
 void Decrypt(PP_Instance instance,
-                PP_Resource encrypted_block,
-                const PP_EncryptedBlockInfo* encrypted_block_info) {
+             PP_Resource encrypted_block,
+             const PP_EncryptedBlockInfo* encrypted_block_info) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
     return;
   }
 
-  if (!AddRefResourceForPlugin(dispatcher, encrypted_block)) {
+  PPPDecryptor_Buffer buffer;
+  if (!InitializePppDecryptorBuffer(instance,
+                                    dispatcher,
+                                    encrypted_block,
+                                    &buffer)) {
     NOTREACHED();
     return;
   }
 
-  HostResource host_resource;
-  host_resource.SetHostResource(instance, encrypted_block);
-
-  uint32_t size = 0;
-  if (DescribeHostBufferResource(encrypted_block, &size) == PP_FALSE)
+  std::string serialized_block_info;
+  if (!SerializeBlockInfo(*encrypted_block_info, &serialized_block_info)) {
+    NOTREACHED();
     return;
-
-  base::SharedMemoryHandle handle;
-  if (ShareHostBufferResourceToPlugin(dispatcher,
-                                      encrypted_block,
-                                      &handle) == PP_FALSE)
-    return;
-
-  PPPDecryptor_Buffer buffer;
-  buffer.resource = host_resource;
-  buffer.handle = handle;
-  buffer.size = size;
-
-  std::string serialized_block_info;
-  if (!SerializeBlockInfo(*encrypted_block_info, &serialized_block_info))
-    return;
+  }
 
   dispatcher->Send(
       new PpapiMsg_PPPContentDecryptor_Decrypt(
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
           buffer,
           serialized_block_info));
 }
 
+void InitializeVideoDecoder(
+    PP_Instance instance,
+    const PP_VideoDecoderConfig* decoder_config,
+    PP_Resource extra_data_buffer) {
+  HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
+  if (!dispatcher) {
+    NOTREACHED();
+    return;
+  }
+
+  std::string serialized_decoder_config;
+  if (!SerializeBlockInfo(*decoder_config, &serialized_decoder_config)) {
+    NOTREACHED();
+    return;
+  }
+
+  PPPDecryptor_Buffer buffer;
+  if (!InitializePppDecryptorBuffer(instance,
+                                    dispatcher,
+                                    extra_data_buffer,
+                                    &buffer)) {
+    NOTREACHED();
+    return;
+  }
+
+  dispatcher->Send(
+      new PpapiMsg_PPPContentDecryptor_InitializeVideoDecoder(
+          API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
+          instance,
+          serialized_decoder_config,
+          buffer));
+}
+
+
 void DecryptAndDecodeFrame(
     PP_Instance instance,
     PP_Resource encrypted_frame,
     const PP_EncryptedVideoFrameInfo* encrypted_video_frame_info) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
     return;
   }
 
-  if (!AddRefResourceForPlugin(dispatcher, encrypted_frame)) {
+  PPPDecryptor_Buffer buffer;
+  if (!InitializePppDecryptorBuffer(instance,
+                                    dispatcher,
+                                    encrypted_frame,
+                                    &buffer)) {
     NOTREACHED();
     return;
   }
 
-  HostResource host_resource;
-  host_resource.SetHostResource(instance, encrypted_frame);
-
-  uint32_t size = 0;
-  if (DescribeHostBufferResource(encrypted_frame, &size) == PP_FALSE)
+  std::string serialized_frame_info;
+  if (!SerializeBlockInfo(*encrypted_video_frame_info,
+                          &serialized_frame_info)) {
+    NOTREACHED();
     return;
-
-  base::SharedMemoryHandle handle;
-  if (ShareHostBufferResourceToPlugin(dispatcher,
-                                      encrypted_frame,
-                                      &handle) == PP_FALSE)
-    return;
-
-  PPPDecryptor_Buffer buffer;
-  buffer.resource = host_resource;
-  buffer.handle = handle;
-  buffer.size = size;
-
-  std::string serialized_frame_info;
-  if (!SerializeBlockInfo(*encrypted_video_frame_info, &serialized_frame_info))
-    return;
+  }
 
   dispatcher->Send(
       new PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame(
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
           buffer,
           serialized_frame_info));
 }
 
 static const PPP_ContentDecryptor_Private content_decryptor_interface = {
   &GenerateKeyRequest,
   &AddKey,
   &CancelKeyRequest,
   &Decrypt,
+  &InitializeVideoDecoder,
   &DecryptAndDecodeFrame
 };
 
 }  // namespace
 
 PPP_ContentDecryptor_Private_Proxy::PPP_ContentDecryptor_Private_Proxy(
     Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher),
       ppp_decryptor_impl_(NULL) {
   if (dispatcher->IsPlugin()) {
@@ skipping 17 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPP_ContentDecryptor_Private_Proxy, msg)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPContentDecryptor_GenerateKeyRequest,
                         OnMsgGenerateKeyRequest)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPContentDecryptor_AddKey,
                         OnMsgAddKey)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPContentDecryptor_CancelKeyRequest,
                         OnMsgCancelKeyRequest)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPContentDecryptor_Decrypt,
                         OnMsgDecrypt)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPPContentDecryptor_InitializeVideoDecoder,
+                        OnMsgInitializeVideoDecoder)
     IPC_MESSAGE_HANDLER(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame,
                         OnMsgDecryptAndDecodeFrame)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 void PPP_ContentDecryptor_Private_Proxy::OnMsgGenerateKeyRequest(
     PP_Instance instance,
@@ skipping 43 matching lines @@
     PP_EncryptedBlockInfo block_info;
     if (!DeserializeBlockInfo(serialized_block_info, &block_info))
       return;
     CallWhileUnlocked(ppp_decryptor_impl_->Decrypt,
                       instance,
                       plugin_resource,
                       const_cast<const PP_EncryptedBlockInfo*>(&block_info));
   }
 }
 
+void PPP_ContentDecryptor_Private_Proxy::OnMsgInitializeVideoDecoder(
+    PP_Instance instance,
+    const std::string& serialized_decoder_config,
+    const PPPDecryptor_Buffer& extra_data_buffer) {
+
+  PP_VideoDecoderConfig decoder_config;
+  if (!DeserializeBlockInfo(serialized_decoder_config, &decoder_config))
+      return;
+
+  if (ppp_decryptor_impl_) {
+    PP_Resource plugin_resource = 0;
+    if (extra_data_buffer.size > 0) {
+      plugin_resource =
+          PPB_Buffer_Proxy::AddProxyResource(extra_data_buffer.resource,
+                                             extra_data_buffer.handle,
+                                             extra_data_buffer.size);
+    }
+
+    CallWhileUnlocked(
+        ppp_decryptor_impl_->InitializeVideoDecoder,
+        instance,
+        const_cast<const PP_VideoDecoderConfig*>(&decoder_config),

[brettw, 2012/10/11 20:45:58]

Are you sure you need this const cast? I thought that you could convert a foo*
to a const foo* implicitly.

[Tom Finegan, 2012/10/11 21:04:04]

Can't construct the base::Closure because of non-const pointer, according to
clang:

../../ppapi/shared_impl/proxy_lock.h:103:12: note: candidate template ignored:
deduced conflicting types for parameter 'P2' ('const PP_VideoDecoderConfig *'
vs. 'PP_VideoDecoderConfig *')
ReturnType CallWhileUnlocked(ReturnType (*function)(P1, P2, P3),

+        plugin_resource);
+  }
+}
+
 void PPP_ContentDecryptor_Private_Proxy::OnMsgDecryptAndDecodeFrame(
     PP_Instance instance,
     const PPPDecryptor_Buffer& encrypted_frame,
     const std::string& serialized_frame_info) {
   if (ppp_decryptor_impl_) {
     PP_Resource plugin_resource =
         PPB_Buffer_Proxy::AddProxyResource(encrypted_frame.resource,
                                            encrypted_frame.handle,
                                            encrypted_frame.size);
     PP_EncryptedVideoFrameInfo frame_info;
     if (!DeserializeBlockInfo(serialized_frame_info, &frame_info))
       return;
     CallWhileUnlocked(
         ppp_decryptor_impl_->DecryptAndDecodeFrame,
         instance,
         plugin_resource,
         const_cast<const PP_EncryptedVideoFrameInfo*>(&frame_info));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi