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

Make rtcp parsing implementation private in RtcpReceiver:

Browse Source 
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}
This commit is contained in:
Danil Chapovalov
2016-09-12 10:31:11 +02:00
parent 1a0533dc3d
commit faf708e238
1 changed files with 15 additions and 16 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,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<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(
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<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(
uint32_t remote_ssrc,
uint32_t source_ssrc)