| Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h
|
| diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h
|
| index a79284196272ae7a37d21c20e927e7a93aba3871..fd8dd8e685457eb6350bb8d9e599739ae2bbf1cd 100644
|
| --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h
|
| +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h
|
| @@ -16,36 +16,18 @@
|
|
|
| #include "webrtc/base/constructormagic.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| -#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h" // RTCPReportBlock
|
| #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
|
| #include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
|
| #include "webrtc/typedefs.h"
|
|
|
| namespace webrtc {
|
| namespace rtcp {
|
| +class ReportBlockInformation;
|
| class TransportFeedback;
|
| }
|
| namespace RTCPHelp
|
| {
|
|
|
| -class RTCPReportBlockInformation
|
| -{
|
| -public:
|
| - RTCPReportBlockInformation();
|
| - ~RTCPReportBlockInformation();
|
| -
|
| - // Statistics
|
| - RTCPReportBlock remoteReceiveBlock;
|
| - uint32_t remoteMaxJitter;
|
| -
|
| - // RTT
|
| - int64_t RTT;
|
| - int64_t minRTT;
|
| - int64_t maxRTT;
|
| - int64_t avgRTT;
|
| - uint32_t numAverageCalcs;
|
| -};
|
| -
|
| class RTCPPacketInformation
|
| {
|
| public:
|
| @@ -60,7 +42,7 @@ public:
|
| void AddNACKPacket(const uint16_t packetID);
|
| void ResetNACKPacketIdArray();
|
|
|
| - void AddReportInfo(const RTCPReportBlockInformation& report_block_info);
|
| + void AddReportInfo(const rtcp::ReportBlockInformation& report_block_info);
|
|
|
| uint32_t rtcpPacketTypeFlags; // RTCPPacketTypeFlags bit field
|
| uint32_t remoteSSRC;
|
|
|