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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2058113002: Add 'cbcs' encryption scheme support in Android media. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
« media/base/encryption_scheme.h ('K') | « media/base/ipc/media_param_traits.cc ('k') | media/filters/android/media_codec_audio_decoder.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 62e3645612b1a792d9089c3264bcf03896ab621b..a86da950d461fd363513e27119d0b35b8ef1d6fe 100644
--- a/media/base/ipc/media_param_traits_macros.h
+++ b/media/base/ipc/media_param_traits_macros.h
@@ -7,6 +7,7 @@
#include "ipc/ipc_message_macros.h"
#include "media/base/audio_parameters.h"
+#include "media/base/encryption_scheme.h"
#include "media/base/video_capture_types.h"
#include "media/base/video_types.h"
@@ -15,5 +16,7 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,
IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,
+ media::EncryptionScheme::CIPHER_MODE_MAX);
#endif // MEDIA_BASE_IPC_COMMON_MEDIA_PARAM_TRAITS_MACROS_H_
« media/base/encryption_scheme.h ('K') | « media/base/ipc/media_param_traits.cc ('k') | media/filters/android/media_codec_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698