Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_RTCP_RTCP_DEFINES_H_ | 5 #ifndef MEDIA_CAST_RTCP_RTCP_DEFINES_H_ |
| 6 #define MEDIA_CAST_RTCP_RTCP_DEFINES_H_ | 6 #define MEDIA_CAST_RTCP_RTCP_DEFINES_H_ |
| 7 | 7 |
| 8 #include <list> | 8 #include <list> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <set> | 10 #include <set> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 typedef std::list<RtcpSenderFrameLogMessage> RtcpSenderLogMessage; | 43 typedef std::list<RtcpSenderFrameLogMessage> RtcpSenderLogMessage; |
| 44 | 44 |
| 45 // Log messages from receiver to sender. | 45 // Log messages from receiver to sender. |
| 46 struct RtcpReceiverEventLogMessage { | 46 struct RtcpReceiverEventLogMessage { |
| 47 CastLoggingEvent type; | 47 CastLoggingEvent type; |
| 48 base::TimeTicks event_timestamp; | 48 base::TimeTicks event_timestamp; |
| 49 base::TimeDelta delay_delta; | 49 base::TimeDelta delay_delta; |
| 50 uint16 packet_id; | 50 uint16 packet_id; |
| 51 }; | 51 }; |
| 52 | 52 |
| 53 typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages; | |
| 54 | |
| 53 class RtcpReceiverFrameLogMessage { | 55 class RtcpReceiverFrameLogMessage { |
| 54 public: | 56 public: |
| 55 RtcpReceiverFrameLogMessage(); | 57 explicit RtcpReceiverFrameLogMessage(uint32 rtp_timestamp); |
| 56 ~RtcpReceiverFrameLogMessage(); | 58 ~RtcpReceiverFrameLogMessage(); |
| 57 | 59 |
| 58 uint32 rtp_timestamp; | 60 uint32 rtp_timestamp; |
|
mikhal
2013/11/22 21:33:18
underscore after member's names
pwestin
2013/11/22 22:50:33
Done.
| |
| 59 std::list<RtcpReceiverEventLogMessage> event_log_messages; | 61 RtcpReceiverEventLogMessages event_log_messages; |
| 60 }; | 62 }; |
| 61 | 63 |
| 62 typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage; | 64 typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage; |
| 63 | 65 |
| 64 struct RtcpSenderInfo { | 66 struct RtcpSenderInfo { |
| 65 // First three members are used for lipsync. | 67 // First three members are used for lipsync. |
| 66 // First two members are used for rtt. | 68 // First two members are used for rtt. |
| 67 uint32 ntp_seconds; | 69 uint32 ntp_seconds; |
| 68 uint32 ntp_fraction; | 70 uint32 ntp_fraction; |
| 69 uint32 rtp_timestamp; | 71 uint32 rtp_timestamp; |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 140 RtcpReceiverReferenceTimeReport rhs) { | 142 RtcpReceiverReferenceTimeReport rhs) { |
| 141 return lhs.remote_ssrc == rhs.remote_ssrc && | 143 return lhs.remote_ssrc == rhs.remote_ssrc && |
| 142 lhs.ntp_seconds == rhs.ntp_seconds && | 144 lhs.ntp_seconds == rhs.ntp_seconds && |
| 143 lhs.ntp_fraction == rhs.ntp_fraction; | 145 lhs.ntp_fraction == rhs.ntp_fraction; |
| 144 } | 146 } |
| 145 | 147 |
| 146 } // namespace cast | 148 } // namespace cast |
| 147 } // namespace media | 149 } // namespace media |
| 148 | 150 |
| 149 #endif // MEDIA_CAST_RTCP_RTCP_DEFINES_H_ | 151 #endif // MEDIA_CAST_RTCP_RTCP_DEFINES_H_ |
| OLD | NEW |