ppapi/proxy/ppapi_messages.h - Issue 11028087: Add decoder de-initialize and reset to the Pepper CDM API.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified 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: Renaming and generalizing done... 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 side-by-side diff with in-line comments

Download patch

« ppapi/c/private/ppp_content_decryptor_private.h ('K') | « ppapi/cpp/private/content_decryptor_private.cc ('k') | ppapi/proxy/ppb_instance_proxy.h » ('j') | ppapi/thunk/ppb_content_decryptor_private_thunk.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ppapi/proxy/ppapi_messages.h

diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h

index 8ac08863f259be2ea620d0b02120d4302ba24e45..66e44e2aa3a4a26a07fe437409a1c20e7697a539 100644

--- a/ppapi/proxy/ppapi_messages.h

+++ b/ppapi/proxy/ppapi_messages.h

@@ -31,6 +31,7 @@

#include "ppapi/c/pp_resource.h"

#include "ppapi/c/pp_size.h"

#include "ppapi/c/pp_time.h"

+#include "ppapi/c/private/pp_content_decryptor.h"

#include "ppapi/c/private/ppb_flash.h"

#include "ppapi/c/private/ppb_host_resolver_private.h"

#include "ppapi/c/private/ppb_net_address_private.h"

@@ -69,6 +70,7 @@ IPC_ENUM_TRAITS(PP_NetworkListType_Private)

IPC_ENUM_TRAITS(PP_PrintOrientation_Dev)

IPC_ENUM_TRAITS(PP_PrintOutputFormat_Dev)

IPC_ENUM_TRAITS(PP_PrintScalingOption_Dev)

+IPC_ENUM_TRAITS(PP_StreamType)

IPC_ENUM_TRAITS(PP_TextInput_Type)

IPC_ENUM_TRAITS(PP_VideoDecodeError_Dev)

IPC_ENUM_TRAITS(PP_VideoDecoder_Profile)

@@ -624,6 +626,14 @@ IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_Decrypt,

PP_Instance /* instance */,

ppapi::proxy::PPPDecryptor_Buffer /* buffer */,

std::string /* serialized_block_info */)

+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DeinitializeDecoder,

+ PP_Instance /* instance */,

+ PP_StreamType /* decoder_type */,

+ uint32_t /* request_id */)

+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_ResetDecoder,

+ PP_Instance /* instance */,

+ PP_StreamType /* decoder_type */,

+ uint32_t /* request_id */)

IPC_MESSAGE_ROUTED3(PpapiMsg_PPPContentDecryptor_DecryptAndDecodeFrame,

PP_Instance /* instance */,

ppapi::proxy::PPPDecryptor_Buffer /* buffer */,

@@ -1209,6 +1219,14 @@ IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverBlock,

PP_Instance /* instance */,

PP_Resource /* decrypted_block, PPB_Buffer_Dev */,

std::string /* serialized_block_info */)

+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderDeinitializeDone,

+ PP_Instance /* instance */,

+ PP_StreamType /* decoder_type */,

+ uint32_t /* request_id */)

+IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DecoderResetDone,

+ PP_Instance /* instance */,

+ PP_StreamType /* decoder_type */,

+ uint32_t /* request_id */)

IPC_MESSAGE_ROUTED3(PpapiHostMsg_PPBInstance_DeliverFrame,

PP_Instance /* instance */,

PP_Resource /* decrypted_frame, PPB_Buffer_Dev */,