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

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

Issue 2423703002: media: Use native CipherMode enum type in media mojo interfaces (Closed)
Patch Set: media: Use native CDM enum types in media mojo interfaces Created 4 years, 2 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 | « no previous file | media/mojo/common/media_type_converters.cc » ('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 806d009a00f6843ad9f50f7a6efa63fe0efeeb1e..cb5db84c4b3af2f01e2fd04b9d35da3dfd47e690 100644
--- a/media/base/ipc/media_param_traits_macros.h
+++ b/media/base/ipc/media_param_traits_macros.h
@@ -13,6 +13,7 @@
#include "media/base/decode_status.h"
#include "media/base/decryptor.h"
#include "media/base/demuxer_stream.h"
+#include "media/base/encryption_scheme.h"
#include "media/base/sample_format.h"
#include "media/base/subsample_entry.h"
#include "media/base/video_capture_types.h"
@@ -49,6 +50,9 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status,
IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type,
media::DemuxerStream::TYPE_MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,
+ media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX)
+
IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)
« no previous file with comments | « no previous file | media/mojo/common/media_type_converters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698