[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 114 matching lines @@
   bool REMB() const;
 
   void SetREMBStatus(bool enable);
 
   void SetREMBData(uint32_t bitrate, const std::vector<uint32_t>& ssrcs);
 
   bool TMMBR() const;
 
   void SetTMMBRStatus(bool enable);
 
-  int32_t SetTMMBN(const TMMBRSet* boundingSet);
+  void SetTMMBN(const TMMBRSet* boundingSet);

[philipel, 2016/03/04 10:49:27]

While you are at it, change to const TMMBRSet& instead.

[danilchap, 2016/03/04 14:06:13]

Unfortunately right now caller can't guarantee non-null parameter.
So leaving this change until later CL where this guarantee would be obvious.

 
   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_

[philipel, 2016/03/04 10:49:27]

Don't you think it would be clearer to use a TMMBRSet instead of a vector here?
Even if you don't need any of the convenience functions I still think it is
better.

[danilchap, 2016/03/04 14:06:13]

Yes, it is inconsistent with SetTMMBN function, but
TMMBRSet type doesn't follow type name convention and doesn't add any real
features to vector. Goal is to remove this type completely.
So, to be clearer, I've updated SetTMMBN function instead.

+      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_);
 
   // APP
   uint8_t app_sub_type_ GUARDED_BY(critical_section_rtcp_sender_);
   uint32_t app_name_ GUARDED_BY(critical_section_rtcp_sender_);
   rtc::scoped_ptr<uint8_t[]> app_data_
       GUARDED_BY(critical_section_rtcp_sender_);
   uint16_t app_length_ GUARDED_BY(critical_section_rtcp_sender_);
 
@@ skipping 33 matching lines @@
 
   typedef rtc::scoped_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_