| Index: content/common/gpu/gpu_messages.h
|
| diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
|
| index 9d66de4ea43d7f6a6c48c6692bb93119d9a67382..f12016e365de463145fce151221612b30e38e851 100644
|
| --- a/content/common/gpu/gpu_messages.h
|
| +++ b/content/common/gpu/gpu_messages.h
|
| @@ -17,6 +17,7 @@
|
| #include "gpu/ipc/gpu_command_buffer_traits.h"
|
| #include "ipc/ipc_channel_handle.h"
|
| #include "ipc/ipc_message_macros.h"
|
| +#include "media/video/video_decode_accelerator.h"
|
| #include "ui/gfx/native_widget_types.h"
|
| #include "ui/gfx/size.h"
|
|
|
| @@ -104,6 +105,13 @@ IPC_STRUCT_TRAITS_END()
|
| IPC_ENUM_TRAITS(content::CauseForGpuLaunch)
|
| IPC_ENUM_TRAITS(gpu::error::ContextLostReason)
|
|
|
| +IPC_ENUM_TRAITS(media::VideoDecodeAccelerator::Config::Format)
|
| +IPC_ENUM_TRAITS(media::VideoDecodeAccelerator::Config::H264Profile)
|
| +IPC_STRUCT_TRAITS_BEGIN(media::VideoDecodeAccelerator::Config)
|
| + IPC_STRUCT_TRAITS_MEMBER(format)
|
| + IPC_STRUCT_TRAITS_MEMBER(h264_profile)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| //------------------------------------------------------------------------------
|
| // GPU Messages
|
| // These are messages from the browser to the GPU process.
|
| @@ -389,7 +397,7 @@ IPC_SYNC_MESSAGE_ROUTED1_2(GpuCommandBufferMsg_GetTransferBuffer,
|
|
|
| // Create and initialize a hardware video decoder, returning its new route_id.
|
| IPC_SYNC_MESSAGE_ROUTED1_1(GpuCommandBufferMsg_CreateVideoDecoder,
|
| - std::vector<int32> /* configs */,
|
| + media::VideoDecodeAccelerator::Config /* config */,
|
| int /* route_id */)
|
|
|
| // Release all resources held by the named hardware video decoder.
|
|
|