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

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

Issue 2416183002: media: Use native DemuxerStream enum types in media mojo interfaces (Closed)
Patch Set: comments addressed 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 | « media/base/demuxer_stream.h ('k') | media/base/stream_parser_buffer.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 bca494bebee64ec3c2f61da546215734d4b5169d..55f0c0e6c1bf371a741d097602513818bd8ffc20 100644
--- a/media/base/ipc/media_param_traits_macros.h
+++ b/media/base/ipc/media_param_traits_macros.h
@@ -12,6 +12,7 @@
#include "media/base/channel_layout.h"
#include "media/base/decode_status.h"
#include "media/base/decryptor.h"
+#include "media/base/demuxer_stream.h"
#include "media/base/sample_format.h"
#include "media/base/subsample_entry.h"
#include "media/base/video_capture_types.h"
@@ -37,10 +38,16 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::DecodeStatus,
media::DecodeStatus::DECODE_STATUS_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::Status,
- media::Decryptor::Status::STATUS_MAX)
+ media::Decryptor::Status::kStatusMax)
IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType,
- media::Decryptor::StreamType::STREAM_TYPE_MAX)
+ media::Decryptor::StreamType::kStreamTypeMax)
+
+IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status,
+ media::DemuxerStream::kStatusMax)
+
+IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type,
+ media::DemuxerStream::TYPE_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
« no previous file with comments | « media/base/demuxer_stream.h ('k') | media/base/stream_parser_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698