diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 01:04:25 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-15 01:04:25 +0000 |
| commit | 734732edf6e4c41ea4502304dcc5e85e248aada6 (patch) | |
| tree | 856a96eee67187b028d0bfae54884b97e9292945 /chrome/common | |
| parent | 20ccd13869224f5c78e18f143ddf2a86c1740aa3 (diff) | |
| download | chromium_src-734732edf6e4c41ea4502304dcc5e85e248aada6.zip chromium_src-734732edf6e4c41ea4502304dcc5e85e248aada6.tar.gz chromium_src-734732edf6e4c41ea4502304dcc5e85e248aada6.tar.bz2 | |
Cast: Reshuffle files under media/cast
This is a large refactoring to move files around where it makes sense.
media/cast/transport/rtp_sender => media/cast/net/rtp
media/cast/transport/rtp_sender/packet_storage => media/cast/net/rtp
media/cast/transport/rtp_sender/packetizer => media/cast/net/rtp
media/cast/transport/transport => media/cast/net
media/cast/base => media/cast/common
media/cast/transport/utility => media/cast/common
media/cast/video_sender => media/cast/sender
media/cast/video_sender/codecs/vp8 => media/cast/sender
media/cast/audio_sender => media/cast/sender
media/cast/congestion_control => media/cast/sender
media/cast/transport => media/cast/net
media/cast/framer => media/cast/net/rtp
media/cast/rtp_receiver => media/cast/net/rtp
media/cast/rtcp => media/cast/net/rtcp
Remove "transport" namespace
BUG=393042
Review URL: https://codereview.chromium.org/388663003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283120 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/cast_messages.h | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/chrome/common/cast_messages.h b/chrome/common/cast_messages.h index 7d4a741..a354de9 100644 --- a/chrome/common/cast_messages.h +++ b/chrome/common/cast_messages.h @@ -8,28 +8,27 @@ #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 "media/cast/net/cast_transport_sender.h" +#include "media/cast/net/rtcp/rtcp_defines.h" #include "net/base/ip_endpoint.h" -#include "net/base/net_util.h" #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT #define IPC_MESSAGE_START CastMsgStart IPC_ENUM_TRAITS_MAX_VALUE( - media::cast::transport::EncodedFrame::Dependency, - media::cast::transport::EncodedFrame::DEPENDENCY_LAST) -IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::Codec, - media::cast::transport::CODEC_LAST) -IPC_ENUM_TRAITS_MAX_VALUE(media::cast::transport::CastTransportStatus, - media::cast::transport::CAST_TRANSPORT_STATUS_LAST) + media::cast::EncodedFrame::Dependency, + media::cast::EncodedFrame::DEPENDENCY_LAST) +IPC_ENUM_TRAITS_MAX_VALUE(media::cast::Codec, + media::cast::CODEC_LAST) +IPC_ENUM_TRAITS_MAX_VALUE(media::cast::CastTransportStatus, + media::cast::CAST_TRANSPORT_STATUS_LAST) IPC_ENUM_TRAITS_MAX_VALUE(media::cast::CastLoggingEvent, media::cast::kNumOfLoggingEvents) IPC_ENUM_TRAITS_MAX_VALUE(media::cast::EventMediaType, media::cast::EVENT_MEDIA_TYPE_LAST) -IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedFrame) +IPC_STRUCT_TRAITS_BEGIN(media::cast::EncodedFrame) IPC_STRUCT_TRAITS_MEMBER(dependency) IPC_STRUCT_TRAITS_MEMBER(frame_id) IPC_STRUCT_TRAITS_MEMBER(referenced_frame_id) @@ -38,12 +37,12 @@ IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::EncodedFrame) IPC_STRUCT_TRAITS_MEMBER(data) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::RtcpDlrrReportBlock) +IPC_STRUCT_TRAITS_BEGIN(media::cast::RtcpDlrrReportBlock) IPC_STRUCT_TRAITS_MEMBER(last_rr) IPC_STRUCT_TRAITS_MEMBER(delay_since_last_rr) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportRtpConfig) +IPC_STRUCT_TRAITS_BEGIN(media::cast::CastTransportRtpConfig) IPC_STRUCT_TRAITS_MEMBER(ssrc) IPC_STRUCT_TRAITS_MEMBER(rtp_payload_type) IPC_STRUCT_TRAITS_MEMBER(stored_frames) @@ -51,7 +50,7 @@ IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::CastTransportRtpConfig) IPC_STRUCT_TRAITS_MEMBER(aes_iv_mask) IPC_STRUCT_TRAITS_END() -IPC_STRUCT_TRAITS_BEGIN(media::cast::transport::SendRtcpFromRtpSenderData) +IPC_STRUCT_TRAITS_BEGIN(media::cast::SendRtcpFromRtpSenderData) IPC_STRUCT_TRAITS_MEMBER(packet_type_flags) IPC_STRUCT_TRAITS_MEMBER(sending_ssrc) IPC_STRUCT_TRAITS_MEMBER(c_name) @@ -80,7 +79,7 @@ IPC_MESSAGE_CONTROL2(CastMsg_ReceivedPacket, IPC_MESSAGE_CONTROL2( CastMsg_NotifyStatusChange, int32 /* channel_id */, - media::cast::transport::CastTransportStatus /* status */) + media::cast::CastTransportStatus /* status */) IPC_MESSAGE_CONTROL2(CastMsg_RawEvents, int32 /* channel_id */, @@ -91,28 +90,28 @@ IPC_MESSAGE_CONTROL2(CastMsg_RawEvents, IPC_MESSAGE_CONTROL2( CastHostMsg_InitializeAudio, int32 /*channel_id*/, - media::cast::transport::CastTransportRtpConfig /*config*/) + media::cast::CastTransportRtpConfig /*config*/) IPC_MESSAGE_CONTROL2( CastHostMsg_InitializeVideo, int32 /*channel_id*/, - media::cast::transport::CastTransportRtpConfig /*config*/) + media::cast::CastTransportRtpConfig /*config*/) IPC_MESSAGE_CONTROL2( CastHostMsg_InsertCodedAudioFrame, int32 /* channel_id */, - media::cast::transport::EncodedFrame /* audio_frame */) + media::cast::EncodedFrame /* audio_frame */) IPC_MESSAGE_CONTROL2( CastHostMsg_InsertCodedVideoFrame, int32 /* channel_id */, - media::cast::transport::EncodedFrame /* video_frame */) + media::cast::EncodedFrame /* video_frame */) IPC_MESSAGE_CONTROL3( CastHostMsg_SendRtcpFromRtpSender, int32 /* channel_id */, - media::cast::transport::SendRtcpFromRtpSenderData /* data */, - media::cast::transport::RtcpDlrrReportBlock /* dlrr */) + media::cast::SendRtcpFromRtpSenderData /* data */, + media::cast::RtcpDlrrReportBlock /* dlrr */) IPC_MESSAGE_CONTROL5( CastHostMsg_ResendPackets, |