Rename ReceiveInfo to TmmbrInfo

webrtc/modules/rtp_rtcp/source/rtcp_receiver.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 87 matching lines @@
   // intervals, but only triggers true once.
   bool RtcpRrTimeout(int64_t rtcp_interval_ms);
 
   // Returns true if we haven't received an RTCP RR telling the receive side
   // has not received RTP packets for too long, i.e. extended highest sequence
   // number hasn't increased for several RTCP intervals. The function only
   // returns true once until a new RR is received.
   bool RtcpRrSequenceNumberTimeout(int64_t rtcp_interval_ms);
 
   std::vector<rtcp::TmmbItem> TmmbrReceived();
-
-  bool UpdateRTCPReceiveInformationTimers();
-
+  // Return true if new bandwidth should be set.
+  bool UpdateTmmbrTimers();
   std::vector<rtcp::TmmbItem> BoundingSet(bool* tmmbr_owner);
-
-  void UpdateTmmbr();
+  // Set new bandwidth and notify remote clients about it.
+  void NotifyTmmbrUpdated();
 
   void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback);
   RtcpStatisticsCallback* GetRtcpStatisticsCallback();
 
  private:
   struct PacketInformation;
-  struct ReceiveInformation;
+  struct TmmbrInformation;
   struct ReportBlockWithRtt;
   struct LastFirStatus;
-  // Mapped by remote ssrc.
-  using ReceivedInfoMap = std::map<uint32_t, ReceiveInformation>;
   // RTCP report blocks mapped by remote SSRC.
   using ReportBlockInfoMap = std::map<uint32_t, ReportBlockWithRtt>;
   // RTCP report blocks map mapped by source SSRC.
   using ReportBlockMap = std::map<uint32_t, ReportBlockInfoMap>;
 
   bool ParseCompoundPacket(const uint8_t* packet_begin,
                            const uint8_t* packet_end,
                            PacketInformation* packet_information);
 
   void TriggerCallbacksFromRtcpPacket(
       const PacketInformation& packet_information);
 
-  void CreateReceiveInformation(uint32_t remote_ssrc)
+  void CreateTmmbrInformation(uint32_t remote_ssrc)
       EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
-  ReceiveInformation* GetReceiveInformation(uint32_t remote_ssrc)
+  TmmbrInformation* GetTmmbrInformation(uint32_t remote_ssrc)
       EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
 
   void HandleSenderReport(const rtcp::CommonHeader& rtcp_block,
                           PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
 
   void HandleReceiverReport(const rtcp::CommonHeader& rtcp_block,
                             PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(rtcp_receiver_lock_);
 
@@ skipping 85 matching lines @@
   NtpTime last_received_sr_ntp_;
 
   // Received XR receive time report.
   rtcp::ReceiveTimeInfo remote_time_info_;
   // Time when the report was received.
   NtpTime last_received_xr_ntp_;
   // Estimated rtt, zero when there is no valid estimate.
   bool xr_rrtr_status_ GUARDED_BY(rtcp_receiver_lock_);
   int64_t xr_rr_rtt_ms_;
 
-  // Received report blocks.
+  int64_t oldest_tmmbr_info_ms_ GUARDED_BY(rtcp_receiver_lock_);
+  // Mapped by remote ssrc.
+  std::map<uint32_t, TmmbrInformation> tmmbr_infos_
+      GUARDED_BY(rtcp_receiver_lock_);
+
   ReportBlockMap received_report_blocks_ GUARDED_BY(rtcp_receiver_lock_);
-  ReceivedInfoMap received_infos_ GUARDED_BY(rtcp_receiver_lock_);
-  int64_t oldest_received_info_ms_ GUARDED_BY(rtcp_receiver_lock_);
   std::map<uint32_t, LastFirStatus> last_fir_ GUARDED_BY(rtcp_receiver_lock_);
   std::map<uint32_t, std::string> received_cnames_
       GUARDED_BY(rtcp_receiver_lock_);
 
   // The last time we received an RTCP RR.
   int64_t last_received_rr_ms_ GUARDED_BY(rtcp_receiver_lock_);
 
   // The time we last received an RTCP RR telling we have successfully
   // delivered RTP packet to the remote side.
   int64_t last_increased_sequence_number_ms_;
 
   RtcpStatisticsCallback* stats_callback_ GUARDED_BY(feedbacks_lock_);
 
   RtcpPacketTypeCounterObserver* const packet_type_counter_observer_;
   RtcpPacketTypeCounter packet_type_counter_;
 
   RtcpNackStats nack_stats_;
 
   size_t num_skipped_packets_;
   int64_t last_skipped_packets_warning_ms_;
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_