content/common/media/video_capture_messages.h - Issue 1204063005: Reland: Video Capture: extract storage info from pixel format in VideoCaptureFormat.

Side by Side Diff: content/common/media/video_capture_messages.h

Issue 1204063005: Reland: Video Capture: extract storage info from pixel format in VideoCaptureFormat. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: dcheng@ nit on DCHECK_EQ(expected, actual) Created 5 years, 5 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 | « content/common/media/media_param_traits.cc ('k') | content/common/view_messages.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #include "base/memory/shared_memory.h"	5 #include "base/memory/shared_memory.h"

6 #include "content/common/content_export.h"	6 #include "content/common/content_export.h"

7 #include "content/common/media/video_capture.h"	7 #include "content/common/media/video_capture.h"

8 #include "content/public/common/common_param_traits.h"	8 #include "content/public/common/common_param_traits.h"

9 #include "gpu/command_buffer/common/mailbox_holder.h"	9 #include "gpu/command_buffer/common/mailbox_holder.h"

10 #include "ipc/ipc_message_macros.h"	10 #include "ipc/ipc_message_macros.h"

11 #include "media/base/video_capture_types.h"	11 #include "media/base/video_capture_types.h"

12 #include "media/base/video_frame.h"	12 #include "media/base/video_frame.h"

13	13

14 #undef IPC_MESSAGE_EXPORT	14 #undef IPC_MESSAGE_EXPORT

15 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT	15 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT

16 #define IPC_MESSAGE_START VideoCaptureMsgStart	16 #define IPC_MESSAGE_START VideoCaptureMsgStart

17	17

18 IPC_ENUM_TRAITS_MAX_VALUE(content::VideoCaptureState,	18 IPC_ENUM_TRAITS_MAX_VALUE(content::VideoCaptureState,

19 content::VIDEO_CAPTURE_STATE_LAST)	19 content::VIDEO_CAPTURE_STATE_LAST)

20 IPC_ENUM_TRAITS_MAX_VALUE(media::ResolutionChangePolicy,	20 IPC_ENUM_TRAITS_MAX_VALUE(media::ResolutionChangePolicy,

21 media::RESOLUTION_POLICY_LAST)	21 media::RESOLUTION_POLICY_LAST)

22 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::Format,	22 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::Format,

23 media::VideoFrame::FORMAT_MAX)	23 media::VideoFrame::FORMAT_MAX)

24 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::StorageType,	24 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoFrame::StorageType,

25 media::VideoFrame::STORAGE_LAST)	25 media::VideoFrame::STORAGE_LAST)

	26 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX - 1)

	27 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)

26	28

27 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams)	29 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams)

28 IPC_STRUCT_TRAITS_MEMBER(requested_format)	30 IPC_STRUCT_TRAITS_MEMBER(requested_format)

29 IPC_STRUCT_TRAITS_MEMBER(resolution_change_policy)	31 IPC_STRUCT_TRAITS_MEMBER(resolution_change_policy)

30 IPC_STRUCT_TRAITS_END()	32 IPC_STRUCT_TRAITS_END()

31	33

32 IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params)	34 IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params)

33 IPC_STRUCT_MEMBER(int, device_id)	35 IPC_STRUCT_MEMBER(int, device_id)

34 IPC_STRUCT_MEMBER(int, buffer_id)	36 IPC_STRUCT_MEMBER(int, buffer_id)

35 IPC_STRUCT_MEMBER(base::TimeTicks, timestamp)	37 IPC_STRUCT_MEMBER(base::TimeTicks, timestamp)

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
112	114

113 // Get the formats supported by a device referenced by \|capture_session_id\|.	115 // Get the formats supported by a device referenced by \|capture_session_id\|.

114 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats,	116 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats,

115 int /* device_id */,	117 int /* device_id */,

116 media::VideoCaptureSessionId /* session_id */)	118 media::VideoCaptureSessionId /* session_id */)

117	119

118 // Get the format(s) in use by a device referenced by \|capture_session_id\|.	120 // Get the format(s) in use by a device referenced by \|capture_session_id\|.

119 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse,	121 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse,

120 int /* device_id */,	122 int /* device_id */,

121 media::VideoCaptureSessionId /* session_id */)	123 media::VideoCaptureSessionId /* session_id */)

OLD	NEW