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

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

Issue 2746013006: use VideoColorSpace in decoder configuration (Closed)
Patch Set: oops, win compile fix reapplied Created 3 years, 9 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/ipc/BUILD.gn ('k') | media/base/mime_util_internal.cc » ('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/cdm_promise.h"
14 #include "media/base/channel_layout.h" 14 #include "media/base/channel_layout.h"
15 #include "media/base/content_decryption_module.h" 15 #include "media/base/content_decryption_module.h"
16 #include "media/base/decode_status.h" 16 #include "media/base/decode_status.h"
17 #include "media/base/decryptor.h" 17 #include "media/base/decryptor.h"
18 #include "media/base/demuxer_stream.h" 18 #include "media/base/demuxer_stream.h"
19 #include "media/base/eme_constants.h" 19 #include "media/base/eme_constants.h"
20 #include "media/base/encryption_scheme.h" 20 #include "media/base/encryption_scheme.h"
21 #include "media/base/output_device_info.h" 21 #include "media/base/output_device_info.h"
22 #include "media/base/sample_format.h" 22 #include "media/base/sample_format.h"
23 #include "media/base/subsample_entry.h" 23 #include "media/base/subsample_entry.h"
24 #include "media/base/video_codecs.h" 24 #include "media/base/video_codecs.h"
25 #include "media/base/video_color_space.h"
25 #include "media/base/video_types.h" 26 #include "media/base/video_types.h"
27 #include "ui/gfx/ipc/color/gfx_param_traits_macros.h"
26 28
27 // Enum traits. 29 // Enum traits.
28 30
29 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax) 31 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)
30 32
31 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType, 33 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,
32 media::AudioLatency::LATENCY_COUNT) 34 media::AudioLatency::LATENCY_COUNT)
33 35
34 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format, 36 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,
35 media::AudioParameters::AUDIO_FORMAT_LAST) 37 media::AudioParameters::AUDIO_FORMAT_LAST)
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax) 81 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
80 82
81 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax) 83 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)
82 84
83 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, 85 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,
84 media::VIDEO_CODEC_PROFILE_MIN, 86 media::VIDEO_CODEC_PROFILE_MIN,
85 media::VIDEO_CODEC_PROFILE_MAX) 87 media::VIDEO_CODEC_PROFILE_MAX)
86 88
87 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX) 89 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)
88 90
91 IPC_ENUM_TRAITS_VALIDATE(
92 media::VideoColorSpace::PrimaryID,
93 static_cast<int>(value) ==
94 static_cast<int>(
95 media::VideoColorSpace::GetPrimaryID(static_cast<int>(value))));
96
97 IPC_ENUM_TRAITS_VALIDATE(
98 media::VideoColorSpace::TransferID,
99 static_cast<int>(value) ==
100 static_cast<int>(
101 media::VideoColorSpace::GetTransferID(static_cast<int>(value))));
102
103 IPC_ENUM_TRAITS_VALIDATE(
104 media::VideoColorSpace::MatrixID,
105 static_cast<int>(value) ==
106 static_cast<int>(
107 media::VideoColorSpace::GetMatrixID(static_cast<int>(value))));
108
89 // Struct traits. 109 // Struct traits.
90 110
91 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation) 111 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation)
92 IPC_STRUCT_TRAITS_MEMBER(key_id) 112 IPC_STRUCT_TRAITS_MEMBER(key_id)
93 IPC_STRUCT_TRAITS_MEMBER(status) 113 IPC_STRUCT_TRAITS_MEMBER(status)
94 IPC_STRUCT_TRAITS_MEMBER(system_code) 114 IPC_STRUCT_TRAITS_MEMBER(system_code)
95 IPC_STRUCT_TRAITS_END() 115 IPC_STRUCT_TRAITS_END()
96 116
97 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) 117 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
98 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) 118 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
99 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) 119 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
100 IPC_STRUCT_TRAITS_END() 120 IPC_STRUCT_TRAITS_END()
101 121
122 IPC_STRUCT_TRAITS_BEGIN(media::VideoColorSpace)
123 IPC_STRUCT_TRAITS_MEMBER(primaries)
124 IPC_STRUCT_TRAITS_MEMBER(transfer)
125 IPC_STRUCT_TRAITS_MEMBER(matrix)
126 IPC_STRUCT_TRAITS_MEMBER(range)
127 IPC_STRUCT_TRAITS_END()
128
102 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ 129 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
OLDNEW
« no previous file with comments | « media/base/ipc/BUILD.gn ('k') | media/base/mime_util_internal.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698