Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(478)

Side by Side 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, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 /* Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 * Use of this source code is governed by a BSD-style license that can be 2 * Use of this source code is governed by a BSD-style license that can be
3 * found in the LICENSE file. 3 * found in the LICENSE file.
4 */ 4 */
5 5
6 /* Last generated from IDL: Wed Sep 19 20:53:31 2012. */ 6 /* Last generated from IDL: Sat Sep 29 15:05:58 2012. */
7 #include "ppapi/generators/pnacl_shim.h" 7 #include "ppapi/generators/pnacl_shim.h"
8 8
9 #include "ppapi/c/ppb.h" 9 #include "ppapi/c/ppb.h"
10 #include "ppapi/c/dev/ppb_audio_input_dev.h" 10 #include "ppapi/c/dev/ppb_audio_input_dev.h"
11 #include "ppapi/c/dev/ppb_buffer_dev.h" 11 #include "ppapi/c/dev/ppb_buffer_dev.h"
12 #include "ppapi/c/dev/ppb_console_dev.h" 12 #include "ppapi/c/dev/ppb_console_dev.h"
13 #include "ppapi/c/dev/ppb_cursor_control_dev.h" 13 #include "ppapi/c/dev/ppb_cursor_control_dev.h"
14 #include "ppapi/c/dev/ppb_device_ref_dev.h" 14 #include "ppapi/c/dev/ppb_device_ref_dev.h"
15 #include "ppapi/c/dev/ppb_file_chooser_dev.h" 15 #include "ppapi/c/dev/ppb_file_chooser_dev.h"
16 #include "ppapi/c/dev/ppb_find_dev.h" 16 #include "ppapi/c/dev/ppb_find_dev.h"
(...skipping 3304 matching lines...) Expand 10 before | Expand all | Expand 10 after
3321 void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, struct PP_Var session_id) = ((void (__attribute__((pnaclcall)) *)(PP_Instance instance, struc t PP_Var session_id))iface->CancelKeyRequest); 3321 void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, struct PP_Var session_id) = ((void (__attribute__((pnaclcall)) *)(PP_Instance instance, struc t PP_Var session_id))iface->CancelKeyRequest);
3322 temp_fp(instance, session_id); 3322 temp_fp(instance, session_id);
3323 } 3323 }
3324 3324
3325 static void Pnacl_M23_PPP_ContentDecryptor_Private_Decrypt(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_bloc k_info) { 3325 static void Pnacl_M23_PPP_ContentDecryptor_Private_Decrypt(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encrypted_bloc k_info) {
3326 const struct PPP_ContentDecryptor_Private_0_1 *iface = Pnacl_WrapperInfo_PPP_C ontentDecryptor_Private_0_1.real_iface; 3326 const struct PPP_ContentDecryptor_Private_0_1 *iface = Pnacl_WrapperInfo_PPP_C ontentDecryptor_Private_0_1.real_iface;
3327 void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, PP_Resource e ncrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info) = ((vo id (__attribute__((pnaclcall)) *)(PP_Instance instance, PP_Resource encrypted_bl ock, const struct PP_EncryptedBlockInfo* encrypted_block_info))iface->Decrypt); 3327 void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, PP_Resource e ncrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info) = ((vo id (__attribute__((pnaclcall)) *)(PP_Instance instance, PP_Resource encrypted_bl ock, const struct PP_EncryptedBlockInfo* encrypted_block_info))iface->Decrypt);
3328 temp_fp(instance, encrypted_block, encrypted_block_info); 3328 temp_fp(instance, encrypted_block, encrypted_block_info);
3329 } 3329 }
3330 3330
3331 static void Pnacl_M23_PPP_ContentDecryptor_Private_DecryptAndDecode(PP_Instance instance, PP_Resource encrypted_block, const struct PP_EncryptedBlockInfo* encry pted_block_info) { 3331 static void Pnacl_M23_PPP_ContentDecryptor_Private_DecryptAndDecodeFrame(PP_Inst ance instance, PP_Resource encrypted_video_frame, const struct PP_EncryptedVideo FrameInfo* encrypted_video_frame_info) {
3332 const struct PPP_ContentDecryptor_Private_0_1 *iface = Pnacl_WrapperInfo_PPP_C ontentDecryptor_Private_0_1.real_iface; 3332 const struct PPP_ContentDecryptor_Private_0_1 *iface = Pnacl_WrapperInfo_PPP_C ontentDecryptor_Private_0_1.real_iface;
3333 void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, PP_Resource e ncrypted_block, const struct PP_EncryptedBlockInfo* encrypted_block_info) = ((vo id (__attribute__((pnaclcall)) *)(PP_Instance instance, PP_Resource encrypted_bl ock, const struct PP_EncryptedBlockInfo* encrypted_block_info))iface->DecryptAnd Decode); 3333 void (__attribute__((pnaclcall)) *temp_fp)(PP_Instance instance, PP_Resource e ncrypted_video_frame, const struct PP_EncryptedVideoFrameInfo* encrypted_video_f rame_info) = ((void (__attribute__((pnaclcall)) *)(PP_Instance instance, PP_Reso urce encrypted_video_frame, const struct PP_EncryptedVideoFrameInfo* encrypted_v ideo_frame_info))iface->DecryptAndDecodeFrame);
3334 temp_fp(instance, encrypted_block, encrypted_block_info); 3334 temp_fp(instance, encrypted_video_frame, encrypted_video_frame_info);
3335 } 3335 }
3336 3336
3337 /* End wrapper methods for PPP_ContentDecryptor_Private_0_1 */ 3337 /* End wrapper methods for PPP_ContentDecryptor_Private_0_1 */
3338 3338
3339 /* Not generating wrapper methods for PPP_Flash_BrowserOperations_1_0 */ 3339 /* Not generating wrapper methods for PPP_Flash_BrowserOperations_1_0 */
3340 3340
3341 /* Not generating wrapper methods for PPP_Flash_BrowserOperations_1_2 */ 3341 /* Not generating wrapper methods for PPP_Flash_BrowserOperations_1_2 */
3342 3342
3343 /* Not generating wrapper methods for PPP_Flash_BrowserOperations_1_3 */ 3343 /* Not generating wrapper methods for PPP_Flash_BrowserOperations_1_3 */
3344 3344
(...skipping 755 matching lines...) Expand 10 before | Expand all | Expand 10 after
4100 .IsX509CertificatePrivate = (PP_Bool (*)(PP_Resource resource))&Pnacl_M19_PP B_X509Certificate_Private_IsX509CertificatePrivate, 4100 .IsX509CertificatePrivate = (PP_Bool (*)(PP_Resource resource))&Pnacl_M19_PP B_X509Certificate_Private_IsX509CertificatePrivate,
4101 .Initialize = (PP_Bool (*)(PP_Resource resource, const char* bytes, uint32_t length))&Pnacl_M19_PPB_X509Certificate_Private_Initialize, 4101 .Initialize = (PP_Bool (*)(PP_Resource resource, const char* bytes, uint32_t length))&Pnacl_M19_PPB_X509Certificate_Private_Initialize,
4102 .GetField = (struct PP_Var (*)(PP_Resource resource, PP_X509Certificate_Priv ate_Field field))&Pnacl_M19_PPB_X509Certificate_Private_GetField 4102 .GetField = (struct PP_Var (*)(PP_Resource resource, PP_X509Certificate_Priv ate_Field field))&Pnacl_M19_PPB_X509Certificate_Private_GetField
4103 }; 4103 };
4104 4104
4105 struct PPP_ContentDecryptor_Private_0_1 Pnacl_Wrappers_PPP_ContentDecryptor_Priv ate_0_1 = { 4105 struct PPP_ContentDecryptor_Private_0_1 Pnacl_Wrappers_PPP_ContentDecryptor_Priv ate_0_1 = {
4106 .GenerateKeyRequest = (void (*)(PP_Instance instance, struct PP_Var key_syst em, struct PP_Var init_data))&Pnacl_M23_PPP_ContentDecryptor_Private_GenerateKey Request, 4106 .GenerateKeyRequest = (void (*)(PP_Instance instance, struct PP_Var key_syst em, struct PP_Var init_data))&Pnacl_M23_PPP_ContentDecryptor_Private_GenerateKey Request,
4107 .AddKey = (void (*)(PP_Instance instance, struct PP_Var session_id, struct P P_Var key, struct PP_Var init_data))&Pnacl_M23_PPP_ContentDecryptor_Private_AddK ey, 4107 .AddKey = (void (*)(PP_Instance instance, struct PP_Var session_id, struct P P_Var key, struct PP_Var init_data))&Pnacl_M23_PPP_ContentDecryptor_Private_AddK ey,
4108 .CancelKeyRequest = (void (*)(PP_Instance instance, struct PP_Var session_id ))&Pnacl_M23_PPP_ContentDecryptor_Private_CancelKeyRequest, 4108 .CancelKeyRequest = (void (*)(PP_Instance instance, struct PP_Var session_id ))&Pnacl_M23_PPP_ContentDecryptor_Private_CancelKeyRequest,
4109 .Decrypt = (void (*)(PP_Instance instance, PP_Resource encrypted_block, cons t struct PP_EncryptedBlockInfo* encrypted_block_info))&Pnacl_M23_PPP_ContentDecr yptor_Private_Decrypt, 4109 .Decrypt = (void (*)(PP_Instance instance, PP_Resource encrypted_block, cons t struct PP_EncryptedBlockInfo* encrypted_block_info))&Pnacl_M23_PPP_ContentDecr yptor_Private_Decrypt,
4110 .DecryptAndDecode = (void (*)(PP_Instance instance, PP_Resource encrypted_bl ock, const struct PP_EncryptedBlockInfo* encrypted_block_info))&Pnacl_M23_PPP_Co ntentDecryptor_Private_DecryptAndDecode 4110 .DecryptAndDecodeFrame = (void (*)(PP_Instance instance, PP_Resource encrypt ed_video_frame, const struct PP_EncryptedVideoFrameInfo* encrypted_video_frame_i nfo))&Pnacl_M23_PPP_ContentDecryptor_Private_DecryptAndDecodeFrame
4111 }; 4111 };
4112 4112
4113 /* Not generating wrapper interface for PPP_Flash_BrowserOperations_1_0 */ 4113 /* Not generating wrapper interface for PPP_Flash_BrowserOperations_1_0 */
4114 4114
4115 /* Not generating wrapper interface for PPP_Flash_BrowserOperations_1_2 */ 4115 /* Not generating wrapper interface for PPP_Flash_BrowserOperations_1_2 */
4116 4116
4117 /* Not generating wrapper interface for PPP_Flash_BrowserOperations_1_3 */ 4117 /* Not generating wrapper interface for PPP_Flash_BrowserOperations_1_3 */
4118 4118
4119 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Audio_1_0 = { 4119 static struct __PnaclWrapperInfo Pnacl_WrapperInfo_PPB_Audio_1_0 = {
4120 .iface_macro = PPB_AUDIO_INTERFACE_1_0, 4120 .iface_macro = PPB_AUDIO_INTERFACE_1_0,
(...skipping 949 matching lines...) Expand 10 before | Expand all | Expand 10 after
5070 } 5070 }
5071 5071
5072 if (wrapper->wrapped_iface) { 5072 if (wrapper->wrapped_iface) {
5073 return wrapper->wrapped_iface; 5073 return wrapper->wrapped_iface;
5074 } else { 5074 } else {
5075 return wrapper->real_iface; 5075 return wrapper->real_iface;
5076 } 5076 }
5077 } 5077 }
5078 5078
5079 #endif 5079 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698