Index: ppapi/proxy/ppapi_messages.h |
diff --git a/ppapi/proxy/ppapi_messages.h b/ppapi/proxy/ppapi_messages.h |
index f4739e80160190cbd3d86eb494e0ddcacbb8d2a8..6a1cfd26c6fd45bbd81ecc623eb643267b0e4274 100644 |
--- a/ppapi/proxy/ppapi_messages.h |
+++ b/ppapi/proxy/ppapi_messages.h |
@@ -26,6 +26,7 @@ |
#include "ppapi/c/pp_rect.h" |
#include "ppapi/c/pp_resource.h" |
#include "ppapi/c/pp_size.h" |
+#include "ppapi/c/dev/pp_video_dev.h" |
#include "ppapi/c/private/ppb_flash_tcp_socket.h" |
#include "ppapi/proxy/ppapi_param_traits.h" |
#include "ppapi/proxy/serialized_flash_menu.h" |
@@ -58,6 +59,12 @@ IPC_STRUCT_TRAITS_BEGIN(PP_Rect) |
IPC_STRUCT_TRAITS_MEMBER(size) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(PP_PictureBuffer_Dev) |
+ IPC_STRUCT_TRAITS_MEMBER(id) |
+ IPC_STRUCT_TRAITS_MEMBER(size) |
+ IPC_STRUCT_TRAITS_MEMBER(texture_id) |
+IPC_STRUCT_TRAITS_END() |
+ |
IPC_STRUCT_TRAITS_BEGIN(::ppapi::Preferences) |
IPC_STRUCT_TRAITS_MEMBER(standard_font_family) |
IPC_STRUCT_TRAITS_MEMBER(fixed_font_family) |
@@ -312,6 +319,36 @@ IPC_MESSAGE_ROUTED3(PpapiMsg_PPBURLLoader_ReadResponseBody_Ack, |
int32 /* result */, |
std::string /* data */) |
+// PPB_VideoDecoder_Dev. |
+// (Messages from renderer to plugin to notify it to run callbacks.) |
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPBVideoDecoder_EndOfBitstreamACK, |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
s/ACK/Callback/g ?
I guess ACK is also used elsewh
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
Yeah, I'm not a fan of ACK, either.
brettw/piman
|
+ pp::proxy::HostResource /* video_decoder */, |
+ int32_t /* pp_error */) |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
pp_error doesn't name a type.
The only thing I can
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
I changed it to "error result for callback," a des
|
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPBVideoDecoder_FlushACK, |
+ pp::proxy::HostResource /* video_decoder */, |
+ int32_t /* pp_error */) |
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPBVideoDecoder_ResetACK, |
+ pp::proxy::HostResource /* video_decoder */, |
+ int32_t /* pp_error */) |
+ |
+// PPP_VideoDecoder_Dev. |
+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPVideoDecoder_ProvidePictureBuffers, |
+ pp::proxy::HostResource /* video_decoder */, |
+ uint32_t /* requested number of buffers */, |
+ PP_Size /* dimensions of buffer */) |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
s/buffer/buffers/
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
Done.
|
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoDecoder_DismissPictureBuffer, |
+ pp::proxy::HostResource /* video_decoder */, |
+ int32_t /* picture id */) |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
s/picture/picture buffer/
(here and below)
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
Done.
|
+IPC_MESSAGE_ROUTED3(PpapiMsg_PPPVideoDecoder_PictureReady, |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
Any reason not to pass a PP_Picture_Dev?
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
No. Done!
|
+ pp::proxy::HostResource /* video_decoder */, |
+ int32_t /* picture id */, |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
ditto
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
n/a w/ PP_Picture_Dev.
|
+ int32_t /* bitstream id */) |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
s/bitstream/bitstream buffer/
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
n/a w/ PP_Picture_Dev.
|
+IPC_MESSAGE_ROUTED1(PpapiMsg_PPPVideoDecoder_NotifyEndOfStream, |
+ pp::proxy::HostResource /* video_decoder */) |
+IPC_MESSAGE_ROUTED2(PpapiMsg_PPPVideoDecoder_NotifyError, |
+ pp::proxy::HostResource /* video_decoder */, |
+ uint32_t /* error id */) |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
PP_VideoDecodeError_Dev ?
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
Done.
|
+ |
// ----------------------------------------------------------------------------- |
// These are from the plugin to the renderer. |
@@ -901,3 +938,26 @@ IPC_SYNC_MESSAGE_ROUTED4_3(PpapiHostMsg_ResourceCreation_ImageData, |
pp::proxy::HostResource /* result_resource */, |
std::string /* image_data_desc */, |
pp::proxy::ImageHandle /* result */) |
+// PPB_VideoDecoder. |
+IPC_SYNC_MESSAGE_ROUTED3_1(PpapiHostMsg_PPBVideoDecoder_Create, |
+ PP_Instance /* instance */, |
+ pp::proxy::HostResource /* context */, |
+ std::vector<int32_t> /* config */, |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
PP_VideoConfigElement ?
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
Done.
|
+ pp::proxy::HostResource /* result */) |
+IPC_MESSAGE_ROUTED4(PpapiHostMsg_PPBVideoDecoder_Decode, |
Ami GONE FROM CHROMIUM
2011/08/02 00:49:08
Pass PP_VideoBitstreamBuffer_Dev instead?
vrk (LEFT CHROMIUM)
2011/08/03 19:04:30
I tried to do this, and I think it makes the plugi
Ami GONE FROM CHROMIUM
2011/08/03 20:25:53
I think it's worth trying harder not so much becau
|
+ pp::proxy::HostResource /* video_decoder */, |
+ pp::proxy::HostResource /* bitstream buffer */, |
+ int32 /* bitstream buffer id */, |
+ int32 /* size of buffer */) |
+IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_AssignPictureBuffers, |
+ pp::proxy::HostResource /* video_decoder */, |
+ std::vector<PP_PictureBuffer_Dev> /* picture buffers */) |
+IPC_MESSAGE_ROUTED2(PpapiHostMsg_PPBVideoDecoder_ReusePictureBuffer, |
+ pp::proxy::HostResource /* video_decoder */, |
+ int32_t /* picture buffer id */) |
+IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Flush, |
+ pp::proxy::HostResource /* video_decoder */) |
+IPC_MESSAGE_ROUTED1(PpapiHostMsg_PPBVideoDecoder_Reset, |
+ pp::proxy::HostResource /* video_decoder */) |
+IPC_SYNC_MESSAGE_ROUTED1_0(PpapiHostMsg_PPBVideoDecoder_Destroy, |
+ pp::proxy::HostResource /* video_decoder */) |