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

Side by Side Diff: ppapi/proxy/ppapi_messages.h

Issue 11028087: Add decoder de-initialize and reset to the Pepper CDM API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments with the exception of renaming Deinit 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 // Multiply-included message header, no traditional include guard. 5 // Multiply-included message header, no traditional include guard.
6 #include <string> 6 #include <string>
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
(...skipping 13 matching lines...) Expand all
24 #include "ppapi/c/dev/ppp_printing_dev.h" 24 #include "ppapi/c/dev/ppp_printing_dev.h"
25 #include "ppapi/c/pp_bool.h" 25 #include "ppapi/c/pp_bool.h"
26 #include "ppapi/c/pp_file_info.h" 26 #include "ppapi/c/pp_file_info.h"
27 #include "ppapi/c/pp_instance.h" 27 #include "ppapi/c/pp_instance.h"
28 #include "ppapi/c/pp_module.h" 28 #include "ppapi/c/pp_module.h"
29 #include "ppapi/c/pp_point.h" 29 #include "ppapi/c/pp_point.h"
30 #include "ppapi/c/pp_rect.h" 30 #include "ppapi/c/pp_rect.h"
31 #include "ppapi/c/pp_resource.h" 31 #include "ppapi/c/pp_resource.h"
32 #include "ppapi/c/pp_size.h" 32 #include "ppapi/c/pp_size.h"
33 #include "ppapi/c/pp_time.h" 33 #include "ppapi/c/pp_time.h"
34 #include "ppapi/c/private/pp_content_decryptor.h"
34 #include "ppapi/c/private/pp_private_font_charset.h" 35 #include "ppapi/c/private/pp_private_font_charset.h"
35 #include "ppapi/c/private/ppb_flash.h" 36 #include "ppapi/c/private/ppb_flash.h"
36 #include "ppapi/c/private/ppb_host_resolver_private.h" 37 #include "ppapi/c/private/ppb_host_resolver_private.h"
37 #include "ppapi/c/private/ppb_net_address_private.h" 38 #include "ppapi/c/private/ppb_net_address_private.h"
38 #include "ppapi/c/private/ppb_tcp_socket_private.h" 39 #include "ppapi/c/private/ppb_tcp_socket_private.h"
39 #include "ppapi/c/private/ppb_udp_socket_private.h" 40 #include "ppapi/c/private/ppb_udp_socket_private.h"
40 #include "ppapi/c/private/ppp_flash_browser_operations.h" 41 #include "ppapi/c/private/ppp_flash_browser_operations.h"
41 #include "ppapi/proxy/ppapi_param_traits.h" 42 #include "ppapi/proxy/ppapi_param_traits.h"
42 #include "ppapi/proxy/ppapi_proxy_export.h" 43 #include "ppapi/proxy/ppapi_proxy_export.h"
43 #include "ppapi/proxy/resource_message_params.h" 44 #include "ppapi/proxy/resource_message_params.h"
44 #include "ppapi/proxy/serialized_flash_menu.h" 45 #include "ppapi/proxy/serialized_flash_menu.h"
45 #include "ppapi/proxy/serialized_structs.h" 46 #include "ppapi/proxy/serialized_structs.h"
46 #include "ppapi/proxy/serialized_var.h" 47 #include "ppapi/proxy/serialized_var.h"
47 #include "ppapi/shared_impl/ppapi_preferences.h" 48 #include "ppapi/shared_impl/ppapi_preferences.h"
48 #include "ppapi/shared_impl/ppb_device_ref_shared.h" 49 #include "ppapi/shared_impl/ppb_device_ref_shared.h"
49 #include "ppapi/shared_impl/ppb_input_event_shared.h" 50 #include "ppapi/shared_impl/ppb_input_event_shared.h"
50 #include "ppapi/shared_impl/ppb_network_list_private_shared.h" 51 #include "ppapi/shared_impl/ppb_network_list_private_shared.h"
51 #include "ppapi/shared_impl/ppb_view_shared.h" 52 #include "ppapi/shared_impl/ppb_view_shared.h"
52 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h" 53 #include "ppapi/shared_impl/ppp_flash_browser_operations_shared.h"
53 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h" 54 #include "ppapi/shared_impl/private/ppb_host_resolver_shared.h"
54 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h" 55 #include "ppapi/shared_impl/private/ppb_x509_certificate_private_shared.h"
55 #include "ppapi/shared_impl/url_request_info_data.h" 56 #include "ppapi/shared_impl/url_request_info_data.h"
56 57
57 #undef IPC_MESSAGE_EXPORT 58 #undef IPC_MESSAGE_EXPORT
58 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT 59 #define IPC_MESSAGE_EXPORT PPAPI_PROXY_EXPORT
59 60
60 #define IPC_MESSAGE_START PpapiMsgStart 61 #define IPC_MESSAGE_START PpapiMsgStart
61 62
62 IPC_ENUM_TRAITS(PP_DeviceType_Dev) 63 IPC_ENUM_TRAITS(PP_DeviceType_Dev)
64 IPC_ENUM_TRAITS(PP_DecryptorStreamType)
63 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_Permission) 65 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_Permission)
64 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_SettingType) 66 IPC_ENUM_TRAITS(PP_Flash_BrowserOperations_SettingType)
65 IPC_ENUM_TRAITS(PP_FlashSetting) 67 IPC_ENUM_TRAITS(PP_FlashSetting)
66 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton) 68 IPC_ENUM_TRAITS(PP_InputEvent_MouseButton)
67 IPC_ENUM_TRAITS(PP_InputEvent_Type) 69 IPC_ENUM_TRAITS(PP_InputEvent_Type)
68 IPC_ENUM_TRAITS(PP_NetAddressFamily_Private) 70 IPC_ENUM_TRAITS(PP_NetAddressFamily_Private)
69 IPC_ENUM_TRAITS(PP_NetworkListState_Private) 71 IPC_ENUM_TRAITS(PP_NetworkListState_Private)
70 IPC_ENUM_TRAITS(PP_NetworkListType_Private) 72 IPC_ENUM_TRAITS(PP_NetworkListType_Private)
71 IPC_ENUM_TRAITS(PP_PrintOrientation_Dev) 73 IPC_ENUM_TRAITS(PP_PrintOrientation_Dev)
72 IPC_ENUM_TRAITS(PP_PrintOutputFormat_Dev) 74 IPC_ENUM_TRAITS(PP_PrintOutputFormat_Dev)
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
625 ppapi::proxy::SerializedVar /* session_id, String */) 627 ppapi::proxy::SerializedVar /* session_id, String */)
626 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt, 628 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,
627 PP_Instance /* instance */, 629 PP_Instance /* instance */,
628 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, 630 ppapi::proxy::PPPDecryptor_Buffer /* buffer */,
629 std::string /* serialized_block_info */) 631 std::string /* serialized_block_info */)
630 IPC_MESSAGE_ROUTED3( 632 IPC_MESSAGE_ROUTED3(
631 PpapiMsg_PPPContentDecryptor_InitializeVideoDecoder, 633 PpapiMsg_PPPContentDecryptor_InitializeVideoDecoder,
632 PP_Instance /* instance */, 634 PP_Instance /* instance */,
633 std::string /* serialized_decoder_config */, 635 std::string /* serialized_decoder_config */,
634 ppapi::proxy::PPPDecryptor_Buffer /* extra_data_buffer. */) 636 ppapi::proxy::PPPDecryptor_Buffer /* extra_data_buffer. */)
637 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DeinitializeDecoder,
638 PP_Instance /* instance */,
639 PP_DecryptorStreamType /* decoder_type */,
640 uint32_t /* request_id */)
641 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_ResetDecoder,
642 PP_Instance /* instance */,
643 PP_DecryptorStreamType /* decoder_type */,
644 uint32_t /* request_id */)
635 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame, 645 IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame,
636 PP_Instance /* instance */, 646 PP_Instance /* instance */,
637 ppapi::proxy::PPPDecryptor_Buffer /* buffer */, 647 ppapi::proxy::PPPDecryptor_Buffer /* buffer */,
638 std::string /* serialized_block_info */) 648 std::string /* serialized_block_info */)
639 649
640 // PPB_Talk 650 // PPB_Talk
641 IPC_MESSAGE_ROUTED3( 651 IPC_MESSAGE_ROUTED3(
642 PpapiMsg_PPBTalk_GetPermissionACK, 652 PpapiMsg_PPBTalk_GetPermissionACK,
643 uint32 /* plugin_dispatcher_id */, 653 uint32 /* plugin_dispatcher_id */,
644 PP_Resource /* resource */, 654 PP_Resource /* resource */,
(...skipping 569 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 int32_t /* media_error */, 1224 int32_t /* media_error */,
1215 int32_t /* system_code */) 1225 int32_t /* system_code */)
1216 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock, 1226 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock,
1217 PP_Instance /* instance */, 1227 PP_Instance /* instance */,
1218 PP_Resource /* decrypted_block, PPB_Buffer_Dev */, 1228 PP_Resource /* decrypted_block, PPB_Buffer_Dev */,
1219 std::string /* serialized_block_info */) 1229 std::string /* serialized_block_info */)
1220 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderInitialized, 1230 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderInitialized,
1221 PP_Instance /* instance */, 1231 PP_Instance /* instance */,
1222 PP_Bool /* success */, 1232 PP_Bool /* success */,
1223 uint32_t /* request_id */) 1233 uint32_t /* request_id */)
1234 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderDeinitializeDone,
1235 PP_Instance /* instance */,
1236 PP_DecryptorStreamType /* decoder_type */,
1237 uint32_t /* request_id */)
1238 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderResetDone,
1239 PP_Instance /* instance */,
1240 PP_DecryptorStreamType /* decoder_type */,
1241 uint32_t /* request_id */)
1224 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame, 1242 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame,
1225 PP_Instance /* instance */, 1243 PP_Instance /* instance */,
1226 PP_Resource /* decrypted_frame, PPB_Buffer_Dev */, 1244 PP_Resource /* decrypted_frame, PPB_Buffer_Dev */,
1227 std::string /* serialized_block_info */) 1245 std::string /* serialized_block_info */)
1228 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples, 1246 IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverSamples,
1229 PP_Instance /* instance */, 1247 PP_Instance /* instance */,
1230 PP_Resource /* decrypted_samples, PPB_Buffer_Dev */, 1248 PP_Resource /* decrypted_samples, PPB_Buffer_Dev */,
1231 std::string /* serialized_block_info */) 1249 std::string /* serialized_block_info */)
1232 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 1250 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
1233 1251
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
1685 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFontFile_GetFontTableReply, 1703 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_FlashFontFile_GetFontTableReply,
1686 std::string /* output */) 1704 std::string /* output */)
1687 1705
1688 // Flash functions. 1706 // Flash functions.
1689 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create) 1707 IPC_MESSAGE_CONTROL0(PpapiHostMsg_Flash_Create)
1690 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_EnumerateVideoCaptureDevices, 1708 IPC_MESSAGE_CONTROL1(PpapiHostMsg_Flash_EnumerateVideoCaptureDevices,
1691 ppapi::HostResource /* video_capture */) 1709 ppapi::HostResource /* video_capture */)
1692 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Flash_EnumerateVideoCaptureDevicesReply, 1710 IPC_MESSAGE_CONTROL1(PpapiPluginMsg_Flash_EnumerateVideoCaptureDevicesReply,
1693 std::vector<ppapi::DeviceRefData> /* devices */) 1711 std::vector<ppapi::DeviceRefData> /* devices */)
1694 #endif // !defined(OS_NACL) && !defined(NACL_WIN64) 1712 #endif // !defined(OS_NACL) && !defined(NACL_WIN64)
OLDNEW
« no previous file with comments | « ppapi/native_client/src/untrusted/pnacl_irt_shim/pnacl_shim.c ('k') | ppapi/proxy/ppb_instance_proxy.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698