Cleanup RtcpReceiver::TMMBRReceived function

webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 1216 matching lines @@
     RTCPUtility::RTCPParserV2* rtcp_parser,
     RTCPHelp::RTCPPacketInformation* rtcp_packet_information) {
   rtcp::RtcpPacket* packet = rtcp_parser->ReleaseRtcpPacket();
   RTC_DCHECK(packet != nullptr);
   rtcp_packet_information->rtcpPacketTypeFlags |= kRtcpTransportFeedback;
   rtcp_packet_information->transport_feedback_.reset(
       static_cast<rtcp::TransportFeedback*>(packet));
 
   rtcp_parser->Iterate();
 }
+
 int32_t RTCPReceiver::UpdateTMMBR() {
-  int32_t size = TMMBRReceived(0, 0, NULL);
-  TMMBRSet candidates;
-  if (size > 0) {
-    candidates.reserve(size);
-    // Get candidate set from receiver.
-    TMMBRReceived(size, 0, &candidates);
-  }
   // Find bounding set
   std::vector<rtcp::TmmbItem> bounding =
-      TMMBRHelp::FindBoundingSet(std::move(candidates));
+      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;
@@ skipping 134 matching lines @@
   rtc::CritScope lock(&_criticalSectionRTCPReceiver);
   RTCPCnameInformation* cnameInfo = GetCnameInformation(remoteSSRC);
   if (cnameInfo == NULL) {
     return -1;
   }
   cName[RTCP_CNAME_SIZE - 1] = 0;
   strncpy(cName, cnameInfo->name, RTCP_CNAME_SIZE - 1);
   return 0;
 }
 
-// no callbacks allowed inside this function
-int32_t RTCPReceiver::TMMBRReceived(uint32_t size,
-                                    uint32_t accNumCandidates,
-                                    TMMBRSet* candidateSet) const {
+std::vector<rtcp::TmmbItem> RTCPReceiver::TMMBRReceived() const {
   rtc::CritScope lock(&_criticalSectionRTCPReceiver);
+  std::vector<rtcp::TmmbItem> candidates;
 
-  std::map<uint32_t, RTCPReceiveInformation*>::const_iterator
-      receiveInfoIt = _receivedInfoMap.begin();
-  if (receiveInfoIt == _receivedInfoMap.end()) {
-    return -1;
+  int64_t now_ms = _clock->TimeInMilliseconds();
+
+  for (const auto& kv : _receivedInfoMap) {
+    RTCPReceiveInformation* receive_info = kv.second;
+    RTC_DCHECK(receive_info);
+    receive_info->GetTMMBRSet(now_ms, &candidates);
   }
-  uint32_t num = accNumCandidates;
-  if (candidateSet) {
-    while( num < size && receiveInfoIt != _receivedInfoMap.end()) {
-      RTCPReceiveInformation* receiveInfo = receiveInfoIt->second;
-      if (receiveInfo == NULL) {
-        return 0;
-      }
-      for (uint32_t i = 0;
-           (num < size) && (i < receiveInfo->TmmbrSet.lengthOfSet()); i++) {
-        if (receiveInfo->GetTMMBRSet(i, num, candidateSet,
-                                     _clock->TimeInMilliseconds()) == 0) {
-          num++;
-        }
-      }
-      receiveInfoIt++;
-    }
-  } else {
-    while (receiveInfoIt != _receivedInfoMap.end()) {
-      RTCPReceiveInformation* receiveInfo = receiveInfoIt->second;
-      if(receiveInfo == NULL) {
-        return -1;
-      }
-      num += receiveInfo->TmmbrSet.lengthOfSet();
-      receiveInfoIt++;
-    }
-  }
-  return num;
+  return candidates;
 }
 
 }  // namespace webrtc