media/base/ipc/media_param_traits_macros.h - Issue 2423703002: media: Use native CipherMode enum type in media mojo interfaces

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

Issue 2423703002: media: Use native CipherMode enum type in media mojo interfaces (Closed)

Patch Set: remove hash function definition 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:

« no previous file with comments | « no previous file | media/mojo/common/media_type_converters.cc » ('j') | media/mojo/interfaces/media_types.typemap » ('J')

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/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/demuxer_stream.h"

	16 #include "media/base/encryption_scheme.h"

16 #include "media/base/sample_format.h"	17 #include "media/base/sample_format.h"

17 #include "media/base/subsample_entry.h"	18 #include "media/base/subsample_entry.h"

18 #include "media/base/video_capture_types.h"	19 #include "media/base/video_capture_types.h"

19 #include "media/base/video_codecs.h"	20 #include "media/base/video_codecs.h"

20 #include "media/base/video_types.h"	21 #include "media/base/video_types.h"

21	22

22 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)	23 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)

23	24

24 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,	25 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,

25 media::AudioLatency::LATENCY_COUNT)	26 media::AudioLatency::LATENCY_COUNT)

(...skipping 16 matching lines...) Expand all Loading...
42	43

43 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType,	44 IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType,

44 media::Decryptor::StreamType::kStreamTypeMax)	45 media::Decryptor::StreamType::kStreamTypeMax)

45	46

46 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status,	47 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status,

47 media::DemuxerStream::kStatusMax)	48 media::DemuxerStream::kStatusMax)

48	49

49 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type,	50 IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Type,

50 media::DemuxerStream::TYPE_MAX)	51 media::DemuxerStream::TYPE_MAX)

51	52

	53 IPC_ENUM_TRAITS_MAX_VALUE(media::EncryptionScheme::CipherMode,

	54 media::EncryptionScheme::CipherMode::CIPHER_MODE_MAX)

	55

52 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)	56 IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)

53	57

54 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)	58 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)

55	59

56 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,	60 IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,

57 media::VIDEO_CODEC_PROFILE_MIN,	61 media::VIDEO_CODEC_PROFILE_MIN,

58 media::VIDEO_CODEC_PROFILE_MAX)	62 media::VIDEO_CODEC_PROFILE_MAX)

59	63

60 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)	64 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)

61	65

62 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)	66 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)

63	67

64 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)	68 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)

65 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)	69 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)

66 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)	70 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)

67 IPC_STRUCT_TRAITS_END()	71 IPC_STRUCT_TRAITS_END()

68	72

69 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_	73 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_

OLD	NEW