Move class RTCPHelp::RTCPPacketInformation into RTCPReceiver

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 94 matching lines @@
   bool UpdateRTCPReceiveInformationTimers();
 
   std::vector<rtcp::TmmbItem> BoundingSet(bool* tmmbr_owner);
 
   void UpdateTmmbr();
 
   void RegisterRtcpStatisticsCallback(RtcpStatisticsCallback* callback);
   RtcpStatisticsCallback* GetRtcpStatisticsCallback();
 
  private:
+  class PacketInformation;
   using ReceivedInfoMap = std::map<uint32_t, RTCPHelp::RTCPReceiveInformation*>;
   // RTCP report block information mapped by remote SSRC.
   using ReportBlockInfoMap =
       std::map<uint32_t, RTCPHelp::RTCPReportBlockInformation*>;
   // RTCP report block information map mapped by source SSRC.
   using ReportBlockMap = std::map<uint32_t, ReportBlockInfoMap>;
 
   bool ParseCompoundPacket(const uint8_t* packet_begin,
                            const uint8_t* packet_end,
-                           RTCPHelp::RTCPPacketInformation* packet_information);
+                           PacketInformation* packet_information);
 
   void TriggerCallbacksFromRTCPPacket(
-      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation);
+      const PacketInformation& packet_information);
 
   RTCPUtility::RTCPCnameInformation* CreateCnameInformation(
       uint32_t remoteSSRC);
   RTCPUtility::RTCPCnameInformation* GetCnameInformation(
       uint32_t remoteSSRC) const;
 
   RTCPHelp::RTCPReceiveInformation* CreateReceiveInformation(
       uint32_t remoteSSRC);
   RTCPHelp::RTCPReceiveInformation* GetReceiveInformation(uint32_t remoteSSRC);
 
-  void HandleSenderReport(
-      const rtcp::CommonHeader& rtcp_block,
-      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+  void HandleSenderReport(const rtcp::CommonHeader& rtcp_block,
+                          PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
-  void HandleReceiverReport(
-      const rtcp::CommonHeader& rtcp_block,
-      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+  void HandleReceiverReport(const rtcp::CommonHeader& rtcp_block,
+                            PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleReportBlock(const rtcp::ReportBlock& report_block,
-                         RTCPHelp::RTCPPacketInformation& rtcpPacketInformation,
+                         PacketInformation* packet_information,
                          uint32_t remoteSSRC)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleSDES(const rtcp::CommonHeader& rtcp_block,
-                  RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                  PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleXr(const rtcp::CommonHeader& rtcp_block,
-                RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
-  void HandleXrReceiveReferenceTime(
-      const rtcp::Rrtr& rrtr,
-      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+  void HandleXrReceiveReferenceTime(const rtcp::Rrtr& rrtr,
+                                    PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
-  void HandleXrDlrrReportBlock(
-      const rtcp::ReceiveTimeInfo& rti,
-      RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+  void HandleXrDlrrReportBlock(const rtcp::ReceiveTimeInfo& rti,
+                               PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleNACK(const rtcp::CommonHeader& rtcp_block,
-                  RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                  PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleBYE(const rtcp::CommonHeader& rtcp_block)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandlePLI(const rtcp::CommonHeader& rtcp_block,
-                 RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                 PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleSLI(const rtcp::CommonHeader& rtcp_block,
-                 RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                 PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleRPSI(const rtcp::CommonHeader& rtcp_block,
-                  RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                  PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandlePsfbApp(const rtcp::CommonHeader& rtcp_block,
-                     RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                     PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleTMMBR(const rtcp::CommonHeader& rtcp_block,
-                   RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                   PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleTMMBN(const rtcp::CommonHeader& rtcp_block,
-                   RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                   PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleSR_REQ(const rtcp::CommonHeader& rtcp_block,
-                    RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                    PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   void HandleFIR(const rtcp::CommonHeader& rtcp_block,
-                 RTCPHelp::RTCPPacketInformation& rtcpPacketInformation)
+                 PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
-  void HandleTransportFeedback(
-      const rtcp::CommonHeader& rtcp_block,
-      RTCPHelp::RTCPPacketInformation* rtcp_packet_information)
+  void HandleTransportFeedback(const rtcp::CommonHeader& rtcp_block,
+                               PacketInformation* packet_information)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
 
   RTCPHelp::RTCPReportBlockInformation* CreateOrGetReportBlockInformation(
       uint32_t remote_ssrc,
       uint32_t source_ssrc)
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
   RTCPHelp::RTCPReportBlockInformation* GetReportBlockInformation(
       uint32_t remote_ssrc,
       uint32_t source_ssrc) const
       EXCLUSIVE_LOCKS_REQUIRED(_criticalSectionRTCPReceiver);
@@ skipping 45 matching lines @@
   RtcpPacketTypeCounterObserver* const packet_type_counter_observer_;
   RtcpPacketTypeCounter packet_type_counter_;
 
   RTCPUtility::NackStats nack_stats_;
 
   size_t num_skipped_packets_;
   int64_t last_skipped_packets_warning_;
 };
 }  // namespace webrtc
 #endif  // WEBRTC_MODULES_RTP_RTCP_SOURCE_RTCP_RECEIVER_H_