Cleaned out candidateSet member from TMMBRHelp class

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 1215 matching lines @@
     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() {
-  TMMBRHelp tmmbr_help;
-  uint32_t bitrate = 0;
-  uint32_t accNumCandidates = 0;
-
   int32_t size = TMMBRReceived(0, 0, NULL);
+  TMMBRSet candidates;
   if (size > 0) {
-    TMMBRSet* candidateSet = tmmbr_help.VerifyAndAllocateCandidateSet(size);
+    candidates.reserve(size);
     // Get candidate set from receiver.
-    accNumCandidates = TMMBRReceived(size, accNumCandidates, candidateSet);
+    TMMBRReceived(size, 0, &candidates);
   }
   // Find bounding set
-  std::vector<rtcp::TmmbItem> bounding = tmmbr_help.FindTMMBRBoundingSet();
+  std::vector<rtcp::TmmbItem> bounding =
+      TMMBRHelp::FindBoundingSet(std::move(candidates));
   // 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;
   }
-  // Get net bitrate from bounding set depending on sent packet rate

[danilchap, 2016/08/10 11:18:48]

comment say bounding set is used, but code used candidate set.
New code use bounding set, both because it make more sense and easier.
Result should be the same anyway: 1st element of the bounding set is a minimum
bitrate element from the candidates set (see Step 3 in FindBoundingSet function)

-  if (tmmbr_help.CalcMinBitRate(&bitrate)) {
-    // we have a new bandwidth estimate on this channel
-    if (_cbRtcpBandwidthObserver) {
-        _cbRtcpBandwidthObserver->OnReceivedEstimatedBitrate(bitrate * 1000);
-    }
+  // We have a new bandwidth estimate on this channel.
+  if (_cbRtcpBandwidthObserver) {
+    uint64_t bitrate_bps = TMMBRHelp::CalcMinBitrateBps(bounding);
+    _cbRtcpBandwidthObserver->OnReceivedEstimatedBitrate(bitrate_bps);
   }
   return 0;
 }
 
 void RTCPReceiver::RegisterRtcpStatisticsCallback(
     RtcpStatisticsCallback* callback) {
   rtc::CritScope cs(&_criticalSectionFeedbacks);
   stats_callback_ = callback;
 }
 
@@ skipping 159 matching lines @@
         return -1;
       }
       num += receiveInfo->TmmbrSet.lengthOfSet();
       receiveInfoIt++;
     }
   }
   return num;
 }
 
 }  // namespace webrtc