Index: media/cast/net/rtcp/rtcp_defines.h |
diff --git a/media/cast/net/rtcp/rtcp_defines.h b/media/cast/net/rtcp/rtcp_defines.h |
index 72fdc31123366099db5fddb1763856f40afe7fd5..de6af424a0b8cae574c90acc956aa4f1578f9273 100644 |
--- a/media/cast/net/rtcp/rtcp_defines.h |
+++ b/media/cast/net/rtcp/rtcp_defines.h |
@@ -62,15 +62,11 @@ struct RtcpReceiverEventLogMessage { |
typedef std::list<RtcpReceiverEventLogMessage> RtcpReceiverEventLogMessages; |
struct RtcpReceiverFrameLogMessage { |
- explicit RtcpReceiverFrameLogMessage(uint32 rtp_timestamp); |
+ explicit RtcpReceiverFrameLogMessage(RtpTimeTicks rtp_timestamp); |
~RtcpReceiverFrameLogMessage(); |
- uint32 rtp_timestamp_; |
+ const RtpTimeTicks rtp_timestamp_; |
RtcpReceiverEventLogMessages event_log_messages_; |
- |
- // TODO(mikhal): Investigate what's the best way to allow adding |
- // DISALLOW_COPY_AND_ASSIGN, as currently it contradicts the implementation |
- // and possible changes have a big impact on design. |
}; |
typedef std::list<RtcpReceiverFrameLogMessage> RtcpReceiverLogMessage; |
@@ -141,7 +137,7 @@ struct SendRtcpFromRtpReceiver_Params { |
RtcpTimeData time_data; |
scoped_ptr<RtcpCastMessage> cast_message; |
base::TimeDelta target_delay; |
- scoped_ptr<std::vector<std::pair<RtpTimestamp, RtcpEvent> > > rtcp_events; |
+ scoped_ptr<std::vector<std::pair<RtpTimeTicks, RtcpEvent>>> rtcp_events; |
scoped_ptr<RtpReceiverStatistics> rtp_receiver_statistics; |
}; |