OLD | NEW |
---|---|
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 #ifndef MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ | 5 #ifndef MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ |
6 #define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ | 6 #define MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ |
7 | 7 |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
114 kRtcpSenderFrameStatusSentToNetwork = 3, | 114 kRtcpSenderFrameStatusSentToNetwork = 3, |
115 }; | 115 }; |
116 | 116 |
117 struct RtcpSenderFrameLogMessage { | 117 struct RtcpSenderFrameLogMessage { |
118 RtcpSenderFrameLogMessage(); | 118 RtcpSenderFrameLogMessage(); |
119 ~RtcpSenderFrameLogMessage(); | 119 ~RtcpSenderFrameLogMessage(); |
120 RtcpSenderFrameStatus frame_status; | 120 RtcpSenderFrameStatus frame_status; |
121 uint32 rtp_timestamp; | 121 uint32 rtp_timestamp; |
122 }; | 122 }; |
123 | 123 |
124 typedef std::list<RtcpSenderFrameLogMessage> RtcpSenderLogMessage; | 124 typedef std::vector<RtcpSenderFrameLogMessage> RtcpSenderLogMessage; |
125 | 125 |
126 struct RtcpSenderInfo { | 126 struct RtcpSenderInfo { |
127 RtcpSenderInfo(); | 127 RtcpSenderInfo(); |
128 ~RtcpSenderInfo(); | 128 ~RtcpSenderInfo(); |
129 // First three members are used for lipsync. | 129 // First three members are used for lipsync. |
130 // First two members are used for rtt. | 130 // First two members are used for rtt. |
131 uint32 ntp_seconds; | 131 uint32 ntp_seconds; |
132 uint32 ntp_fraction; | 132 uint32 ntp_fraction; |
133 uint32 rtp_timestamp; | 133 uint32 rtp_timestamp; |
134 uint32 send_packet_count; | 134 uint32 send_packet_count; |
(...skipping 13 matching lines...) Expand all Loading... | |
148 uint32 delay_since_last_sr; | 148 uint32 delay_since_last_sr; |
149 }; | 149 }; |
150 | 150 |
151 struct RtcpDlrrReportBlock { | 151 struct RtcpDlrrReportBlock { |
152 RtcpDlrrReportBlock(); | 152 RtcpDlrrReportBlock(); |
153 ~RtcpDlrrReportBlock(); | 153 ~RtcpDlrrReportBlock(); |
154 uint32 last_rr; | 154 uint32 last_rr; |
155 uint32 delay_since_last_rr; | 155 uint32 delay_since_last_rr; |
156 }; | 156 }; |
157 | 157 |
158 // This is only needed because IPC messages don't support more than | |
159 // 5 arguments. | |
160 struct SendRtcpFromRtpSenderData { | |
161 SendRtcpFromRtpSenderData(); | |
162 ~SendRtcpFromRtpSenderData(); | |
163 uint32 packet_type_flags; | |
164 uint32 sending_ssrc; | |
165 std::string c_name; | |
palmer
2014/02/11 00:50:04
What is the intended structure of this string?
Ca
hubbe
2014/02/12 00:54:24
Apparently, the CNAME comes from RFC 3550 page 46,
| |
166 }; | |
167 | |
158 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) { | 168 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) { |
159 return lhs.ntp_seconds == rhs.ntp_seconds && | 169 return lhs.ntp_seconds == rhs.ntp_seconds && |
160 lhs.ntp_fraction == rhs.ntp_fraction && | 170 lhs.ntp_fraction == rhs.ntp_fraction && |
161 lhs.rtp_timestamp == rhs.rtp_timestamp && | 171 lhs.rtp_timestamp == rhs.rtp_timestamp && |
162 lhs.send_packet_count == rhs.send_packet_count && | 172 lhs.send_packet_count == rhs.send_packet_count && |
163 lhs.send_octet_count == rhs.send_octet_count; | 173 lhs.send_octet_count == rhs.send_octet_count; |
164 } | 174 } |
165 | 175 |
166 } // namespace transport | 176 } // namespace transport |
167 } // namespace cast | 177 } // namespace cast |
168 } // namespace media | 178 } // namespace media |
169 | 179 |
170 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ | 180 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ |
OLD | NEW |