| Index: media/gpu/ipc/common/media_param_traits_macros.h
|
| diff --git a/media/gpu/ipc/common/media_param_traits_macros.h b/media/gpu/ipc/common/media_param_traits_macros.h
|
| index b77189cbc028686da5a1985df82678b868aed6f3..3fcbefd1c7579481410f8e1d374f50b0e8e3347a 100644
|
| --- a/media/gpu/ipc/common/media_param_traits_macros.h
|
| +++ b/media/gpu/ipc/common/media_param_traits_macros.h
|
| @@ -8,6 +8,7 @@
|
| #include "gpu/config/gpu_info.h"
|
| #include "ipc/ipc_message_macros.h"
|
| #include "media/base/ipc/media_param_traits.h"
|
| +#include "media/base/overlay_info.h"
|
| #include "media/gpu/ipc/common/create_video_encoder_params.h"
|
| #include "media/video/jpeg_decode_accelerator.h"
|
| #include "media/video/video_decode_accelerator.h"
|
| @@ -25,7 +26,7 @@ IPC_STRUCT_TRAITS_BEGIN(media::VideoDecodeAccelerator::Config)
|
| IPC_STRUCT_TRAITS_MEMBER(encryption_scheme)
|
| IPC_STRUCT_TRAITS_MEMBER(cdm_id)
|
| IPC_STRUCT_TRAITS_MEMBER(is_deferred_initialization_allowed)
|
| - IPC_STRUCT_TRAITS_MEMBER(surface_id)
|
| + IPC_STRUCT_TRAITS_MEMBER(overlay_info)
|
| IPC_STRUCT_TRAITS_MEMBER(initial_expected_coded_size)
|
| IPC_STRUCT_TRAITS_MEMBER(supported_output_formats)
|
| IPC_STRUCT_TRAITS_MEMBER(sps)
|
| @@ -41,4 +42,10 @@ IPC_STRUCT_TRAITS_BEGIN(media::CreateVideoEncoderParams)
|
| IPC_STRUCT_TRAITS_MEMBER(encoder_route_id)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(media::OverlayInfo)
|
| + IPC_STRUCT_TRAITS_MEMBER(surface_id)
|
| + IPC_STRUCT_TRAITS_MEMBER(routing_token)
|
| + IPC_STRUCT_TRAITS_MEMBER(is_fullscreen)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| #endif // MEDIA_GPU_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_
|
|
|