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

Move RTCPHelp::RTCPReceiveInformation inside RTCPReceiver

Browse Source 
move all logic from that class into RTCPReceiver too,
Simplify and fix style on the way.

BUG=webrtc:5565

Review-Url: https://codereview.webrtc.org/2373053002
Cr-Commit-Position: refs/heads/master@{#14442}
This commit is contained in:
danilchap
2016-09-29 15:28:07 -07:00
committed by Commit bot
parent c8d21712dd
commit 7851bda9bc
4 changed files with 115 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
webrtc/modules/rtp_rtcp/source/rtcp_receiver_help.h
View File

@ -11,11 +11,7 @@
#ifndef WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_
#define WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_HELP_H_
#include <map>
#include <vector>
#include "webrtc/modules/rtp_rtcp/include/rtp_rtcp_defines.h"
#include "webrtc/modules/rtp_rtcp/source/tmmbr_help.h"
#include "webrtc/typedefs.h"
namespace webrtc {
@ -38,38 +34,6 @@ class RTCPReportBlockInformation {
uint32_t numAverageCalcs;
};
class RTCPReceiveInformation {
public:
RTCPReceiveInformation();
~RTCPReceiveInformation();
void InsertTmmbrItem(uint32_t sender_ssrc,
const rtcp::TmmbItem& tmmbr_item,
int64_t current_time_ms);
void GetTmmbrSet(int64_t current_time_ms,
std::vector<rtcp::TmmbItem>* candidates);
void ClearTmmbr();
int64_t last_time_received_ms = 0;
int32_t last_fir_sequence_number = -1;
int64_t last_fir_request_ms = 0;
bool ready_for_delete = false;
std::vector<rtcp::TmmbItem> tmmbn;
private:
struct TimedTmmbrItem {
rtcp::TmmbItem tmmbr_item;
int64_t last_updated_ms;
};
std::map<uint32_t, TimedTmmbrItem> tmmbr_;
};
} // end namespace RTCPHelp
} // namespace webrtc