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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2444683002: Move MediaKeys::Exception to CdmPromise::Exception (Closed)
Patch Set: include "media/base/media_keys.h" Created 4 years, 1 month 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/cdm_promise_adapter.cc ('k') | media/base/media_keys.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/cdm_key_information.h"
13 #include "media/base/cdm_promise.h"
13 #include "media/base/channel_layout.h" 14 #include "media/base/channel_layout.h"
14 #include "media/base/decode_status.h" 15 #include "media/base/decode_status.h"
15 #include "media/base/decryptor.h" 16 #include "media/base/decryptor.h"
16 #include "media/base/demuxer_stream.h" 17 #include "media/base/demuxer_stream.h"
17 #include "media/base/eme_constants.h" 18 #include "media/base/eme_constants.h"
18 #include "media/base/encryption_scheme.h" 19 #include "media/base/encryption_scheme.h"
19 #include "media/base/media_keys.h" 20 #include "media/base/media_keys.h"
20 #include "media/base/sample_format.h" 21 #include "media/base/sample_format.h"
21 #include "media/base/subsample_entry.h" 22 #include "media/base/subsample_entry.h"
22 #include "media/base/video_capture_types.h" 23 #include "media/base/video_capture_types.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 media::DemuxerStream::kStatusMax) 57 media::DemuxerStream::kStatusMax)
57 58
58 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type, 59 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type,
59 media::DemuxerStream::TYPE_MAX) 60 media::DemuxerStream::TYPE_MAX)
60 61
61 IPC_ENUM_TRAITS_MAX_VALUE(media::EmeInitDataType, media::EmeInitDataType::MAX) 62 IPC_ENUM_TRAITS_MAX_VALUE(media::EmeInitDataType, media::EmeInitDataType::MAX)
62 63
63 IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode, 64 IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,
64 media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX) 65 media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX)
65 66
66 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::Exception, 67 IPC_ENUM_TRAITS_MAX_VALUE(media::CdmPromise::Exception,
67 media::MediaKeys::EXCEPTION_MAX) 68 media::CdmPromise::EXCEPTION_MAX)
68 69
69 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType, 70 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::MessageType,
70 media::MediaKeys::MESSAGE_TYPE_MAX) 71 media::MediaKeys::MESSAGE_TYPE_MAX)
71 72
72 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::SessionType, 73 IPC_ENUM_TRAITS_MAX_VALUE(media::MediaKeys::SessionType,
73 media::MediaKeys::SESSION_TYPE_MAX) 74 media::MediaKeys::SESSION_TYPE_MAX)
74 75
75 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax) 76 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
76 77
77 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax) 78 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)
(...skipping 13 matching lines...) Expand all
91 IPC_STRUCT_TRAITS_MEMBER(status) 92 IPC_STRUCT_TRAITS_MEMBER(status)
92 IPC_STRUCT_TRAITS_MEMBER(system_code) 93 IPC_STRUCT_TRAITS_MEMBER(system_code)
93 IPC_STRUCT_TRAITS_END() 94 IPC_STRUCT_TRAITS_END()
94 95
95 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) 96 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
96 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) 97 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
97 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) 98 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
98 IPC_STRUCT_TRAITS_END() 99 IPC_STRUCT_TRAITS_END()
99 100
100 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ 101 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
OLDNEW
« no previous file with comments | « media/base/cdm_promise_adapter.cc ('k') | media/base/media_keys.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698