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

Side by Side Diff: media/base/ipc/media_param_traits_macros.h

Issue 2425663003: media: Use native CDM 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 unified diff | Download patch
« no previous file with comments | « media/base/eme_constants.h ('k') | media/mojo/clients/mojo_cdm.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ 5 #ifndef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
6 #define MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ 6 #define MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
7 7
8 #include "ipc/ipc_message_macros.h" 8 #include "ipc/ipc_message_macros.h"
9 #include "media/base/audio_codecs.h" 9 #include "media/base/audio_codecs.h"
10 #include "media/base/audio_parameters.h" 10 #include "media/base/audio_parameters.h"
11 #include "media/base/buffering_state.h" 11 #include "media/base/buffering_state.h"
12 #include "media/base/cdm_key_information.h"
12 #include "media/base/channel_layout.h" 13 #include "media/base/channel_layout.h"
13 #include "media/base/decode_status.h" 14 #include "media/base/decode_status.h"
14 #include "media/base/decryptor.h" 15 #include "media/base/decryptor.h"
15 #include "media/base/demuxer_stream.h" 16 #include "media/base/demuxer_stream.h"
17 #include "media/base/eme_constants.h"
16 #include "media/base/encryption_scheme.h" 18 #include "media/base/encryption_scheme.h"
19 #include "media/base/media_keys.h"
17 #include "media/base/sample_format.h" 20 #include "media/base/sample_format.h"
18 #include "media/base/subsample_entry.h" 21 #include "media/base/subsample_entry.h"
19 #include "media/base/video_capture_types.h" 22 #include "media/base/video_capture_types.h"
20 #include "media/base/video_codecs.h" 23 #include "media/base/video_codecs.h"
21 #include "media/base/video_types.h" 24 #include "media/base/video_types.h"
22 25
26 // Enum traits.
27
23 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax) 28 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)
24 29
25 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType, 30 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,
26 media::AudioLatency::LATENCY_COUNT) 31 media::AudioLatency::LATENCY_COUNT)
27 32
28 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format, 33 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,
29 media::AudioParameters::AUDIO_FORMAT_LAST) 34 media::AudioParameters::AUDIO_FORMAT_LAST)
30 35
31 IPC_ENUM_TRAITS_MAX_VALUE(media::BufferingState, 36 IPC_ENUM_TRAITS_MAX_VALUE(media::BufferingState,
32 media::BufferingState::BUFFERING_STATE_MAX) 37 media::BufferingState::BUFFERING_STATE_MAX)
33 38
39 IPC_ENUM_TRAITS_MAX_VALUE(media::CdmKeyInformation::KeyStatus,
40 media::CdmKeyInformation::KEY_STATUS_MAX)
41
34 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX) 42 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX)
35 43
36 IPC_ENUM_TRAITS_MAX_VALUE(media::ColorSpace, media::COLOR_SPACE_MAX) 44 IPC_ENUM_TRAITS_MAX_VALUE(media::ColorSpace, media::COLOR_SPACE_MAX)
37 45
38 IPC_ENUM_TRAITS_MAX_VALUE(media::DecodeStatus, 46 IPC_ENUM_TRAITS_MAX_VALUE(media::DecodeStatus,
39 media::DecodeStatus::DECODE_STATUS_MAX) 47 media::DecodeStatus::DECODE_STATUS_MAX)
40 48
41 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::Status, 49 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::Status,
42 media::Decryptor::Status::kStatusMax) 50 media::Decryptor::Status::kStatusMax)
43 51
44 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType, 52 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType,
45 media::Decryptor::StreamType::kStreamTypeMax) 53 media::Decryptor::StreamType::kStreamTypeMax)
46 54
47 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status, 55 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status,
48 media::DemuxerStream::kStatusMax) 56 media::DemuxerStream::kStatusMax)
49 57
50 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type, 58 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type,
51 media::DemuxerStream::TYPE_MAX) 59 media::DemuxerStream::TYPE_MAX)
52 60
61 IPC_ENUM_TRAITS_MAX_VALUE(media::EmeInitDataType, media::EmeInitDataType::MAX)
62
53 IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode, 63 IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,
54 media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX) 64 media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX)
55 65
66 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::Exception,
67 media::MediaKeys::EXCEPTION_MAX)
68
69 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType,
70 media::MediaKeys::MESSAGE_TYPE_MAX)
71
72 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::SessionType,
73 media::MediaKeys::SESSION_TYPE_MAX)
74
56 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax) 75 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
57 76
58 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax) 77 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)
59 78
60 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, 79 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,
61 media::VIDEO_CODEC_PROFILE_MIN, 80 media::VIDEO_CODEC_PROFILE_MIN,
62 media::VIDEO_CODEC_PROFILE_MAX) 81 media::VIDEO_CODEC_PROFILE_MAX)
63 82
64 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX) 83 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)
65 84
66 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX) 85 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)
67 86
87 // Struct traits.
88
89 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)
90 IPC_STRUCT_TRAITS_MEMBER(key_id)
91 IPC_STRUCT_TRAITS_MEMBER(status)
92 IPC_STRUCT_TRAITS_MEMBER(system_code)
93 IPC_STRUCT_TRAITS_END()
94
68 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) 95 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
69 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) 96 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
70 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) 97 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
71 IPC_STRUCT_TRAITS_END() 98 IPC_STRUCT_TRAITS_END()
72 99
73 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ 100 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
OLDNEW
« no previous file with comments | « media/base/eme_constants.h ('k') | media/mojo/clients/mojo_cdm.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698