From faf708e238c7b43a732fbebf79ac9298b4b95a95 Mon Sep 17 00:00:00 2001 From: Danil Chapovalov Date: Mon, 12 Sep 2016 10:31:11 +0200 Subject: [PATCH] Make rtcp parsing implementation private in RtcpReceiver: Function just for Parse and for Callbacks moved to private section. All handles moved from protected to private section. BUG=webrtc:5260 R=sprang@webrtc.org Review URL: https://codereview.webrtc.org/2320603002 . Cr-Commit-Position: refs/heads/master@{#14181} --- .../modules/rtp_rtcp/source/rtcp_receiver.h | 31 +++++++++---------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h index 365937474f..e9d2c94b7c 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h @@ -60,13 +60,6 @@ class RTCPReceiver { void SetRemoteSSRC(uint32_t ssrc); uint32_t RemoteSSRC() const; - int32_t IncomingRTCPPacket( - RTCPHelp::RTCPPacketInformation& rtcpPacketInformation, - RTCPUtility::RTCPParserV2* rtcpParser); - - void TriggerCallbacksFromRTCPPacket( - RTCPHelp::RTCPPacketInformation& rtcpPacketInformation); - // get received cname int32_t CNAME(uint32_t remoteSSRC, char cName[RTCP_CNAME_SIZE]) const; @@ -115,7 +108,21 @@ class RTCPReceiver { void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback); RtcpStatisticsCallback* GetRtcpStatisticsCallback(); - protected: + private: + using ReceivedInfoMap = std::map; + // RTCP report block information mapped by remote SSRC. + using ReportBlockInfoMap = + std::map; + // RTCP report block information map mapped by source SSRC. + using ReportBlockMap = std::map; + + int32_t IncomingRTCPPacket( + RTCPHelp::RTCPPacketInformation& rtcpPacketInformation, + RTCPUtility::RTCPParserV2* rtcpParser); + + void TriggerCallbacksFromRTCPPacket( + RTCPHelp::RTCPPacketInformation& rtcpPacketInformation); + RTCPUtility::RTCPCnameInformation* CreateCnameInformation( uint32_t remoteSSRC); RTCPUtility::RTCPCnameInformation* GetCnameInformation( @@ -253,14 +260,6 @@ class RTCPReceiver { RTCPHelp::RTCPPacketInformation* rtcp_packet_information) EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver); - private: - typedef std::map ReceivedInfoMap; - // RTCP report block information mapped by remote SSRC. - typedef std::map - ReportBlockInfoMap; - // RTCP report block information map mapped by source SSRC. - typedef std::map ReportBlockMap; - RTCPHelp::RTCPReportBlockInformation* CreateOrGetReportBlockInformation( uint32_t remote_ssrc, uint32_t source_ssrc)