[rtp_rtcp] ReportBlockInformation cleaned and moved out of the rtcp_receiver_help.

webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.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.
  */
 
 #include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h"
 
 #include <assert.h>  // assert
 #include <string.h>  // memset
 
+#include "webrtc/modules/rtp_rtcp/source/report_block_information.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 
 namespace webrtc {
 namespace RTCPHelp {
 
 RTCPPacketInformation::RTCPPacketInformation()
     : rtcpPacketTypeFlags(0),
       remoteSSRC(0),
       nackSequenceNumbers(),
@@ skipping 59 matching lines @@
 
 void
 RTCPPacketInformation::AddNACKPacket(const uint16_t packetID)
 {
   if (nackSequenceNumbers.size() >= kSendSideNackListSizeSanity) {
     return;
   }
   nackSequenceNumbers.push_back(packetID);
 }
 
-void
-RTCPPacketInformation::AddReportInfo(
-    const RTCPReportBlockInformation& report_block_info)
-{
-  this->rtt = report_block_info.RTT;
-  report_blocks.push_back(report_block_info.remoteReceiveBlock);
-}
-
-RTCPReportBlockInformation::RTCPReportBlockInformation():
-    remoteReceiveBlock(),
-    remoteMaxJitter(0),
-    RTT(0),
-    minRTT(0),
-    maxRTT(0),
-    avgRTT(0),
-    numAverageCalcs(0)
-{
-    memset(&remoteReceiveBlock,0,sizeof(remoteReceiveBlock));
-}
-
-RTCPReportBlockInformation::~RTCPReportBlockInformation()
-{
+void RTCPPacketInformation::AddReportInfo(
+    const rtcp::ReportBlockInformation& report_block_info) {
+  this->rtt = report_block_info.LastRttMs();
+  report_blocks.push_back(report_block_info.LastBlock());
 }
 
 RTCPReceiveInformation::RTCPReceiveInformation()
     : lastTimeReceived(0),
       lastFIRSequenceNumber(-1),
       lastFIRRequest(0),
       readyForDelete(false) {
 }
 
 RTCPReceiveInformation::~RTCPReceiveInformation() {
@@ skipping 58 matching lines @@
                          TmmbrSet.Ssrc(sourceIdx));
   return 0;
 }
 
 void RTCPReceiveInformation::VerifyAndAllocateBoundingSet(
     const uint32_t minimumSize) {
   TmmbnBoundingSet.VerifyAndAllocateSet(minimumSize);
 }
 }  // namespace RTCPHelp
 }  // namespace webrtc