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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1211273005: Use safer IPC serializations in media_param_traits.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Try harder to force invalid enum values 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
« content/common/media/media_param_traits.cc ('K') | « content/common/media/media_param_traits.cc ('k') | content/common/view_messages.h » ('j') | media/audio/audio_parameters.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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) 26 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelFormat, media::PIXEL_FORMAT_MAX)
27 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX) 27 IPC_ENUM_TRAITS_MAX_VALUE(media::VideoPixelStorage, media::PIXEL_STORAGE_MAX)
28 28
29 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams) 29 IPC_STRUCT_TRAITS_BEGIN(media::VideoCaptureParams)
30 IPC_STRUCT_TRAITS_MEMBER(requested_format) 30 IPC_STRUCT_TRAITS_MEMBER(requested_format)
31 IPC_STRUCT_TRAITS_MEMBER(resolution_change_policy) 31 IPC_STRUCT_TRAITS_MEMBER(resolution_change_policy)
32 IPC_STRUCT_TRAITS_END() 32 IPC_STRUCT_TRAITS_END()
33 33
34 IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params) 34 IPC_STRUCT_BEGIN(VideoCaptureMsg_BufferReady_Params)
35 IPC_STRUCT_MEMBER(int, device_id) 35 IPC_STRUCT_MEMBER(int, device_id)
36 IPC_STRUCT_MEMBER(int, buffer_id) 36 IPC_STRUCT_MEMBER(int, buffer_id)
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 114
115 // 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|.
116 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats, 116 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceSupportedFormats,
117 int /* device_id */, 117 int /* device_id */,
118 media::VideoCaptureSessionId /* session_id */) 118 media::VideoCaptureSessionId /* session_id */)
119 119
120 // 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|.
121 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse, 121 IPC_MESSAGE_CONTROL2(VideoCaptureHostMsg_GetDeviceFormatsInUse,
122 int /* device_id */, 122 int /* device_id */,
123 media::VideoCaptureSessionId /* session_id */) 123 media::VideoCaptureSessionId /* session_id */)
OLDNEW
« content/common/media/media_param_traits.cc ('K') | « content/common/media/media_param_traits.cc ('k') | content/common/view_messages.h » ('j') | media/audio/audio_parameters.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698