media/base/ipc/media_param_traits_macros.h - Issue 2606983002: Media Capture Depth Stream Extensions API: focal length and depth range.

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

Issue 2606983002: Media Capture Depth Stream Extensions API: focal length and depth range. (Closed)

Patch Set: review #25 fix. Thanks kinuko@. Created 3 years, 11 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:

« content/common/media/media_stream_messages.h ('K') | « content/test/data/media/getusermedia-depth-capture.html ('k') | media/capture/video/fake_video_capture_device_factory.cc » ('j') | media/capture/video/fake_video_capture_device_factory.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/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/sample_format.h"	21 #include "media/base/sample_format.h"

22 #include "media/base/subsample_entry.h"	22 #include "media/base/subsample_entry.h"

23 #include "media/base/video_codecs.h"	23 #include "media/base/video_codecs.h"

24 #include "media/base/video_types.h"	24 #include "media/base/video_types.h"

	25 #include "media/capture/video/video_capture_device_descriptor.h"

25	26

26 // Enum traits.	27 // Enum traits.

27	28

28 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)	29 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)

29	30

30 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,	31 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,

31 media::AudioLatency::LATENCY_COUNT)	32 media::AudioLatency::LATENCY_COUNT)

32	33

33 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,	34 IPC_ENUM_TRAITS_MAX_VALUE(media::AudioParameters::Format,

34 media::AudioParameters::AUDIO_FORMAT_LAST)	35 media::AudioParameters::AUDIO_FORMAT_LAST)

(...skipping 53 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
88 IPC_STRUCT_TRAITS_MEMBER(key_id)	89 IPC_STRUCT_TRAITS_MEMBER(key_id)

89 IPC_STRUCT_TRAITS_MEMBER(status)	90 IPC_STRUCT_TRAITS_MEMBER(status)

90 IPC_STRUCT_TRAITS_MEMBER(system_code)	91 IPC_STRUCT_TRAITS_MEMBER(system_code)

91 IPC_STRUCT_TRAITS_END()	92 IPC_STRUCT_TRAITS_END()

92	93

93 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)	94 IPC_STRUCT_TRAITS_BEGIN(media::SubsampleEntry)

94 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)	95 IPC_STRUCT_TRAITS_MEMBER(clear_bytes)

95 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)	96 IPC_STRUCT_TRAITS_MEMBER(cypher_bytes)

96 IPC_STRUCT_TRAITS_END()	97 IPC_STRUCT_TRAITS_END()

97	98

	99 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureDeviceDescriptor::CameraCalibration)

	100 IPC_STRUCT_TRAITS_MEMBER(focal_length_x)
	nasko 2017/01/11 18:41:41 nit: Please indent by two spaces to match the styl nit: Please indent by two spaces to match the style above. aleksandar.stojiljkovic 2017/01/11 23:06:22 Done. Show quoted text On 2017/01/11 18:41:41, nasko wrote: > nit: Please indent by two spaces to match the style above. Done.
	101 IPC_STRUCT_TRAITS_MEMBER(focal_length_y)

	102 IPC_STRUCT_TRAITS_MEMBER(depth_near)

	103 IPC_STRUCT_TRAITS_MEMBER(depth_far)

	104 IPC_STRUCT_TRAITS_END()

	105

98 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_	106 #endif // MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_

OLD	NEW