ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c - Issue 11023004: Update PPP side of Pepper CDM API to support video decoding.

Unified Diff: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

Issue 11023004: Update PPP side of Pepper CDM API to support video decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use DecryptAndDecodeFrame instead of DecryptAndDecodeVideo. Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« ppapi/api/private/ppp_content_decryptor_private.idl ('K') | « ppapi/cpp/private/content_decryptor_private.cc ('k') | ppapi/proxy/ppapi_messages.h » ('j') | webkit/plugins/ppapi/ppapi_plugin_instance.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

diff --git a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

index d010710e164a2706cc9b974aaac824df26be7c54..da21137326e87453158c6cd06f70bdc31b34cc02 100644

--- a/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

+++ b/ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c

@@ -3,7 +3,7 @@

* found in the LICENSE file.

-/* Last generated from IDL: Wed Sep 19 20:53:31 2012. */

+/* Last generated from IDL: Sat Sep 29 15:05:58 2012. */

#include "ppapi/generators/pnacl_shim.h"

#include "ppapi/c/ppb.h"

@@ -3328,10 +3328,10 @@ static void Pnacl_M23_PPP_ContentDecryptor_Private_Decrypt(PP_Instance instance,

temp_fp(instance, encrypted_block, encrypted_block_info);

}

-static void Pnacl_M23_PPP_ContentDecryptor_Private_DecryptAndDecode(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info) {

+static void Pnacl_M23_PPP_ContentDecryptor_Private_DecryptAndDecodeFrame(PP_Instance instance, PP_Resource encrypted_video_frame, const struct PP_EncryptedVideoFrameInfo* encrypted_video_frame_info) {

const struct PPP_ContentDecryptor_Private_0_1 *iface = Pnacl_WrapperInfo_PPP_ContentDecryptor_Private_0_1.real_iface;

- void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info) = ((void (__attribute__((pnaclcall)) *)(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info))iface->DecryptAndDecode);

- temp_fp(instance, encrypted_block, encrypted_block_info);

+ void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, PP_Resource encrypted_video_frame, const struct PP_EncryptedVideoFrameInfo* encrypted_video_frame_info) = ((void (__attribute__((pnaclcall)) *)(PP_Instance instance, PP_Resource encrypted_video_frame, const struct PP_EncryptedVideoFrameInfo* encrypted_video_frame_info))iface->DecryptAndDecodeFrame);

+ temp_fp(instance, encrypted_video_frame, encrypted_video_frame_info);

}

/* End wrapper methods for PPP_ContentDecryptor_Private_0_1 */

@@ -4107,7 +4107,7 @@ struct PPP_ContentDecryptor_Private_0_1 Pnacl_Wrappers_PPP_ContentDecryptor_Priv

.AddKey = (void (*)(PP_Instance instance, struct PP_Var session_id, struct PP_Var key, struct PP_Var init_data))&Pnacl_M23_PPP_ContentDecryptor_Private_AddKey,

.CancelKeyRequest = (void (*)(PP_Instance instance, struct PP_Var session_id))&Pnacl_M23_PPP_ContentDecryptor_Private_CancelKeyRequest,

.Decrypt = (void (*)(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info))&Pnacl_M23_PPP_ContentDecryptor_Private_Decrypt,

- .DecryptAndDecode = (void (*)(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info))&Pnacl_M23_PPP_ContentDecryptor_Private_DecryptAndDecode

+ .DecryptAndDecodeFrame = (void (*)(PP_Instance instance, PP_Resource encrypted_video_frame, const struct PP_EncryptedVideoFrameInfo* encrypted_video_frame_info))&Pnacl_M23_PPP_ContentDecryptor_Private_DecryptAndDecodeFrame

};

/* Not generating wrapper interface for PPP_Flash_BrowserOperations_1_0 */