Generalize Pepper CDM API decrypt and decode.

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 124 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)) {
     NOTREACHED();
     return;
   }
@@ skipping 21 matching lines @@
     return;
 
   dispatcher->Send(
       new PpapiMsg_PPPContentDecryptor_Decrypt(
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
           buffer,
           serialized_block_info));
 }
 
-void DecryptAndDecodeFrame(
-    PP_Instance instance,
-    PP_Resource encrypted_frame,
-    const PP_EncryptedVideoFrameInfo* encrypted_video_frame_info) {
+void DecryptAndDecode(PP_Instance instance,
+                      PP_StreamType decoder_type,
+                      PP_Resource encrypted_buffer,
+                      const PP_EncryptedBlockInfo* encrypted_block_info) {
   HostDispatcher* dispatcher = HostDispatcher::GetForInstance(instance);
   if (!dispatcher) {
     NOTREACHED();
     return;
   }
 
-  if (!AddRefResourceForPlugin(dispatcher, encrypted_frame)) {
+  if (!AddRefResourceForPlugin(dispatcher, encrypted_buffer)) {
     NOTREACHED();
     return;
   }
 
   HostResource host_resource;
-  host_resource.SetHostResource(instance, encrypted_frame);
+  host_resource.SetHostResource(instance, encrypted_buffer);
 
   uint32_t size = 0;
-  if (DescribeHostBufferResource(encrypted_frame, &size) == PP_FALSE)
+  if (DescribeHostBufferResource(encrypted_buffer, &size) == PP_FALSE)
     return;
 
   base::SharedMemoryHandle handle;
   if (ShareHostBufferResourceToPlugin(dispatcher,
-                                      encrypted_frame,
+                                      encrypted_buffer,
                                       &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))
+  std::string serialized_block_info;
+  if (!SerializeBlockInfo(*encrypted_block_info, &serialized_block_info))
     return;
 
   dispatcher->Send(
-      new PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame(
+      new PpapiMsg_PPPContentDecryptor_DecryptAndDecode(
           API_ID_PPP_CONTENT_DECRYPTOR_PRIVATE,
           instance,
+          decoder_type,
           buffer,
-          serialized_frame_info));
+          serialized_block_info));
 }
 
 static const PPP_ContentDecryptor_Private content_decryptor_interface = {
   &GenerateKeyRequest,
   &AddKey,
   &CancelKeyRequest,
   &Decrypt,
-  &DecryptAndDecodeFrame
+  &DecryptAndDecode
 };
 
 }  // namespace
 
 PPP_ContentDecryptor_Private_Proxy::PPP_ContentDecryptor_Private_Proxy(
     Dispatcher* dispatcher)
     : InterfaceProxy(dispatcher),
       ppp_decryptor_impl_(NULL) {
   if (dispatcher->IsPlugin()) {
     ppp_decryptor_impl_ = static_cast<const PPP_ContentDecryptor_Private*>(
@@ skipping 16 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_DecryptAndDecodeFrame,
-                        OnMsgDecryptAndDecodeFrame)
+    IPC_MESSAGE_HANDLER(PpapiMsg_PPPContentDecryptor_DecryptAndDecode,
+                        OnMsgDecryptAndDecode)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   DCHECK(handled);
   return handled;
 }
 
 void PPP_ContentDecryptor_Private_Proxy::OnMsgGenerateKeyRequest(
     PP_Instance instance,
     SerializedVarReceiveInput key_system,
     SerializedVarReceiveInput init_data) {
@@ skipping 41 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::OnMsgDecryptAndDecodeFrame(
+void PPP_ContentDecryptor_Private_Proxy::OnMsgDecryptAndDecode(
     PP_Instance instance,
-    const PPPDecryptor_Buffer& encrypted_frame,
-    const std::string& serialized_frame_info) {
+    PP_StreamType decoder_type,
+    const PPPDecryptor_Buffer& encrypted_buffer,
+    const std::string& serialized_block_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))
+        PPB_Buffer_Proxy::AddProxyResource(encrypted_buffer.resource,
+                                           encrypted_buffer.handle,
+                                           encrypted_buffer.size);
+    PP_EncryptedBlockInfo block_info;
+    if (!DeserializeBlockInfo(serialized_block_info, &block_info))
       return;
     CallWhileUnlocked(
-        ppp_decryptor_impl_->DecryptAndDecodeFrame,
+        ppp_decryptor_impl_->DecryptAndDecode,
         instance,
+        decoder_type,
         plugin_resource,
-        const_cast<const PP_EncryptedVideoFrameInfo*>(&frame_info));
+        const_cast<const PP_EncryptedBlockInfo*>(&block_info));
   }
 }
 
 }  // namespace proxy
 }  // namespace ppapi