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

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

Issue 2707763004: Rename ReceiveInfo to TmmbrInfo (Closed)
Patch Set: +comment Created 3 years, 10 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
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 26defae680d5d22fd157ecd6fdf9399a4c15e566..c00e7ee793d100f875fa20b72be0291235efd910 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -105,23 +105,20 @@ class RTCPReceiver {
bool RtcpRrSequenceNumberTimeout(int64_t rtcp_interval_ms);
std::vector<rtcp::TmmbItem> TmmbrReceived();
-
- bool UpdateRTCPReceiveInformationTimers();
-
+ // Return true if new bandwidth should be set.
+ bool UpdateTmmbrTimers();
std::vector<rtcp::TmmbItem> BoundingSet(bool* tmmbr_owner);
-
- void UpdateTmmbr();
+ // Set new bandwidth and notify remote clients about it.
+ void NotifyTmmbrUpdated();
void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback);
RtcpStatisticsCallback* GetRtcpStatisticsCallback();
private:
struct PacketInformation;
- struct ReceiveInformation;
+ struct TmmbrInformation;
struct ReportBlockWithRtt;
struct LastFirStatus;
- // Mapped by remote ssrc.
- using ReceivedInfoMap = std::map<uint32_t, ReceiveInformation>;
// RTCP report blocks mapped by remote SSRC.
using ReportBlockInfoMap = std::map<uint32_t, ReportBlockWithRtt>;
// RTCP report blocks map mapped by source SSRC.
@@ -134,9 +131,9 @@ class RTCPReceiver {
void TriggerCallbacksFromRtcpPacket(
const PacketInformation& packet_information);
- void CreateReceiveInformation(uint32_t remote_ssrc)
+ void CreateTmmbrInformation(uint32_t remote_ssrc)
EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
- ReceiveInformation* GetReceiveInformation(uint32_t remote_ssrc)
+ TmmbrInformation* GetTmmbrInformation(uint32_t remote_ssrc)
EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
void HandleSenderReport(const rtcp::CommonHeader& rtcp_block,
@@ -242,10 +239,12 @@ class RTCPReceiver {
bool xr_rrtr_status_ GUARDED_BY(rtcp_receiver_lock_);
int64_t xr_rr_rtt_ms_;
- // Received report blocks.
+ int64_t oldest_tmmbr_info_ms_ GUARDED_BY(rtcp_receiver_lock_);
+ // Mapped by remote ssrc.
+ std::map<uint32_t, TmmbrInformation> tmmbr_infos_
+ GUARDED_BY(rtcp_receiver_lock_);
+
ReportBlockMap received_report_blocks_ GUARDED_BY(rtcp_receiver_lock_);
- ReceivedInfoMap received_infos_ GUARDED_BY(rtcp_receiver_lock_);
- int64_t oldest_received_info_ms_ GUARDED_BY(rtcp_receiver_lock_);
std::map<uint32_t, LastFirStatus> last_fir_ GUARDED_BY(rtcp_receiver_lock_);
std::map<uint32_t, std::string> received_cnames_
GUARDED_BY(rtcp_receiver_lock_);
« no previous file with comments | « no previous file | webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698