| 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_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 <stddef.h> | 8 #include <stddef.h> |
| 9 #include <stdint.h> | 9 #include <stdint.h> |
| 10 | 10 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 | 59 |
| 60 CastLoggingEvent type; | 60 CastLoggingEvent type; |
| 61 base::TimeTicks event_timestamp; | 61 base::TimeTicks event_timestamp; |
| 62 base::TimeDelta delay_delta; | 62 base::TimeDelta delay_delta; |
| 63 uint16_t packet_id; | 63 uint16_t packet_id; |
| 64 }; | 64 }; |
| 65 | 65 |
| 66 typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages; | 66 typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages; |
| 67 | 67 |
| 68 struct RtcpReceiverFrameLogMessage { | 68 struct RtcpReceiverFrameLogMessage { |
| 69 explicit RtcpReceiverFrameLogMessage(uint32_t rtp_timestamp); | 69 explicit RtcpReceiverFrameLogMessage(RtpTimeTicks rtp_timestamp); |
| 70 ~RtcpReceiverFrameLogMessage(); | 70 ~RtcpReceiverFrameLogMessage(); |
| 71 | 71 |
| 72 uint32_t rtp_timestamp_; | 72 const RtpTimeTicks rtp_timestamp_; |
| 73 RtcpReceiverEventLogMessages event_log_messages_; | 73 RtcpReceiverEventLogMessages event_log_messages_; |
| 74 | |
| 75 // TODO(mikhal): Investigate what's the best way to allow adding | |
| 76 // DISALLOW_COPY_AND_ASSIGN, as currently it contradicts the implementation | |
| 77 // and possible changes have a big impact on design. | |
| 78 }; | 74 }; |
| 79 | 75 |
| 80 typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage; | 76 typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage; |
| 81 | 77 |
| 82 struct RtcpReceiverReferenceTimeReport { | 78 struct RtcpReceiverReferenceTimeReport { |
| 83 RtcpReceiverReferenceTimeReport(); | 79 RtcpReceiverReferenceTimeReport(); |
| 84 ~RtcpReceiverReferenceTimeReport(); | 80 ~RtcpReceiverReferenceTimeReport(); |
| 85 | 81 |
| 86 uint32_t remote_ssrc; | 82 uint32_t remote_ssrc; |
| 87 uint32_t ntp_seconds; | 83 uint32_t ntp_seconds; |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 138 // This struct is used to encapsulate all the parameters of the | 134 // This struct is used to encapsulate all the parameters of the |
| 139 // SendRtcpFromRtpReceiver for IPC transportation. | 135 // SendRtcpFromRtpReceiver for IPC transportation. |
| 140 struct SendRtcpFromRtpReceiver_Params { | 136 struct SendRtcpFromRtpReceiver_Params { |
| 141 SendRtcpFromRtpReceiver_Params(); | 137 SendRtcpFromRtpReceiver_Params(); |
| 142 ~SendRtcpFromRtpReceiver_Params(); | 138 ~SendRtcpFromRtpReceiver_Params(); |
| 143 uint32_t ssrc; | 139 uint32_t ssrc; |
| 144 uint32_t sender_ssrc; | 140 uint32_t sender_ssrc; |
| 145 RtcpTimeData time_data; | 141 RtcpTimeData time_data; |
| 146 scoped_ptr<RtcpCastMessage> cast_message; | 142 scoped_ptr<RtcpCastMessage> cast_message; |
| 147 base::TimeDelta target_delay; | 143 base::TimeDelta target_delay; |
| 148 scoped_ptr<std::vector<std::pair<RtpTimestamp, RtcpEvent> > > rtcp_events; | 144 scoped_ptr<std::vector<std::pair<RtpTimeTicks, RtcpEvent>>> rtcp_events; |
| 149 scoped_ptr<RtpReceiverStatistics> rtp_receiver_statistics; | 145 scoped_ptr<RtpReceiverStatistics> rtp_receiver_statistics; |
| 150 }; | 146 }; |
| 151 | 147 |
| 152 | 148 |
| 153 } // namespace cast | 149 } // namespace cast |
| 154 } // namespace media | 150 } // namespace media |
| 155 | 151 |
| 156 #endif // MEDIA_CAST_RTCP_RTCP_DEFINES_H_ | 152 #endif // MEDIA_CAST_RTCP_RTCP_DEFINES_H_ |
| OLD | NEW |