From 150708e061b88c1e7c02aba13d4196a4913f99cc Mon Sep 17 00:00:00 2001 From: nisse Date: Thu, 16 Mar 2017 05:02:53 -0700 Subject: [PATCH] Make ModuleRtpRtcpImpl member variables private. This is a follow-up to https://codereview.webrtc.org/2747743002. BUG=webrtc:7135 Review-Url: https://codereview.webrtc.org/2750283003 Cr-Commit-Position: refs/heads/master@{#17271} --- webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h index dfb31c4661..b5d2185113 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h @@ -318,15 +318,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { const Clock* clock() const { return clock_; } - // TODO(nisse): Demote all member variables to private, as soon as - // downstream code is updated to use the above accessor methods. - RTPSender rtp_sender_; - - RTCPSender rtcp_sender_; - RTCPReceiver rtcp_receiver_; - - const Clock* const clock_; - private: FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, Rtt); FRIEND_TEST_ALL_PREFIXES(RtpRtcpImplTest, RttForReceiverOnly); @@ -338,6 +329,12 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp { bool TimeToSendFullNackList(int64_t now) const; + RTPSender rtp_sender_; + RTCPSender rtcp_sender_; + RTCPReceiver rtcp_receiver_; + + const Clock* const clock_; + const bool audio_; int64_t last_process_time_; int64_t last_bitrate_process_time_;