| Index: content/common/media/video_capture_messages.h
|
| diff --git a/content/common/media/video_capture_messages.h b/content/common/media/video_capture_messages.h
|
| index f599d5f53e5366a4fd6aa6996a72505999cff256..e00904d17a47e42116c792dc4c0cf22776c52baf 100644
|
| --- a/content/common/media/video_capture_messages.h
|
| +++ b/content/common/media/video_capture_messages.h
|
| @@ -10,6 +10,7 @@
|
| #include "ipc/ipc_message_macros.h"
|
| #include "media/base/video_capture_types.h"
|
| #include "media/base/video_frame.h"
|
| +#include "ui/gfx/gpu_memory_buffer.h"
|
|
|
| #undef IPC_MESSAGE_EXPORT
|
| #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
|
| @@ -40,7 +41,7 @@ IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params)
|
| IPC_STRUCT_MEMBER(media::VideoFrame::StorageType, storage_type)
|
| IPC_STRUCT_MEMBER(gfx::Size, coded_size)
|
| IPC_STRUCT_MEMBER(gfx::Rect, visible_rect)
|
| - IPC_STRUCT_MEMBER(gpu::MailboxHolder, mailbox_holder)
|
| + IPC_STRUCT_MEMBER(std::vector<gpu::MailboxHolder>, mailbox_holders)
|
| IPC_STRUCT_END()
|
|
|
| // TODO(nick): device_id in these messages is basically just a route_id. We
|
| @@ -59,6 +60,14 @@ IPC_MESSAGE_CONTROL4(VideoCaptureMsg_NewBuffer,
|
| int /* length */,
|
| int /* buffer_id */)
|
|
|
| +// Tell the renderer process that a new GpuMemoryBuffer backed buffer is
|
| +// allocated for video capture.
|
| +IPC_MESSAGE_CONTROL4(VideoCaptureMsg_NewGpuMemoryBuffer,
|
| + int /* device id */,
|
| + std::vector<gfx::GpuMemoryBufferHandle> /* gmb_handles */,
|
| + gfx::Size /* dimensions */,
|
| + int /* buffer_id */)
|
| +
|
| // Tell the renderer process that it should release a buffer previously
|
| // allocated by VideoCaptureMsg_NewBuffer.
|
| IPC_MESSAGE_CONTROL2(VideoCaptureMsg_FreeBuffer,
|
|
|