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

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

Issue 2224933002: Cleaned out boundingSet member from TMMBRHelp class (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: nit from presubmit 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
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/CPPLINT.cfg ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.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.cc
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
index ae1f87596b993fe08ac1f9dcf1f6269e46345283..31a11e28925759fd149de689d197a37f0876c5ca 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -1234,7 +1234,6 @@ void RTCPReceiver::HandleTransportFeedback(
}
int32_t RTCPReceiver::UpdateTMMBR() {
TMMBRHelp tmmbr_help;
- int32_t numBoundingSet = 0;
uint32_t bitrate = 0;
uint32_t accNumCandidates = 0;
@@ -1245,19 +1244,14 @@ int32_t RTCPReceiver::UpdateTMMBR() {
accNumCandidates = TMMBRReceived(size, accNumCandidates, candidateSet);
}
// Find bounding set
- TMMBRSet* boundingSet = NULL;
- numBoundingSet = tmmbr_help.FindTMMBRBoundingSet(boundingSet);
- if (numBoundingSet == -1) {
- LOG(LS_WARNING) << "Failed to find TMMBR bounding set.";
- return -1;
- }
+ std::vector<rtcp::TmmbItem> bounding = tmmbr_help.FindTMMBRBoundingSet();
// Set bounding set
// Inform remote clients about the new bandwidth
// inform the remote client
- _rtpRtcp.SetTMMBN(boundingSet);
+ _rtpRtcp.SetTMMBN(&bounding);
// might trigger a TMMBN
- if (numBoundingSet == 0) {
+ if (bounding.empty()) {
// owner of max bitrate request has timed out
// empty bounding set has been sent
return 0;
« no previous file with comments | « webrtc/modules/rtp_rtcp/source/CPPLINT.cfg ('k') | webrtc/modules/rtp_rtcp/source/rtcp_sender.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698