[rtp_rtcp] tmmbr helper simplified by moving set_to_send member out

webrtc/modules/rtp_rtcp/source/rtcp_sender.h

 /*
  *  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 117 matching lines @@
   void SetREMBStatus(bool enable);
 
   void SetREMBData(uint32_t bitrate, const std::vector<uint32_t>& ssrcs);
 
   bool TMMBR() const;
 
   void SetTMMBRStatus(bool enable);
 
   void SetMaxPayloadLength(size_t max_payload_length);
 
-  int32_t SetTMMBN(const TMMBRSet* boundingSet);
+  void SetTMMBN(const std::vector<rtcp::TmmbItem>* boundingSet);
 
   int32_t SetApplicationSpecificData(uint8_t subType,
                                      uint32_t name,
                                      const uint8_t* data,
                                      uint16_t length);
   int32_t SetRTCPVoIPMetrics(const RTCPVoIPMetric* VoIPMetric);
 
   void SendRtcpXrReceiverReferenceTime(bool enable);
 
   bool RtcpXrReceiverReferenceTime() const;
@@ skipping 85 matching lines @@
   std::vector<uint32_t> csrcs_ GUARDED_BY(critical_section_rtcp_sender_);
 
   // Full intra request
   uint8_t sequence_number_fir_ GUARDED_BY(critical_section_rtcp_sender_);
 
   // REMB
   uint32_t remb_bitrate_ GUARDED_BY(critical_section_rtcp_sender_);
   std::vector<uint32_t> remb_ssrcs_ GUARDED_BY(critical_section_rtcp_sender_);
 
   TMMBRHelp tmmbr_help_ GUARDED_BY(critical_section_rtcp_sender_);
+  std::vector<rtcp::TmmbItem> tmmbn_to_send_
+      GUARDED_BY(critical_section_rtcp_sender_);
   uint32_t tmmbr_send_ GUARDED_BY(critical_section_rtcp_sender_);
   uint32_t packet_oh_send_ GUARDED_BY(critical_section_rtcp_sender_);
   size_t max_payload_length_;
 
   // APP
   uint8_t app_sub_type_ GUARDED_BY(critical_section_rtcp_sender_);
   uint32_t app_name_ GUARDED_BY(critical_section_rtcp_sender_);
   std::unique_ptr<uint8_t[]> app_data_
       GUARDED_BY(critical_section_rtcp_sender_);
   uint16_t app_length_ GUARDED_BY(critical_section_rtcp_sender_);
@@ skipping 34 matching lines @@
 
   typedef std::unique_ptr<rtcp::RtcpPacket> (RTCPSender::*BuilderFunc)(
       const RtcpContext&);
   std::map<RTCPPacketType, BuilderFunc> builders_;
 
   RTC_DISALLOW_IMPLICIT_CONSTRUCTORS(RTCPSender);
 };
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_SENDER_H_