Replace RtcpReceiveTimeInfo with rtcp::ReceiveTimeInfo

webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 233 matching lines @@
   if (RTCPArrivalTimeSecs) {
     *RTCPArrivalTimeSecs = _lastReceivedSRNTPsecs;
   }
   if (rtcp_timestamp) {
     *rtcp_timestamp = _remoteSenderInfo.RTPtimeStamp;
   }
   return true;
 }
 
 bool RTCPReceiver::LastReceivedXrReferenceTimeInfo(
-    RtcpReceiveTimeInfo* info) const {
+    rtcp::ReceiveTimeInfo* info) const {
   assert(info);
   rtc::CritScope lock(&_criticalSectionRTCPReceiver);
   if (_lastReceivedXRNTPsecs == 0 && _lastReceivedXRNTPfrac == 0) {
     return false;
   }
 
-  info->sourceSSRC = _remoteXRReceiveTimeInfo.sourceSSRC;
-  info->lastRR = _remoteXRReceiveTimeInfo.lastRR;
+  info->ssrc = remote_time_info_.ssrc;
+  info->last_rr = remote_time_info_.last_rr;
 
   // Get the delay since last received report (RFC 3611).
   uint32_t receive_time =
       RTCPUtility::MidNtp(_lastReceivedXRNTPsecs, _lastReceivedXRNTPfrac);
 
   uint32_t ntp_sec = 0;
   uint32_t ntp_frac = 0;
   _clock->CurrentNtp(ntp_sec, ntp_frac);
   uint32_t now = RTCPUtility::MidNtp(ntp_sec, ntp_frac);
 
-  info->delaySinceLastRR = now - receive_time;
+  info->delay_since_last_rr = now - receive_time;
   return true;
 }
 
 int32_t RTCPReceiver::SenderInfoReceived(RTCPSenderInfo* senderInfo) const {
   assert(senderInfo);
   rtc::CritScope lock(&_criticalSectionRTCPReceiver);
   if (_lastReceivedSRNTPsecs == 0) {
     return -1;
   }
   memcpy(senderInfo, &(_remoteSenderInfo), sizeof(RTCPSenderInfo));
@@ skipping 518 matching lines @@
 
   for (const rtcp::Dlrr& dlrr : xr.dlrrs()) {
     for (const rtcp::ReceiveTimeInfo& time_info : dlrr.sub_blocks())
       HandleXrDlrrReportBlock(time_info);
   }
 }
 
 void RTCPReceiver::HandleXrReceiveReferenceTime(
     uint32_t sender_ssrc,
     const rtcp::Rrtr& rrtr) {
-  _remoteXRReceiveTimeInfo.sourceSSRC = sender_ssrc;
-  _remoteXRReceiveTimeInfo.lastRR = CompactNtp(rrtr.ntp());
+  remote_time_info_.ssrc = sender_ssrc;
+  remote_time_info_.last_rr = CompactNtp(rrtr.ntp());
   _clock->CurrentNtp(_lastReceivedXRNTPsecs, _lastReceivedXRNTPfrac);
 }
 
 void RTCPReceiver::HandleXrDlrrReportBlock(const rtcp::ReceiveTimeInfo& rti) {
   if (registered_ssrcs_.count(rti.ssrc) == 0)  // Not to us.
     return;
 
   // Caller should explicitly enable rtt calculation using extended reports.
   if (!xr_rrtr_status_)
     return;
@@ skipping 334 matching lines @@
 
   for (const auto& kv : _receivedInfoMap) {
     RTCPReceiveInformation* receive_info = kv.second;
     RTC_DCHECK(receive_info);
     receive_info->GetTmmbrSet(now_ms, &candidates);
   }
   return candidates;
 }
 
 }  // namespace webrtc