| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 kRtcpSenderFrameStatusSentToNetwork = 3, | 106 kRtcpSenderFrameStatusSentToNetwork = 3, |
| 107 }; | 107 }; |
| 108 | 108 |
| 109 struct RtcpSenderFrameLogMessage { | 109 struct RtcpSenderFrameLogMessage { |
| 110 RtcpSenderFrameLogMessage(); | 110 RtcpSenderFrameLogMessage(); |
| 111 ~RtcpSenderFrameLogMessage(); | 111 ~RtcpSenderFrameLogMessage(); |
| 112 RtcpSenderFrameStatus frame_status; | 112 RtcpSenderFrameStatus frame_status; |
| 113 uint32 rtp_timestamp; | 113 uint32 rtp_timestamp; |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 typedef std::list<RtcpSenderFrameLogMessage> RtcpSenderLogMessage; | 116 typedef std::vector<RtcpSenderFrameLogMessage> RtcpSenderLogMessage; |
| 117 | 117 |
| 118 struct RtcpSenderInfo { | 118 struct RtcpSenderInfo { |
| 119 RtcpSenderInfo(); | 119 RtcpSenderInfo(); |
| 120 ~RtcpSenderInfo(); | 120 ~RtcpSenderInfo(); |
| 121 // First three members are used for lipsync. | 121 // First three members are used for lipsync. |
| 122 // First two members are used for rtt. | 122 // First two members are used for rtt. |
| 123 uint32 ntp_seconds; | 123 uint32 ntp_seconds; |
| 124 uint32 ntp_fraction; | 124 uint32 ntp_fraction; |
| 125 uint32 rtp_timestamp; | 125 uint32 rtp_timestamp; |
| 126 uint32 send_packet_count; | 126 uint32 send_packet_count; |
| (...skipping 13 matching lines...) Expand all Loading... |
| 140 uint32 delay_since_last_sr; | 140 uint32 delay_since_last_sr; |
| 141 }; | 141 }; |
| 142 | 142 |
| 143 struct RtcpDlrrReportBlock { | 143 struct RtcpDlrrReportBlock { |
| 144 RtcpDlrrReportBlock(); | 144 RtcpDlrrReportBlock(); |
| 145 ~RtcpDlrrReportBlock(); | 145 ~RtcpDlrrReportBlock(); |
| 146 uint32 last_rr; | 146 uint32 last_rr; |
| 147 uint32 delay_since_last_rr; | 147 uint32 delay_since_last_rr; |
| 148 }; | 148 }; |
| 149 | 149 |
| 150 // This is only needed because IPC messages don't support more than |
| 151 // 5 arguments. |
| 152 struct SendRtcpFromRtpSenderData { |
| 153 SendRtcpFromRtpSenderData(); |
| 154 ~SendRtcpFromRtpSenderData(); |
| 155 uint32 packet_type_flags; |
| 156 uint32 sending_ssrc; |
| 157 std::string c_name; |
| 158 }; |
| 159 |
| 150 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) { | 160 inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) { |
| 151 return lhs.ntp_seconds == rhs.ntp_seconds && | 161 return lhs.ntp_seconds == rhs.ntp_seconds && |
| 152 lhs.ntp_fraction == rhs.ntp_fraction && | 162 lhs.ntp_fraction == rhs.ntp_fraction && |
| 153 lhs.rtp_timestamp == rhs.rtp_timestamp && | 163 lhs.rtp_timestamp == rhs.rtp_timestamp && |
| 154 lhs.send_packet_count == rhs.send_packet_count && | 164 lhs.send_packet_count == rhs.send_packet_count && |
| 155 lhs.send_octet_count == rhs.send_octet_count; | 165 lhs.send_octet_count == rhs.send_octet_count; |
| 156 } | 166 } |
| 157 | 167 |
| 158 } // namespace transport | 168 } // namespace transport |
| 159 } // namespace cast | 169 } // namespace cast |
| 160 } // namespace media | 170 } // namespace media |
| 161 | 171 |
| 162 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ | 172 #endif // MEDIA_CAST_TRANSPORT_CAST_TRANSPORT_CONFIG_H_ |
| OLD | NEW |