| OLD | NEW |
|---|
| 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/channel_layout.h" | 13 #include "media/base/channel_layout.h" |
| 14 #include "media/base/decode_status.h" | 14 #include "media/base/decode_status.h" |
| 15 #include "media/base/decryptor.h" | 15 #include "media/base/decryptor.h" |
| 16 #include "media/base/demuxer_stream.h" | 16 #include "media/base/demuxer_stream.h" |
| 17 #include "media/base/eme_constants.h" | 17 #include "media/base/eme_constants.h" |
| 18 #include "media/base/encryption_scheme.h" | 18 #include "media/base/encryption_scheme.h" |
| 19 #include "media/base/media_keys.h" | 19 #include "media/base/media_keys.h" |
| 20 #include "media/base/sample_format.h" | 20 #include "media/base/sample_format.h" |
| 21 #include "media/base/subsample_entry.h" | 21 #include "media/base/subsample_entry.h" |
| 22 #include "media/base/video_capture_types.h" | |
| 23 #include "media/base/video_codecs.h" | 22 #include "media/base/video_codecs.h" |
| 24 #include "media/base/video_types.h" | 23 #include "media/base/video_types.h" |
| 25 | 24 |
| 26 // Enum traits. | 25 // Enum traits. |
| 27 | 26 |
| 28 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax) | 27 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax) |
| 29 | 28 |
| 30 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType, | 29 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType, |
| 31 media::AudioLatency::LATENCY_COUNT) | 30 media::AudioLatency::LATENCY_COUNT) |
| 32 | 31 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax) | 74 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax) |
| 76 | 75 |
| 77 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax) | 76 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax) |
| 78 | 77 |
| 79 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, | 78 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile, |
| 80 media::VIDEO_CODEC_PROFILE_MIN, | 79 media::VIDEO_CODEC_PROFILE_MIN, |
| 81 media::VIDEO_CODEC_PROFILE_MAX) | 80 media::VIDEO_CODEC_PROFILE_MAX) |
| 82 | 81 |
| 83 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX) | 82 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX) |
| 84 | 83 |
| 85 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX) | |
| 86 | |
| 87 // Struct traits. | 84 // Struct traits. |
| 88 | 85 |
| 89 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation) | 86 IPC_STRUCT_TRAITS_BEGIN(media::CdmKeyInformation) |
| 90 IPC_STRUCT_TRAITS_MEMBER(key_id) | 87 IPC_STRUCT_TRAITS_MEMBER(key_id) |
| 91 IPC_STRUCT_TRAITS_MEMBER(status) | 88 IPC_STRUCT_TRAITS_MEMBER(status) |
| 92 IPC_STRUCT_TRAITS_MEMBER(system_code) | 89 IPC_STRUCT_TRAITS_MEMBER(system_code) |
| 93 IPC_STRUCT_TRAITS_END() | 90 IPC_STRUCT_TRAITS_END() |
| 94 | 91 |
| 95 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) | 92 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) |
| 96 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) | 93 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) |
| 97 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) | 94 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) |
| 98 IPC_STRUCT_TRAITS_END() | 95 IPC_STRUCT_TRAITS_END() |
| 99 | 96 |
| 100 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ | 97 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 2415703002:
Move files video_capture*.* from media/base to media/capture (Closed)
