[rtp_rtcp] cleanup in RTCPSender class internals.

webrtc/modules/rtp_rtcp/source/rtcp_sender.h

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 140 matching lines @@
   bool SendFeedbackPacket(const rtcp::TransportFeedback& packet);
 
  private:
   class RtcpContext;
 
   // Determine which RTCP messages should be sent and setup flags.
   void PrepareReport(const std::set<RTCPPacketType>& packetTypes,
                      const FeedbackState& feedback_state)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
-  int32_t AddReportBlock(const RTCPReportBlock& report_block)
+  bool AddReportBlock(const FeedbackState& feedback_state,
+                      uint32_t ssrc,
+                      StreamStatistician* statistician)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
-  bool PrepareReportBlock(const FeedbackState& feedback_state,
-                          uint32_t ssrc,
-                          StreamStatistician* statistician,
-                          RTCPReportBlock* report_block);
-
   rtc::scoped_ptr<rtcp::RtcpPacket> BuildSR(const RtcpContext& context)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   rtc::scoped_ptr<rtcp::RtcpPacket> BuildRR(const RtcpContext& context)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   rtc::scoped_ptr<rtcp::RtcpPacket> BuildSDES(const RtcpContext& context)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   rtc::scoped_ptr<rtcp::RtcpPacket> BuildPLI(const RtcpContext& context)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   rtc::scoped_ptr<rtcp::RtcpPacket> BuildREMB(const RtcpContext& context)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
@@ skipping 117 matching lines @@
 
   std::set<ReportFlag> report_flags_ GUARDED_BY(critical_section_rtcp_sender_);
 
   typedef rtc::scoped_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)(
       const RtcpContext&);
   std::map<RTCPPacketType, BuilderFunc> builders_;
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_