zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert of Make rtcp parsing implementation private in RtcpReceiver (patchset #1 id:1 of https://codereview.webrtc.org/2320603002/ )

Browse Source 
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}
This commit is contained in:
danilchap
2016-09-12 01:40:40 -07:00
committed by Commit bot
parent faf708e238
commit 180e4525ca
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
View File

@ -60,6 +60,13 @@ class RTCPReceiver {
void SetRemoteSSRC(uint32_t ssrc); void SetRemoteSSRC(uint32_t ssrc);
uint32_t RemoteSSRC() const; uint32_t RemoteSSRC() const;
int32_t IncomingRTCPPacket(
RTCPHelp::RTCPPacketInformation& rtcpPacketInformation,
RTCPUtility::RTCPParserV2* rtcpParser);
void TriggerCallbacksFromRTCPPacket(
RTCPHelp::RTCPPacketInformation& rtcpPacketInformation);
// get received cname // get received cname
int32_t CNAME(uint32_t remoteSSRC, char cName[RTCP_CNAME_SIZE]) const; int32_t CNAME(uint32_t remoteSSRC, char cName[RTCP_CNAME_SIZE]) const;
@ -108,21 +115,7 @@ class RTCPReceiver {
void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback); void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback);
RtcpStatisticsCallback* GetRtcpStatisticsCallback(); RtcpStatisticsCallback* GetRtcpStatisticsCallback();
private: protected:
using ReceivedInfoMap = std::map<uint32_t, RTCPHelp::RTCPReceiveInformation*>;
// RTCP report block information mapped by remote SSRC.
using ReportBlockInfoMap =
std::map<uint32_t, RTCPHelp::RTCPReportBlockInformation*>;
// RTCP report block information map mapped by source SSRC.
using ReportBlockMap = std::map<uint32_t, ReportBlockInfoMap>;
int32_t IncomingRTCPPacket(
RTCPHelp::RTCPPacketInformation& rtcpPacketInformation,
RTCPUtility::RTCPParserV2* rtcpParser);
void TriggerCallbacksFromRTCPPacket(
RTCPHelp::RTCPPacketInformation& rtcpPacketInformation);
RTCPUtility::RTCPCnameInformation* CreateCnameInformation( RTCPUtility::RTCPCnameInformation* CreateCnameInformation(
uint32_t remoteSSRC); uint32_t remoteSSRC);
RTCPUtility::RTCPCnameInformation* GetCnameInformation( RTCPUtility::RTCPCnameInformation* GetCnameInformation(
@ -260,6 +253,14 @@ class RTCPReceiver {
RTCPHelp::RTCPPacketInformation* rtcp_packet_information) RTCPHelp::RTCPPacketInformation* rtcp_packet_information)
EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver); EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
private:
typedef std::map<uint32_t, RTCPHelp::RTCPReceiveInformation*> ReceivedInfoMap;
// RTCP report block information mapped by remote SSRC.
typedef std::map<uint32_t, RTCPHelp::RTCPReportBlockInformation*>
ReportBlockInfoMap;
// RTCP report block information map mapped by source SSRC.
typedef std::map<uint32_t, ReportBlockInfoMap> ReportBlockMap;
RTCPHelp::RTCPReportBlockInformation* CreateOrGetReportBlockInformation( RTCPHelp::RTCPReportBlockInformation* CreateOrGetReportBlockInformation(
uint32_t remote_ssrc, uint32_t remote_ssrc,
uint32_t source_ssrc) uint32_t source_ssrc)