Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(314)

Unified Diff: media/base/ipc/media_param_traits_macros.h

Issue 2966643002: media: Plumb MediaLog to MojoVideoDecoderService. (Closed)
Patch Set: Swap client/service directory. Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/decoder_factory.cc ('k') | media/base/media_log.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 79083bc42ec3b0eb5c4fac101c22f99f4435cbfa..a127800c4d8234b699910690ed38f7aed0ca4aae 100644
--- a/media/base/ipc/media_param_traits_macros.h
+++ b/media/base/ipc/media_param_traits_macros.h
@@ -18,6 +18,7 @@
#include "media/base/demuxer_stream.h"
#include "media/base/eme_constants.h"
#include "media/base/encryption_scheme.h"
+#include "media/base/media_log_event.h"
#include "media/base/output_device_info.h"
#include "media/base/sample_format.h"
#include "media/base/subsample_entry.h"
@@ -42,6 +43,15 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::BufferingState,
IPC_ENUM_TRAITS_MAX_VALUE(media::CdmKeyInformation::KeyStatus,
media::CdmKeyInformation::KEY_STATUS_MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(media::CdmMessageType,
+ media::CdmMessageType::MESSAGE_TYPE_MAX)
+
+IPC_ENUM_TRAITS_MAX_VALUE(media::CdmPromise::Exception,
+ media::CdmPromise::EXCEPTION_MAX)
+
+IPC_ENUM_TRAITS_MAX_VALUE(media::CdmSessionType,
+ media::CdmSessionType::SESSION_TYPE_MAX)
+
IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::ColorSpace, media::COLOR_SPACE_MAX)
@@ -66,14 +76,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::EmeInitDataType, media::EmeInitDataType::MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,
media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX)
-IPC_ENUM_TRAITS_MAX_VALUE(media::CdmPromise::Exception,
- media::CdmPromise::EXCEPTION_MAX)
-
-IPC_ENUM_TRAITS_MAX_VALUE(media::CdmMessageType,
- media::CdmMessageType::MESSAGE_TYPE_MAX)
-
-IPC_ENUM_TRAITS_MAX_VALUE(media::CdmSessionType,
- media::CdmSessionType::SESSION_TYPE_MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(media::MediaLogEvent::Type,
+ media::MediaLogEvent::TYPE_LAST)
IPC_ENUM_TRAITS_MAX_VALUE(media::OutputDeviceStatus,
media::OUTPUT_DEVICE_STATUS_MAX)
@@ -114,6 +118,13 @@ IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)
IPC_STRUCT_TRAITS_MEMBER(system_code)
IPC_STRUCT_TRAITS_END()
+IPC_STRUCT_TRAITS_BEGIN(media::MediaLogEvent)
+ IPC_STRUCT_TRAITS_MEMBER(id)
+ IPC_STRUCT_TRAITS_MEMBER(type)
+ IPC_STRUCT_TRAITS_MEMBER(params)
+ IPC_STRUCT_TRAITS_MEMBER(time)
+IPC_STRUCT_TRAITS_END()
+
IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
« no previous file with comments | « media/base/decoder_factory.cc ('k') | media/base/media_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698