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

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

Issue 2416183002: media: Use native DemuxerStream 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/demuxer_stream.h ('k') | media/base/stream_parser_buffer.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/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/decryptor.h"
15 #include "media/base/demuxer_stream.h"
15 #include "media/base/sample_format.h" 16 #include "media/base/sample_format.h"
16 #include "media/base/subsample_entry.h" 17 #include "media/base/subsample_entry.h"
17 #include "media/base/video_capture_types.h" 18 #include "media/base/video_capture_types.h"
18 #include "media/base/video_codecs.h" 19 #include "media/base/video_codecs.h"
19 #include "media/base/video_types.h" 20 #include "media/base/video_types.h"
20 21
21 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax) 22 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)
22 23
23 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType, 24 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,
24 media::AudioLatency::LATENCY_COUNT) 25 media::AudioLatency::LATENCY_COUNT)
25 26
26 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format, 27 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,
27 media::AudioParameters::AUDIO_FORMAT_LAST) 28 media::AudioParameters::AUDIO_FORMAT_LAST)
28 29
29 IPC_ENUM_TRAITS_MAX_VALUE(media::BufferingState, 30 IPC_ENUM_TRAITS_MAX_VALUE(media::BufferingState,
30 media::BufferingState::BUFFERING_STATE_MAX) 31 media::BufferingState::BUFFERING_STATE_MAX)
31 32
32 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX) 33 IPC_ENUM_TRAITS_MAX_VALUE(media::ChannelLayout, media::CHANNEL_LAYOUT_MAX)
33 34
34 IPC_ENUM_TRAITS_MAX_VALUE(media::ColorSpace, media::COLOR_SPACE_MAX) 35 IPC_ENUM_TRAITS_MAX_VALUE(media::ColorSpace, media::COLOR_SPACE_MAX)
35 36
36 IPC_ENUM_TRAITS_MAX_VALUE(media::DecodeStatus, 37 IPC_ENUM_TRAITS_MAX_VALUE(media::DecodeStatus,
37 media::DecodeStatus::DECODE_STATUS_MAX) 38 media::DecodeStatus::DECODE_STATUS_MAX)
38 39
39 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::Status, 40 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::Status,
40 media::Decryptor::Status::STATUS_MAX) 41 media::Decryptor::Status::kStatusMax)
41 42
42 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType, 43 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType,
43 media::Decryptor::StreamType::STREAM_TYPE_MAX) 44 media::Decryptor::StreamType::kStreamTypeMax)
45
46 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status,
47 media::DemuxerStream::kStatusMax)
48
49 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type,
50 media::DemuxerStream::TYPE_MAX)
44 51
45 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax) 52 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
46 53
47 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax) 54 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)
48 55
49 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodecProfile, 56 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodecProfile,
50 media::VIDEO_CODEC_PROFILE_MAX) 57 media::VIDEO_CODEC_PROFILE_MAX)
51 58
52 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX) 59 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)
53 60
54 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX) 61 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)
55 62
56 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry) 63 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)
57 IPC_STRUCT_TRAITS_MEMBER(clear_bytes) 64 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)
58 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes) 65 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)
59 IPC_STRUCT_TRAITS_END() 66 IPC_STRUCT_TRAITS_END()
60 67
61 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_ 68 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
OLDNEW
« no previous file with comments | « media/base/demuxer_stream.h ('k') | media/base/stream_parser_buffer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698