Refactor composing report blocks for rtcp Sender/Receiver reports.

Compose them while creating sr/rr instead of presaving in temporary
member variable

BUG=webrtc:5565, webrtc:8016

Review-Url: https://codereview.webrtc.org/2979413002
Cr-Commit-Position: refs/heads/master@{#19138}
This commit is contained in:
danilchap
2017-07-25 09:15:14 -07:00
committed by Commit Bot
parent 7fb11d7376
commit 96b69bdbee
2 changed files with 56 additions and 60 deletions

View File

@ -157,9 +157,8 @@ class RTCPSender {
void PrepareReport(const FeedbackState& feedback_state)
EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
bool AddReportBlock(const FeedbackState& feedback_state,
uint32_t ssrc,
StreamStatistician* statistician)
std::vector<rtcp::ReportBlock> CreateReportBlocks(
const FeedbackState& feedback_state)
EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
std::unique_ptr<rtcp::RtcpPacket> BuildSR(const RtcpContext& context)
@ -214,8 +213,6 @@ class RTCPSender {
ReceiveStatistics* receive_statistics_
GUARDED_BY(critical_section_rtcp_sender_);
std::map<uint32_t, rtcp::ReportBlock> report_blocks_
GUARDED_BY(critical_section_rtcp_sender_);
std::map<uint32_t, std::string> csrc_cnames_
GUARDED_BY(critical_section_rtcp_sender_);