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

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

Issue 2416373002: media: Use native Decryptor enum types in media mojo interfaces (Closed)
Patch Set: 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
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/channel_layout.h" 12 #include "media/base/channel_layout.h"
13 #include "media/base/decode_status.h" 13 #include "media/base/decode_status.h"
14 #include "media/base/decryptor.h"
14 #include "media/base/sample_format.h" 15 #include "media/base/sample_format.h"
15 #include "media/base/subsample_entry.h" 16 #include "media/base/subsample_entry.h"
16 #include "media/base/video_capture_types.h" 17 #include "media/base/video_capture_types.h"
17 #include "media/base/video_codecs.h" 18 #include "media/base/video_codecs.h"
18 #include "media/base/video_types.h" 19 #include "media/base/video_types.h"
19 20
20 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax) 21 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)
21 22
22 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType, 23 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,
23 media::AudioLatency::LATENCY_COUNT) 24 media::AudioLatency::LATENCY_COUNT)
24 25
25 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format, 26 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,
26 media::AudioParameters::AUDIO_FORMAT_LAST) 27 media::AudioParameters::AUDIO_FORMAT_LAST)
27 28
28 IPC_ENUM_TRAITS_MAX_VALUE(media::BufferingState, 29 IPC_ENUM_TRAITS_MAX_VALUE(media::BufferingState,
29 media::BufferingState::BUFFERING_STATE_MAX) 30 media::BufferingState::BUFFERING_STATE_MAX)
30 31
31 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX) 32 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX)
32 33
33 IPC_ENUM_TRAITS_MAX_VALUE(media::ColorSpace, media::COLOR_SPACE_MAX) 34 IPC_ENUM_TRAITS_MAX_VALUE(media::ColorSpace, media::COLOR_SPACE_MAX)
34 35
35 IPC_ENUM_TRAITS_MAX_VALUE(media::DecodeStatus, 36 IPC_ENUM_TRAITS_MAX_VALUE(media::DecodeStatus,
36 media::DecodeStatus::DECODE_STATUS_MAX) 37 media::DecodeStatus::DECODE_STATUS_MAX)
37 38
39 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::Status,
40 media::Decryptor::Status::STATUS_MAX)
41
42 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType,
43 media::Decryptor::StreamType::STREAM_TYPE_MAX)
44
38 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax) 45 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
39 46
40 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax) 47 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)
41 48
42 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodecProfile, 49 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodecProfile,
43 media::VIDEO_CODEC_PROFILE_MAX) 50 media::VIDEO_CODEC_PROFILE_MAX)
44 51
45 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX) 52 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)
46 53
47 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX) 54 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)
48 55
49 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) 56 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
50 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) 57 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
51 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) 58 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
52 IPC_STRUCT_TRAITS_END() 59 IPC_STRUCT_TRAITS_END()
53 60
54 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ 61 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698