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

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

Issue 2258523005: Style cleanup in UpdateTmmbr: (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: . Created 4 years, 4 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
Index: webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index d57432cea469365fa6b989725ced3ec23e6a8782..28c6867a34a532687437a16ae428c901f0c82f42 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -1210,28 +1210,20 @@ void RTCPReceiver::HandleTransportFeedback(
rtcp_parser->Iterate();
}
-int32_t RTCPReceiver::UpdateTMMBR() {
- // Find bounding set
+void RTCPReceiver::UpdateTmmbr() {
+ // Find bounding set.
std::vector<rtcp::TmmbItem> bounding =
- TMMBRHelp::FindBoundingSet(TMMBRReceived());
- // Set bounding set
- // Inform remote clients about the new bandwidth
- // inform the remote client
- _rtpRtcp.SetTMMBN(&bounding);
-
- // might trigger a TMMBN
- if (bounding.empty()) {
- // owner of max bitrate request has timed out
- // empty bounding set has been sent
- return 0;
- }
- // We have a new bandwidth estimate on this channel.
- if (_cbRtcpBandwidthObserver) {
+ TMMBRHelp::FindBoundingSet(TmmbrReceived());
+
+ if (!bounding.empty() && _cbRtcpBandwidthObserver) {
+ // We have a new bandwidth estimate on this channel.
uint64_t bitrate_bps = TMMBRHelp::CalcMinBitrateBps(bounding);
if (bitrate_bps <= std::numeric_limits<uint32_t>::max())
_cbRtcpBandwidthObserver->OnReceivedEstimatedBitrate(bitrate_bps);
}
- return 0;
+
+ // Set bounding set: inform remote clients about the new bandwidth.
+ _rtpRtcp.SetTmmbn(std::move(bounding));
}
void RTCPReceiver::RegisterRtcpStatisticsCallback(
@@ -1252,7 +1244,7 @@ void RTCPReceiver::TriggerCallbacksFromRTCPPacket(
// to OnNetworkChanged.
if (rtcpPacketInformation.rtcpPacketTypeFlags & kRtcpTmmbr) {
// Might trigger a OnReceivedBandwidthEstimateUpdate.
- UpdateTMMBR();
+ UpdateTmmbr();
}
uint32_t local_ssrc;
std::set<uint32_t> registered_ssrcs;
@@ -1366,7 +1358,7 @@ int32_t RTCPReceiver::CNAME(uint32_t remoteSSRC,
return 0;
}
-std::vector<rtcp::TmmbItem> RTCPReceiver::TMMBRReceived() const {
+std::vector<rtcp::TmmbItem> RTCPReceiver::TmmbrReceived() const {
rtc::CritScope lock(&_criticalSectionRTCPReceiver);
std::vector<rtcp::TmmbItem> candidates;
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/rtcp_receiver.h ('k') | webrtc/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698