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