Index: media/base/ipc/media_param_traits_macros.h |
diff --git a/media/base/ipc/media_param_traits_macros.h b/media/base/ipc/media_param_traits_macros.h |
index 70766ac9626b2f570a59067ec4bdf740e724757a..52f5ed49fac28606b360ed557ce016515746509c 100644 |
--- a/media/base/ipc/media_param_traits_macros.h |
+++ b/media/base/ipc/media_param_traits_macros.h |
@@ -22,7 +22,9 @@ |
#include "media/base/sample_format.h" |
#include "media/base/subsample_entry.h" |
#include "media/base/video_codecs.h" |
+#include "media/base/video_color_space.h" |
#include "media/base/video_types.h" |
+#include "ui/gfx/ipc/color/gfx_param_traits_macros.h" |
// Enum traits. |
@@ -86,6 +88,24 @@ IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, |
IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX) |
+IPC_ENUM_TRAITS_VALIDATE( |
+ media::VideoColorSpace::PrimaryID, |
+ static_cast<int>(value) == |
+ static_cast<int>( |
+ media::VideoColorSpace::GetPrimaryID(static_cast<int>(value)))); |
+ |
+IPC_ENUM_TRAITS_VALIDATE( |
+ media::VideoColorSpace::TransferID, |
+ static_cast<int>(value) == |
+ static_cast<int>( |
+ media::VideoColorSpace::GetTransferID(static_cast<int>(value)))); |
+ |
+IPC_ENUM_TRAITS_VALIDATE( |
+ media::VideoColorSpace::MatrixID, |
+ static_cast<int>(value) == |
+ static_cast<int>( |
+ media::VideoColorSpace::GetMatrixID(static_cast<int>(value)))); |
+ |
// Struct traits. |
IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation) |
@@ -99,4 +119,11 @@ IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) |
IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) |
IPC_STRUCT_TRAITS_END() |
+IPC_STRUCT_TRAITS_BEGIN(media::VideoColorSpace) |
+ IPC_STRUCT_TRAITS_MEMBER(primaries) |
+ IPC_STRUCT_TRAITS_MEMBER(transfer) |
+ IPC_STRUCT_TRAITS_MEMBER(matrix) |
+ IPC_STRUCT_TRAITS_MEMBER(range) |
+IPC_STRUCT_TRAITS_END() |
+ |
#endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |