Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(280)

Unified Diff: webrtc/modules/rtp_rtcp/source/rtcp_receiver.h

Issue 2390643002: Move RTCPHelp::RTCPReportBlockInformation into RTCPReceiver (Closed)
Patch Set: -diviision by 0 Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
index 71ccb0df6c06bd67a058393a8e3e2ebb5993cade..31b3bb8e6261afa2fa6ce7c69105beeaa793e54a 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -20,7 +20,6 @@
#include "webrtc/base/thread_annotations.h"
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_packet/dlrr.h"
-#include "webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h"
#include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
#include "webrtc/typedefs.h"
@@ -76,12 +75,12 @@ class RTCPReceiver {
bool LastReceivedXrReferenceTimeInfo(rtcp::ReceiveTimeInfo* info) const;
- // get rtt
- int32_t RTT(uint32_t remoteSSRC,
- int64_t* RTT,
- int64_t* avgRTT,
- int64_t* minRTT,
- int64_t* maxRTT) const;
+ // Get rtt.
+ int32_t RTT(uint32_t remote_ssrc,
+ int64_t* last_rtt_ms,
+ int64_t* avg_rtt_ms,
+ int64_t* min_rtt_ms,
+ int64_t* max_rtt_ms) const;
int32_t SenderInfoReceived(RTCPSenderInfo* senderInfo) const;
@@ -115,11 +114,11 @@ class RTCPReceiver {
private:
struct PacketInformation;
struct ReceiveInformation;
+ struct ReportBlockInformation;
// Mapped by remote ssrc.
using ReceivedInfoMap = std::map<uint32_t, ReceiveInformation>;
// RTCP report block information mapped by remote SSRC.
- using ReportBlockInfoMap =
- std::map<uint32_t, RTCPHelp::RTCPReportBlockInformation*>;
+ using ReportBlockInfoMap = std::map<uint32_t, ReportBlockInformation>;
// RTCP report block information map mapped by source SSRC.
using ReportBlockMap = std::map<uint32_t, ReportBlockInfoMap>;
@@ -206,15 +205,6 @@ class RTCPReceiver {
PacketInformation* packet_information)
EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
- RTCPHelp::RTCPReportBlockInformation* CreateOrGetReportBlockInformation(
- uint32_t remote_ssrc,
- uint32_t source_ssrc)
- EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
- RTCPHelp::RTCPReportBlockInformation* GetReportBlockInformation(
- uint32_t remote_ssrc,
- uint32_t source_ssrc) const
- EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
-
Clock* const _clock;
const bool receiver_only_;
ModuleRtpRtcp& _rtpRtcp;
@@ -245,7 +235,7 @@ class RTCPReceiver {
int64_t xr_rr_rtt_ms_;
// Received report blocks.
- ReportBlockMap _receivedReportBlockMap
+ ReportBlockMap received_report_blocks_
GUARDED_BY(_criticalSectionRTCPReceiver);
ReceivedInfoMap received_infos_ GUARDED_BY(_criticalSectionRTCPReceiver);
std::map<uint32_t, std::string> received_cnames_

Powered by Google App Engine
This is Rietveld 408576698