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

Side by Side Diff: chrome/common/cast_messages.h

Issue 279833003: Cast: Add missing enum and PacketEvent field to cast_messages. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 7 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 | « chrome/chrome_tests_unit.gypi ('k') | chrome/renderer/media/cast_ipc_dispatcher_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 Cast transport API. 5 // IPC messages for the Cast transport API.
6 // Multiply-included message file, hence no include guard. 6 // Multiply-included message file, hence no include guard.
7 7
8 #include "ipc/ipc_message_macros.h" 8 #include "ipc/ipc_message_macros.h"
9 #include "media/cast/cast_sender.h" 9 #include "media/cast/cast_sender.h"
10 #include "media/cast/logging/logging_defines.h" 10 #include "media/cast/logging/logging_defines.h"
11 #include "media/cast/rtcp/rtcp_defines.h" 11 #include "media/cast/rtcp/rtcp_defines.h"
12 #include "media/cast/transport/cast_transport_sender.h" 12 #include "media/cast/transport/cast_transport_sender.h"
13 #include "net/base/ip_endpoint.h" 13 #include "net/base/ip_endpoint.h"
14 #include "net/base/net_util.h" 14 #include "net/base/net_util.h"
15 15
16 #undef IPC_MESSAGE_EXPORT 16 #undef IPC_MESSAGE_EXPORT
17 #define IPC_MESSAGE_EXPORT 17 #define IPC_MESSAGE_EXPORT
18 #define IPC_MESSAGE_START CastMsgStart 18 #define IPC_MESSAGE_START CastMsgStart
19 19
20 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::AudioCodec, 20 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::AudioCodec,
21 media::cast::transport::kAudioCodecLast) 21 media::cast::transport::kAudioCodecLast)
22 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::VideoCodec, 22 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::VideoCodec,
23 media::cast::transport::kVideoCodecLast) 23 media::cast::transport::kVideoCodecLast)
24 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::RtcpSenderFrameStatus, 24 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::RtcpSenderFrameStatus,
25 media::cast::transport::kRtcpSenderFrameStatusLast) 25 media::cast::transport::kRtcpSenderFrameStatusLast)
26 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::CastTransportStatus, 26 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::CastTransportStatus,
27 media::cast::transport::CAST_TRANSPORT_STATUS_LAST) 27 media::cast::transport::CAST_TRANSPORT_STATUS_LAST)
28 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::CastLoggingEvent, 28 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::CastLoggingEvent,
29 media::cast::kNumOfLoggingEvents) 29 media::cast::kNumOfLoggingEvents)
30 IPC_ENUM_TRAITS_MAX_VALUE(media::cast::EventMediaType,
31 media::cast::EVENT_MEDIA_TYPE_LAST)
30 32
31 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedAudioFrame) 33 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedAudioFrame)
32 IPC_STRUCT_TRAITS_MEMBER(codec) 34 IPC_STRUCT_TRAITS_MEMBER(codec)
33 IPC_STRUCT_TRAITS_MEMBER(frame_id) 35 IPC_STRUCT_TRAITS_MEMBER(frame_id)
34 IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp) 36 IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
35 IPC_STRUCT_TRAITS_MEMBER(data) 37 IPC_STRUCT_TRAITS_MEMBER(data)
36 IPC_STRUCT_TRAITS_END() 38 IPC_STRUCT_TRAITS_END()
37 39
38 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedVideoFrame) 40 IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedVideoFrame)
39 IPC_STRUCT_TRAITS_MEMBER(codec) 41 IPC_STRUCT_TRAITS_MEMBER(codec)
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 IPC_STRUCT_TRAITS_END() 96 IPC_STRUCT_TRAITS_END()
95 97
96 IPC_STRUCT_TRAITS_BEGIN(media::cast::PacketEvent) 98 IPC_STRUCT_TRAITS_BEGIN(media::cast::PacketEvent)
97 IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp) 99 IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp)
98 IPC_STRUCT_TRAITS_MEMBER(frame_id) 100 IPC_STRUCT_TRAITS_MEMBER(frame_id)
99 IPC_STRUCT_TRAITS_MEMBER(max_packet_id) 101 IPC_STRUCT_TRAITS_MEMBER(max_packet_id)
100 IPC_STRUCT_TRAITS_MEMBER(packet_id) 102 IPC_STRUCT_TRAITS_MEMBER(packet_id)
101 IPC_STRUCT_TRAITS_MEMBER(size) 103 IPC_STRUCT_TRAITS_MEMBER(size)
102 IPC_STRUCT_TRAITS_MEMBER(timestamp) 104 IPC_STRUCT_TRAITS_MEMBER(timestamp)
103 IPC_STRUCT_TRAITS_MEMBER(type) 105 IPC_STRUCT_TRAITS_MEMBER(type)
106 IPC_STRUCT_TRAITS_MEMBER(media_type)
104 IPC_STRUCT_TRAITS_END() 107 IPC_STRUCT_TRAITS_END()
105 108
106 // Cast messages sent from the browser to the renderer. 109 // Cast messages sent from the browser to the renderer.
107 110
108 IPC_MESSAGE_CONTROL2(CastMsg_ReceivedPacket, 111 IPC_MESSAGE_CONTROL2(CastMsg_ReceivedPacket,
109 int32 /* channel_id */, 112 int32 /* channel_id */,
110 media::cast::Packet /* packet */); 113 media::cast::Packet /* packet */);
111 114
112 IPC_MESSAGE_CONTROL2( 115 IPC_MESSAGE_CONTROL2(
113 CastMsg_NotifyStatusChange, 116 CastMsg_NotifyStatusChange,
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 media::cast::MissingFramesAndPacketsMap /* missing_packets */) 168 media::cast::MissingFramesAndPacketsMap /* missing_packets */)
166 169
167 IPC_MESSAGE_CONTROL2( 170 IPC_MESSAGE_CONTROL2(
168 CastHostMsg_New, 171 CastHostMsg_New,
169 int32 /* channel_id */, 172 int32 /* channel_id */,
170 net::IPEndPoint /*remote_end_point*/); 173 net::IPEndPoint /*remote_end_point*/);
171 174
172 IPC_MESSAGE_CONTROL1( 175 IPC_MESSAGE_CONTROL1(
173 CastHostMsg_Delete, 176 CastHostMsg_Delete,
174 int32 /* channel_id */); 177 int32 /* channel_id */);
OLDNEW
« no previous file with comments | « chrome/chrome_tests_unit.gypi ('k') | chrome/renderer/media/cast_ipc_dispatcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698