From 180e4525ca7c9a23602cdf37a8756df7d23e7143 Mon Sep 17 00:00:00 2001 From: danilchap Date: Mon, 12 Sep 2016 01:40:40 -0700 Subject: [PATCH] Revert of Make rtcp parsing implementation private in RtcpReceiver (patchset #1 id:1 of https://codereview.webrtc.org/2320603002/ ) Reason for revert: Breaks fuzzer compilation. Original issue's description: > 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 > > Committed: https://crrev.com/faf708e238c7b43a732fbebf79ac9298b4b95a95 > Cr-Commit-Position: refs/heads/master@{#14181} TBR=sprang@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:5260 Review-Url: https://codereview.webrtc.org/2332673003 Cr-Commit-Position: refs/heads/master@{#14182} --- .../modules/rtp_rtcp/source/rtcp_receiver.h | 31 ++++++++++--------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h index e9d2c94b7c..365937474f 100644 --- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h +++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h @@ -60,6 +60,13 @@ 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; @@ -108,21 +115,7 @@ class RTCPReceiver { void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback); RtcpStatisticsCallback* GetRtcpStatisticsCallback(); - 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); - + protected: RTCPUtility::RTCPCnameInformation* CreateCnameInformation( uint32_t remoteSSRC); RTCPUtility::RTCPCnameInformation* GetCnameInformation( @@ -260,6 +253,14 @@ 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)