Move RtcEventLog object from inside VoiceEngine to Call.

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 61 matching lines @@
     RtcpReceiveTimeInfo last_xr_rr;
 
     // Used when generating TMMBR.
     ModuleRtpRtcpImpl* module;
   };
 
   RTCPSender(bool audio,
              Clock* clock,
              ReceiveStatistics* receive_statistics,
              RtcpPacketTypeCounterObserver* packet_type_counter_observer,
-             RtcEventLog* event_log,
              Transport* outgoing_transport);
   virtual ~RTCPSender();
 
   RtcpMode Status() const;
   void SetRTCPStatus(RtcpMode method);
 
   bool Sending() const;
   int32_t SetSendingStatus(const FeedbackState& feedback_state,
                            bool enabled);  // combine the functions
 
@@ skipping 49 matching lines @@
 
   void SendRtcpXrReceiverReferenceTime(bool enable);
 
   bool RtcpXrReceiverReferenceTime() const;
 
   void SetCsrcs(const std::vector<uint32_t>& csrcs);
 
   void SetTargetBitrate(unsigned int target_bitrate);
   bool SendFeedbackPacket(const rtcp::TransportFeedback& packet);
 
+  void SetRtcEventLog(RtcEventLog* event_log);
+
  private:
   class RtcpContext;
 
   // Determine which RTCP messages should be sent and setup flags.
   void PrepareReport(const std::set<RTCPPacketType>& packetTypes,
                      const FeedbackState& feedback_state)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
   bool AddReportBlock(const FeedbackState& feedback_state,
                       uint32_t ssrc,
@@ skipping 33 matching lines @@
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
   rtc::scoped_ptr<rtcp::RtcpPacket> BuildDlrr(const RtcpContext& context)
       EXCLUSIVE_LOCKS_REQUIRED(critical_section_rtcp_sender_);
 
  private:
   const bool audio_;
   Clock* const clock_;
   Random random_ GUARDED_BY(critical_section_rtcp_sender_);
   RtcpMode method_ GUARDED_BY(critical_section_rtcp_sender_);
 
-  RtcEventLog* const event_log_;
+  rtc::scoped_ptr<CriticalSectionWrapper> event_log_crit_;
+  RtcEventLog* event_log_ GUARDED_BY(event_log_crit_);

[the sun, 2016/03/03 09:25:13]

Can you use critical_section_rtcp_sender_ instead?

[stefan-webrtc, 2016/03/03 10:08:25]

Or set it in the constructor and make it const?

[ivoc, 2016/03/10 13:15:36]

This is changed into a pointer to the proxy object, so the critical section is
no longer needed.

   Transport* const transport_;
 
   rtc::scoped_ptr<CriticalSectionWrapper> critical_section_rtcp_sender_;
   bool using_nack_ GUARDED_BY(critical_section_rtcp_sender_);
   bool sending_ GUARDED_BY(critical_section_rtcp_sender_);
   bool remb_enabled_ GUARDED_BY(critical_section_rtcp_sender_);
 
   int64_t next_time_to_send_rtcp_ GUARDED_BY(critical_section_rtcp_sender_);
 
   uint32_t start_timestamp_ GUARDED_BY(critical_section_rtcp_sender_);
@@ skipping 68 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_