Chromium Code Reviews| Index: media/cast/net/rtcp/rtcp.h |
| diff --git a/media/cast/net/rtcp/rtcp.h b/media/cast/net/rtcp/rtcp.h |
| index 48c6f0dcaa5811763684870b245f76d286c58dbc..16a379276a808ca74f60cecae3d4f99204b7e524 100644 |
| --- a/media/cast/net/rtcp/rtcp.h |
| +++ b/media/cast/net/rtcp/rtcp.h |
| @@ -25,6 +25,7 @@ |
| #include "media/cast/net/rtcp/receiver_rtcp_event_subscriber.h" |
| #include "media/cast/net/rtcp/rtcp_builder.h" |
| #include "media/cast/net/rtcp/rtcp_defines.h" |
| +#include "media/cast/net/rtcp/rtcp_utility.h" |
| namespace media { |
| namespace cast { |
| @@ -57,7 +58,7 @@ class Rtcp { |
| // |send_packet_count| is the number of packets sent. |
| // |send_octet_count| is the number of octets sent. |
| void SendRtcpFromRtpSender(base::TimeTicks current_time, |
| - uint32_t current_time_as_rtp_timestamp, |
| + RtpTimeTicks current_time_as_rtp_timestamp, |
| uint32_t send_packet_count, |
| size_t send_octet_count); |
| @@ -92,7 +93,7 @@ class Rtcp { |
| // provides reference NTP times relative to its own wall clock, the |
| // |reference_time| returned here has been translated to the local |
| // CastEnvironment clock. |
| - bool GetLatestLipSyncTimes(uint32_t* rtp_timestamp, |
| + bool GetLatestLipSyncTimes(RtpTimeTicks* rtp_timestamp, |
| base::TimeTicks* reference_time) const; |
| void OnReceivedReceiverLog(const RtcpReceiverLogMessage& receiver_log); |
| @@ -110,7 +111,7 @@ class Rtcp { |
| protected: |
| void OnReceivedNtp(uint32_t ntp_seconds, uint32_t ntp_fraction); |
| - void OnReceivedLipSyncInfo(uint32_t rtp_timestamp, |
| + void OnReceivedLipSyncInfo(RtpTimeTicks rtp_timestamp, |
| uint32_t ntp_seconds, |
| uint32_t ntp_fraction); |
| @@ -137,6 +138,8 @@ class Rtcp { |
| const uint32_t local_ssrc_; |
| const uint32_t remote_ssrc_; |
| + RtcpParser parser_; |
|
Irfan
2015/12/09 21:24:28
probably add a comment here that parser now rememb
miu
2015/12/10 00:38:37
Done.
|
| + |
| RtcpSendTimeMap last_reports_sent_map_; |
| RtcpSendTimeQueue last_reports_sent_queue_; |
| @@ -157,7 +160,7 @@ class Rtcp { |
| // NTP timestamp sampled from a clock common to all media streams. It is |
| // expected that the sender will update this data regularly and in a timely |
| // manner (e.g., about once per second). |
| - uint32_t lip_sync_rtp_timestamp_; |
| + RtpTimeTicks lip_sync_rtp_timestamp_; |
| uint64_t lip_sync_ntp_timestamp_; |
| // The last measured network round trip time. This is updated with each |