| 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 // IPC messages for the media streaming. | 5 // IPC messages for the media streaming. |
| 6 // Multiply-included message file, hence no include guard. | 6 // Multiply-included message file, hence no include guard. |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "content/common/content_export.h" |
| 10 #include "content/common/media/media_stream_options.h" | 11 #include "content/common/media/media_stream_options.h" |
| 11 #include "ipc/ipc_message_macros.h" | 12 #include "ipc/ipc_message_macros.h" |
| 12 | 13 |
| 14 #undef IPC_MESSAGE_EXPORT |
| 15 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| 13 #define IPC_MESSAGE_START MediaStreamMsgStart | 16 #define IPC_MESSAGE_START MediaStreamMsgStart |
| 14 | 17 |
| 15 IPC_ENUM_TRAITS(media_stream::MediaStreamType) | 18 IPC_ENUM_TRAITS(media_stream::MediaStreamType) |
| 16 IPC_ENUM_TRAITS(media_stream::StreamOptions::VideoOption) | 19 IPC_ENUM_TRAITS(media_stream::StreamOptions::VideoOption) |
| 17 | 20 |
| 18 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions) | 21 IPC_STRUCT_TRAITS_BEGIN(media_stream::StreamOptions) |
| 19 IPC_STRUCT_TRAITS_MEMBER(audio) | 22 IPC_STRUCT_TRAITS_MEMBER(audio) |
| 20 IPC_STRUCT_TRAITS_MEMBER(video_option) | 23 IPC_STRUCT_TRAITS_MEMBER(video_option) |
| 21 IPC_STRUCT_TRAITS_END() | 24 IPC_STRUCT_TRAITS_END() |
| 22 | 25 |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 media_stream::MediaStreamType /* type */, | 96 media_stream::MediaStreamType /* type */, |
| 94 std::string /* security origin */) | 97 std::string /* security origin */) |
| 95 | 98 |
| 96 // Request to open the device. | 99 // Request to open the device. |
| 97 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, | 100 IPC_MESSAGE_CONTROL5(MediaStreamHostMsg_OpenDevice, |
| 98 int /* render view id */, | 101 int /* render view id */, |
| 99 int /* request id */, | 102 int /* request id */, |
| 100 std::string /* device_id */, | 103 std::string /* device_id */, |
| 101 media_stream::MediaStreamType /* type */, | 104 media_stream::MediaStreamType /* type */, |
| 102 std::string /* security origin */) | 105 std::string /* security origin */) |
| OLD | NEW |