Chromium Code Reviews| Index: chrome/common/cast_messages.h |
| diff --git a/chrome/common/cast_messages.h b/chrome/common/cast_messages.h |
| index 129c4d36576a6843ee15409109980ee9093942f6..2a077087108954da44bc11407626b39d0a701cde 100644 |
| --- a/chrome/common/cast_messages.h |
| +++ b/chrome/common/cast_messages.h |
| @@ -7,6 +7,7 @@ |
| #include "ipc/ipc_message_macros.h" |
| #include "media/cast/cast_sender.h" |
| +#include "media/cast/logging/logging_defines.h" |
| #include "media/cast/rtcp/rtcp_defines.h" |
| #include "media/cast/transport/cast_transport_sender.h" |
| #include "net/base/ip_endpoint.h" |
| @@ -24,6 +25,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::RtcpSenderFrameStatus, |
| media::cast::transport::kRtcpSenderFrameStatusLast) |
| IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::CastTransportStatus, |
| media::cast::transport::CAST_TRANSPORT_STATUS_LAST) |
| +IPC_ENUM_TRAITS_MAX_VALUE(media::cast::CastLoggingEvent, |
| + media::cast::kNumOfLoggingEvents) |
| IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedAudioFrame) |
| IPC_STRUCT_TRAITS_MEMBER(codec) |
| @@ -77,6 +80,7 @@ IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportConfig) |
| IPC_STRUCT_TRAITS_MEMBER(video_rtp_config) |
| IPC_STRUCT_TRAITS_MEMBER(aes_key) |
| IPC_STRUCT_TRAITS_MEMBER(aes_iv_mask) |
| + IPC_STRUCT_TRAITS_MEMBER(enable_raw_event_logging) |
| IPC_STRUCT_TRAITS_END() |
| IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::SendRtcpFromRtpSenderData) |
| @@ -85,6 +89,15 @@ IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::SendRtcpFromRtpSenderData) |
| IPC_STRUCT_TRAITS_MEMBER(c_name) |
| IPC_STRUCT_TRAITS_END() |
| +IPC_STRUCT_TRAITS_BEGIN(media::cast::PacketEvent) |
| +IPC_STRUCT_TRAITS_MEMBER(rtp_timestamp) |
|
hubbe
2014/02/25 22:22:16
Indentation...
imcheng
2014/02/25 23:14:56
Done.
|
| +IPC_STRUCT_TRAITS_MEMBER(frame_id) |
| +IPC_STRUCT_TRAITS_MEMBER(max_packet_id) |
| +IPC_STRUCT_TRAITS_MEMBER(packet_id) |
| +IPC_STRUCT_TRAITS_MEMBER(size) |
| +IPC_STRUCT_TRAITS_MEMBER(timestamp) |
| +IPC_STRUCT_TRAITS_MEMBER(type) |
| +IPC_STRUCT_TRAITS_END() |
| // Cast messages sent from the browser to the renderer. |
| @@ -105,6 +118,9 @@ IPC_MESSAGE_CONTROL5( |
| base::TimeTicks /* time_sent */, |
| uint32 /* rtp_timestamp */); |
| +IPC_MESSAGE_CONTROL2(CastMsg_RawEvents, |
| + int32 /* channel_id */, |
| + std::vector<media::cast::PacketEvent> /* packet_events */); |
| // Cast messages sent from the renderer to the browser. |